[PATCH conductor] update conductor to work against ruby 1.9.3

Tomas Sedovic tsedovic at redhat.com
Thu Feb 9 09:47:19 UTC 2012


On 02/08/2012 06:34 PM, Mo Morsi wrote:
> From: mmorsi<mmorsi at redhat.com>
>
> ---
>   aeolus-conductor.spec.in                           |    9 ++++-----
>   src/Gemfile                                        |    1 -
>   src/Gemfile.lock                                   |    2 --
>   src/app/stylesheets/layout.scss                    |    2 +-
>   src/config/application.rb                          |    2 --
>   src/config/locales/en.yml                          |   12 ++++++------
>   ...824_rename_cloud_account_to_provider_account.rb |   12 ++++++------
>   7 files changed, 17 insertions(+), 23 deletions(-)
>
> diff --git a/aeolus-conductor.spec.in b/aeolus-conductor.spec.in
> index e6a2659..2b6b20a 100644
> --- a/aeolus-conductor.spec.in
> +++ b/aeolus-conductor.spec.in
> @@ -17,8 +17,8 @@ URL:      http://aeolusproject.org
>   # cp aeolus-conductor-0.3.0.tar.gz ~/rpmbuild/SOURCES
>   Source0:    aeolus-conductor-%{version}.tar.gz
>
> -Requires: ruby>= 1.8.1
> -Requires: ruby(abi) = 1.8
> +Requires: ruby>= 1.9.3
> +Requires: ruby(abi) = 1.9.1
>   Requires: rubygem(rails)>= 3.0.7
>   Requires: rubygem(haml)>= 3.1
>   Requires: rubygem(nokogiri)>= 1.4.0
> @@ -31,11 +31,10 @@ Requires: rubygem(json)
>   Requires: rubygem(rack-restful_submit)
>   Requires: rubygem(uuidtools)
>   Requires: rubygem(sqlite3)
> -Requires: rubygem(fastercsv)
>   Requires: rubygem(rails_warden)
> -Requires: rubygem(aeolus-image)>= 0.1.0-4
> +Requires: rubygem(aeolus-image)
>   Requires: rubygem(pg)
> -Requires: rubygem(ruby-net-ldap)
> +Requires: rubygem(net-ldap)
>   Requires: rubygem(oauth)
>   Requires: rubygem(rake)
>   Requires: postgresql
> diff --git a/src/Gemfile b/src/Gemfile
> index 2d8e8df..2f3bda3 100644
> --- a/src/Gemfile
> +++ b/src/Gemfile
> @@ -17,7 +17,6 @@ gem 'pg'
>   gem 'thin'
>   gem 'json'
>   gem 'railties'
> -gem 'fastercsv'
>   gem 'rails_warden'
>   gem 'ruby-net-ldap'
>   gem 'aeolus-image'
> diff --git a/src/Gemfile.lock b/src/Gemfile.lock
> index cc74477..e551cc4 100644
> --- a/src/Gemfile.lock
> +++ b/src/Gemfile.lock
> @@ -67,7 +67,6 @@ GEM
>       factory_girl_rails (1.4.0)
>         factory_girl (~>  2.3.0)
>         railties (>= 3.0.0)
> -    fastercsv (1.5.4)
>       ffi (1.0.9)
>       gherkin (2.4.5)
>         json (>= 1.4.6)
> @@ -170,7 +169,6 @@ DEPENDENCIES
>     database_cleaner
>     deltacloud-client
>     factory_girl_rails
> -  fastercsv
>     haml
>     json
>     launchy
> diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
> index d9aa2ff..07a0c2d 100644
> --- a/src/app/stylesheets/layout.scss
> +++ b/src/app/stylesheets/layout.scss
> @@ -2768,7 +2768,7 @@ ul.catalog_pretty {
>           display: table-cell;
>           vertical-align: middle;
>           a{ margin-right: 10px; text-decoration: none; }
> -        a:after{ content: " ▼"; }
> +        a:after{ content: " +"; }
>           a:hover{ color: black; }
>         }
>
> diff --git a/src/config/application.rb b/src/config/application.rb
> index f2295ab..00a7835 100644
> --- a/src/config/application.rb
> +++ b/src/config/application.rb
> @@ -39,7 +39,6 @@ else
>     require 'pg'
>     require 'thin'
>     require 'json'
> -  require 'fastercsv'
>     require 'nokogiri'
>     #require 'railties'
>
> @@ -52,7 +51,6 @@ else
>       require 'cucumber'
>       require 'database_cleaner'
>       require 'vcr'
> -    require 'webmock'
>       require 'launchy'
>     end
>   end
> diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
> index b23efe4..1faa356 100644
> --- a/src/config/locales/en.yml
> +++ b/src/config/locales/en.yml
> @@ -3,8 +3,8 @@ en:
>     datetime:
>       distance_in_words:
>         x_hours:
> -        one: 1 hour
> -        other: %{count} hours
> +        one: "1 hour"
> +        other: "%{count} hours"
>     users:
>       users_groups: "Users&  Groups"
>       return_to: "Return to:"
> @@ -179,7 +179,7 @@ en:
>         finalize: Finalize
>         reference: "Reference to %{assembly}'s return parameter: %{parameter}"
>       overview:
> -      pool_name: %{pool} Pool
> +      pool_name: "%{pool} Pool"
>         header: Deploy "%{deployment}" to %{pool} Pool?
>         confirmation:
>           Are you sure you wish to deploy "%{deployment}" to the %{pool} Pool? Doing
> @@ -422,11 +422,11 @@ en:
>         catalog: Catalog
>         catalog_entry: Deployable
>         image: "Image:"
> -      pushed: %{uuid} pushed to %{provider}
> +      pushed: "%{uuid} pushed to %{provider}"
>       properties:
>         properties: Properties for %{pool}
>       header_show:
> -      pool_name: %{name} Pool
> +      pool_name: "%{name} Pool"
>       flash:
>         notice:
>           added: Pool added.
> @@ -695,7 +695,7 @@ en:
>           delete_failed: Unable to Delete Target Image
>           not_found: Target Image not found
>     images:
> -    environment: %{environment} Environment
> +    environment: "%{environment} Environment"
>       import:
>         import_image: Import Image
>         provider_account: Provider Account
> diff --git a/src/db/migrate/20110117140824_rename_cloud_account_to_provider_account.rb b/src/db/migrate/20110117140824_rename_cloud_account_to_provider_account.rb
> index 5cc44cd..d126a54 100644
> --- a/src/db/migrate/20110117140824_rename_cloud_account_to_provider_account.rb
> +++ b/src/db/migrate/20110117140824_rename_cloud_account_to_provider_account.rb
> @@ -16,14 +16,14 @@
>
>   class RenameCloudAccountToProviderAccount<  ActiveRecord::Migration
>     def self.up
> -    rename_table (:cloud_accounts,:provider_accounts)
> -    remove_column (:providers, :cloud_type)
> -    add_column (:providers, :provider_type, :integer)
> +    rename_table(:cloud_accounts,:provider_accounts)
> +    remove_column(:providers, :cloud_type)
> +    add_column(:providers, :provider_type, :integer)
>     end
>
>     def self.down
> -    remove_column (:providers, :provider_type)
> -    add_column (:providers, :cloud_type, :string, :null =>  false)
> -    rename_table (:provider_accounts, :cloud_accounts)
> +    remove_column(:providers, :provider_type)
> +    add_column(:providers, :cloud_type, :string, :null =>  false)
> +    rename_table(:provider_accounts, :cloud_accounts)
>     end
>   end

Hi Mo,

Good work. One note on removing the 'fastercsv' gem. We're still using 
the `FasterCSV` class in the Instance model.

That should be changed to `CSV` either in this or in a related patch.

Is the plan to maintain compatibility with 1.8? If so, we'd need to make 
sure CSV constant exists and points to FasterCSV under 1.8.

Thomas



More information about the aeolus-devel mailing list