deb-s3 0.5.0 → 0.5.1

data/README.md

@@ -94,6 +94,7 @@ Usage:
 
 Options:
   -f, [--fix-manifests]          # Whether to fix problems in manifests when verifying.
+      [--sign=SIGN]              # Sign the Release file. Use --sign with your key ID to use a specific key.
   -b, [--bucket=BUCKET]          # The name of the S3 bucket to upload to.
   -c, [--codename=CODENAME]      # The codename of the APT repository.
                                  # Default: stable

data/lib/deb/s3.rb

@@ -1,5 +1,5 @@
 module Deb
   module S3
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/lib/deb/s3/cli.rb

@@ -52,6 +52,17 @@ class Deb::S3::CLI < Thor
     :desc     => "The access policy for the uploaded files. " +
                  "Can be public, private, or authenticated."
 
+  class_option :sign,
+    :type     => :string,
+    :desc     => "Sign the Release file when uploading a package," +
+                 "or when verifying it after removing a package." +
+                 "Use --sign with your key ID to use a specific key."
+
+  class_option :gpg_options,
+    :default => "",
+    :type    => :string,
+    :desc    => "Additional command line options to pass to GPG when signing"
+
   desc "upload FILES",
     "Uploads the given files to a S3 bucket as an APT repository."
 
@@ -60,11 +71,6 @@ class Deb::S3::CLI < Thor
     :aliases  => "-a",
     :desc     => "The architecture of the package in the APT repository."
 
-  option :sign,
-    :type     => :string,
-    :desc     => "Sign the Release file. Use --sign with your key ID to use " +
-                 "a specific key."
-
   option :preserve_versions,
     :default  => false,
     :type     => :boolean,
@@ -91,8 +97,6 @@ class Deb::S3::CLI < Thor
     # configure AWS::S3
     configure_s3_client
 
-    Deb::S3::Utils.signing_key = options[:sign]
-
     # retrieve the existing manifests
     log("Retrieving existing manifests")
     release  = Deb::S3::Release.retrieve(options[:codename])
@@ -218,7 +222,9 @@ class Deb::S3::CLI < Thor
 
     AWS::S3::DEFAULT_HOST.replace options[:endpoint] if options[:endpoint]
 
-    Deb::S3::Utils.bucket = options[:bucket]
+    Deb::S3::Utils.bucket      = options[:bucket]
+    Deb::S3::Utils.signing_key = options[:sign]
+    Deb::S3::Utils.gpg_options = options[:gpg_options]
 
     # make sure we have a valid visibility setting
     Deb::S3::Utils.access_policy = case options[:visibility]

data/lib/deb/s3/release.rb

@@ -41,7 +41,7 @@ class Deb::S3::Release
   end
 
   def parse(str)
-    parse = lambda do |field| 
+    parse = lambda do |field|
       value = str[/^#{field}: .*/]
       if value.nil?
         return nil
@@ -91,7 +91,7 @@ class Deb::S3::Release
     # sign the file, if necessary
     if Deb::S3::Utils.signing_key
       key_param = Deb::S3::Utils.signing_key != "" ? "--default-key=#{Deb::S3::Utils.signing_key}" : ""
-      if system("gpg -a #{key_param} -b #{release_tmp.path}")
+      if system("gpg -a #{key_param} #{Deb::S3::Utils.gpg_options} -b #{release_tmp.path}")
         local_file = release_tmp.path+".asc"
         remote_file = self.filename+".gpg"
         yield remote_file if block_given?

data/lib/deb/s3/utils.rb

@@ -9,6 +9,8 @@ module Deb::S3::Utils
   def access_policy= v; @access_policy = v end
   def signing_key; @signing_key end
   def signing_key= v; @signing_key = v end
+  def gpg_options; @gpg_options end
+  def gpg_options= v; @gpg_options = v end
 
   def safesystem(*args)
     success = system(*args)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deb-s3
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor