reaper-man 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b65c616d8cb213ea551b5f0b2cf1a426544f6b6c
-  data.tar.gz: 6082d657d10e1db68a2adca5e00e950b25505a46
+  metadata.gz: 2a9fa742e2b634580a7bbcf8c2fecec0f4aa7475
+  data.tar.gz: e5fbbbef5da442fbf19d79eae0076e09461222c6
 SHA512:
-  metadata.gz: ea0688fa54abfef33864fa2830c040c8891cd0948f4ff5dd3db26253fcdaf36e793708921f05ddb66d80023f9bd50b37f7be6579afd0884c13133b6a593aee04
-  data.tar.gz: 889dc2c1f5159d243f4ab52ba60e0e1be259075b5ffac13b8723e8fddd80c03d2eda0f6092ffe2c8a08848e96d49da58610921891ecb514f3e70e2ab0d4207e0
+  metadata.gz: a4adefa68d4ade7620ac4d88151f361bef6b6e31beccd24bc1f08a4a90225527ec8b80e8dd7ef259e2da01520655e2bf6d1849cddb264d2eaebb9c3fe3b6b5c4
+  data.tar.gz: f5c489deda65dbb86073cb34b7b247a4fd32fc8261d0920c97b02eeca2d0def7bb18239da10902ed415ef6ac29b6ca7fea0bc263c9b4d95d946af4d4a7b8655c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.1.4
+* [fix] fix package and repository signing for deb/apt
+* [enhancement] allow passing mix of files/directories for signing
+
 # v0.1.2
 * [fix] properly prefix generated deb package path (GH#1)
 

data/README.md

@@ -6,10 +6,12 @@ Grow code, harvest packages
 
 ### Harvests
 
-Package repository is maintained via `JSON` file. Packages are added or removed
-from the `JSON` registry. Repository generation will result in skeleton repository
-with the proper `Release` and `Packages` files. Package paths will be not exist
-within the generated repository. Resolving that issue is left to the reader.
+Reaper man generates a `JSON` registry that describes one or more package repositories
+that can be used to generate the expected repository file system. Packages are added
+or removed from the registry, and regeneration of the repository file system is fast
+and simple. The generated repository file system will refer to the referenced packages
+but will not actually contain the referenced packages. Storage of the actual package
+assets (and the delivery of said assets) is left to the reader.
 
 ### Support
 
@@ -50,6 +52,14 @@ or remove a specific version
 
 This can also be used to update an existing repository structure.
 
+### Dependencies
+
+Commands that must be available within the path:
+
+* `gpg`
+* `debsigs`
+* `expect`
+
 ## Infos
 * Repository: https://github.com/hw-labs/reaper-man
 * IRC: Freenode @ #heavywater

data/bin/reaper-man

@@ -71,7 +71,7 @@ Bogo::Cli::Setup.define do
 
   command :sign do
     description 'Sign package(s)'
-
+    instance_exec(&common_options)
     on :S, :'package-system=', 'Packaging system to generate repository (apt/yum/rubygems/supermarket)', :required => true
     on :Z, :'signing-chunk-size=', 'Number of packages to sign at once', :default => 20, :as => Integer
 

data/lib/reaper-man/command/repository/generate.rb

@@ -13,7 +13,8 @@ module ReaperMan
                 Smash.new(
                   :package_config => MultiJson.load(
                     File.read(config[:packages_file])
-                  ).to_smash
+                  ).to_smash,
+                  :signer => config[:sign] ? Signer.new(config) : nil
                 )
               )
             ).generate!

data/lib/reaper-man/command/sign.rb

@@ -5,15 +5,27 @@ module ReaperMan
     class Sign < Command
 
       def execute!
+        files = arguments.map do |item|
+          if(File.file?(item))
+            item
+          else
+            File.directory?(item)
+            i_files = Dir.glob(File.join(item, '**', '*'))
+            i_files.delete_if do |path|
+              !File.file?(path)
+            end
+            i_files
+          end
+        end.flatten.compact.uniq
         run_action 'Signing file(s)' do
           signer = Signer.new(config)
-          files = Dir.glob(File.join(arguments.first, '**', '*'))
-          files.delete_if do |path|
-            !File.file?(path)
-          end
           signer.package(*files)
           nil
         end
+        ui.info "Files signed:"
+        files.sort.each do |path|
+          ui.puts "  #{ui.color(File.expand_path(path), :yellow)}"
+        end
       end
 
     end

data/lib/reaper-man/generator/apt.rb

@@ -36,6 +36,15 @@ module ReaperMan
               end.compact
             ]
             release_headers['Components'] = dist_args[:components].keys.join(' ')
+            signed = sign_file_if_setup('--clearsign') do
+              release_file(origin_name, dist_name, release_headers)
+            end
+            if(File.exists?("#{signed}.gpg"))
+              FileUtils.mv(
+                "#{signed}.gpg",
+                File.join(File.dirname(signed), 'InRelease')
+              )
+            end
             sign_file_if_setup do
               release_file(origin_name, dist_name, release_headers)
             end
@@ -48,10 +57,10 @@ module ReaperMan
       #
       # @yield block returning file path
       # @return [String] file path
-      def sign_file_if_setup
+      def sign_file_if_setup(opts=nil)
         path = yield
         if(signer && options[:sign])
-          signer.file(path)
+          signer.file(path, nil, opts)
         end
         path
       end

data/lib/reaper-man/signer.rb

@@ -16,6 +16,12 @@ module ReaperMan
     attr_reader :package_system
     attr_reader :key_password
 
+    # command to use for file signing
+    HELPER_COMMAND = File.join(
+      File.expand_path(File.dirname(__FILE__)),
+      'util-scripts/auto-helper'
+    )
+
     # Create new instance
     #
     # @param args [Hash]
@@ -48,12 +54,21 @@ 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)
-      opts = ['--detach-sign', '--armor']
+    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'] + opts + [src]).join(' ')
-      shellout!(cmd)
+      cmd = (["gpg --default-key #{key_id}"] + opts + [src]).join(' ')
+      if(key_password)
+        shellout(
+          "#{HELPER_COMMAND} #{cmd}",
+          :environment => {
+            'REAPER_KEY_PASSWORD' => key_password
+          }
+        )
+      else
+        shellout(cmd)
+      end
       dst
     end
 

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

@@ -5,12 +5,6 @@ module ReaperMan
     # Signing methods for deb files
     module Deb
 
-      # command to use for file signing
-      SIGN_COMMAND = File.join(
-        File.expand_path(File.join(File.dirname(__FILE__), '..')),
-        'util-scripts/auto-debsigs'
-      )
-
       # Sign given files
       #
       # @param pkgs [String] list of file paths
@@ -18,15 +12,16 @@ 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)
             shellout(
-              "#{SIGN_COMMAND} #{sign_type} #{key_id} #{pkgs.join(' ')}",
+              "#{Signer::HELPER_COMMAND} #{cmd}",
               :environment => {
                 'REAPER_KEY_PASSWORD' => key_password
               }
             )
           else
-            shellout(%w(debsigs --sign="#{sign_type}" --default-key="#{key_id}" #{pkgs.join(' ')}))
+            shellout(cmd)
           end
         end
         true

data/lib/reaper-man/util-scripts/{auto-debsigs → auto-helper}

@@ -4,14 +4,12 @@ log_user 0
 
 set timeout 3
 
-set signtype [lindex $argv 0]
-set signkey [lindex $argv 1]
-set package [join [lrange $argv 2 [llength $argv]] " "]
+set commandstring [join [lrange $argv 0 [llength $argv]] " "]
 
 spawn /bin/bash
 expect {
   -re ".*\$ *$" {
-    send "/usr/bin/debsigs --sign=\"$signtype\" --default-key=\"$signkey\" $package\r"
+    send "$commandstring\r"
   }
   timeout { exit 1 }
 }

data/lib/reaper-man/version.rb

@@ -1,4 +1,4 @@
 module ReaperMan
   # current library version
-  VERSION = Gem::Version.new('0.1.2')
+  VERSION = Gem::Version.new('0.1.4')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reaper-man
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bogo-cli
@@ -84,7 +84,7 @@ files:
 - lib/reaper-man/signer.rb
 - lib/reaper-man/signer/deb.rb
 - lib/reaper-man/signer/rubygems.rb
-- lib/reaper-man/util-scripts/auto-debsigs
+- lib/reaper-man/util-scripts/auto-helper
 - lib/reaper-man/utils.rb
 - lib/reaper-man/utils/process.rb
 - lib/reaper-man/version.rb