gem2rpm 0.11.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: efc85b245df67b937a7440f37dd36104bfa2ab79
-  data.tar.gz: 64250a9c7ea0809174f793677f5eee672ef9cc9e
+SHA256:
+  metadata.gz: '086b2a558ce9da7aaf91e3594e282dbd32990b3a9efd83188dca07e60e43c6bf'
+  data.tar.gz: 40d16bcea05765aebff465241453c666b99eabc5940ef1c62b2e413bf05f321a
 SHA512:
-  metadata.gz: 28e35a45ba4df3e56ada85b58e07be99c45fc480ffc462c26064234c42b7436d501621504c91b1c40a5f814a054b4396a7995dc8d8fa68242b82d7761d489dfb
-  data.tar.gz: d2e2737db3761b636e21ce7d679cd672959bd9fde2c70616046244282e9650061148875e89ae122c4ee83d59c0192e75992a6beb1e9565f7d9928f0ea948d7ce
+  metadata.gz: c8a0f9accd90101da8ef84f1551d46a1dbfc1611a81710375e1d27a0875fd766ee710109a81d3b97ec0bde723b3ef4e445982858e3af21659cf98f3e83c7523b
+  data.tar.gz: 8261b9eee3e9403023c83750955534f6af915e50140ed2906457fc10e8643ceb540dba9591f94288dc259b5e8b17419150ec924d0cd6fc3451632067cd237590

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

@@ -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
@@ -58,18 +57,30 @@ $ 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.
 
+To see all available templates that are shipped and can be directly used with gem2rpm run:
+
+```
+$ 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:
 
@@ -77,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
@@ -99,17 +110,13 @@ $ 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.
 
-## 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,140 +1,114 @@
 #!/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'
 require 'fileutils'
+require 'tmpdir'
 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 spec")
-
-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("-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
+options = begin
+  Gem2Rpm::Configuration.instance.options
+rescue Gem2Rpm::Configuration::InvalidOption => e
+  Gem2Rpm.show_message(e)
+  exit(1)
 end
-opts.on("--no-doc", "Disable document subpackage") do |val|
-  doc_subpackage = false
+if options[:templates]
+  Gem2Rpm.show_templates
+  exit(0)
 end
-opts.on("--fetch", "Fetch the gem from rubygems.org") do |val|
-  fetch = true
+if options[:version]
+  Gem2Rpm.show_version
+  exit(0)
 end
-opts.separator("")
-opts.separator("  Arguments:")
-opts.separator("    GEM            the path to locally stored gem package file or the name")
-opts.separator("                   of the gem when using --fetch.")
-opts.separator("")
 
-rest = opts.permute(ARGV)
+rest = options[:args]
 
 template = begin
-  Gem2Rpm::Template.find template_file, :gem_file => rest[0]
-rescue Gem2Rpm::Template::TemplateError
-  $stderr.puts "Could not open template #{template_file}. Aborting"
+  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"
-    $stderr.puts opts
-    exit(1)
+  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 fetch
+if options[:fetch]
   gem_uri = ''
-  open("http://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
+    URI("https://rubygems.org/api/v1/gems/#{gemfile}.json").open 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(URI(gem_uri).open.read)
+      end
     end
+  rescue OpenURI::HTTPError => e
+    Gem2Rpm.show_message("Gem fetch failed with error: #{e.message}")
+    exit(1)
   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
+unless File.exist?(gemfile)
+  Gem2Rpm.show_message("Invalid GEMFILE #{gemfile}")
+  exit(1)
+end
+
+if options[:deps]
+  Gem2Rpm.print_dependencies(gemfile)
+  exit 0
 end
 
-# Produce a specfile
-if output_file.nil?
-    Gem2Rpm::convert(gemfile, template, $stdout, nongem, local, doc_subpackage) unless deps
+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
-    begin
-        out = open(output_file, "w")
-        Gem2Rpm::convert(gemfile, template, out, nongem, local, doc_subpackage)
-    ensure
-        out.close()
-    end
+  puts output_spec.string unless options[:srpm]
 end
 
-# Create a  source RPM
-if srpm
-    unless File::exist?(specfile)
-        FileUtils::copy(output_file, specfile)
+# Create a SRPM.
+if options[:srpm]
+  gemname = Gem2Rpm::Package.new(gemfile).spec.name
+  Dir.mktmpdir "gem2rpm-#{gemname}-" do |srpmdir|
+    specfile = File.join(srpmdir, "rubygem-#{gemname}.spec")
+
+    File.open(specfile, "w") do |f|
+      f.puts(output_spec.string)
     end
-    FileUtils::copy(gemfile, srpmdir)
 
-    system("rpmbuild -bs --nodeps --define '_sourcedir #{srpmdir}' --define '_srcrpmdir #{Dir::pwd}' #{specfile}")
-end
+    FileUtils.copy(gemfile, srpmdir)
+
+    command =
+      "rpmbuild -bs --nodeps " +
+      "--define '_sourcedir #{srpmdir}' " +
+      "--define '_srcrpmdir #{out_dir}' " +
+      specfile
 
-if deps
-  Gem2Rpm::Package.new(gemfile).spec.dependencies.each do |dep|
-    Gem2Rpm::Dependency.new(dep).requirement.each do |r|
-      puts "rubygem(#{dep.name}) #{r}"
+    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.1"
+  Gem2Rpm::VERSION = "1.0.2".freeze
 
   class Exception < RuntimeError; end
   class DownloadUrlError < Exception; end
@@ -23,15 +26,33 @@ 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)
 
     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 +62,24 @@ module Gem2Rpm
     download_path
   end
 
-  def Gem2Rpm.convert(fname, template=RUBYGEM_TEMPLATE, out=$stdout,
-                      nongem=true, local=false, doc_subpackage = true)
+  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 = 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
@@ -64,30 +96,38 @@ module Gem2Rpm
     puts e
   end
 
+  # Print gem dependencies to the specified output ($stdout by default).
+  def self.print_dependencies(gemfile, out = $stdout)
+    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
   # 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
 
-  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
+  def self.rubygem_template
+    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}-vagrant-plugin.spec.erb")
+    Template.new(file)
+  end
 end
 
 # Local Variables: