gem2rpm 0.7.1 → 0.8.0

data/README

@@ -17,14 +17,25 @@ Usage
 
 Run 'gem2rpm --help' for options
 
-At its simplest, download a gem (let's call that file GEM) and run
-  gem2rpm $GEM
+At its simplest, download a gem (let's call it GEM) in its latest
+version (e.g. 1.2.3):
+
+  $ gem fetch GEM
+
+and run gem2rpm above the downloaded file:
+
+  $ gem2rpm GEM-1.2.3.gem
+
+You can also use the --fetch flag to fetch the (latest) gem before generating the spec file, achieving the same effect as running 'gem fetch GEM' plus 'gem2rpm GEM-1.2.3.gem':
+
+  $ gem2rpm --fetch GEM
 
 This will print an rpm spec file based on the information contained in the
 gem's spec file. In general, it is necessary to edit the generated spec
 file because the gem is missing some important information that is
 customarily provided in rpm's, most notably the license and the changelog.
 
+
 Rather than editing the generated specfile, edit the template from which
 the specfile is generated. This will make it easier to update the RPM when
 a new version of the Gem becomes available. 

data/bin/gem2rpm

@@ -7,8 +7,10 @@ require 'gem2rpm'
 require 'optparse'
 require 'rubygems/format'
 require 'fileutils'
+require 'open-uri'
+require 'uri'
 
-opts = OptionParser.new("#{$0} [OPTIONS] GEMFILE")
+opts = OptionParser.new("Usage: #{$0} [OPTIONS] GEM")
 opts.separator("  Convert ruby Gems to source RPMs and specfiles")
 opts.separator("  Uses a template to generate the RPM specfile")
 opts.separator("  from the Gem spec")
@@ -21,7 +23,10 @@ srpm = false
 deps = false
 nongem = false
 doc_subpackage = true
+fetch = false
 
+opts.separator("")
+opts.separator("  Options:")
 opts.on("-T", "--current-template", "Print the current template") do |val|
     print_template_file = true
 end
@@ -51,6 +56,15 @@ end
 opts.on("--no-doc", "Disable document subpackage") do |val|
   doc_subpackage = false
 end
+opts.on("--fetch", "Fetch the gem from rubygems.org") do |val|
+  fetch = true
+end
+opts.separator("")
+opts.separator("  Arguments:")
+opts.separator("    GEM            the path to locally stored gem package file or the name")
+opts.separator("                   of the gem when using --fetch.")
+opts.separator("")
+
 rest = opts.permute(ARGV)
 
 template = nil
@@ -58,7 +72,8 @@ if template_file.nil?
   template = Gem2Rpm::TEMPLATE
 else
   begin
-      f = open(template_file, "r")
+      f = open(template_file, "r") if File.exists?(template_file)
+      f = open(File.join(Gem2Rpm.template_dir, template_file + '.spec.erb'), "r") unless f
   rescue Errno::ENOENT
       $stderr.puts "Could not open template #{template_file}. Aborting"
       exit(1)
@@ -79,6 +94,17 @@ if rest.size != 1
 end
 gemfile = rest[0]
 
+if fetch
+  gem_uri = ''
+  open("http://rubygems.org/api/v1/gems/#{gemfile}.json") do |f|
+    gem_uri = f.read.match(/"gem_uri":\s*"(.*?)",/m)[1]
+    gemfile = URI.parse(gem_uri).path.split('/').last
+    open(gemfile, 'w') do |gf|
+      gf.write(open(gem_uri).read)
+    end
+  end
+end
+
 srpmdir = nil
 gemname = nil
 srpmdir = nil
@@ -115,7 +141,9 @@ if srpm
 end
 
 if deps
-    Gem::Format.from_file_by_path(gemfile).spec.dependencies.each do |dep|
-        puts "rubygem(#{dep.name}) #{dep.version_requirements.to_rpm}"
+  Gem::Format.from_file_by_path(gemfile).spec.dependencies.each do |dep|
+    Gem2Rpm::Dependency.new(dep).requirement.each do |r|
+      puts "rubygem(#{dep.name}) #{r}"
     end
+  end
 end

data/lib/gem2rpm/distro.rb

@@ -6,7 +6,20 @@ module Gem2Rpm
 
     def self.nature
       if !release_files.grep(/fedora/).empty?
-        FEDORA
+        versions = []
+
+        release_files.each do |file|
+          /\d+/ =~ File.open(file).readline
+          versions << Regexp.last_match.to_s.to_i if Regexp.last_match
+        end
+
+        versions.uniq!
+
+        if versions.length == 1
+          template_by_os_version(FEDORA, versions.first) || FEDORA
+        else # no version or more versions (=> don't know what to do)
+          FEDORA
+        end
       elsif !release_files.grep(/SuSe/).empty?
         OPENSUSE
       else
@@ -17,6 +30,29 @@ module Gem2Rpm
     def self.release_files
       @@release_files ||= Dir.glob '/etc/*{_version,-release}*'
     end
+
+    def self.template_by_os_version(os, version)
+      Dir.new(Gem2Rpm::template_dir).each do |file|
+        /#{os}-([\w-]+).spec.erb/ =~ file
+        return file.gsub('.spec.erb', '') if Regexp.last_match and in_range?(version, Regexp.last_match[1].to_s.split('-'))
+      end
+
+      nil
+    end
+
+    def self.in_range?(version, range)
+      return nil unless range
+
+      if range.length == 1
+        return true if range.first.to_i == version
+      else # range: [xx, yy]
+        if range[0].to_i <= version
+          return true if range[1] == 'rawhide' or version <= range[1].to_i
+        end
+      end
+
+      false
+    end
   end
 end
 

data/lib/gem2rpm.rb

@@ -15,7 +15,7 @@ if HAS_REMOTE_INSTALLER
 end
 
 module Gem2Rpm
-  Gem2Rpm::VERSION = "0.7.1"
+  Gem2Rpm::VERSION = "0.8.0"
 
   if HAS_REMOTE_INSTALLER
     def self.find_download_url(name, version)
@@ -50,6 +50,8 @@ module Gem2Rpm
     end
     template = ERB.new(template, 0, '-')
     out.puts template.result(binding)
+  rescue Gem::Exception => e
+    puts e
   end
 
   # Returns the email address of the packager (i.e., the person running
@@ -69,7 +71,11 @@ module Gem2Rpm
     packager
   end
 
-  TEMPLATE = File.read File.join(File.dirname(__FILE__), '..', 'templates', "#{Distro.nature.to_s}.spec.erb")
+  def Gem2Rpm.template_dir
+    File.join(File.dirname(__FILE__), '..', 'templates')
+  end
+
+  TEMPLATE = File.read File.join(template_dir, "#{Distro.nature.to_s}.spec.erb")
 end
 
 # Local Variables:

data/templates/fedora-17-rawhide.spec.erb

@@ -0,0 +1,130 @@
+# Generated from <%= File::basename(format.gem_path) %> by gem2rpm -*- rpm-spec -*-
+%global gem_name <%= spec.name %>
+%global rubyabi 1.9.1
+
+Summary: <%= spec.summary.gsub(/\.$/, "") %>
+Name: rubygem-%{gem_name}
+Version: <%= spec.version %>
+Release: 1%{?dist}
+Group: Development/Languages
+License: <%= spec.licenses.empty? ? "GPLv2+ or Ruby" : spec.licenses.join(" and ") %>
+<% if spec.homepage -%>
+URL: <%= spec.homepage %>
+<% end -%>
+Source0: <%= download_path %>%{gem_name}-%{version}.gem
+Requires: ruby(abi) = %{rubyabi}
+<% for req in spec.required_rubygems_version -%>
+Requires: ruby(rubygems) <%= req %>
+<% end -%>
+<%# TODO: Unfortunatelly this do not match with ruby(abi) yet -%>
+<% for req in spec.required_ruby_version -%>
+Requires: ruby <%= req %>
+<% end -%>
+<% for d in spec.runtime_dependencies -%>
+<% for req in d.requirement -%>
+Requires: rubygem(<%= d.name %>) <%= req  %>
+<% end -%>
+<% end -%>
+BuildRequires: ruby(abi) = %{rubyabi}
+<% for req in spec.required_rubygems_version -%>
+BuildRequires: ruby(rubygems) <%= req %>
+<% end -%>
+<%# TODO: Unfortunatelly this do not match with ruby(abi) yet -%>
+<% for req in spec.required_ruby_version -%>
+BuildRequires: ruby <%= req %>
+<% end -%>
+<% if spec.extensions.empty? -%>
+BuildArch: noarch
+<% end -%>
+Provides: rubygem(%{gem_name}) = %{version}
+
+%description
+<%= spec.description %>
+
+<% if doc_subpackage -%>
+%package doc
+Summary: Documentation for %{name}
+Group: Documentation
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description doc
+Documentation for %{name}
+<% end # if doc_subpackage -%>
+
+%prep
+%setup -q -c -T
+mkdir -p .%{gem_dir}
+<% unless spec.extensions.empty? -%>
+export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
+<% end -%>
+gem install --local --install-dir .%{gem_dir} \
+<% unless spec.executables.nil? or spec.executables.empty? -%>
+            --bindir .%{_bindir} \
+<% end -%>
+<% unless spec.extensions.empty? -%>
+            -V \
+<% end -%>
+            --force %{SOURCE0}
+
+%build
+
+%install
+mkdir -p %{buildroot}%{gem_dir}
+cp -a .%{gem_dir}/* \
+        %{buildroot}%{gem_dir}/
+
+<% unless spec.extensions.empty? -%>
+mkdir -p %{buildroot}%{gem_extdir}/<%= spec.require_paths.first %>
+# TODO: move the extensions
+##mv %{buildroot}%{gem_instdir}/<%= spec.require_paths.first %>/shared_object.so %{buildroot}%{gem_extdir}/<%= spec.require_paths.first %>/
+<% end -%>
+
+<% unless spec.executables.nil? or spec.executables.empty? -%>
+mkdir -p %{buildroot}%{_bindir}
+cp -a .%{_bindir}/* \
+        %{buildroot}%{_bindir}/
+<% end -%>
+
+<% unless spec.executables.empty? -%>
+find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x
+<% end -%>
+
+<% unless spec.extensions.empty? -%>
+<%# TODO: Is it possible to delete the folder specified by the spec.extensions? -%>
+# Remove the binary extension sources and build leftovers.
+rm -rf %{buildroot}%{geminstdir}/ext
+<% end -%>
+
+%files
+%dir %{gem_instdir}
+<% unless spec.executables.nil? or spec.executables.empty? -%>
+<% for f in spec.executables -%>
+%{_bindir}/<%= f %>
+<% end -%>
+%{gem_instdir}/bin
+<% end -%>
+%{gem_libdir}
+<% unless spec.extensions.empty? -%>
+%{gem_extdir}
+<% end -%>
+<% unless doc_subpackage -%>
+%doc %{gem_docdir}
+<% for f in spec.extra_rdoc_files -%>
+%doc %{gem_instdir}/<%= f %>
+<% end -%>
+<% end -%>
+%exclude %{gem_cache}
+%{gem_spec}
+
+<% if doc_subpackage -%>
+%files doc
+%doc %{gem_docdir}
+<% for f in spec.extra_rdoc_files -%>
+%doc %{gem_instdir}/<%= f %>
+<% end -%>
+<% end # if doc_subpackage -%>
+
+%changelog
+* <%= Time.now.strftime("%a %b %d %Y") %> <%= packager %> - <%= spec.version %>-1
+- Initial package

data/templates/fedora.spec.erb

@@ -128,7 +128,7 @@ rm -rf %{buildroot}%{geminstdir}/ext
 %doc %{geminstdir}/<%= f %>
 <% end -%>
 <% end -%>
-%{gemdir}/cache/%{gemname}-%{version}.gem
+%exclude %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 <% if doc_subpackage -%>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gem2rpm
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 7
-  - 1
-  version: 0.7.1
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - David Lutterkort
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-30 00:00:00 Z
+date: 2012-01-23 00:00:00 Z
 dependencies: []
 
 description: "  Generate source rpms and rpm spec files from a Ruby Gem. \n  The spec file tries to follow the gem as closely as possible\n"
@@ -31,14 +31,15 @@ extra_rdoc_files:
 - LICENSE
 files: 
 - bin/gem2rpm
-- lib/gem2rpm/distro.rb
 - lib/gem2rpm/specification.rb
 - lib/gem2rpm/helpers.rb
 - lib/gem2rpm/dependency.rb
+- lib/gem2rpm/distro.rb
 - lib/gem2rpm.rb
 - templates/fedora.spec.erb
 - templates/opensuse.spec.erb
 - templates/default.spec.erb
+- templates/fedora-17-rawhide.spec.erb
 - LICENSE
 - README
 - AUTHORS
@@ -71,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Generate rpm specfiles from gems