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

Jason Guiditta jguiditt at redhat.com
Fri Feb 17 17:20:25 UTC 2012


On 16/02/12 17:09 -0500, Mo Morsi wrote:
>---
> Rakefile                     |    2 +-
> rubygem-aeolus-image.spec.in |   11 ++++++++---
> 2 files changed, 9 insertions(+), 4 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/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)

While I agree that these should not be requires, I have 2
questions/concerns here:
1. In theory at least, you can use this library without conductor, so
should we consider adding (this can be at a later date) a -devel
package? Or maybe just rename conductor-devel to aeolus-devel?  Not
sure, just thinking.

2. The gemspec (in Rakefile) includes a development dependency on
rspec ~> 1.3.0, so this seems likely to cause issues (and I noticed we
dont have the above test deps listed there either, which I can add in
the new .gemspec file update I am currently working on - not for 0.3.x
necessarily- I can rebase my stuff to account for your changes oonce
pushed)

>
> 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
>-- 
>1.7.6.5
>



More information about the aeolus-devel mailing list