gem2rpm 0.11.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 911d15cecd229ed97a9a901cfdac408ef08796cb
-  data.tar.gz: 211b7ad4686015ac6eb03729f61a31f85894c581
+  metadata.gz: 533b43170c8f68fbc24c8a17071ea0aa8d620cbf
+  data.tar.gz: e3b075d6da795f5d9629eeca762a6a1114e77e76
 SHA512:
-  metadata.gz: f4cb61a3ab8618afda9f3530bafb8712e76ebc21eb7f00ff97678704584342a3f1af230d4b4d150457db1f33feec7c5756ff0dcc92b7985921e3c3d7f5f2505c
-  data.tar.gz: bf4a5b88e63300b0f0db6bd0f64685250c182a638a2b6e0e41588bd588f65e5ade8187fe438d7ae05e951d09ad907cb7e3284620488f681341bdad6661c83172
+  metadata.gz: 1b886216fa24aee9387abd0beb6518930ad33bb474336f43f36a4b99302af005458b99a7af12de3be79f49fa5773bc59175aacbf9659bc01da9dbf073795064e
+  data.tar.gz: ae28972dbc76725945a3edb23e60fa774fd06867b9e0326f2ad167dfba2a2c413b334b0e659a239240b8ec17265df38f69f1b983f1bb4c29340abc821ed3dd22

data/README.md

@@ -15,7 +15,7 @@ $ gem install gem2rpm
 or download gem2rpm from Fedora repositories as RPM package:
 
 ```
-# yum install rubygem-gem2rpm
+# dnf install rubygem-gem2rpm
 ```
 
 ## Usage
@@ -41,8 +41,7 @@ You can also use the `--fetch` flag to fetch the (latest) gem before generating
 $ 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.
+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
@@ -71,11 +70,17 @@ $ gem2rpm --templates
 
 ## Templates
 
-The template is a standard ERB file that comes with three main variables:
+The template is a standard ERB file that comes with several 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
+- `runtime_dependencies` - the `Gem2Rpm::RpmDependencyList` providing list of package runtime dependencies
+- `development_dependencies` - the `Gem2Rpm::RpmDependencyList` providing list of package development dependencies
+- `tests` - the `Gem2Rpm::TestSuite` providing list of test frameworks allowing their execution
+- `files` - the `Gem2Rpm::RpmFileList` providing unfiltered list of files in package
+- `main_files` - the `Gem2Rpm::RpmFileList` providing list of files suitable for main package
+- `doc_files` - the `Gem2Rpm::RpmFileList` providing list of files suitable for -doc subpackage
 
 The following variables still work, but are now deprecated:
 
@@ -83,7 +88,7 @@ The following variables still work, but are now deprecated:
 
 ### 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:
+To make the templates lighter and more complete, Gem2Rpm introduced in version 0.11.0 new configurable template variables such as `main_files` or `doc_files` that can be further configured via local `config` variable as follows:
 
 ```ruby
 # Change macros for Vagrant packaging
@@ -105,15 +110,11 @@ $ irb -rgem2rpm
 
 ## 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.
+A typical source RPM for a gem should consist of two files: the gem file
+itself and 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.
+where GEM is the name of the packaged gem.
 
 ## Limitations
 

data/bin/gem2rpm

@@ -4,12 +4,26 @@
 $LOAD_PATH.push(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 
 require 'gem2rpm'
-require 'optparse'
 require 'fileutils'
+require 'tmpdir'
 require 'open-uri'
 require 'uri'
 
-options = Gem2Rpm::Configuration.instance.options
+options = begin
+  Gem2Rpm::Configuration.instance.options
+rescue Gem2Rpm::Configuration::InvalidOption => e
+  Gem2Rpm.show_message(e)
+  exit(1)
+end
+if options[:templates]
+  Gem2Rpm.show_templates
+  exit(0)
+end
+if options[:version]
+  Gem2Rpm.show_version
+  exit(0)
+end
+
 rest = options[:args]
 
 template = begin
@@ -25,50 +39,76 @@ if options[:print_template_file]
 end
 
 if rest.size != 1
-  $stderr.puts "Missing GEMFILE\n\n"
-  $stderr.puts opts
+  Gem2Rpm.show_message('Missing GEMFILE')
   exit(1)
 end
 gemfile = rest[0]
+out_dir = options[:directory]
+unless File.directory?(out_dir)
+  Gem2Rpm.show_message("No such directory #{out_dir}")
+  exit(1)
+end
 
 if options[:fetch]
   gem_uri = ''
-  open("https://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)
+  begin
+    open("https://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
+      gemfile = File.join(out_dir, gemfile)
+      open(gemfile, 'w') do |gf|
+        gf.write(open(gem_uri).read)
+      end
     end
+  rescue OpenURI::HTTPError => e
+    Gem2Rpm.show_message("Gem fetch failed with error: #{e.message}")
+    exit(1)
   end
 end
 
-srpmdir = nil
-specfile = nil
-if options[:srpm]
-  gemname = Gem2Rpm::Package.new(gemfile).spec.name
-  srpmdir = `/bin/mktemp -t -d gem2rpm-#{gemname}.XXXXXX`.chomp
-  specfile = File.join(srpmdir, "rubygem-#{gemname}.spec")
-  options[:output_file] ||= specfile
+unless File.exist?(gemfile)
+  Gem2Rpm.show_message("Invalid GEMFILE #{gemfile}")
+  exit(1)
 end
 
-# Produce a specfile
-if options[:output_file].nil?
-  Gem2Rpm.convert(gemfile, template, $stdout, options[:nongem], options[:local], options[:doc_subpackage]) unless options[:deps]
-else
-  begin
-    out = open(options[:output_file], "w")
-    Gem2Rpm.convert(gemfile, template, out, options[:nongem], options[:local], options[:doc_subpackage])
-  ensure
-    out.close
+if options[:deps]
+  Gem2Rpm.print_dependencies(gemfile)
+  exit 0
+end
+
+output_spec = StringIO.new
+Gem2Rpm.convert(gemfile, template, output_spec, options[:nongem], options[:local], options[:doc_subpackage])
+
+# Save or print a specfile.
+if options[:output_file]
+  File.open(options[:output_file], "w") do |f|
+    f.puts(output_spec.string)
   end
+else
+  puts output_spec.string unless options[:srpm]
 end
 
-# Create a  source RPM
+# Create a SRPM.
 if options[:srpm]
-  FileUtils.copy(options[:output_file], specfile) unless File.exist?(specfile)
-  FileUtils.copy(gemfile, srpmdir)
+  gemname = Gem2Rpm::Package.new(gemfile).spec.name
+  Dir.mktmpdir "gem2rpm-#{gemname}-" do |srpmdir|
+    specfile = File.join(srpmdir, "rubygem-#{gemname}.spec")
 
-  system("rpmbuild -bs --nodeps --define '_sourcedir #{srpmdir}' --define '_srcrpmdir #{Dir.pwd}' #{specfile}")
-end
+    File.open(specfile, "w") do |f|
+      f.puts(output_spec.string)
+    end
+
+    FileUtils.copy(gemfile, srpmdir)
+
+    command =
+      "rpmbuild -bs --nodeps " +
+      "--define '_sourcedir #{srpmdir}' " +
+      "--define '_srcrpmdir #{out_dir}' " +
+      specfile
 
-Gem2Rpm.print_dependencies(gemfile) if options[:deps]
+    unless system(command)
+      Gem2Rpm.show_message("Command failed: #{command}")
+      exit(1)
+    end
+  end
+end

data/lib/gem2rpm.rb

@@ -1,17 +1,20 @@
 require 'erb'
 require 'socket'
-require 'gem2rpm/package'
 require 'gem2rpm/distro'
-require 'gem2rpm/format'
-require 'gem2rpm/spec_fetcher'
-require 'gem2rpm/specification'
+require 'gem2rpm/gem/format'
+require 'gem2rpm/gem/package'
+require 'gem2rpm/gem/spec_fetcher'
+require 'gem2rpm/gem/specification'
+require 'gem2rpm/rpm_dependency_list'
+require 'gem2rpm/rpm_file_list'
 require 'gem2rpm/template_helpers'
 require 'gem2rpm/template'
+require 'gem2rpm/test_suite'
 
 module Gem2Rpm
   extend Gem2Rpm::TemplateHelpers
 
-  Gem2Rpm::VERSION = "0.11.3"
+  Gem2Rpm::VERSION = "1.0.0".freeze
 
   class Exception < RuntimeError; end
   class DownloadUrlError < Exception; end
@@ -23,6 +26,24 @@ module Gem2Rpm
       'r'
     end
 
+  def self.show_message(message, obj = nil, out = $stderr)
+    out.puts("#{message}\n\n")
+    out.puts obj if obj
+  end
+
+  def self.show_templates(out = $stdout)
+    out.puts "Available templates in #{Gem2Rpm::Template.default_location}:\n\n"
+    template_list = Gem2Rpm::Template.list.map do |t|
+      t = t.gsub(/(.*)\.spec.erb/, '\\1')
+      t.gsub(/^/, t == Distro.nature ? '* ' : '  ')
+    end.join("\n")
+    out.puts template_list
+  end
+
+  def self.show_version(out = $stdout)
+    out.puts Gem2Rpm::VERSION
+  end
+
   def self.find_download_url(name, version)
     dep = Gem::Dependency.new(name, "=#{version}")
     fetcher = Gem2Rpm::SpecFetcher.new(Gem::SpecFetcher.fetcher)
@@ -47,7 +68,18 @@ module Gem2Rpm
     # Deprecate, kept just for backward compatibility.
     format = Gem2Rpm::Format.new(package)
     spec = Gem2Rpm::Specification.new(package.spec)
-    config = Gem2Rpm::Configuration.instance.reset
+
+    config = Configuration.instance.reset
+
+    runtime_dependencies = Gem2Rpm::RpmDependencyList.new(spec.runtime_dependencies)
+    development_dependencies = Gem2Rpm::RpmDependencyList.new(spec.development_dependencies)
+
+    tests = TestSuite.new(spec)
+
+    files = RpmFileList.new(spec.files)
+    main_files = files.top_level_entries.main_entries
+    doc_files = files.top_level_entries.doc_entries
+
     download_path = ""
     unless local
       begin
@@ -66,11 +98,8 @@ module Gem2Rpm
 
   # Print gem dependencies to the specified output ($stdout by default).
   def self.print_dependencies(gemfile, out = $stdout)
-    Gem2Rpm::Package.new(gemfile).spec.dependencies.each do |dep|
-      Gem2Rpm::Dependency.new(dep).requirement.each do |r|
-        out.puts "rubygem(#{dep.name}) #{r}"
-      end
-    end
+    dl = RpmDependencyList.new(Gem2Rpm::Package.new(gemfile).spec.dependencies)
+    out.puts dl.virtualize.to_rpm
   end
 
   # Returns the email address of the packager (i.e., the person running

data/lib/gem2rpm/configuration.rb

@@ -1,12 +1,19 @@
+require 'optparse'
 require 'singleton'
 
 module Gem2Rpm
   class Configuration
     include Singleton
 
+    class InvalidOption < Exception; end
+
+    CURRENT_DIR = Dir.pwd
+
     DEFAULT_OPTIONS = {
       :print_template_file => nil,
       :template_file => nil,
+      :templates => false,
+      :version => false,
       :output_file => nil,
       :local => false,
       :srpm => false,
@@ -14,7 +21,8 @@ module Gem2Rpm
       :nongem => false,
       :doc_subpackage => true,
       :fetch => false,
-    }
+      :directory => CURRENT_DIR,
+    }.freeze
 
     # The defaults should mostly work
     DEFAULT_MACROS = {
@@ -23,7 +31,7 @@ module Gem2Rpm
       :doc => '%doc',
       :license => '%license',
       :ignore => '%exclude'
-    }
+    }.freeze
 
     DEFAULT_RULES = {
       :doc => [
@@ -40,7 +48,7 @@ module Gem2Rpm
       :license => [
         /\/?MIT/,
         /\/?GPLv[0-9]+/,
-        /\/?.*LICEN(C|S)E/,
+        /\/?.*LICEN(C|S)E/i,
         /\/?COPYING/,
       ],
       :ignore => [
@@ -48,24 +56,29 @@ module Gem2Rpm
         '.gitignore',
         '.travis.yml',
         '.yardopts',
+        '.rspec',
         '.rvmrc',
         '.rubocop.yml',
         /^\..*rc$/i,
+        /\/?.*\.gemspec$/,
+      ],
+      :test => [
+        '.rspec',
+        'cucumber.yml',
+        /^features.*/,
+        /^r?spec.*/,
+        /^tests?/,
       ],
       # 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.*/,
       ]
-    }
+    }.freeze
 
     def initialize
       @options = nil
@@ -112,9 +125,8 @@ module Gem2Rpm
       @options[:args] = args
     # TODO: Refactor, this is probably not the best palce.
     rescue OptionParser::InvalidOption => e
-      $stderr.puts "#{e}\n\n"
-      $stderr.puts parser
-      exit(1)
+      message = "#{e}\n\n#{parser}\n"
+      fail(InvalidOption, message)
     end
 
     # Creates an option parser.
@@ -148,19 +160,12 @@ module Gem2Rpm
         options[:template_file] = val
       end
 
-      # TODO: This does not belong here.
       parser.on('--templates', 'List all available templates') do
-        puts 'Available templates in #{Gem2Rpm::Template.default_location}:\n\n'
-        puts Gem2Rpm::Template.list.map do |t|
-          t.gsub(/(.*)\.spec.erb/, '\\1')
-        end.join("\n")
-        exit 0
+        options[:templates] = true
       end
 
-      # TODO: This does not belong here.
       parser.on('-v', '--version', 'Print gem2rpm\'s version and exit') do
-        puts Gem2Rpm::VERSION
-        exit 0
+        options[:version] = true
       end
 
       parser.on('-o', '--output FILE', 'Send the specfile to FILE') do |val|
@@ -192,6 +197,10 @@ module Gem2Rpm
         options[:fetch] = true
       end
 
+      parser.on('-C', '--directory DIR', 'Change to directory DIR') do |val|
+        options[:directory] = val
+      end
+
       parser.separator('')
 
       parser.separator('  Arguments:')

data/lib/gem2rpm/distro.rb

@@ -5,7 +5,7 @@ module Gem2Rpm
     OPENSUSE = :opensuse
     DEFAULT = :default
 
-    ROLLING_RELEASES = ['rawhide', 'factory', 'tumbleweed']
+    ROLLING_RELEASES = %w[rawhide factory tumbleweed].freeze
 
     OsRelease = Struct.new :os, :version
 
@@ -29,8 +29,8 @@ module Gem2Rpm
           content = File.open(os_release_files.first, Gem2Rpm::OPEN_MODE, &:read)
 
           begin
-            os_release.os = content[/^ID=(.*)$/, 1].to_sym
-            os_release.version = content[/^VERSION_ID=(.*)$/, 1]
+            os_release.os = content[/^ID=['"]?(.*?)['"]?$/, 1].to_sym
+            os_release.version = content[/^VERSION_ID=['"]?(.*?)['"]?$/, 1]
           rescue
           end
         end
@@ -65,7 +65,7 @@ module Gem2Rpm
     end
 
     def self.nature
-      template_by_os_version(os_release.os, os_release.version) || DEFAULT
+      template_by_os_version(os_release.os, os_release.version) || DEFAULT.to_s
     end
 
     # Provides list of release files found on the system.

data/lib/gem2rpm/{specification.rb → gem/specification.rb}

@@ -1,10 +1,12 @@
 require 'delegate'
 require 'gem2rpm/configuration'
-require 'gem2rpm/dependency'
+require 'gem2rpm/gem/dependency'
 require 'gem2rpm/helpers'
 
 module Gem2Rpm
   class Specification < SimpleDelegator
+    BLANK_RE = /\A[[:space:]]*\z/
+
     # A long description of gem wrapped to 78 characters.
     def description
       d = super.to_s.chomp
@@ -13,6 +15,13 @@ module Gem2Rpm
       Helpers.word_wrap(d, 78) + "\n"
     end
 
+    # The URL of this gem's home page
+    def homepage
+      h = super
+      h = nil if h && BLANK_RE =~ h
+      h
+    end
+
     # A list of Gem::Dependency objects this gem depends on (includes every
     # runtime or development dependency).
     def dependencies

data/lib/gem2rpm/helpers.rb

@@ -24,7 +24,7 @@ module Gem2Rpm
     # '<' pair.
     def self.expand_pessimistic_requirement(requirement)
       next_version = Gem::Version.create(requirement.last).bump
-      return ['=>', requirement.last], ['<', next_version]
+      return ['>=', requirement.last], ['<', next_version]
     end
 
     # Expands the not equal version operator '!=' into equivalent '<' and
@@ -41,50 +41,6 @@ module Gem2Rpm
       end
     end
 
-    def self.file_entries_to_rpm(entries)
-      rpm_file_list = entries.map { |e| 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
-      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|

data/lib/gem2rpm/rpm_dependency.rb

@@ -0,0 +1,49 @@
+module Gem2Rpm
+  class RpmDependency < Gem2Rpm::Dependency
+    def initialize(dependency)
+      if dependency.respond_to? :__getobj__
+        super dependency.__getobj__
+      else
+        super
+      end
+    end
+
+    # Convert to rubygem() virtual provide dependency.
+    def virtualize
+      dep = __getobj__.dup
+      dep.name = "rubygem(#{dep.name})"
+
+      self.class.new dep
+    end
+
+    # Output dependency with RPM requires tag.
+    def with_requires
+      dep = __getobj__.dup
+      dep.name = case dep.type
+      when :development
+        "BuildRequires: #{dep.name}"
+      else
+        "Requires: #{dep.name}"
+      end
+
+      self.class.new dep
+    end
+
+    # Comment out the dependency.
+    def comment_out
+      dep = __getobj__.dup
+      dep.name = "# #{dep.name}"
+
+      self.class.new dep
+    end
+
+    # Returns string with entry suitable for RPM .spec file.
+    def to_rpm
+      rpm_dependencies = requirement.map do |version|
+        version = nil if version && version.to_s.empty?
+        [name, version].compact.join(' ')
+      end
+      rpm_dependencies.join("\n")
+    end
+  end
+end

data/lib/gem2rpm/rpm_dependency_list.rb

@@ -0,0 +1,60 @@
+require 'gem2rpm/rpm_dependency'
+
+module Gem2Rpm
+  class RpmDependencyList
+    include Enumerable
+
+    def initialize(dependencies)
+      @items = dependencies.map { |r| RpmDependency.new(r) }
+    end
+
+    # Calls the given block once for each element in self, passing that
+    # element as a parameter. Returns the array itself.
+    # If no block is given, an Enumerator is returned.
+    def each
+      # Return Enumerator when called withoug block.
+      return to_enum(__callee__) unless block_given?
+
+      @items.each { |item| yield item }
+    end
+
+    # Returns a new array containing the items in self for which the given
+    # block is not true. The ordering of non-rejected elements is maintained.
+    # If no block is given, an Enumerator is returned instead.
+    def reject
+      # Return Enumerator when called withoug block.
+      return to_enum(__callee__) unless block_given?
+
+      self.class.new(@items.reject { |item| yield item })
+    end
+
+    # Convert to rubygem() virtual provide dependencies.
+    def virtualize
+      dep_list = self.map(&:virtualize)
+
+      self.class.new dep_list
+    end
+
+    # Output dependencies with RPM requires tag.
+    def with_requires
+      dep_list = self.map(&:with_requires)
+
+      self.class.new dep_list
+    end
+
+    # Comment out the dependency.
+    def comment_out
+      dep_list = self.map(&:comment_out)
+
+      self.class.new dep_list
+    end
+
+    # Returns string with all dependencies from the list converted into entries
+    # suitable for RPM .spec file. Thise entries should include all necessary
+    # macros depending on file categorization.
+    def to_rpm
+      s = entries.map(&:to_rpm).join("\n")
+      s += "\n" unless s.empty?
+    end
+  end
+end

data/lib/gem2rpm/rpm_file.rb

@@ -0,0 +1,51 @@
+require 'pathname'
+require 'gem2rpm/helpers'
+
+module Gem2Rpm
+  class RpmFile < String
+    # Returns string with entry suitable for RPM .spec file. This typically
+    # includes all necessary macros depending on file categorization.
+    def to_rpm
+      config = Gem2Rpm::Configuration.instance
+
+      case
+      when license?
+        "#{config.macro_for(:license)} #{config.macro_for(:instdir)}/#{self}".strip
+      when doc?
+        "#{config.macro_for(:doc)} #{config.macro_for(:instdir)}/#{self}".strip
+      when ignore?
+        "#{config.macro_for(:ignore)} #{config.macro_for(:instdir)}/#{self}".strip
+      # /lib should have its own macro
+      when self == 'lib'
+        "#{config.macro_for(:libdir)}"
+      else
+        "#{config.macro_for(:instdir)}/#{self}"
+      end
+    end
+
+    # Returs true for documentation files.
+    def doc?
+      Helpers.check_str_on_conditions(self, Gem2Rpm::Configuration.instance.rule_for(:doc))
+    end
+
+    # Returns true for license files.
+    def license?
+      Helpers.check_str_on_conditions(self, Gem2Rpm::Configuration.instance.rule_for(:license))
+    end
+
+    # Returns true for files which should be ommited from the package.
+    def ignore?
+      Helpers.check_str_on_conditions(self, Gem2Rpm::Configuration.instance.rule_for(:ignore))
+    end
+
+    # Returns true for files which are part of package test suite.
+    def test?
+      Helpers.check_str_on_conditions(self, Gem2Rpm::Configuration.instance.rule_for(:test))
+    end
+
+    # Returns true for other known miscellaneous files.
+    def misc?
+      Helpers.check_str_on_conditions(self, Gem2Rpm::Configuration.instance.rule_for(:misc))
+    end
+  end
+end

data/lib/gem2rpm/rpm_file_list.rb

@@ -0,0 +1,55 @@
+require 'gem2rpm/rpm_file'
+
+module Gem2Rpm
+  class RpmFileList
+    include Enumerable
+
+    # Returns a new file list created from the array of files (e.g.
+    # Gem2Rpm::Specification.files).
+    def initialize(files)
+      @items = files.map { |f| RpmFile.new(f) }
+    end
+
+    # Calls the given block once for each element in self, passing that
+    # element as a parameter. Returns the array itself.
+    # If no block is given, an Enumerator is returned.
+    def each
+      # Return Enumerator when called withoug block.
+      return to_enum(__callee__) unless block_given?
+
+      @items.each { |item| yield item }
+    end
+
+    # Returns a new array containing the items in self for which the given
+    # block is not true. The ordering of non-rejected elements is maintained.
+    # If no block is given, an Enumerator is returned instead.
+    def reject
+      # Return Enumerator when called withoug block.
+      return to_enum(__callee__) unless block_given?
+
+      self.class.new(@items.reject { |item| yield item })
+    end
+
+    # Returns a list of top level directories and files, omit all subdirectories.
+    def top_level_entries
+      self.class.new(entries.map { |f| f.gsub!(/([^\/]*).*/, '\1') }.uniq)
+    end
+
+    # Returns new list of files suitable for main.
+    def main_entries
+      self.class.new(entries.delete_if { |f| (f.doc? && !f.license?) || f.misc? || f.test? })
+    end
+
+    # Returns new list of files suitable for -doc subpackage.
+    def doc_entries
+      self.class.new(entries.delete_if { |f| !((f.doc? && !f.license?) || f.misc? || f.test?) })
+    end
+
+    # Returns string with all files from the list converted into entries
+    # suitable for RPM .spec file. Thise entries should include all necessary
+    # macros depending on file categorization.
+    def to_rpm
+      entries.map(&:to_rpm).join("\n")
+    end
+  end
+end

data/lib/gem2rpm/template_helpers.rb

@@ -1,23 +1,24 @@
+require 'gem2rpm/rpm_file_list'
+require 'gem2rpm/rpm_dependency'
+
 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)
+      entries = RpmFileList.new(spec.files).top_level_entries.main_entries
+      entries.to_rpm
     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)
+      entries = RpmFileList.new(spec.files).top_level_entries.doc_entries
+      entries.to_rpm
     end
 
     # Provides well formatted requirement with version.
     def requirement(name, version = nil)
       version = nil if version && version.to_s.empty?
-      [name, version].compact.join(' ')
+      RpmDependency.new(Gem::Dependency.new(name, version)).to_rpm
     end
   end
 end

data/lib/gem2rpm/test_suite.rb

@@ -0,0 +1,46 @@
+require 'gem2rpm/rpm_file_list'
+
+module Gem2Rpm
+  class TestSuite
+    include Enumerable
+
+    TestFramework = Struct.new :name, :command
+
+    TEST_FRAMEWORKS = [
+      TestFramework.new('cucumber', %|cucumber|),
+      TestFramework.new('minitest', %|ruby -e 'Dir.glob "./test/**/*_test.rb", &method(:require)'|),
+      TestFramework.new('rspec', %|rspec spec|),
+      TestFramework.new('shindo', %|shindont|),
+      TestFramework.new('test-unit', %|ruby -e 'Dir.glob "./test/**/*_test.rb", &method(:require)'|),
+      TestFramework.new('bacon', %|bacon -a|),
+    ].freeze
+
+    # Returns new test suite list detected from Gem::Specification.
+    def initialize(spec)
+      @items = detect_test_frameworks(spec)
+    end
+
+    # Calls the given block once for each element in self, passing that
+    # element as a parameter. Returns the array itself.
+    # If no block is given, an Enumerator is returned.
+    def each
+      # Return Enumerator when called withoug block.
+      return to_enum(__callee__) unless block_given?
+
+      @items.each { |item| yield item }
+    end
+
+    private
+
+    def detect_test_frameworks(spec)
+      from_development_dependencies(spec)
+      # TODO: Try to guess the test framework from spec.files. This could
+      # improve the test execution command a bit, but might not be reliable.
+    end
+
+    def from_development_dependencies(spec)
+      deps = spec.development_dependencies.map(&:name)
+      TEST_FRAMEWORKS.select { |tf| deps.include?(tf.name) }.map(&:dup)
+    end
+  end
+end

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

@@ -0,0 +1,112 @@
+# Generated from <%= 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(/\.$/, "") %>
+License: <%= spec.licenses.join(" and ") %>
+<% if spec.homepage -%>
+URL: <%= spec.homepage %>
+<% end -%>
+Source0: <%= download_path %>%{vagrant_plugin_name}-%{version}.gem
+Requires: vagrant
+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}
+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.empty? -%>
+mkdir -p %{buildroot}%{_bindir}
+cp -pa .%{_bindir}/* \
+        %{buildroot}%{_bindir}/
+
+find %{buildroot}%{vagrant_plugin_instdir}/<%= spec.bindir %> -type f | xargs chmod a+x
+<% end -%>
+
+%check
+pushd .%{gem_instdir}
+<% if tests.entries.empty? -%>
+# Run the test suite.
+<% end -%>
+<% for t in tests -%>
+# <%= t.command %>
+<% end -%>
+popd
+
+<%
+# Change macros for Vagrant packaging
+config.macros[:instdir] = '%{vagrant_plugin_instdir}'
+config.macros[:libdir] = '%{vagrant_plugin_libdir}'
+-%>
+%files
+%dir %{vagrant_plugin_instdir}
+<% for f in spec.executables -%>
+%{_bindir}/<%= f %>
+<% end -%>
+<% unless spec.extensions.empty? -%>
+%{vagrant_plugin_extdir_mri}
+<% end -%>
+<%= main_files.reject do |item|
+  spec.extensions.detect { |extension| item =~ /^#{extension.split(File::SEPARATOR).first}$/}
+end.to_rpm %>
+<% unless doc_subpackage -%>
+%doc %{vagrant_plugin_docdir}
+<%= doc_files.to_rpm %>
+<% end -%>
+%exclude %{vagrant_plugin_cache}
+%{vagrant_plugin_spec}
+
+<% if doc_subpackage -%>
+%files doc
+%doc %{vagrant_plugin_docdir}
+<%= files.top_level_entries.doc_entries.to_rpm %>
+<% end # if doc_subpackage -%>
+
+%changelog
+* <%= Time.now.strftime("%a %b %d %Y") %> <%= packager %> - <%= spec.version %>-1
+- Initial package

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

@@ -0,0 +1,119 @@
+# Generated from <%= spec.file_name %> by gem2rpm -*- rpm-spec -*-
+%global gem_name <%= spec.name %>
+
+Name: rubygem-%{gem_name}
+Version: <%= spec.version %>
+Release: 1%{?dist}
+Summary: <%= spec.summary.gsub(/\.$/, "") %>
+License: <%= spec.licenses.join(" and ") %>
+<% if spec.homepage -%>
+URL: <%= spec.homepage %>
+<% end -%>
+Source0: <%= download_path %>%{gem_name}-%{version}.gem
+BuildRequires: ruby(release)
+<% for req in spec.required_rubygems_version -%>
+BuildRequires: <%= requirement 'rubygems-devel', req %>
+<% end -%>
+<% for req in spec.required_ruby_version -%>
+BuildRequires: <%= requirement "ruby#{'-devel' unless spec.extensions.empty?}", req %>
+<% end -%>
+<% unless spec.extensions.empty? -%>
+# Compiler is required for build of gem binary extension.
+# https://fedoraproject.org/wiki/Packaging:C_and_C++#BuildRequires_and_Requires
+BuildRequires: gcc
+<% end -%>
+<%= development_dependencies.reject do |d|
+  ["rdoc", "rake", "bundler"].include? d.name
+end.virtualize.with_requires.comment_out.to_rpm -%>
+<% if spec.extensions.empty? -%>
+BuildArch: noarch
+<% end -%>
+
+%description
+<%= spec.description %>
+
+<% if doc_subpackage -%>
+%package doc
+Summary: Documentation for %{name}
+Requires: %{name} = %{version}-%{release}
+BuildArch: noarch
+
+%description doc
+Documentation for %{name}.
+<% end # if doc_subpackage -%>
+
+%prep
+gem unpack %{SOURCE0}
+
+%setup -q -D -T -n  %{gem_name}-%{version}
+
+gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
+
+%build
+# Create the gem as gem install only works on a gem file
+gem build %{gem_name}.gemspec
+
+# %%gem_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
+%gem_install
+
+%install
+mkdir -p %{buildroot}%{gem_dir}
+cp -a .%{gem_dir}/* \
+        %{buildroot}%{gem_dir}/
+
+<% unless spec.extensions.empty? -%>
+mkdir -p %{buildroot}%{gem_extdir_mri}
+cp -a .%{gem_extdir_mri}/{gem.build_complete,*.so} %{buildroot}%{gem_extdir_mri}/
+
+<% for ext in spec.extensions -%>
+# Prevent dangling symlink in -debuginfo (rhbz#878863).
+rm -rf %{buildroot}%{gem_instdir}/<%= ext.split(File::SEPARATOR).first %>/
+<% end -%>
+<% end -%>
+
+<% unless spec.executables.empty? -%>
+mkdir -p %{buildroot}%{_bindir}
+cp -pa .%{_bindir}/* \
+        %{buildroot}%{_bindir}/
+
+find %{buildroot}%{gem_instdir}/<%= spec.bindir %> -type f | xargs chmod a+x
+<% end -%>
+
+%check
+pushd .%{gem_instdir}
+<% if tests.entries.empty? -%>
+# Run the test suite.
+<% end -%>
+<% for t in tests -%>
+# <%= t.command %>
+<% end -%>
+popd
+
+%files
+%dir %{gem_instdir}
+<% for f in spec.executables -%>
+%{_bindir}/<%= f %>
+<% end -%>
+<% unless spec.extensions.empty? -%>
+%{gem_extdir_mri}
+<% end -%>
+<%= main_files.reject do |item|
+  spec.extensions.detect { |extension| item =~ /^#{extension.split(File::SEPARATOR).first}$/}
+end.to_rpm %>
+<% unless doc_subpackage -%>
+%doc %{gem_docdir}
+<%= doc_files.to_rpm %>
+<% end -%>
+%exclude %{gem_cache}
+%{gem_spec}
+
+<% if doc_subpackage -%>
+%files doc
+%doc %{gem_docdir}
+<%= doc_files.to_rpm %>
+<% end # if doc_subpackage -%>
+
+%changelog
+* <%= Time.now.strftime("%a %b %d %Y") %> <%= packager %> - <%= spec.version %>-1
+- Initial package

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem2rpm
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 1.0.0
 platform: ruby
 authors:
 - David Lutterkort
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies: []
 description: |2
     Generate source rpms and rpm spec files from a Ruby Gem.
@@ -29,26 +29,33 @@ files:
 - bin/gem2rpm
 - lib/gem2rpm.rb
 - lib/gem2rpm/configuration.rb
-- lib/gem2rpm/dependency.rb
 - lib/gem2rpm/distro.rb
-- lib/gem2rpm/format.rb
+- lib/gem2rpm/gem/dependency.rb
+- lib/gem2rpm/gem/format.rb
+- lib/gem2rpm/gem/package.rb
+- lib/gem2rpm/gem/spec_fetcher.rb
+- lib/gem2rpm/gem/specification.rb
 - lib/gem2rpm/helpers.rb
-- lib/gem2rpm/package.rb
-- lib/gem2rpm/spec_fetcher.rb
-- lib/gem2rpm/specification.rb
+- lib/gem2rpm/rpm_dependency.rb
+- lib/gem2rpm/rpm_dependency_list.rb
+- lib/gem2rpm/rpm_file.rb
+- lib/gem2rpm/rpm_file_list.rb
 - lib/gem2rpm/template.rb
 - lib/gem2rpm/template_helpers.rb
+- lib/gem2rpm/test_suite.rb
 - templates/default.spec.erb
 - templates/fedora-17-18.spec.erb
 - templates/fedora-19-20.spec.erb
-- templates/fedora-21-rawhide-vagrant-plugin.spec.erb
-- templates/fedora-21-rawhide.spec.erb
+- templates/fedora-21-25-vagrant-plugin.spec.erb
+- templates/fedora-21-25.spec.erb
+- templates/fedora-26-rawhide-vagrant-plugin.spec.erb
+- templates/fedora-26-rawhide.spec.erb
 - templates/fedora.spec.erb
 - templates/opensuse.spec.erb
 - templates/pld.spec.erb
 homepage: https://github.com/fedora-ruby/gem2rpm
 licenses:
-- GPLv2+
+- GPL-2.0+
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -66,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Generate rpm specfiles from gems