rpgem 0.1.1 → 0.1.2

data/bin/rpgem

@@ -64,21 +64,31 @@ begin
 
     opts.on('-d DEPENDS',
       '--depends DEPENDS',
-      'Specify a non-gem dependency (e.g. mysql-devel, etc.)'
+      'Specify a non-gem dependency (e.g. mysql, etc.)'
     ) do |d|
       options[:dependencies] ||= []
       options[:dependencies] << d
     end
+
+    opts.on('-B BD',
+      '--build-dependency BD',
+      'Specify a build dependency (e.g. mysql-devel)'
+    ) do |bd|
+      options[:build_dependencies] ||= []
+      options[:build_dependencies] << bd
+    end
+
+    opts.on('-E',
+      '--ree',
+      'Use Ruby Enterprise Edition'
+    ) do
+      options[:ree] = true
+    end
   end.parse!
 
   options.rmerge!({
-    :version => nil,
     :recursive => false,
-    :version_reqs => [],
-    :action => :build!,
-    :ruby_cmd => "ruby",
-    :prefix => '/usr',
-    :dependencies => []
+    :action => :build!
   })
 
   p [options, ARGV]

data/lib/rpgem.rb

@@ -49,13 +49,17 @@ class RPGem
 
   def initialize(name, options={})
     @name = name
-    @options = options.rmerge({
+    @options = options.rmerge!({
       :version => nil,
-      :version_reqs => [],
       :recursive => false,
+      :version_reqs => [],
       :ruby_cmd => "ruby",
-      :dependencies => []
+      :prefix => '/usr',
+      :dependencies => [],
+      :build_dependencies => [],
+      :ree => false
     })
+
     @options.each do |k,v|
       instance_variable_set("@#{k}", v)
     end
@@ -139,7 +143,7 @@ class RPGem
   end
 
   def make_spec!
-    puts "rendering the specfile..."
+    puts "Rendering specfile for #{self.to_s}"
     template = File.read("#{LIB_DIR}/template.spec.erb")
     specfile = ERB.new(template).result(binding)
     puts "rendered:"
@@ -152,11 +156,12 @@ class RPGem
 
   def build!
     make_spec!
-    puts "-*- Building RPM -*-"
+    puts
+    puts "-*- Building RPM rpgem-#{self.to_s} -*-"
     FileUtils.in_dir RPMBUILD_DIR do
       system("rpmbuild -ba #{spec_loc}")
     end
-    puts "-*- Done Building RPM -*-"
+    puts "-*- Done Building RPM rpgem-#{self.to_s} -*-"
   end
 
   def recurse!(action=:setup!)
@@ -164,10 +169,13 @@ class RPGem
     #TODO: don't choke on circular dependencies
     deps = self.spec.runtime_dependencies
     deps.each do |d|
+      puts
+      puts "#{self.to_s} depends on #{d.name}"
       g = self.class.new(d.name,
         :version_reqs => d.requirements_list,
         :recursive => true,
-        :ruby_cmd => @ruby_cmd
+        :prefix => @prefix,
+        :ree => @ree
       )
       g.fetch!
       g.recurse!(action)

data/lib/template.spec.erb

@@ -8,6 +8,18 @@
     v == ">= 0" ? "" : " #{v}"
   end
 
+  ruby = @ree ? "ruby-enterprise" : "ruby"
+  rubygems = @ree ? "ruby-enterprise-rubygems" : "rubygems"
+
+  requires = "#{ruby}#{ruby_ver}, #{rubygems}#{rubygems_ver}#{
+    (spec.runtime_dependencies.map do |d|
+      ", rpgem-#{d.name} #{d.requirements_list.first.gsub(/~>/,'>=')}"
+    end.join + @dependencies.map do |d|
+      ", #{d}"
+    end.join)
+  }"
+  build_requires = "ruby#{ruby_ver}, rubygems#{rubygems_ver}" + 
+    (@dependencies + @build_dependencies).map { |d| ", #{d}"}.join
 %>
 %define rbname <%= spec.name %>
 
@@ -17,24 +29,18 @@ Release:	1%{?dist}
 Summary:	<%= spec.summary || spec.description %>
 
 Group: Development/Languages/Ruby
-License:  <%= spec.license || "#FIXME - this gem has an unspecified license!" %>
-URL:  <%= spec.homepage %>
+License: <%= spec.license || "#FIXME - this gem has an unspecified license" %>
+<%= "Url: #{spec.homepage}" unless spec.homepage.empty? %>
 Source0:  %{_sourcedir}/%{rbname}-%{version}.gem
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Vendor: <%= spec.author %>
-
-BuildRequires: ruby<%=ruby_ver%>, rubygems<%=rubygems_ver%>
-Requires:	ruby<%=ruby_ver%>, rubygems<%=rubygems_ver%><%=
-  spec.runtime_dependencies.map do |d|
-    ", rpgem-#{d.name} #{d.requirements_list.first.gsub(/~>/,'>=')}"
-  end.join
-%><%=
-  @dependencies.map {|d| ", #{d}"}.join
-%>
+<%= "Vendor: #{spec.author}" unless spec.author.empty? %>
+
+BuildRequires: <%= build_requires %>
+Requires:	<%= requires %>
 
 Prefix: <%=@prefix%>
 
-%define gem_prefix %{prefix}/lib/gems/%(%{prefix}/bin/ruby -e "puts VERSION.split('.')[0..1].join('.')")
+%define gem_prefix %{prefix}/lib/ruby/gems/%(%{prefix}/bin/ruby -e "puts VERSION.split('.')[0..1].join('.')")
 
 %description
 <%= spec.description %>
@@ -45,14 +51,17 @@ Prefix: <%=@prefix%>
 %build
 rm -rf $RPM_BUILD_ROOT
 mkdir $RPM_BUILD_ROOT
-%{prefix}/bin/gem install %{SOURCE0} --force --local --no-rdoc --no-ri --install-dir=.
+gem install %{SOURCE0} --force --local --no-rdoc --no-ri --install-dir=.
 
 %install
 
-echo %{gem_prefix}
 rm -rf $RPM_BUILD_ROOT%{gem_prefix}
 mkdir -p $RPM_BUILD_ROOT%{gem_prefix}
 mv * $RPM_BUILD_ROOT%{gem_prefix}
+
+#remove test and spec files, or RPM throws a fit.
+rm -rf $RPM_BUILD_ROOT%{gem_prefix}/gems/%{rbname}-%{version}/{test,spec}
+
 chmod -R 0755 $RPM_BUILD_ROOT%{gem_prefix}
 
 %clean

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rpgem
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jay Adkisson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-17 00:00:00 -07:00
+date: 2010-05-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency