[PATCH aeolus-image-rubygems] update aeolus-image to support both ruby 1.8 and 1.9

Mo Morsi mmorsi at redhat.com
Wed May 2 13:48:50 UTC 2012


---
 Rakefile                                           |    2 +-
 .../model/warehouse/warehouse_model.rb             |    2 +-
 rubygem-aeolus-image.spec.in                       |   11 ++++++++---
 spec/models/warehouse/warehouse_model_spec.rb      |    2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Rakefile b/Rakefile
index e43f22b..59cb58b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -19,7 +19,7 @@ require 'rubygems/package_task'
 require 'rdoc/task'
 require 'rake/testtask'
 require 'rspec/core/rake_task'
-require 'rake/rpmtask'
+require './rake/rpmtask'
 
 RPMBUILD_DIR = "#{File.expand_path('~')}/rpmbuild"
 RPM_SPEC = "rubygem-aeolus-image.spec"
diff --git a/lib/aeolus_image/model/warehouse/warehouse_model.rb b/lib/aeolus_image/model/warehouse/warehouse_model.rb
index dd494d6..881bc04 100644
--- a/lib/aeolus_image/model/warehouse/warehouse_model.rb
+++ b/lib/aeolus_image/model/warehouse/warehouse_model.rb
@@ -40,7 +40,7 @@ module Aeolus
           return false unless instance_variables.sort == other_obj.instance_variables.sort
           # Otherwise, ensure that they're all the same
           instance_variables.each do |iv|
-            next if iv == "@obj"
+            next if iv == "@obj" || iv == :@obj
             return false unless other_obj.instance_variable_get(iv) == instance_variable_get(iv)
             return false unless other_obj.body == body
           end
diff --git a/rubygem-aeolus-image.spec.in b/rubygem-aeolus-image.spec.in
index e8eea79..d54bbbf 100644
--- a/rubygem-aeolus-image.spec.in
+++ b/rubygem-aeolus-image.spec.in
@@ -1,7 +1,12 @@
 %global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %global gemname aeolus-image
 %global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%if 0%{?fedora} > 16
+%global rubyabi 1.9.1
+%else
 %global rubyabi 1.8
+%endif
+
 
 Summary: Ruby Client for interacting with Image Warehouse and Image Factory
 Name: rubygem-aeolus-image
@@ -18,9 +23,6 @@ Requires: rubygems
 Requires: rubygem(nokogiri) >= 1.4.0
 Requires: rubygem(rest-client)
 Requires: rubygem(oauth)
-Requires: rubygem(vcr)
-Requires: rubygem(webmock)
-Requires: rubygem(timecop)
 
 BuildRequires: ruby
 BuildRequires: rubygems
@@ -56,6 +58,9 @@ rm -rf %{buildroot}%{gemdir}/gems/%{gemname}-%{version}/.yardoc
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
+* Wed Feb 15 2012 Mo Morsi <mmorsi at redhat.com> - 0.3.0-3
+- updated to ruby 1.9
+
 * Mon Jan 09 2012 Steve Linabery <slinaber at redhat.com> - 0.3.0-2
 - d0624e1 Add provider_account-filtered 'provider images' method to build model
 - 8108b42 Remove extra_release from spec.in
diff --git a/spec/models/warehouse/warehouse_model_spec.rb b/spec/models/warehouse/warehouse_model_spec.rb
index c537801..c811e34 100644
--- a/spec/models/warehouse/warehouse_model_spec.rb
+++ b/spec/models/warehouse/warehouse_model_spec.rb
@@ -38,7 +38,7 @@ module Aeolus
           context "when other object has the same instance variables list" do
             context "with the same values" do
               let(:other_warehouse_attributes) { @warehouse_model_attributes }
-              it { subject.==(other_warehouse_model).should be_true }
+              it { subject.should == other_warehouse_model }
             end
 
             context "with different values" do
-- 
1.7.6.5




More information about the aeolus-devel mailing list