gem2rpm 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efc85b245df67b937a7440f37dd36104bfa2ab79
-  data.tar.gz: 64250a9c7ea0809174f793677f5eee672ef9cc9e
+  metadata.gz: 05c2d7ff2784e6acf91598c7eb14826f9b6e131c
+  data.tar.gz: dd82ef52cba6f90b6f27659345b4a5aa40c92b8f
 SHA512:
-  metadata.gz: 28e35a45ba4df3e56ada85b58e07be99c45fc480ffc462c26064234c42b7436d501621504c91b1c40a5f814a054b4396a7995dc8d8fa68242b82d7761d489dfb
-  data.tar.gz: d2e2737db3761b636e21ce7d679cd672959bd9fde2c70616046244282e9650061148875e89ae122c4ee83d59c0192e75992a6beb1e9565f7d9928f0ea948d7ce
+  metadata.gz: 233cfde605cf890876d4fba199ff1c1d23ffd34d683af16146406594dbf443f683961a7294310787924685c687650f7fd0aaaf7f82faa5d25602f5e4c2f25125
+  data.tar.gz: 52cd2e8b0fcece311b18f79b61c928829adc88b95144cbbd61ea45f17fc77835305c1556d0a82d89065f6e4f045a22bc5ec119f19e8ec67923929138a58b2b3e

data/README.md

@@ -63,6 +63,12 @@ $ gem2rpm -t rubygem-GEM.spec.template > rubygem-GEM.spec
 
 With this new template you can now build your RPM as usual and when a new version of the gem becomes available, you just edit the saved template and rerun gem2rpm over it.
 
+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:

data/bin/gem2rpm

@@ -10,9 +10,9 @@ require 'open-uri'
 require 'uri'
 
 opts = OptionParser.new("Usage: #{$0} [OPTIONS] GEM")
-opts.separator("  Convert ruby Gems to source RPMs and specfiles")
+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")
+opts.separator("  from the gem specification.")
 
 print_template_file = nil
 template_file = nil
@@ -32,6 +32,13 @@ 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
@@ -60,16 +67,22 @@ opts.on("--fetch", "Fetch the gem from rubygems.org") do |val|
 end
 opts.separator("")
 opts.separator("  Arguments:")
-opts.separator("    GEM            the path to locally stored gem package file or the name")
+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("")
 
-rest = opts.permute(ARGV)
+begin
+  rest = opts.permute(ARGV)
+rescue OptionParser::InvalidOption => e
+  $stderr.puts "#{e}\n\n"
+  $stderr.puts opts
+  exit(1)
+end
 
 template = begin
   Gem2Rpm::Template.find template_file, :gem_file => rest[0]
-rescue Gem2Rpm::Template::TemplateError
-  $stderr.puts "Could not open template #{template_file}. Aborting"
+rescue Gem2Rpm::Template::TemplateError => e
+  $stderr.puts e
   exit(1)
 end
 
@@ -79,7 +92,7 @@ if print_template_file
 end
 
 if rest.size != 1
-    $stderr.puts "Missing GEMFILE"
+    $stderr.puts "Missing GEMFILE\n\n"
     $stderr.puts opts
     exit(1)
 end

data/lib/gem2rpm.rb

@@ -11,7 +11,7 @@ require 'gem2rpm/template'
 module Gem2Rpm
   extend Gem2Rpm::TemplateHelpers
 
-  Gem2Rpm::VERSION = "0.11.1"
+  Gem2Rpm::VERSION = "0.11.2"
 
   class Exception < RuntimeError; end
   class DownloadUrlError < Exception; end
@@ -41,8 +41,8 @@ module Gem2Rpm
     download_path
   end
 
-  def Gem2Rpm.convert(fname, template=RUBYGEM_TEMPLATE, out=$stdout,
-                      nongem=true, local=false, doc_subpackage = true)
+  def Gem2Rpm.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)
@@ -82,10 +82,13 @@ module Gem2Rpm
     packager
   end
 
-  RUBYGEM_TEMPLATE = Template.new(File.join(Template::default_location, "#{Distro.nature.to_s}.spec.erb"))
-  VAGRANT_PLUGIN_TEMPLATE = begin
+  def self.rubygem_template
+    Template.new(File.join(Template::default_location, "#{Distro.nature.to_s}.spec.erb"))
+  end
+
+  def self.vagrant_plugin_template
     file = File.join(Template::default_location, "#{Distro.nature.to_s}-vagrant-plugin.spec.erb")
-    Template.new(file) if File.exist? file
+    Template.new(file)
   end
 
 end

data/lib/gem2rpm/template.rb

@@ -25,15 +25,16 @@ module Gem2Rpm
     # when looking for vagrant templates for example.
     def self.find(name = nil, options = {})
       if name.nil?
-        case options[:gem_file]
+        gem_file = File.basename(options[:gem_file]) if options[:gem_file]
+        case gem_file
         when /^vagrant(-|_).*/
-          Gem2Rpm::VAGRANT_PLUGIN_TEMPLATE
+          Gem2Rpm.vagrant_plugin_template
         else
-          Gem2Rpm::RUBYGEM_TEMPLATE
+          Gem2Rpm.rubygem_template
         end
       else
         begin
-	  if File.exists?(name)
+          if File.exists?(name)
             Gem2Rpm::Template.new(name)
           else
             Gem2Rpm::Template.new(File.join(Gem2Rpm::Template::default_location, name + '.spec.erb'))

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

@@ -14,9 +14,6 @@ Source0: <%= download_path %>%{vagrant_plugin_name}-%{version}.gem
 Requires(posttrans): vagrant
 Requires(preun): vagrant
 Requires: vagrant
-BuildRequires: ruby(release)
-BuildRequires: rubygems-devel
-BuildRequires: ruby
 BuildRequires: vagrant
 <% if spec.extensions.empty? -%>
 BuildArch: noarch

metadata

@@ -1,37 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: gem2rpm
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - David Lutterkort
 - Vit Ondruch
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDeDCCAmCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBBMRIwEAYDVQQDDAl2Lm9u
-  ZHJ1Y2gxFzAVBgoJkiaJk/IsZAEZFgd0aXNjYWxpMRIwEAYKCZImiZPyLGQBGRYC
-  Y3owHhcNMTQxMjA0MTMyNDA3WhcNMTUxMjA0MTMyNDA3WjBBMRIwEAYDVQQDDAl2
-  Lm9uZHJ1Y2gxFzAVBgoJkiaJk/IsZAEZFgd0aXNjYWxpMRIwEAYKCZImiZPyLGQB
-  GRYCY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdw3QyZX/I96ds
-  cNDN12zTyvF0xX7DF59bDknSsm0cnor9hfK9okgZSaFqzkbVoxqjTp3eTZ6jfWi6
-  /uU0mDASkuC2RjZLKYmVYlydVbicAAu4AQwCqVcDisx2v8CJZZ9CKjxIj5/mIDPh
-  54cXNKxagZUCl1b4oI+HdGtR5l1opxcm9UGM4ff1BJjTBlydvYnrROmGqAXuPHY5
-  +l9CsFwPwxQPTfE4VVcDUVmMQ/IORgocSVhx1mHxTZlEBweP4GJ59phAeDl4Vt8h
-  2Zok26KN1rok3Jq+iSEw9DuJtoHqgNjGNPNtZOA9knAQOrnPidlibKdfDG53GBKW
-  ZIbhk+pfAgMBAAGjezB5MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
-  BBSVtjoVmQK/PkQOwue1qIXjLS7rjjAfBgNVHREEGDAWgRR2Lm9uZHJ1Y2hAdGlz
-  Y2FsaS5jejAfBgNVHRIEGDAWgRR2Lm9uZHJ1Y2hAdGlzY2FsaS5jejANBgkqhkiG
-  9w0BAQUFAAOCAQEAewzbZ+U7K0HZKyezyny8txhuLL21JCT4Vv6NbHbmdtn+UXma
-  0m24dKlBsYU6tzZA4J7By+ARGn6xTssv4LnL3a+Yl/S69oCyjmCaxmkRt+6LMaQo
-  V3UO37rdJCCowWcP1k7rU+KsT/2V3mhBliTjYHH/RyEeqlJ9/3JazlCdYbLWobqO
-  m3oVhvQvTkxDCHSsYga0FQt6a26k+fX65GAyjY/fJWmceetOyax4e+5xjZ9fKEik
-  YpMJ590rUNfDhbfYuAY0l6VDmajngEKkdxCEP0v6KBQeOmH3/+oOxcSVnc3NAp2J
-  eE+DjyUv9Cq0yBFpfdrGk1fHwX/dtWcFrsKNxw==
-  -----END CERTIFICATE-----
-date: 2015-05-06 00:00:00.000000000 Z
+cert_chain: []
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies: []
 description: |2
     Generate source rpms and rpm spec files from a Ruby Gem.
@@ -88,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Generate rpm specfiles from gems

checksums.yaml.gz.sig

@@ -1,3 +0,0 @@
-#���N�@?Iv.���s��R�`���h"��\uϪwv��۾h	"
-�B�"��'bt�������c~�A)]$���| N��&$&;��܀���D�����B����D�維WҌY�V��S	<��0\)8�0�E�b�ٜ��U).��x��Ոb�w)�s��x4������e
-7��2��&��4�_�K#[�5�r%�c�����4��i�7��*

metadata.gz.sig

@@ -1,2 +0,0 @@
-i]�i��N��lڮ�l";LC�
-B�+�M��jw�X4����S�[�����_