gem2rpm 0.11.2 → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05c2d7ff2784e6acf91598c7eb14826f9b6e131c
-  data.tar.gz: dd82ef52cba6f90b6f27659345b4a5aa40c92b8f
+  metadata.gz: 911d15cecd229ed97a9a901cfdac408ef08796cb
+  data.tar.gz: 211b7ad4686015ac6eb03729f61a31f85894c581
 SHA512:
-  metadata.gz: 233cfde605cf890876d4fba199ff1c1d23ffd34d683af16146406594dbf443f683961a7294310787924685c687650f7fd0aaaf7f82faa5d25602f5e4c2f25125
-  data.tar.gz: 52cd2e8b0fcece311b18f79b61c928829adc88b95144cbbd61ea45f17fc77835305c1556d0a82d89065f6e4f045a22bc5ec119f19e8ec67923929138a58b2b3e
+  metadata.gz: f4cb61a3ab8618afda9f3530bafb8712e76ebc21eb7f00ff97678704584342a3f1af230d4b4d150457db1f33feec7c5756ff0dcc92b7985921e3c3d7f5f2505c
+  data.tar.gz: bf4a5b88e63300b0f0db6bd0f64685250c182a638a2b6e0e41588bd588f65e5ade8187fe438d7ae05e951d09ad907cb7e3284620488f681341bdad6661c83172

data/AUTHORS

@@ -25,3 +25,4 @@ Patches from:
   Bohuslav Kabrda       bkabrda@redhat.com
   Saleem Ansari         tuxdna@gmail.com
   Sergio Rubio          rubiojr@frameos.org
+  Oleg Girko            ol@infoserver.lv

data/README.md

@@ -58,7 +58,7 @@ $ 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
+$ gem2rpm -t rubygem-GEM.spec.template GEM-1.2.3.gem > 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.
@@ -115,7 +115,7 @@ 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
+## Limitations
 
 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.
 

data/bin/gem2rpm

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- ruby -*-
 
-$:.push(File.expand_path(File.dirname(__FILE__) + "/../lib"))
+$LOAD_PATH.push(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 
 require 'gem2rpm'
 require 'optparse'
@@ -9,98 +9,31 @@ require 'fileutils'
 require 'open-uri'
 require 'uri'
 
-opts = OptionParser.new("Usage: #{$0} [OPTIONS] GEM")
-opts.separator("  Convert Ruby gems to source RPMs and specfiles.")
-opts.separator("  Uses a template to generate the RPM specfile")
-opts.separator("  from the gem specification.")
-
-print_template_file = nil
-template_file = nil
-output_file = nil
-local = false
-srpm = false
-deps = false
-nongem = false
-doc_subpackage = true
-fetch = false
-
-opts.separator("")
-opts.separator("  Options:")
-opts.on("-T", "--current-template", "Print the current template") do |val|
-    print_template_file = true
-end
-opts.on("-t", "--template TEMPLATE", "Use TEMPLATE for the specfile") do |val|
-    template_file = val
-end
-opts.on("--templates", "List all available templates") do
-    puts "Available templates in #{Gem2Rpm::Template.default_location}:\n\n"
-    puts Gem2Rpm::Template.list.map{
-      |t| t.gsub(/(.*)\.spec.erb/, '\\1')
-    }.join("\n")
-    exit 0
-end
-opts.on("-v", "--version", "Print gem2rpm's version and exit") do
-    puts Gem2Rpm::VERSION
-    exit 0
-end
-opts.on("-o", "--output FILE", "Send the specfile to FILE") do |val|
-    output_file = val
-end
-opts.on("-s", "--srpm", "Create a source RPM") do |val|
-    srpm = true
-end
-opts.on("-l", "--local", "Do not retrieve Gem information over
-#{' '*36} the network. Use on disconnected machines") do |val|
-    local = true
-end
-opts.on("-d", "--dependencies", "Print the dependencies of the gem") do |val|
-    deps = true
-end
-opts.on("-n", "--nongem", "Generate a subpackage for non-gem use") do |val|
-    nongem = true
-end
-opts.on("--no-doc", "Disable document subpackage") do |val|
-  doc_subpackage = false
-end
-opts.on("--fetch", "Fetch the gem from rubygems.org") do |val|
-  fetch = true
-end
-opts.separator("")
-opts.separator("  Arguments:")
-opts.separator("    GEM            The path to the locally stored gem package file or the name")
-opts.separator("                   of the gem when using --fetch.")
-opts.separator("")
-
-begin
-  rest = opts.permute(ARGV)
-rescue OptionParser::InvalidOption => e
-  $stderr.puts "#{e}\n\n"
-  $stderr.puts opts
-  exit(1)
-end
+options = Gem2Rpm::Configuration.instance.options
+rest = options[:args]
 
 template = begin
-  Gem2Rpm::Template.find template_file, :gem_file => rest[0]
+  Gem2Rpm::Template.find options[:template_file], :gem_file => rest[0]
 rescue Gem2Rpm::Template::TemplateError => e
   $stderr.puts e
   exit(1)
 end
 
-if print_template_file
+if options[:print_template_file]
   puts template.read
   exit 0
 end
 
 if rest.size != 1
-    $stderr.puts "Missing GEMFILE\n\n"
-    $stderr.puts opts
-    exit(1)
+  $stderr.puts "Missing GEMFILE\n\n"
+  $stderr.puts opts
+  exit(1)
 end
 gemfile = rest[0]
 
-if fetch
+if options[:fetch]
   gem_uri = ''
-  open("http://rubygems.org/api/v1/gems/#{gemfile}.json") do |f|
+  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|
@@ -109,45 +42,33 @@ if fetch
   end
 end
 
-srpmdir = nil
-gemname = nil
 srpmdir = nil
 specfile = nil
-if srpm
-    gemname = Gem2Rpm::Package.new(gemfile).spec.name
-    srpmdir = `/bin/mktemp -t -d gem2rpm-#{gemname}.XXXXXX`.chomp
-    specfile = File::join(srpmdir, "rubygem-#{gemname}.spec")
-    if output_file.nil?
-        output_file = specfile
-    end
+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
 end
 
 # Produce a specfile
-if output_file.nil?
-    Gem2Rpm::convert(gemfile, template, $stdout, nongem, local, doc_subpackage) unless deps
+if options[:output_file].nil?
+  Gem2Rpm.convert(gemfile, template, $stdout, options[:nongem], options[:local], options[:doc_subpackage]) unless options[:deps]
 else
-    begin
-        out = open(output_file, "w")
-        Gem2Rpm::convert(gemfile, template, out, nongem, local, doc_subpackage)
-    ensure
-        out.close()
-    end
+  begin
+    out = open(options[:output_file], "w")
+    Gem2Rpm.convert(gemfile, template, out, options[:nongem], options[:local], options[:doc_subpackage])
+  ensure
+    out.close
+  end
 end
 
 # Create a  source RPM
-if srpm
-    unless File::exist?(specfile)
-        FileUtils::copy(output_file, specfile)
-    end
-    FileUtils::copy(gemfile, srpmdir)
+if options[:srpm]
+  FileUtils.copy(options[:output_file], specfile) unless File.exist?(specfile)
+  FileUtils.copy(gemfile, srpmdir)
 
-    system("rpmbuild -bs --nodeps --define '_sourcedir #{srpmdir}' --define '_srcrpmdir #{Dir::pwd}' #{specfile}")
+  system("rpmbuild -bs --nodeps --define '_sourcedir #{srpmdir}' --define '_srcrpmdir #{Dir.pwd}' #{specfile}")
 end
 
-if deps
-  Gem2Rpm::Package.new(gemfile).spec.dependencies.each do |dep|
-    Gem2Rpm::Dependency.new(dep).requirement.each do |r|
-      puts "rubygem(#{dep.name}) #{r}"
-    end
-  end
-end
+Gem2Rpm.print_dependencies(gemfile) if options[:deps]

data/lib/gem2rpm.rb

@@ -11,7 +11,7 @@ require 'gem2rpm/template'
 module Gem2Rpm
   extend Gem2Rpm::TemplateHelpers
 
-  Gem2Rpm::VERSION = "0.11.2"
+  Gem2Rpm::VERSION = "0.11.3"
 
   class Exception < RuntimeError; end
   class DownloadUrlError < Exception; end
@@ -29,9 +29,9 @@ module Gem2Rpm
 
     spec_and_source, errors = fetcher.spec_for_dependency(dep, false)
 
-    raise DownloadUrlError.new(errors.first.error.message) unless errors.empty?
+    fail DownloadUrlError, errors.first.error.message unless errors.empty?
 
-    spec, source = spec_and_source.first
+    _spec, source = spec_and_source.first
 
     if source && source.uri
       download_path = source.uri.to_s
@@ -41,13 +41,13 @@ module Gem2Rpm
     download_path
   end
 
-  def Gem2Rpm.convert(fname, template, out=$stdout, nongem=true, local=false,
+  def self.convert(fname, 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)
-    config = Gem2Rpm::Configuration.instance.to_default
+    config = Gem2Rpm::Configuration.instance.reset
     download_path = ""
     unless local
       begin
@@ -64,33 +64,41 @@ module Gem2Rpm
     puts e
   end
 
+  # 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
+  end
+
   # Returns the email address of the packager (i.e., the person running
   # gem2spec).  Taken from RPM macros if present, constructed from system
   # username and hostname otherwise.
-  def Gem2Rpm.packager()
+  def self.packager
     packager = `rpmdev-packager 2> /dev/null`.chomp rescue ''
 
     if packager.empty?
       packager = `rpm --eval '%{packager}' 2> /dev/null`.chomp rescue ''
     end
 
-    if packager.empty? or packager == '%{packager}'
-      passwd_entry = Etc::getpwnam(Etc::getlogin)
-      packager = "#{(passwd_entry && passwd_entry.gecos) || Etc::getlogin } <#{Etc::getlogin}@#{Socket::gethostname}>"
+    if packager.empty? || (packager == '%{packager}')
+      passwd_entry = Etc.getpwnam(Etc.getlogin)
+      packager = "#{(passwd_entry && passwd_entry.gecos) || Etc.getlogin} <#{Etc.getlogin}@#{Socket.gethostname}>"
     end
 
     packager
   end
 
   def self.rubygem_template
-    Template.new(File.join(Template::default_location, "#{Distro.nature.to_s}.spec.erb"))
+    Template.new(File.join(Template.default_location, "#{Distro.nature}.spec.erb"))
   end
 
   def self.vagrant_plugin_template
-    file = File.join(Template::default_location, "#{Distro.nature.to_s}-vagrant-plugin.spec.erb")
+    file = File.join(Template.default_location, "#{Distro.nature}-vagrant-plugin.spec.erb")
     Template.new(file)
   end
-
 end
 
 # Local Variables:

data/lib/gem2rpm/configuration.rb

@@ -4,6 +4,18 @@ module Gem2Rpm
   class Configuration
     include Singleton
 
+    DEFAULT_OPTIONS = {
+      :print_template_file => nil,
+      :template_file => nil,
+      :output_file => nil,
+      :local => false,
+      :srpm => false,
+      :deps => false,
+      :nongem => false,
+      :doc_subpackage => true,
+      :fetch => false,
+    }
+
     # The defaults should mostly work
     DEFAULT_MACROS = {
       :instdir => '%{gem_instdir}',
@@ -14,20 +26,54 @@ module Gem2Rpm
     }
 
     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/,
+        /\/?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.*/]
+      :misc => [
+        /.*.gemspec/,
+        /Gemfile.*/,
+        'Rakefile',
+        'rakefile.rb',
+        'Vagrantfile',
+        /^spec.*/,
+        /^rspec.*/,
+        /^test(s|)/,
+        /^examples.*/,
+      ]
     }
 
-    # Set the configuration back to default
-    def to_default
+    def initialize
+      @options = nil
+      @parser = nil
+    end
+
+    # Set the configuration back to default values
+    def reset
       @_macros = nil
       @_rules = nil
       self
@@ -51,5 +97,108 @@ 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
+      $stderr.puts "#{e}\n\n"
+      $stderr.puts parser
+      exit(1)
+    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
+
+      # 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
+      end
+
+      # TODO: This does not belong here.
+      parser.on('-v', '--version', 'Print gem2rpm\'s version and exit') do
+        puts Gem2Rpm::VERSION
+        exit 0
+      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.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/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/distro.rb

@@ -25,10 +25,8 @@ 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
@@ -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 = []
 
@@ -73,7 +71,7 @@ module Gem2Rpm
     # 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/helpers.rb

@@ -36,13 +36,13 @@ 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 = entries.map { |e| file_entry_to_rpm(e) }
       rpm_file_list.join("\n")
     end
 
@@ -64,7 +64,7 @@ module Gem2Rpm
 
     def self.file_entry_to_rpm(entry)
       config = Gem2Rpm::Configuration.instance
-      case true
+      case
       when doc_file?(entry)
         "#{config.macro_for(:doc)} #{config.macro_for(:instdir)}/#{entry}".strip
       when license_file?(entry)
@@ -82,7 +82,7 @@ module Gem2Rpm
     # 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
+      file_list.map { |f| f.gsub!(/([^\/]*).*/, '\1') }.uniq
     end
 
     # Compares string to the given regexp conditions

data/lib/gem2rpm/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

@@ -5,24 +5,23 @@ 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 = summary.to_s.chomp if d.empty?
       d.gsub!(/([^.!?])\Z/, "\\1.")
-      Helpers::word_wrap(d, 78) + "\n"
+      Helpers.word_wrap(d, 78) + "\n"
     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 +35,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 +52,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/template.rb

@@ -34,10 +34,10 @@ module Gem2Rpm
         end
       else
         begin
-          if File.exists?(name)
+          if File.exist?(name)
             Gem2Rpm::Template.new(name)
           else
-            Gem2Rpm::Template.new(File.join(Gem2Rpm::Template::default_location, name + '.spec.erb'))
+            Gem2Rpm::Template.new(File.join(Gem2Rpm::Template.default_location, name + '.spec.erb'))
           end
         rescue TemplateError
           raise TemplateError, "Could not locate template #{name}"
@@ -48,17 +48,17 @@ module Gem2Rpm
     # 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
+      if File.exist? filename
         @filename = filename
       else
-        raise TemplateError, "Could not locate template #{filename}"
+        fail 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 }
+        File.open(@filename, OPEN_MODE, &:read)
       end
     end
   end

data/lib/gem2rpm/template_helpers.rb

@@ -3,14 +3,14 @@ module Gem2Rpm
     # 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) }
+      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)) }
+      entries.delete_if { |f| !(Helpers.doc_file?(f) || Helpers.misc_file?(f)) }
       Helpers.file_entries_to_rpm(entries)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem2rpm
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - David Lutterkort
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies: []
 description: |2
     Generate source rpms and rpm spec files from a Ruby Gem.
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Generate rpm specfiles from gems