gem2rpm 0.8.4 → 0.9.0

data/README

@@ -55,12 +55,18 @@ gem2rpm over it.
 Template Details
 ================
 
-The template is a standard erb file; there are three main variables
-available in the template file:
+The template is a standard erb file; there are two main variables available
+in the template file:
   
-  format       - The Gem::Format for the gem
+  package      - The Gem::Package for the gem
   spec         - The Gem::Specification for the gem (the same as format.spec)
 
+Deprecated:
+
+  format       - The Gem::Format for the gem. Please note that this is kept
+                 just for compatibility reasons, since RubyGems 2.0 removed
+                 this class.
+
 Conventions
 ===========
 

data/bin/gem2rpm

@@ -5,7 +5,6 @@ $:.push(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 
 require 'gem2rpm'
 require 'optparse'
-require 'rubygems/format'
 require 'fileutils'
 require 'open-uri'
 require 'uri'
@@ -141,7 +140,7 @@ if srpm
 end
 
 if deps
-  Gem::Format.from_file_by_path(gemfile).spec.dependencies.each do |dep|
+  Gem2Rpm::Package.new(gemfile).spec.dependencies.each do |dep|
     Gem2Rpm::Dependency.new(dep).requirement.each do |r|
       puts "rubygem(#{dep.name}) #{r}"
     end

data/lib/gem2rpm.rb

@@ -1,43 +1,30 @@
 require 'erb'
 require 'socket'
-require 'rubygems/format'
+require 'gem2rpm/package'
 require 'gem2rpm/distro'
+require 'gem2rpm/format'
+require 'gem2rpm/spec_fetcher'
 require 'gem2rpm/specification'
 
-# Adapt to the differences between rubygems < 1.0.0 and after
-# Once we can be reasonably certain that everybody has version >= 1.0.0
-# all this logic should be killed
-GEM_VERSION = Gem::Version.create(Gem::RubyGemsVersion)
-HAS_REMOTE_INSTALLER = GEM_VERSION < Gem::Version.create("1.0.0")
+module Gem2Rpm
+  Gem2Rpm::VERSION = "0.9.0"
 
-if HAS_REMOTE_INSTALLER
-  require 'rubygems/remote_installer'
-end
+  def self.find_download_url(name, version)
+    dep = Gem::Dependency.new(name, "=#{version}")
+    fetcher = Gem2Rpm::SpecFetcher.new(Gem::SpecFetcher.fetcher)
+    dummy, source = fetcher.spec_for_dependency(dep, false).first.first
 
-module Gem2Rpm
-  Gem2Rpm::VERSION = "0.8.4"
+    download_path = source.uri
 
-  if HAS_REMOTE_INSTALLER
-    def self.find_download_url(name, version)
-      installer = Gem::RemoteInstaller.new
-      dummy, download_path = installer.find_gem_to_install(name, "=#{version}")
-      download_path += "/gems/" if download_path.to_s != ""
-      return download_path
-    end
-  else
-    def self.find_download_url(name, version)
-      dep = Gem::Dependency.new(name, "=#{version}")
-      fetcher = Gem::SpecFetcher.fetcher
-      dummy, download_path = fetcher.find_matching(dep, false, false).first
-      download_path += "gems/" if download_path.to_s != ""
-      return download_path
-    end
+    download_path += "gems/" if download_path.to_s != ""
+    return download_path
   end
 
   def Gem2Rpm.convert(fname, template=TEMPLATE, out=$stdout,
                       nongem=true, local=false, doc_subpackage = true)
-    format = Gem::Format.from_file_by_path(fname)
-    spec = Gem2Rpm::Specification.new(format.spec)
+    package = Gem2Rpm::Package.new(fname)
+    format = Gem2Rpm::Format.new(package)
+    spec = Gem2Rpm::Specification.new(package.spec)
     spec.description ||= spec.summary
     download_path = ""
     unless local

data/lib/gem2rpm/format.rb

@@ -0,0 +1,19 @@
+require 'delegate'
+
+module Gem2Rpm
+  class Format < SimpleDelegator
+    # Returns the value of attribute gem_path
+    def gem_path
+      super
+    rescue
+      spec.file_name
+    end
+
+    # Returns the value of attribute file_entries
+    def file_entries
+      super
+    rescue
+      spec.files
+    end
+  end
+end

data/lib/gem2rpm/package.rb

@@ -0,0 +1,14 @@
+require 'delegate'
+require 'rubygems/package'
+begin
+  require 'rubygems/format'
+rescue LoadError
+end
+
+module Gem2Rpm
+  class Package < SimpleDelegator
+    def initialize(gem)
+      super(Gem::Package.new(gem)) rescue super(Gem::Format.from_file_by_path(gem))
+    end
+  end
+end

data/lib/gem2rpm/spec_fetcher.rb

@@ -0,0 +1,17 @@
+require 'delegate'
+require 'ostruct'
+
+module Gem2Rpm
+  class SpecFetcher < SimpleDelegator
+    # Find and fetch specs that match +dependency+.
+    #
+    # If +matching_platform+ is false, gems for all platforms are returned.
+    def spec_for_dependency(dependency, matching_platform=true)
+      super
+    rescue
+      spec, source = find_matching(dependency, true, matching_platform).first
+      source = OpenStruct.new(:uri => source)
+      [[[spec, source]]]
+    end
+  end
+end

data/templates/default.spec.erb

@@ -1,4 +1,4 @@
-# Generated from <%= format.gem_path %> by gem2rpm -*- rpm-spec -*-
+# Generated from <%= package.spec.file_name %> by gem2rpm -*- rpm-spec -*-
 %define rbname <%= spec.name %>
 %define version <%= spec.version %>
 %define release 1
@@ -56,14 +56,14 @@ rmdir %{gembuilddir}/bin
 <% for f in spec.executables -%>
 %{_bindir}/<%= f %>
 <% end -%>
-<% format.file_entries.each do |entry, data| -%>
+<% package.spec.files.each do |entry, data| -%>
 <%   path = entry['path'] -%>
 <%   doc_prefix = spec.extra_rdoc_files.include?(path) ? "%doc " : "" -%>
 <%= doc_prefix %>%{gemdir}/gems/<%= spec.name %>-<%= spec.version %>/<%= path %>
 <% end %>
 
 %doc %{gemdir}/doc/<%= spec.name %>-<%= spec.version %>
-%{gemdir}/cache/<%= format.gem_path %>
-%{gemdir}/specifications/<%= format.gem_path %>spec
+%{gemdir}/cache/<%= package.spec.file_name %>
+%{gemdir}/specifications/<%= package.spec.file_name %>spec
 
 %changelog

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

@@ -1,4 +1,4 @@
-# Generated from <%= File::basename(format.gem_path) %> by gem2rpm -*- rpm-spec -*-
+# Generated from <%= package.spec.file_name %> by gem2rpm -*- rpm-spec -*-
 %global gem_name <%= spec.name %>
 <%# TODO: Try to check against spec.required_ruby_version -%>
 %global rubyabi 1.9.1

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

@@ -1,4 +1,4 @@
-# Generated from <%= File::basename(format.gem_path) %> by gem2rpm -*- rpm-spec -*-
+# Generated from <%= package.spec.file_name %> by gem2rpm -*- rpm-spec -*-
 %global gem_name <%= spec.name %>
 
 Name: rubygem-%{gem_name}

data/templates/fedora.spec.erb

@@ -1,4 +1,4 @@
-# Generated from <%= File::basename(format.gem_path) %> by gem2rpm -*- rpm-spec -*-
+# Generated from <%= package.spec.file_name %> by gem2rpm -*- rpm-spec -*-
 %global gemname <%= spec.name %>
 
 <% if nongem -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem2rpm
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 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"
@@ -27,7 +27,10 @@ files:
 - lib/gem2rpm.rb
 - lib/gem2rpm/dependency.rb
 - lib/gem2rpm/distro.rb
+- lib/gem2rpm/format.rb
 - lib/gem2rpm/helpers.rb
+- lib/gem2rpm/package.rb
+- lib/gem2rpm/spec_fetcher.rb
 - lib/gem2rpm/specification.rb
 - templates/default.spec.erb
 - templates/fedora-17-18.spec.erb