gem2rpm 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5071e2999f126ee7bdc80bc843b599fe549173c3
-  data.tar.gz: b1fd5c29a48f203ef4db2125e8983250a75e88d2
+  metadata.gz: 0e853558c4d17632fc6eff4d64b1917c7f07c5f8
+  data.tar.gz: bdbc295c35e951f0021397087b9bd6e094b67444
 SHA512:
-  metadata.gz: 9007f195afa49da3a9263cb0c4d38e006c727322813a3cddafd24142600b0f6d56c24d05e581d5d16826b1ad88b67023a2dbfeaa0ce68162df6b9fd08612e672
-  data.tar.gz: 4219fb1a7652f37eafc81be919f1750fac3bd1d0691703f627a316a297846ba60d84a1f63e021a90a9a326dccabb31da5f1b022d58f0eb93fb18f3016d2ddf9f
+  metadata.gz: 44b51cfa1e4e131254cef25cfb4c35355c22ddf68150450893821a01d07cb1bb1ef1ec0821c1a3c1f7080e2e079bf73633ee708f1a7d6c117fd79448d666b01e
+  data.tar.gz: 3384aa940e54ab4cb438fd2fdc3cf1a7b72c4a3a2f557b48e679b6d4aa81c137bb6d2b1ba2eb39f13bb7c7bda627f7115b597337ca4ea2b8abe61efc411c89a9

data/AUTHORS

@@ -3,16 +3,25 @@ gem2rpm Authors
 
 Initiated and maintained by:
 
-  David Lutterkort   lutter@watzmann.net
+  David Lutterkort      lutter@watzmann.net
 
 Maintained by:
-  Vít Ondruch        vondruch at gmail dot com
+  Vít Ondruch           vondruch at gmail dot com
+  Josef Strzibny        strzibny at strzibny.name
 
 Patches from:
 
-  Brian Candler      B.Candler at pobox dot com
-  Josh Kelley        joshkel at gmail dot com
-  Paul Nasrat        pauln at truemesh.com
-  Chris Ess          caess at ithiriel.com
-  Matthew Kent       mattkent at rubyforge.com
-  Michal Fojtík      mi at mifo dot sk
+  Brian Candler         B.Candler at pobox dot com
+  Josh Kelley           joshkel at gmail dot com
+  Paul Nasrat           pauln at truemesh.com
+  Chris Ess             caess at ithiriel.com
+  Matthew Kent          mattkent at rubyforge.com
+  Michal Fojtík         mi at mifo dot sk
+  Elan Ruusamäe         glen at delfi.ee
+  Achilleas Pipinellis  axilleas at archlinux.gr
+  Russell Harrison      rharriso at redhat.com
+  Nicolas Dupeux        nicolas.dupeux at arkea.com
+  Ken Dreyer            ktdreyer at ktdreyer.com
+  Bohuslav Kabrda       bkabrda@redhat.com
+  Saleem Ansari         tuxdna@gmail.com
+  Sergio Rubio          rubiojr@frameos.org

data/README.md

@@ -0,0 +1,122 @@
+[![Build Status](https://travis-ci.org/fedora-ruby/gem2rpm.svg?branch=master)](https://travis-ci.org/fedora-ruby/gem2rpm)
+
+# gem2rpm
+
+gem2rpm converts RubyGems packages to RPM spec files.
+
+## Installation
+
+You can install gem2rpm as any other gem from RubyGems.org:
+
+```
+$ gem install gem2rpm
+```
+
+or download gem2rpm from Fedora repositories as RPM package:
+
+```
+# yum install rubygem-gem2rpm
+```
+
+## Usage
+
+Run `gem2rpm --help` to see all of the options.
+
+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:
+
+```
+$ 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.
+
+To support this process, it is recommended to first save the default
+template somewhere:
+
+```
+$ gem2rpm -T > rubygem-GEM.spec.template
+```
+
+Now you can edit the template and then run gem2rpm to generate the spec file using the edited template:
+
+```
+$ gem2rpm -t rubygem-GEM.spec.template > rubygem-GEM.spec
+```
+
+With this new template you can now build your RPM as usual and when a new version of the gem becomes available, you just edit the saved template and rerun gem2rpm over it.
+
+## Templates
+
+The template is a standard ERB file that comes with three main variables:
+
+- `package` - the `Gem::Package` for the gem
+- `spec` - the `Gem::Specification` for the gem (the same as `format.spec`)
+- `config` - the `Gem2Rpm::Configuration` that can redefine default macros or rules used in `spec` template helpers
+
+The following variables still work, but are now 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.
+
+### Template Configuration
+
+To make the templates lighter and more complete, Gem2Rpm introduced in version 0.11.0 new configurable `spec` helpers such as `spec.main_file_entries` or `spec.doc_file_entries` that can be further configured via local `config` variable as follows:
+
+```ruby
+# Change macros for Vagrant packaging
+config.macros[:instdir] = '%{vagrant_plugin_instdir}'
+config.macros[:libdir] = '%{vagrant_plugin_libdir}'
+
+# Change what files go to the -doc sub-package
+config.rules[:doc] = [/\/?doc(\/.*)?/]
+
+```
+
+To see all the defaults that can be changed (from https://github.com/fedora-ruby/gem2rpm/blob/master/lib/gem2rpm/configuration.rb):
+
+```ruby
+$ irb -rgem2rpm
+> Gem2Rpm::Configuration::DEFAULT_MACROS
+> Gem2Rpm::Configuration::DEFAULT_RULES
+```
+
+## Conventions
+
+A typical source RPM for a gem should consist of three files: the gem file
+itself, the template for the spec file and the spec file. To ensure that
+the template will be included in the source RPM, it must be listed as one
+of the sources in the spec file.
+
+The resulting RPMs should follow the naming convention 'rubygem-$GEM'
+where GEM is the name of the packaged gem. The default template also makes
+sure that the resulting package provides 'ruby($GEM)', according to general
+packaging conventions for scripting languages.
+
+## Limitiations
+
+Because of the differences between the two packaging schemes, it is impossible to come up with a completely automated way of doing the conversion, but the spec files produced by this package should be good enough for most pure-ruby gems.
+
+## See also
+
+Fedora ruby and rubygem packaging guidelines:
+-  http://fedoraproject.org/wiki/Packaging/Ruby
+
+Project website
+-  https://github.com/fedora-ruby/gem2rpm

data/bin/gem2rpm

@@ -66,23 +66,15 @@ opts.separator("")
 
 rest = opts.permute(ARGV)
 
-template = nil
-if template_file.nil?
-  template = Gem2Rpm::TEMPLATE
-else
-  begin
-      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)
-  end
-  template = f.read
-  f.close
+template = begin
+  Gem2Rpm::Template.find template_file, :gem_file => rest[0]
+rescue Gem2Rpm::Template::TemplateError
+  $stderr.puts "Could not open template #{template_file}. Aborting"
+  exit(1)
 end
 
 if print_template_file
-  puts template
+  puts template.read
   exit 0
 end
 

data/lib/gem2rpm/configuration.rb

@@ -0,0 +1,55 @@
+require 'singleton'
+
+module Gem2Rpm
+  class Configuration
+    include Singleton
+
+    # The defaults should mostly work
+    DEFAULT_MACROS = {
+      :instdir => '%{gem_instdir}',
+      :libdir => '%{gem_libdir}',
+      :doc => '%doc',
+      :license => '%license',
+      :ignore => '%exclude'
+    }
+
+    DEFAULT_RULES = {
+      :doc => [/\/?CHANGELOG.*/i, /\/?CONTRIBUTING.*/i, /\/?CONTRIBUTORS.*/i,
+               /\/?AUTHORS.*/i,/\/?README.*/i, /\/?History.*/i, /\/?Release.*/i,
+               /\/?doc(\/.*)?/, 'NEWS'],
+      :license => [/\/?MIT/, /\/?GPLv[0-9]+/, /\/?.*LICEN(C|S)E/, /\/?COPYING/],
+      :ignore => ['.gemtest', '.gitignore', '.travis.yml', '.yardopts', '.rvmrc',
+                  '.rubocop.yml', /^\..*rc$/i],
+      # Other files including test files that are not required for
+      # runtime and therefore currently included in -doc
+      :misc => [/.*.gemspec/, /Gemfile.*/, 'Rakefile', 'rakefile.rb', 'Vagrantfile',
+                /^spec.*/, /^rspec.*/, /^test(s|)/, /^examples.*/]
+    }
+
+    # Set the configuration back to default
+    def to_default
+      @_macros = nil
+      @_rules = nil
+      self
+    end
+
+    # Hash with macros for files categories
+    def macros
+      @_macros ||= DEFAULT_MACROS.dup
+    end
+
+    # Hash with rules for file categorization
+    def rules
+      @_rules ||= DEFAULT_RULES.dup
+    end
+
+    def macro_for(category)
+      macros[category] ||= ''
+    end
+
+    def rule_for(category)
+      rules[category] ||= ''
+    end
+
+  end
+end

data/lib/gem2rpm/distro.rb

@@ -1,52 +1,76 @@
 module Gem2Rpm
   class Distro
     FEDORA = :fedora
+    PLD = :pld
     OPENSUSE = :opensuse
     DEFAULT = :default
 
-    OPEN_MODE = # :nodoc:
-      if Object.const_defined? :Encoding
-        'r:UTF-8'
-      else
-        'r'
-      end
+    ROLLING_RELEASES = ['rawhide', 'factory', 'tumbleweed']
 
-    def self.nature
-      if !release_files.grep(/fedora/).empty?
-        versions = []
+    OsRelease = Struct.new :os, :version
+
+    def self.os_release
+      @os_release ||= begin
+        os_release = OsRelease.new DEFAULT
+
+        # Try os-release first.
+        if !release_files.grep(/os-release/).empty?
+          content = File.open(release_files.grep(/os-release/).first, Gem2Rpm::OPEN_MODE) do |f|
+            f.read
+          end
 
-        release_files.each do |file|
-          /\d+/ =~ File.open(file, OPEN_MODE).readline
-          versions << Regexp.last_match.to_s if Regexp.last_match
+          os_release.os = content[/^ID=(.*)$/, 1].to_sym rescue
+          os_release.version = content[/^VERSION_ID=(.*)$/, 1]
         end
 
-        versions.uniq!
+        # If os-release failed (it is empty or has not enough information),
+        # try some other release files.
+        if os_release.os == DEFAULT
+          if !release_files.grep(/fedora/).empty?
+            os_release.os = FEDORA
+            versions = []
 
-        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
+            release_files.each do |file|
+              /\d+/ =~ File.open(file, OPEN_MODE).readline
+              versions << Regexp.last_match.to_s if Regexp.last_match
+            end
+
+            versions.uniq!
+
+            os_release.version = versions.first if versions.length == 1
+          elsif !release_files.grep(/redhat/).empty?
+            # Use Fedora's template for RHEL ATM.
+            os_release.os = FEDORA
+          elsif !release_files.grep(/SuSE/).empty?
+            os_release.os = OPENSUSE
+          elsif !release_files.grep(/pld/).empty?
+            os_release.os = PLD
+          end
         end
-      elsif !release_files.grep(/redhat/).empty?
-        # Use Fedora's template for RHEL ATM.
-        FEDORA
-      elsif !release_files.grep(/SuSE/).empty?
-        OPENSUSE
-      else
-        DEFAULT
+
+        os_release
       end
     end
 
+    def self.nature
+      template_by_os_version(os_release.os, os_release.version) || DEFAULT
+    end
+
     def self.release_files
-      @@release_files ||=
-        Dir.glob('/etc/*{_version,-release}*').select {|e| File.file? e}
+      @release_files ||=
+        Dir.glob('/etc/{os-release,*{_version,-release}}*').uniq.select {|e| File.file? e}
+    end
+
+    def self.release_files=(files)
+      @release_files = files
     end
 
     def self.template_by_os_version(os, version)
-      Dir.new(Gem2Rpm::template_dir).each do |file|
+      Template.list.each do |file|
         next if 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('-'))
+        # We want only distro RubyGems templates to get the right versions
+        next unless file =~ /^#{os}((-([0-9]+\.{0,1}[0-9]+){0,}){0,}(-(#{ROLLING_RELEASES.join('|')})){0,1}).spec.erb/
+        return file.gsub('.spec.erb', '') if Regexp.last_match and in_range?(version, Regexp.last_match[1].to_s.split('-').drop(1))
       end
 
       nil
@@ -59,7 +83,7 @@ module Gem2Rpm
         return true if range.first.to_s == version.to_s
       else # range: [xx, yy]
         if range[0].to_s <= version.to_s
-          return true if range[1] == 'rawhide' or version.to_s <= range[1].to_s
+          return true if ROLLING_RELEASES.include? range[1] or version.to_s <= range[1].to_s
         end
       end
 
@@ -67,4 +91,3 @@ module Gem2Rpm
     end
   end
 end
-

data/lib/gem2rpm/helpers.rb

@@ -40,5 +40,56 @@ module Gem2Rpm
         version == Gem::Version.new(0) ? "" : "#{op} #{version}"
       end
     end
+
+    def self.file_entries_to_rpm(entries)
+      rpm_file_list = entries.map{ |e| self.file_entry_to_rpm(e) }
+      rpm_file_list.join("\n")
+    end
+
+    def self.doc_file?(file)
+      check_str_on_conditions(file, Gem2Rpm::Configuration.instance.rule_for(:doc))
+    end
+
+    def self.license_file?(file)
+      check_str_on_conditions(file, Gem2Rpm::Configuration.instance.rule_for(:license))
+    end
+
+    def self.ignore_file?(file)
+      check_str_on_conditions(file, Gem2Rpm::Configuration.instance.rule_for(:ignore))
+    end
+
+    def self.misc_file?(file)
+      check_str_on_conditions(file, Gem2Rpm::Configuration.instance.rule_for(:misc))
+    end
+
+    def self.file_entry_to_rpm(entry)
+      config = Gem2Rpm::Configuration.instance
+      case true
+      when doc_file?(entry)
+        "#{config.macro_for(:doc)} #{config.macro_for(:instdir)}/#{entry}".strip
+      when license_file?(entry)
+        "#{config.macro_for(:license)} #{config.macro_for(:instdir)}/#{entry}".strip
+      when ignore_file?(entry)
+        "#{config.macro_for(:ignore)} #{config.macro_for(:instdir)}/#{entry}".strip
+      # /lib should have its own macro
+      when entry == 'lib'
+        "#{config.macro_for(:libdir)}"
+      else
+        "#{config.macro_for(:instdir)}/#{entry}"
+      end
+    end
+
+    # Returns a list of top level directories and files
+    # out of an array of file_list
+    def self.top_level_from_file_list(file_list)
+      file_list.map{ |f| f.gsub!(/([^\/]*).*/,"\\1") }.uniq
+    end
+
+    # Compares string to the given regexp conditions
+    def self.check_str_on_conditions(str, conditions)
+      conditions.any? do |condition|
+        condition.is_a?(Regexp) ? condition.match(str) : condition == str
+      end
+    end
   end
 end

data/lib/gem2rpm/specification.rb

@@ -1,13 +1,16 @@
 require 'delegate'
+require 'gem2rpm/configuration'
 require 'gem2rpm/dependency'
 require 'gem2rpm/helpers'
 
 module Gem2Rpm
   class Specification < SimpleDelegator
+
     # A long description of gem wrapped to 78 characters.
     def description
       d = super.to_s.chomp
-      d.gsub!(/([^.])\Z/, "\\1.")
+      d = summary.to_s.chomp if d.empty?
+      d.gsub!(/([^.!?])\Z/, "\\1.")
       Helpers::word_wrap(d, 78) + "\n"
     end
 

data/lib/gem2rpm/template.rb

@@ -0,0 +1,64 @@
+module Gem2Rpm
+  class Template
+    class TemplateError < Exception; end
+
+    attr_accessor :filename
+
+    def self.default_location
+      @@location ||= File.join(File.dirname(__FILE__), '..', '..', 'templates')
+    end
+
+    def self.default_location=(location)
+      @@location = location
+      @@list = nil
+    end
+
+    def self.list
+      @@list ||= Dir.chdir(default_location) do
+        Dir.glob('*').sort
+      end
+    end
+
+    # Returns instance of Template class. If the 'name' parameter is specified
+    # it tries to instantiate the template of specific name first. When
+    # options[:gem_file] is specified, it can be taken into consideration
+    # when looking for vagrant templates for example.
+    def self.find(name = nil, options = {})
+      if name.nil?
+        case options[:gem_file]
+        when /^vagrant(-|_).*/
+          Gem2Rpm::VAGRANT_PLUGIN_TEMPLATE
+        else
+          Gem2Rpm::RUBYGEM_TEMPLATE
+        end
+      else
+        begin
+	  if File.exists?(name)
+            Gem2Rpm::Template.new(name)
+          else
+            Gem2Rpm::Template.new(File.join(Gem2Rpm::Template::default_location, name + '.spec.erb'))
+          end
+        rescue TemplateError
+          raise TemplateError, "Could not locate template #{name}"
+        end
+      end
+    end
+
+    # Create instance of Template class of specified template filename.
+    # TemplateError is raised when the template file does not exists.
+    def initialize(filename)
+      if File.exists? filename
+        @filename = filename
+      else
+        raise TemplateError, "Could not locate template #{filename}"
+      end
+    end
+
+    # Read the content of the template file.
+    def read
+      @content ||= begin
+        File.open(@filename, OPEN_MODE) {|f| f.read }
+      end
+    end
+  end
+end

data/lib/gem2rpm/template_helpers.rb

@@ -0,0 +1,23 @@
+module Gem2Rpm
+  module TemplateHelpers
+    # File list block for the main package
+    def main_file_entries(spec)
+      entries = Helpers.top_level_from_file_list(spec.files)
+      entries.delete_if{ |f| Helpers.doc_file?(f) || Helpers.misc_file?(f) }
+      Helpers.file_entries_to_rpm(entries)
+    end
+
+    # File list block for the doc sub-package
+    def doc_file_entries(spec)
+      entries = Helpers.top_level_from_file_list(spec.files)
+      entries.delete_if{ |f| !(Helpers.doc_file?(f) || Helpers.misc_file?(f)) }
+      Helpers.file_entries_to_rpm(entries)
+    end
+
+    # Provides well formatted requirement with version.
+    def requirement(name, version = nil)
+      version = nil if version && version.to_s.empty?
+      [name, version].compact.join(' ')
+    end
+  end
+end

data/lib/gem2rpm.rb

@@ -5,13 +5,24 @@ require 'gem2rpm/distro'
 require 'gem2rpm/format'
 require 'gem2rpm/spec_fetcher'
 require 'gem2rpm/specification'
+require 'gem2rpm/template_helpers'
+require 'gem2rpm/template'
 
 module Gem2Rpm
-  Gem2Rpm::VERSION = "0.10.1"
+  extend Gem2Rpm::TemplateHelpers
+
+  Gem2Rpm::VERSION = "0.11.0"
 
   class Exception < RuntimeError; end
   class DownloadUrlError < Exception; end
 
+  OPEN_MODE = # :nodoc:
+    if Object.const_defined? :Encoding
+      'r:UTF-8'
+    else
+      'r'
+    end
+
   def self.find_download_url(name, version)
     dep = Gem::Dependency.new(name, "=#{version}")
     fetcher = Gem2Rpm::SpecFetcher.new(Gem::SpecFetcher.fetcher)
@@ -30,13 +41,13 @@ module Gem2Rpm
     download_path
   end
 
-  def Gem2Rpm.convert(fname, template=TEMPLATE, out=$stdout,
+  def Gem2Rpm.convert(fname, template=RUBYGEM_TEMPLATE, out=$stdout,
                       nongem=true, local=false, doc_subpackage = true)
     package = Gem2Rpm::Package.new(fname)
     # Deprecate, kept just for backward compatibility.
     format = Gem2Rpm::Format.new(package)
     spec = Gem2Rpm::Specification.new(package.spec)
-    spec.description ||= spec.summary
+    config = Gem2Rpm::Configuration.instance.to_default
     download_path = ""
     unless local
       begin
@@ -46,8 +57,9 @@ module Gem2Rpm
         $stderr.puts e.inspect
       end
     end
-    template = ERB.new(template, 0, '-')
-    out.puts template.result(binding)
+
+    erb = ERB.new(template.read, 0, '-')
+    out.puts erb.result(binding)
   rescue Gem::Exception => e
     puts e
   end
@@ -56,10 +68,10 @@ module Gem2Rpm
   # gem2spec).  Taken from RPM macros if present, constructed from system
   # username and hostname otherwise.
   def Gem2Rpm.packager()
-    packager = `rpmdev-packager`.chomp rescue ''
+    packager = `rpmdev-packager 2> /dev/null`.chomp rescue ''
 
     if packager.empty?
-      packager = `rpm --eval '%{packager}'`.chomp rescue ''
+      packager = `rpm --eval '%{packager}' 2> /dev/null`.chomp rescue ''
     end
 
     if packager.empty? or packager == '%{packager}'
@@ -70,11 +82,12 @@ module Gem2Rpm
     packager
   end
 
-  def Gem2Rpm.template_dir
-    File.join(File.dirname(__FILE__), '..', 'templates')
+  RUBYGEM_TEMPLATE = Template.new(File.join(Template::default_location, "#{Distro.nature.to_s}.spec.erb"))
+  VAGRANT_PLUGIN_TEMPLATE = begin
+    file = File.join(Template::default_location, "#{Distro.nature.to_s}-vagrant-plugin.spec.erb")
+    Template.new(file) if File.exist? file
   end
 
-  TEMPLATE = File.read File.join(template_dir, "#{Distro.nature.to_s}.spec.erb")
 end
 
 # Local Variables:

data/templates/fedora-21-rawhide-vagrant-plugin.spec.erb

@@ -0,0 +1,123 @@
+# Generated from <%= package.spec.file_name %> by gem2rpm -*- rpm-spec -*-
+%global vagrant_plugin_name <%= spec.name %>
+
+Name: %{vagrant_plugin_name}
+Version: <%= spec.version %>
+Release: 1%{?dist}
+Summary: <%= spec.summary.gsub(/\.$/, "") %>
+Group: Development/Languages
+License: <%= spec.licenses.join(" and ") %>
+<% if spec.homepage -%>
+URL: <%= spec.homepage %>
+<% end -%>
+Source0: <%= download_path %>%{vagrant_plugin_name}-%{version}.gem
+Requires(posttrans): vagrant
+Requires(preun): vagrant
+Requires: vagrant
+BuildRequires: ruby(release)
+BuildRequires: rubygems-devel
+BuildRequires: ruby
+BuildRequires: vagrant
+<% if spec.extensions.empty? -%>
+BuildArch: noarch
+<% end -%>
+Provides: vagrant(%{vagrant_plugin_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
+gem unpack %{SOURCE0}
+
+%setup -q -D -T -n  %{vagrant_plugin_name}-%{version}
+
+gem spec %{SOURCE0} -l --ruby > %{vagrant_plugin_name}.gemspec
+
+%build
+# Create the gem as gem install only works on a gem file
+gem build %{vagrant_plugin_name}.gemspec
+
+# %%vagrant_plugin_install compiles any C extensions and installs the gem into ./%%gem_dir
+# by default, so that we can move it into the buildroot in %%install
+%vagrant_plugin_install
+
+%install
+mkdir -p %{buildroot}%{vagrant_plugin_dir}
+cp -a .%{vagrant_plugin_dir}/* \
+        %{buildroot}%{vagrant_plugin_dir}/
+
+<% unless spec.extensions.empty? -%>
+mkdir -p %{buildroot}%{vagrant_plugin_extdir_mri}
+cp -a .%{vagrant_plugin_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{vagrant_plugin_extdir_mri}/
+
+<% for ext in spec.extensions -%>
+# Prevent dangling symlink in -debuginfo (rhbz#878863).
+rm -rf %{buildroot}%{vagrant_plugin_instdir}/<%= ext.split(File::SEPARATOR).first %>/
+<% end -%>
+<% end -%>
+
+<% unless spec.executables.nil? or spec.executables.empty? -%>
+mkdir -p %{buildroot}%{_bindir}
+cp -pa .%{_bindir}/* \
+        %{buildroot}%{_bindir}/
+<% end -%>
+
+<% unless spec.executables.empty? -%>
+find %{buildroot}%{vagrant_plugin_instdir}/bin -type f | xargs chmod a+x
+<% end -%>
+
+# Run the test suite
+%check
+pushd .%{vagrant_plugin_instdir}
+
+popd
+
+%posttrans
+%vagrant_plugin_register %{vagrant_plugin_name}
+
+%preun
+%vagrant_plugin_unregister %{vagrant_plugin_name}
+
+<%
+# Change macros for Vagrant packaging
+config.macros[:instdir] = '%{vagrant_plugin_instdir}'
+config.macros[:libdir] = '%{vagrant_plugin_libdir}'
+-%>
+%files
+%dir %{vagrant_plugin_instdir}
+<% unless spec.executables.nil? or spec.executables.empty? -%>
+<% for f in spec.executables -%>
+%{_bindir}/<%= f %>
+<% end -%>
+<% end -%>
+<% unless spec.extensions.empty? -%>
+%{vagrant_plugin_extdir_mri}
+<% end -%>
+<%= main_file_entries(spec) %>
+<% unless doc_subpackage -%>
+%doc %{vagrant_plugin_docdir}
+<%= doc_file_entries(spec) -%>
+<% end -%>
+%exclude %{vagrant_plugin_cache}
+%{vagrant_plugin_spec}
+
+<% if doc_subpackage -%>
+%files doc
+%doc %{vagrant_plugin_docdir}
+<%= doc_file_entries(spec) %>
+<% end # if doc_subpackage -%>
+
+%changelog
+* <%= Time.now.strftime("%a %b %d %Y") %> <%= packager %> - <%= spec.version %>-1
+- Initial package

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

@@ -13,15 +13,15 @@ URL: <%= spec.homepage %>
 Source0: <%= download_path %>%{gem_name}-%{version}.gem
 BuildRequires: ruby(release)
 <% for req in spec.required_rubygems_version -%>
-BuildRequires: rubygems-devel <%= req %>
+BuildRequires: <%= requirement 'rubygems-devel', req %>
 <% end -%>
 <% for req in spec.required_ruby_version -%>
-BuildRequires: ruby<%= "-devel" unless spec.extensions.empty? %> <%= req %>
+BuildRequires: <%= requirement "ruby#{'-devel' unless spec.extensions.empty?}", req %>
 <% end -%>
 <% for d in spec.development_dependencies -%>
 <% unless ["rdoc", "rake", "bundler"].include? d.name -%>
 <% for req in d.requirement -%>
-# BuildRequires: rubygem(<%= d.name %>) <%= req  %>
+# BuildRequires: <%= requirement "rubygem(#{d.name})", req %>
 <% end -%>
 <% end -%>
 <% end -%>
@@ -95,17 +95,14 @@ popd
 <% for f in spec.executables -%>
 %{_bindir}/<%= f %>
 <% end -%>
-%{gem_instdir}/bin
 <% end -%>
-%{gem_libdir}
 <% unless spec.extensions.empty? -%>
 %{gem_extdir_mri}
 <% end -%>
+<%= main_file_entries(spec) %>
 <% unless doc_subpackage -%>
 %doc %{gem_docdir}
-<% for f in spec.extra_rdoc_files -%>
-%doc %{gem_instdir}/<%= f %>
-<% end -%>
+<%= doc_file_entries(spec) -%>
 <% end -%>
 %exclude %{gem_cache}
 %{gem_spec}
@@ -113,9 +110,7 @@ popd
 <% if doc_subpackage -%>
 %files doc
 %doc %{gem_docdir}
-<% for f in spec.extra_rdoc_files -%>
-%doc %{gem_instdir}/<%= f %>
-<% end -%>
+<%= doc_file_entries(spec) %>
 <% end # if doc_subpackage -%>
 
 %changelog

data/templates/pld.spec.erb

@@ -0,0 +1,92 @@
+<% if ! spec.development_dependencies.empty? -%>
+#
+# Conditional build:
+%bcond_without	tests		# build without tests
+
+<% end -%>
+%define	pkgname	<%= spec.name %>
+Summary:	<%= spec.summary %>
+Name:		ruby-%{pkgname}
+Version:	<%= spec.version %>
+Release:	0.1
+License:	<%= spec.licenses.empty? ? "GPL v2+ or Ruby" : spec.licenses.join(", ") %>
+Group:		Development/Languages
+Source0:	http://rubygems.org/downloads/%{pkgname}-%{version}.gem
+# Source0-md5:	-
+URL:		<%= spec.homepage %>
+BuildRequires:	rpm-rubyprov
+BuildRequires:	rpmbuild(macros) >= 1.656
+<% if ! spec.extensions.empty? -%>
+BuildRequires:	ruby-devel
+<% end -%>
+<% if ! spec.executables.empty? -%>
+BuildRequires:	sed >= 4.0
+<% end -%>
+<% if ! spec.development_dependencies.empty? -%>
+%if %{with tests}
+<% for d in spec.development_dependencies.sort -%>
+<% for req in d.requirement -%>
+BuildRequires:	ruby-<%= d.name %> <%= req %>
+<% end -%>
+<% end -%>
+%endif
+<% end -%>
+<% if ! spec.required_rubygems_version.empty? and ! spec.required_rubygems_version.first.empty? -%>
+Requires:	ruby-rubygems <%= spec.required_rubygems_version.first %>
+<% end -%>
+<% for d in spec.runtime_dependencies.sort -%>
+<% for req in d.requirement -%>
+Requires:	ruby-<%= d.name %> <%= req %>
+<% end -%>
+<% end -%>
+<% if spec.extensions.empty? -%>
+BuildArch:	noarch
+<% end -%>
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+<%= spec.description %>
+
+%prep
+%setup -q -n %{pkgname}-%{version}
+<% if ! spec.executables.empty? -%>
+%{__sed} -i -e '1 s,#!.*ruby,#!%{__ruby},' bin/*
+<% end -%>
+
+%build
+# write .gemspec
+%__gem_helper spec
+
+<% if !spec.extensions.empty? -%>
+cd ext/%{pkgname}
+%{__ruby} extconf.rb
+%{__make} \
+	CC="%{__cc}" \
+	LDFLAGS="%{rpmldflags}" \
+	CFLAGS="%{rpmcflags} -fPIC"
+<% end -%>
+
+%install
+rm -rf $RPM_BUILD_ROOT
+<% if spec.executables.empty? -%>
+install -d $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{ruby_specdir}}
+<% else -%>
+install -d $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{ruby_specdir},%{_bindir}}
+<% end -%>
+cp -a lib/* $RPM_BUILD_ROOT%{ruby_vendorlibdir}
+<% if ! spec.executables.empty? -%>
+cp -a bin/* $RPM_BUILD_ROOT%{_bindir}
+<% end -%>
+cp -p %{pkgname}-%{version}.gemspec $RPM_BUILD_ROOT%{ruby_specdir}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+<% for f in spec.executables.sort -%>
+%attr(755,root,root) %{_bindir}/<%= f %>
+<% end -%>
+%{ruby_vendorlibdir}/%{pkgname}.rb
+%{ruby_vendorlibdir}/%{pkgname}
+%{ruby_specdir}/%{pkgname}-%{version}.gemspec

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem2rpm
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - David Lutterkort
@@ -9,21 +9,26 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2015-04-30 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"
+description: |2
+    Generate source rpms and rpm spec files from a Ruby Gem.
+    The spec file tries to follow the gem as closely as possible
 email: gem2rpm-devel@rubyforge.org
 executables:
 - gem2rpm
 extensions: []
 extra_rdoc_files:
 - AUTHORS
-- README
+- README.md
 - LICENSE
 files:
+- AUTHORS
+- LICENSE
+- README.md
 - bin/gem2rpm
 - lib/gem2rpm.rb
+- lib/gem2rpm/configuration.rb
 - lib/gem2rpm/dependency.rb
 - lib/gem2rpm/distro.rb
 - lib/gem2rpm/format.rb
@@ -31,16 +36,17 @@ files:
 - lib/gem2rpm/package.rb
 - lib/gem2rpm/spec_fetcher.rb
 - lib/gem2rpm/specification.rb
+- lib/gem2rpm/template.rb
+- lib/gem2rpm/template_helpers.rb
 - templates/default.spec.erb
 - templates/fedora-17-18.spec.erb
-- templates/fedora-19-21.spec.erb
+- templates/fedora-19-20.spec.erb
+- templates/fedora-21-rawhide-vagrant-plugin.spec.erb
 - templates/fedora-21-rawhide.spec.erb
 - templates/fedora.spec.erb
 - templates/opensuse.spec.erb
-- LICENSE
-- README
-- AUTHORS
-homepage: https://github.com/lutter/gem2rpm/
+- templates/pld.spec.erb
+homepage: https://github.com/fedora-ruby/gem2rpm
 licenses: []
 metadata: {}
 post_install_message: 
@@ -49,17 +55,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Generate rpm specfiles from gems

data/README

@@ -1,105 +0,0 @@
-This package is a first attempt at converting ruby gems to rpm's. Because
-of the differences between the two packaging schemes, it is impossible to
-come up with a completely automated way of doing the conversion, but the
-spec files produced by this package should be good enough for most
-pure-ruby gems. I wouldn't put too much hope into automating the gem->rpm
-process for gems with binary code such as database drivers. But even for
-those, gem2rpm provides a good starting point for the packaging gems as
-RPM's.
-
-Installation
-============
-
-Download the ruby gem or an RPM (TODO: more detail)
-
-Usage
-=====
-
-Run 'gem2rpm --help' for options
-
-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. 
-
-To support this process, it is recommended to first save the default
-template somewhere: 
-  gem2rpm -T > rubygem-GEM.spec.template
-
-Now, edit the template and then run gem2rpm to generate the spec file
-using the edited template:
-  gem2rpm -t rubygem-GEM.spec.template > rubygem-GEM.spec
-
-With that, you can now build your RPM as usual. When a new version of the
-gem becomes available, you should edit the saved template and rerun
-gem2rpm over it.
-
-Template Details
-================
-
-The template is a standard erb file; there are two main variables available
-in the template file:
-  
-  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
-===========
-
-A typical source RPM for a gem should consist of three files: the gem file
-itself, the template for the spec file and the spec file. To ensure that
-the template will be included in the source RPM, it must be listed as one
-of the sources in the spec file.
-
-The resulting rpms should follow the naming convention 'rubygem-$GEM'
-where GEM is the name of the packaged gem. The default template also makes
-sure that the resulting package provides 'ruby($GEM)', according to general
-packaging conventions for scripting languages.
-
-Gem Limitiations
-================
-
-Gem has some important limitations that make it next to impossible to
-fully automate the gem -> rpm conversion process. Amongst them are
-  
-  - No license field
-  - No changelog
-  - No distinction between build and install time (important for gems with
-    binary components)
-  - Because of its nature as a separate packaging system, gems can not
-    capture dependencies on non-gem system components, e.g., the ruby
-    PostgreSQL driver can not properly describe its build- and
-    runtime-dependencies on the various pieces of the PostgreSQL database
-
-See also
-========
-
-Fedora ruby and rubygem packaging guidelines:
-  http://fedoraproject.org/wiki/Packaging/Ruby
-
-Project website
-  https://github.com/lutter/gem2rpm/