gem2rpm 0.11.1 → 1.0.2

data/lib/gem2rpm/configuration.rb

@@ -1,9 +1,29 @@
+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,
+      :deps => false,
+      :nongem => false,
+      :doc_subpackage => true,
+      :fetch => false,
+      :directory => CURRENT_DIR,
+    }.freeze
+
     # The defaults should mostly work
     DEFAULT_MACROS = {
       :instdir => '%{gem_instdir}',
@@ -11,23 +31,64 @@ module Gem2Rpm
       :doc => '%doc',
       :license => '%license',
       :ignore => '%exclude'
-    }
+    }.freeze
 
     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],
+      :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/i,
+        /\/?COPYING/,
+      ],
+      :ignore => [
+        '.gemtest',
+        '.gitignore',
+        '.travis.yml',
+        '.hound.yml',
+        '.yardopts',
+        '.rspec',
+        '.rvmrc',
+        '.rubocop.yml',
+        '.rubocop_todo.yml',
+        /^\..*rc$/i,
+      ],
+      :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.*/]
-    }
+      :misc => [
+        /Gemfile.*/,
+        'Rakefile',
+        'rakefile.rb',
+        'Vagrantfile',
+        /^examples.*/,
+        /\/?.*\.gemspec$/,
+      ]
+    }.freeze
+
+    def initialize
+      @options = nil
+      @parser = nil
+    end
 
-    # Set the configuration back to default
-    def to_default
+    # Set the configuration back to default values
+    def reset
       @_macros = nil
       @_rules = nil
       self
@@ -51,5 +112,104 @@ module Gem2Rpm
       rules[category] ||= ''
     end
 
+    # Get options.
+    def options
+      handle_options unless @options
+      @options
+    end
+
+    private
+
+    # Handles list of given options. Use ARGV by default.
+    def handle_options(args = ARGV)
+      @options = Marshal.load Marshal.dump DEFAULT_OPTIONS # deep copy
+      parser.parse!(args)
+      @options[:args] = args
+    # TODO: Refactor, this is probably not the best palce.
+    rescue OptionParser::InvalidOption => e
+      message = "#{e}\n\n#{parser}\n"
+      fail(InvalidOption, message)
+    end
+
+    # Creates an option parser.
+    def create_option_parser
+      @parser = OptionParser.new
+      setup_parser_options
+    end
+
+    # Get parser instance.
+    def parser
+      create_option_parser unless @parser
+      @parser
+    end
+
+    def setup_parser_options
+      parser.banner = "Usage: #{$PROGRAM_NAME} [OPTIONS] GEM"
+
+      parser.separator('  Convert Ruby gems to source RPMs and specfiles.')
+      parser.separator('  Uses a template to generate the RPM specfile')
+      parser.separator('  from the gem specification.')
+
+      parser.separator('')
+
+      parser.separator('  Options:')
+
+      parser.on('-T', '--current-template', 'Print the current template') do
+        options[:print_template_file] = true
+      end
+
+      parser.on('-t', '--template TEMPLATE', 'Use TEMPLATE for the specfile') do |val|
+        options[:template_file] = val
+      end
+
+      parser.on('--templates', 'List all available templates') do
+        options[:templates] = true
+      end
+
+      parser.on('-v', '--version', 'Print gem2rpm\'s version and exit') do
+        options[:version] = true
+      end
+
+      parser.on('-o', '--output FILE', 'Send the specfile to FILE') do |val|
+        options[:output_file] = val
+      end
+
+      parser.on('-s', '--srpm', 'Create a source RPM') do
+        options[:srpm] = true
+      end
+
+      parser.on('-l', '--local', "Do not retrieve Gem information over
+              #{' ' * 22} the network. Use on disconnected machines") do
+        options[:local] = true
+      end
+
+      parser.on('-d', '--dependencies', 'Print the dependencies of the gem') do
+        options[:deps] = true
+      end
+
+      parser.on('-n', '--nongem', 'Generate a subpackage for non-gem use') do
+        options[:nongem] = true
+      end
+
+      parser.on('--no-doc', 'Disable document subpackage') do
+        options[:doc_subpackage] = false
+      end
+
+      parser.on('--fetch', 'Fetch the gem from rubygems.org') do
+        options[:fetch] = true
+      end
+
+      parser.on('-C', '--directory DIR', 'Change to directory DIR') do |val|
+        options[:directory] = val
+      end
+
+      parser.separator('')
+
+      parser.separator('  Arguments:')
+      parser.separator('    GEM            The path to the locally stored gem package file or the name')
+      parser.separator('                   of the gem when using --fetch.')
+
+      parser.separator('')
+    end
   end
 end

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
 
@@ -25,14 +25,12 @@ module Gem2Rpm
         end
 
         # Try os-release first.
-        if os_release_files = grouped_release_files['os-release']
-          content = File.open(os_release_files.first, Gem2Rpm::OPEN_MODE) do |f|
-            f.read
-          end
+        if (os_release_files = grouped_release_files['os-release'])
+          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
@@ -40,7 +38,7 @@ module Gem2Rpm
         # If os-release failed (it is empty or has not enough information),
         # try some other release files.
         if os_release.os == DEFAULT
-          if fedora_release_files = grouped_release_files['fedora']
+          if (fedora_release_files = grouped_release_files['fedora'])
             os_release.os = FEDORA
             versions = []
 
@@ -67,13 +65,13 @@ 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.
     def self.release_files
       @release_files ||=
-        Dir.glob('/etc/{os-release,*{_version,-release}}*').uniq.select {|e| File.file? e}
+        Dir.glob('/etc/{os-release,*{_version,-release}}*').uniq.select { |e| File.file? e }
     end
 
     # Allows to override release files list.
@@ -84,13 +82,13 @@ module Gem2Rpm
 
     # Tries to find best suitable template for specified os and version.
     def self.template_by_os_version(os, version)
-      os_templates = Template.list.grep /#{os}.*\.spec\.erb/
+      os_templates = Template.list.grep(/#{os}.*\.spec\.erb/)
 
       os_templates.each do |file|
         # 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/
 
-        if match = Regexp.last_match
+        if (match = Regexp.last_match)
           return file.gsub('.spec.erb', '') if in_range?(version, match[1].to_s.split('-').drop(1)) || match[1].empty?
         end
       end
@@ -105,7 +103,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 ROLLING_RELEASES.include? range[1] or version.to_s <= range[1].to_s
+          return true if ROLLING_RELEASES.include?(range[1]) || (version.to_s <= range[1].to_s)
         end
       end
 

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

@@ -11,7 +11,7 @@ module Gem2Rpm
         version_requirements # For RubyGems < 1.3.6
       end
 
-      Helpers::requirement_versions_to_rpm r
+      Helpers.requirement_versions_to_rpm r
     end
 
     # Dependency type. Needs to be explicitly reimplemented.

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

@@ -6,7 +6,7 @@ module Gem2Rpm
     # 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)
+    def spec_for_dependency(dependency, matching_platform = true)
       super
     rescue
       errors = []

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

@@ -1,28 +1,36 @@
 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
       d = summary.to_s.chomp if d.empty?
       d.gsub!(/([^.!?])\Z/, "\\1.")
-      Helpers::word_wrap(d, 78) + "\n"
+      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
-      super.map {|d| Gem2Rpm::Dependency.new d}
+      super.map { |d| Gem2Rpm::Dependency.new d }
     end
 
     # List of dependencies that are used for development.
     def development_dependencies
-      super.map {|d| Gem2Rpm::Dependency.new d}
+      super.map { |d| Gem2Rpm::Dependency.new d }
     end
 
     # The license(s) for the library. Each license must be a short name,
@@ -36,7 +44,7 @@ module Gem2Rpm
 
     # List of dependencies that will automatically be activated at runtime.
     def runtime_dependencies
-      super.map {|d| Gem2Rpm::Dependency.new d}
+      super.map { |d| Gem2Rpm::Dependency.new d }
     end
 
     # The version of Ruby required by the gem. Returns array with
@@ -53,7 +61,7 @@ module Gem2Rpm
     # array with empty string. However, this should happen only in rare cases.
     def required_rubygems_version
       @required_rubygems_version ||= begin
-        Helpers::requirement_versions_to_rpm(super)
+        Helpers.requirement_versions_to_rpm(super)
       rescue
         ['']
       end

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
@@ -36,55 +36,11 @@ module Gem2Rpm
     # Converts Gem::Requirement into array of requirements strings compatible
     # with RPM .spec file.
     def self.requirement_versions_to_rpm(requirement)
-      self.expand_requirement(requirement.requirements).map do |op, version|
+      expand_requirement(requirement.requirements).map do |op, version|
         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|

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