gem2rpm 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e853558c4d17632fc6eff4d64b1917c7f07c5f8
-  data.tar.gz: bdbc295c35e951f0021397087b9bd6e094b67444
+  metadata.gz: efc85b245df67b937a7440f37dd36104bfa2ab79
+  data.tar.gz: 64250a9c7ea0809174f793677f5eee672ef9cc9e
 SHA512:
-  metadata.gz: 44b51cfa1e4e131254cef25cfb4c35355c22ddf68150450893821a01d07cb1bb1ef1ec0821c1a3c1f7080e2e079bf73633ee708f1a7d6c117fd79448d666b01e
-  data.tar.gz: 3384aa940e54ab4cb438fd2fdc3cf1a7b72c4a3a2f557b48e679b6d4aa81c137bb6d2b1ba2eb39f13bb7c7bda627f7115b597337ca4ea2b8abe61efc411c89a9
+  metadata.gz: 28e35a45ba4df3e56ada85b58e07be99c45fc480ffc462c26064234c42b7436d501621504c91b1c40a5f814a054b4396a7995dc8d8fa68242b82d7761d489dfb
+  data.tar.gz: d2e2737db3761b636e21ce7d679cd672959bd9fde2c70616046244282e9650061148875e89ae122c4ee83d59c0192e75992a6beb1e9565f7d9928f0ea948d7ce

checksums.yaml.gz.sig

@@ -0,0 +1,3 @@
+#���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��*

data/lib/gem2rpm.rb

@@ -11,7 +11,7 @@ require 'gem2rpm/template'
 module Gem2Rpm
   extend Gem2Rpm::TemplateHelpers
 
-  Gem2Rpm::VERSION = "0.11.0"
+  Gem2Rpm::VERSION = "0.11.1"
 
   class Exception < RuntimeError; end
   class DownloadUrlError < Exception; end

data/lib/gem2rpm/distro.rb

@@ -9,28 +9,42 @@ module Gem2Rpm
 
     OsRelease = Struct.new :os, :version
 
+    # Returns struct with OS detected based on release files.
+    #
+    # Distro.os_release.os contains either one of supported distributions
+    # (:fedora, :pld, :opensuse) or :default for unrecognized/unsupported
+    # distributions.
+    #
+    # Distro.os_release.version contains version if it is possible to detect.
     def self.os_release
       @os_release ||= begin
         os_release = OsRelease.new DEFAULT
 
+        grouped_release_files = release_files.group_by do |file|
+          File.basename(file)[/os-release|fedora|redhat|SuSE|pld/] || 'unrecognized'
+        end
+
         # Try os-release first.
-        if !release_files.grep(/os-release/).empty?
-          content = File.open(release_files.grep(/os-release/).first, Gem2Rpm::OPEN_MODE) do |f|
+        if os_release_files = grouped_release_files['os-release']
+          content = File.open(os_release_files.first, Gem2Rpm::OPEN_MODE) do |f|
             f.read
           end
 
-          os_release.os = content[/^ID=(.*)$/, 1].to_sym rescue
-          os_release.version = content[/^VERSION_ID=(.*)$/, 1]
+          begin
+            os_release.os = content[/^ID=(.*)$/, 1].to_sym
+            os_release.version = content[/^VERSION_ID=(.*)$/, 1]
+          rescue
+          end
         end
 
         # If os-release failed (it is empty or has not enough information),
         # try some other release files.
         if os_release.os == DEFAULT
-          if !release_files.grep(/fedora/).empty?
+          if fedora_release_files = grouped_release_files['fedora']
             os_release.os = FEDORA
             versions = []
 
-            release_files.each do |file|
+            fedora_release_files.each do |file|
               /\d+/ =~ File.open(file, OPEN_MODE).readline
               versions << Regexp.last_match.to_s if Regexp.last_match
             end
@@ -38,12 +52,12 @@ module Gem2Rpm
             versions.uniq!
 
             os_release.version = versions.first if versions.length == 1
-          elsif !release_files.grep(/redhat/).empty?
+          elsif grouped_release_files['redhat']
             # Use Fedora's template for RHEL ATM.
             os_release.os = FEDORA
-          elsif !release_files.grep(/SuSE/).empty?
+          elsif grouped_release_files['SuSE']
             os_release.os = OPENSUSE
-          elsif !release_files.grep(/pld/).empty?
+          elsif grouped_release_files['pld']
             os_release.os = PLD
           end
         end
@@ -56,21 +70,29 @@ module Gem2Rpm
       template_by_os_version(os_release.os, os_release.version) || DEFAULT
     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}
     end
 
+    # Allows to override release files list.
     def self.release_files=(files)
+      @os_release = nil
       @release_files = files
     end
 
+    # Tries to find best suitable template for specified os and version.
     def self.template_by_os_version(os, version)
-      Template.list.each do |file|
-        next if file =~ /^\./
+      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/
-        return file.gsub('.spec.erb', '') if Regexp.last_match and in_range?(version, Regexp.last_match[1].to_s.split('-').drop(1))
+
+        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
 
       nil

metadata

@@ -1,15 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: gem2rpm
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - David Lutterkort
 - Vit Ondruch
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+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
 dependencies: []
 description: |2
     Generate source rpms and rpm spec files from a Ruby Gem.
@@ -47,7 +69,8 @@ files:
 - templates/opensuse.spec.erb
 - templates/pld.spec.erb
 homepage: https://github.com/fedora-ruby/gem2rpm
-licenses: []
+licenses:
+- GPLv2+
 metadata: {}
 post_install_message: 
 rdoc_options: []

metadata.gz.sig

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