reaper-man 0.1.8 → 0.1.10

data/lib/reaper-man/package_list/gem.rb

@@ -1,5 +1,5 @@
-require 'reaper-man'
-require 'rubygems/package'
+require "reaper-man"
+require "rubygems/package"
 
 module ReaperMan
   class PackageList
@@ -11,6 +11,10 @@ module ReaperMan
         # @param conf [Hash]
         # @param package [String] path to package
         def add(hash, package)
+          if hash["rubygem"] && !hash.to_smash.get(:rubygem, :clean)
+            hash["rubygem"] = clean(hash["rubygem"])
+            hash["rubygem"]["clean"] = true
+          end
           info = extract_fields(package)
           filenames = inject_package(hash, info, package)
           filenames
@@ -21,13 +25,13 @@ module ReaperMan
         # @param conf [Hash] configuration hash
         # @param package_name [String] name
         # @param version [String]
-        def remove(hash, package_name, version, args={})
+        def remove(hash, package_name, version, args = {})
           deleted = false
-          if(hash['rubygems'][package_name])
-            if(version)
-              deleted = hash['rubygems'][package_name].delete(version)
+          if hash["rubygems"][package_name]
+            if version
+              deleted = hash["rubygems"][package_name].delete(version)
             else
-              deleted = hash['rubygems'].delete(package_name)
+              deleted = hash["rubygems"].delete(package_name)
             end
           end
           !!deleted
@@ -40,12 +44,18 @@ module ReaperMan
         def extract_fields(package)
           spec = ::Gem::Package.new(package).spec
           fields = Smash[
-            spec.to_yaml_properties.map do |var_name|
-              [var_name.to_s.tr('@', ''), spec.instance_variable_get(var_name)]
-            end
+            spec.class.attribute_names.map do |var_name|
+              value = spec.send(var_name)
+              next if value.nil? || (value.respond_to?(:empty?) && value.empty?)
+              [var_name, value]
+            end.compact
           ]
-          fields['dependencies'] = fields['dependencies'].map do |dep|
-            [dep.name, dep.requirement.to_s.split(',').map(&:strip)]
+          fields["dependencies"] = fields["dependencies"].map do |dep|
+            [dep.name, dep.requirement.to_s.split(",").map(&:strip)]
+          end
+          if fields["required_ruby_version"]
+            fields["required_ruby_version"] = fields["required_ruby_version"].
+              to_s.split(",").map(&:strip)
           end
           fields
         end
@@ -58,22 +68,35 @@ module ReaperMan
         # @return [Array<String>] package paths within package list contents
         def inject_package(hash, info, package)
           package_path = File.join(
-            'rubygems', 'gems', "#{info['name']}-#{info['version']}.gem"
+            "rubygems", "gems", "#{info["name"]}-#{info["version"]}.gem"
           )
-          classification = info['version'].prerelease? ? 'prerelease' : 'release'
-          info['version'] = info['version'].version
+          classification = info["version"].prerelease? ? "prerelease" : "release"
+          info["version"] = info["version"].version
           hash.deep_merge!(
-            'rubygem' => {
+            "rubygem" => {
               classification => {
-                info['name'] => {
-                  info['version'].to_s => info.merge('package_path' => package_path)
-                }
-              }
-            }
+                info["name"] => {
+                  info["version"].to_s => info.merge("package_path" => package_path),
+                },
+              },
+            },
           )
           package_path
         end
 
+        # Clean data hash of empty values
+        #
+        # @param hash [Hash] package list information
+        # @return [Smash]
+        def clean(hash)
+          Smash[
+            hash.map { |k, v|
+              v = clean(v) if v.is_a?(Hash)
+              next if v.nil? || (v.respond_to?(:empty?) && v.empty?)
+              [k, v]
+            }
+          ]
+        end
       end
     end
   end

data/lib/reaper-man/package_list/rpm.rb

@@ -1,4 +1,4 @@
-require 'reaper-man'
+require "reaper-man"
 
 module ReaperMan
   class PackageList
@@ -20,11 +20,11 @@ module ReaperMan
         attr_reader :package_bucket
 
         # default package root prefix
-        DEFAULT_ROOT = 'pool'
+        DEFAULT_ROOT = "pool"
         # default namespace for packages
-        DEFAULT_BUCKET = 'public'
+        DEFAULT_BUCKET = "public"
         # default architectures to define
-        DEFAULT_ALL_MAP = ['amd64', 'i386']
+        DEFAULT_ALL_MAP = ["amd64", "i386"]
 
         # Create new instance
         #
@@ -35,14 +35,14 @@ module ReaperMan
         # @option args [String] :package_root
         # @option args [String] :package_bucket
         # @option args [Array<String>] :all_map
-        def initialize(args={})
+        def initialize(args = {})
           @origin = args[:origin].to_s
           @dist = args[:codename].to_s
           @component = args[:component].to_s
           @package_root = args.fetch(:package_root, DEFAULT_ROOT)
           @package_bucket = args.fetch(:package_bucket, DEFAULT_BUCKET)
-          if(dist.empty? || component.empty?)
-            raise 'Both `codename` and `component` must contain valid values'
+          if dist.empty? || component.empty?
+            raise "Both `codename` and `component` must contain valid values"
           end
           @all_map = args.fetch(:all_map, DEFAULT_ALL_MAP)
         end
@@ -63,14 +63,14 @@ module ReaperMan
         # @param conf [Hash] configuration hash
         # @param package_name [String] name
         # @param version [String]
-        def remove(hash, package_name, version, args={})
+        def remove(hash, package_name, version, args = {})
           hash = hash.to_smash
           arch = [args.fetch(:arch, all_map)].flatten.compact
           deleted = false
           arch.each do |arch_name|
             arch_name = "binary-#{arch_name}"
-            if(hash.get(:yum, origin, dist, :components, component, arch_name, package_name))
-              if(version)
+            if hash.get(:yum, origin, dist, :components, component, arch_name, package_name)
+              if version
                 deleted = hash[:yum][origin][dist][:components][component][arch_name][package_name].delete(version)
               else
                 deleted = hash[:yum][origin][dist][:components][component][arch_name].delete(package_name)
@@ -85,9 +85,9 @@ module ReaperMan
         # @param package [String] path to package
         # @return [Hash]
         def extract_fields(package)
-          fields = shellout('rpm --querytags').stdout.split("\n").map do |line|
+          fields = shellout("rpm --querytags").stdout.split("\n").map do |line|
             line.strip!
-            unless(line.empty? || line.start_with?('HEADER'))
+            unless line.empty? || line.start_with?("HEADER")
               line
             end
           end.compact
@@ -97,18 +97,18 @@ module ReaperMan
           end.flatten.join("\n")
 
           cmd = "rpm -q -p #{package} --queryformat 'output:\n#{fmt}'"
-          result = shellout(cmd).stdout.sub(/.*output:/, '')
+          result = shellout(cmd).stdout.sub(/.*output:/, "")
 
           data = Smash.new
           key = nil
           result.split("\n").each do |item|
             item.strip!
             next if item.empty?
-            if(item.start_with?('[') && item.end_with?(']'))
-              key = item.tr('[]', '')
+            if item.start_with?("[") && item.end_with?("]")
+              key = item.tr("[]", "")
             else
-              if(data[key])
-                if(!data[key].is_a?(Array))
+              if data[key]
+                if !data[key].is_a?(Array)
                   data[key] = [data[key]]
                 end
                 data[key] << item
@@ -117,7 +117,7 @@ module ReaperMan
               end
             end
           end
-          data[:generated_sha] = checksum(File.open(package, 'r'), :sha1)
+          data[:generated_sha] = checksum(File.open(package, "r"), :sha1)
           data[:generated_size] = File.size(package)
           data[:generated_header] = extract_header_information(package)
           data
@@ -130,31 +130,31 @@ module ReaperMan
         # @param package [String] path to package file
         # @return [Array<String>] package paths within package list contents
         def inject_package(hash, info, package)
-          arch = info['ARCH']
-          arch = arch == 'all' ? all_map : [arch]
+          arch = info["ARCH"]
+          arch = arch == "all" ? all_map : [arch]
           arch.map do |arch|
             package_file_name = File.join(
               package_root, package_bucket, origin,
               dist, component, File.basename(package)
             )
             hash.deep_merge!(
-              'yum' => {
+              "yum" => {
                 origin => {
                   dist => {
-                    'components' => {
+                    "components" => {
                       component => {
                         arch => {
-                          info['NAME'] => {
-                            info['NEVR'] => info.merge(:generated_path => package_file_name)
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
+                          info["NAME"] => {
+                            info["NEVR"] => info.merge(:generated_path => package_file_name),
+                          },
+                        },
+                      },
+                    },
+                  },
+                },
+              },
             )
-            File.join('yum', origin, package_file_name)
+            File.join("yum", origin, package_file_name)
           end
         end
 
@@ -163,11 +163,11 @@ module ReaperMan
         # @param package [String] path to package file
         # @return [Hash] checksums
         def generate_checksums(package)
-          File.open(package, 'r') do |pkg|
+          File.open(package, "r") do |pkg|
             {
-              'MD5sum' => checksum(pkg.rewind && pkg, :md5),
-              'SHA1' => checksum(pkg.rewind && pkg, :sha1),
-              'SHA256' => checksum(pkg.rewind && pkg, :sha256)
+              "MD5sum" => checksum(pkg.rewind && pkg, :md5),
+              "SHA1" => checksum(pkg.rewind && pkg, :sha1),
+              "SHA256" => checksum(pkg.rewind && pkg, :sha256),
             }
           end
         end
@@ -179,15 +179,15 @@ module ReaperMan
         # @return [Smash<start,end>]
         # @note ported from: http://yum.baseurl.org/gitweb?p=yum.git;a=blob;f=yum/packages.py;h=eebeb9dfd264b887b054187276cea12ced3a0bc2;hb=HEAD#l2212
         def extract_header_information(package)
-          io = File.open(package, 'rb')
+          io = File.open(package, "rb")
 
           # read past lead and 8 bytes of signature header
           io.seek(104)
           binindex = io.read(4)
-          sigindex, _ = binindex.unpack('I>')
+          sigindex, _ = binindex.unpack("I>")
 
           bindata = io.read(4)
-          sigdata, _ = bindata.unpack('I>')
+          sigdata, _ = bindata.unpack("I>")
 
           # seeked in to 112 bytes
 
@@ -199,7 +199,7 @@ module ReaperMan
           # Round to next 8 byte boundary
 
           disttoboundary = (sigsize % 8)
-          unless(disttoboundary == 0)
+          unless disttoboundary == 0
             disttoboundary = 8 - disttoboundary
           end
 
@@ -216,9 +216,9 @@ module ReaperMan
 
           binindex = io.read(4)
 
-          hdrindex, _ = binindex.unpack('I>')
+          hdrindex, _ = binindex.unpack("I>")
           bindata = io.read(4)
-          hdrdata, _ = bindata.unpack('I>')
+          hdrdata, _ = bindata.unpack("I>")
 
           # each index is 4 32bit segments - so each is 16 bytes
 
@@ -235,10 +235,9 @@ module ReaperMan
 
           Smash.new(
             :start => hdrstart,
-            :end => hdrend
+            :end => hdrend,
           )
         end
-
       end
     end
   end

data/lib/reaper-man/signer.rb

@@ -1,12 +1,11 @@
-require 'reaper-man'
+require "reaper-man"
 
 module ReaperMan
   # File signer
   class Signer
-
-    autoload :Rpm, 'reaper-man/signer/rpm'
-    autoload :Deb, 'reaper-man/signer/deb'
-    autoload :Rubygems, 'reaper-man/signer/rubygems'
+    autoload :Rpm, "reaper-man/signer/rpm"
+    autoload :Deb, "reaper-man/signer/deb"
+    autoload :Rubygems, "reaper-man/signer/rubygems"
 
     include Utils::Process
 
@@ -19,7 +18,7 @@ module ReaperMan
     # command to use for file signing
     HELPER_COMMAND = File.join(
       File.expand_path(File.dirname(__FILE__)),
-      'util-scripts/auto-helper'
+      "util-scripts/auto-helper"
     )
 
     # Create new instance
@@ -30,12 +29,12 @@ module ReaperMan
     # @option args [String] :signing_type (defaults to 'origin')
     # @option args [String] :key_password (defaults to `ENV['REAPER_KEY_PASSWORD']`)
     # @option args [String] :package_system
-    def initialize(args={})
+    def initialize(args = {})
       args = args.to_smash
       @key_id = args[:signing_key]
       @sign_chunk_size = args.fetch(:signing_chunk_size, 1)
-      @sign_type = args.fetch(:signing_type, 'origin')
-      @key_password = args.fetch(:key_password, ENV['REAPER_KEY_PASSWORD'])
+      @sign_type = args.fetch(:signing_type, "origin")
+      @key_password = args.fetch(:key_password, ENV["REAPER_KEY_PASSWORD"])
       @package_system = args[:package_system]
       case package_system.to_sym
       when :deb, :apt
@@ -54,24 +53,22 @@ module ReaperMan
     # @param src [String] path to source file
     # @param dst [String] path for destination file
     # @return [String] destination file path
-    def file(src, dst=nil, sign_opts=nil)
-      opts = sign_opts ? [sign_opts].flatten.compact : ['--detach-sign', '--armor']
-      dst ||= src.sub(/#{Regexp.escape(File.extname(src))}$/, '.gpg')
+    def file(src, dst = nil, sign_opts = nil)
+      opts = sign_opts ? [sign_opts].flatten.compact : ["--detach-sign", "--armor"]
+      dst ||= src.sub(/#{Regexp.escape(File.extname(src))}$/, ".gpg")
       opts << "--output '#{dst}'"
-      cmd = (["gpg --default-key #{key_id}"] + opts + [src]).join(' ')
-      if(key_password)
+      cmd = (["gpg --default-key #{key_id}"] + opts + [src]).join(" ")
+      if key_password
         shellout(
           "#{HELPER_COMMAND} #{cmd}",
           :environment => {
-            'REAPER_KEY_PASSWORD' => key_password
-          }
+            "REAPER_KEY_PASSWORD" => key_password,
+          },
         )
       else
         shellout(cmd)
       end
       dst
     end
-
   end
-
 end

data/lib/reaper-man/signer/deb.rb

@@ -1,4 +1,4 @@
-require 'reaper-man'
+require "reaper-man"
 
 module ReaperMan
   class Signer
@@ -12,13 +12,13 @@ module ReaperMan
       def package(*pkgs)
         pkgs = valid_packages(*pkgs)
         pkgs.each_slice(sign_chunk_size) do |pkgs|
-          cmd = %(debsigs --sign="#{sign_type}" --default-key="#{key_id}" #{pkgs.join(' ')})
-          if(key_password)
+          cmd = %(debsigs --sign="#{sign_type}" --default-key="#{key_id}" #{pkgs.join(" ")})
+          if key_password
             shellout(
               "#{Signer::HELPER_COMMAND} #{cmd}",
               :environment => {
-                'REAPER_KEY_PASSWORD' => key_password
-              }
+                "REAPER_KEY_PASSWORD" => key_password,
+              },
             )
           else
             shellout(cmd)
@@ -33,10 +33,9 @@ module ReaperMan
       # @return [Array<String>]
       def valid_packages(*pkgs)
         pkgs.find_all do |pkg|
-          File.extname(pkg) == '.deb'
+          File.extname(pkg) == ".deb"
         end
       end
-
     end
   end
 end

data/lib/reaper-man/signer/rpm.rb

@@ -1,4 +1,4 @@
-require 'reaper-man'
+require "reaper-man"
 
 module ReaperMan
   class Signer
@@ -12,13 +12,13 @@ module ReaperMan
       def package(*pkgs)
         pkgs = valid_packages(*pkgs)
         pkgs.each_slice(sign_chunk_size) do |pkgs|
-          cmd = %(rpmsign --resign --key-id="#{key_id}" #{pkgs.join(' ')})
-          if(key_password)
+          cmd = %(rpmsign --resign --key-id="#{key_id}" #{pkgs.join(" ")})
+          if key_password
             shellout(
               "#{Signer::HELPER_COMMAND} #{cmd}",
               :environment => {
-                'REAPER_KEY_PASSWORD' => key_password
-              }
+                "REAPER_KEY_PASSWORD" => key_password,
+              },
             )
           else
             shellout(cmd)
@@ -33,10 +33,9 @@ module ReaperMan
       # @return [Array<String>]
       def valid_packages(*pkgs)
         pkgs.find_all do |pkg|
-          File.extname(pkg) == '.rpm'
+          File.extname(pkg) == ".rpm"
         end
       end
-
     end
   end
 end