deb-s3 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: ec462c0b2f303467f4894dd8aa080b8ba29132015af2c8d6b641a101ceb9d184
-  data.tar.gz: 497c2f2658e577d1357bfd48683aa6b03626efa32bd1686d4a28aa99fe64eec6
+SHA1:
+  metadata.gz: 9e8dbe12df60c668bf2f6469b90d6cdd1cd81325
+  data.tar.gz: 0107fe0bd5e38e79a39046ebeb19566b647e3865
 SHA512:
-  metadata.gz: 0da988ffe976866db0ee34ae7646ecbf7c7bb439e4ecbc6a77b03ae834b1f89c0ac417b8ff391845d2f9c24a1d94af898c1ff628c132ad1794b81adaf45e0751
-  data.tar.gz: 9ece8553037e9abe6d56110715e5a5d1249756fd353f9d7cbb5e0b270476f2ccfdadc7c6b4e3c62689a88d21dc56414313e5103f0e3f3ba4ec129cf398591be8
+  metadata.gz: 79b208495ff06a5e68a0a6ccb6829fc8bf0b7ef99a78eb33959e688e27ac9407e9f19d1ab6af3e4c90056fb46dd6b354de43e26b1d43df16ed76a586a057c7de
+  data.tar.gz: 720fc4fc1585841872a49e1572a88107adad1b404e65be6984fff915062aa30f9e63ba31215020606e082cbba108506750c63d30a01bdcbd4437c392dec689aa

data/lib/deb/s3.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 module Deb
   module S3
-    VERSION = "0.9.2"
+    VERSION = "0.9.3"
   end
 end

data/lib/deb/s3/cli.rb

@@ -60,10 +60,14 @@ class Deb::S3::CLI < Thor
   :type     => :string,
   :desc     => "The (optional) session token for connecting to S3."
 
+  class_option :endpoint,
+  :type     => :string,
+  :desc     => "The URL endpoint to the S3 API."
+
   class_option :s3_region,
   :type     => :string,
   :desc     => "The region for connecting to S3.",
-  :default  => "us-east-1"
+  :default  => ENV["AWS_DEFAULT_REGION"] || "us-east-1"
 
   class_option :force_path_style,
   :default  => false,
@@ -74,11 +78,6 @@ class Deb::S3::CLI < Thor
   :type     => :string,
   :desc     => "The URI of the proxy to send service requests through."
 
-  #class_option :use_ssl,
-  #:default  => true,
-  #:type     => :boolean,
-  #:desc     => "Whether to use HTTP or HTTPS for request transport."
-
   class_option :visibility,
   :default  => "public",
   :type     => :string,
@@ -590,6 +589,7 @@ class Deb::S3::CLI < Thor
       :http_proxy   => options[:proxy_uri],
       :force_path_style => options[:force_path_style]
     }
+    settings[:endpoint] = options[:endpoint] if options[:endpoint]
     settings.merge!(provider)
 
     Deb::S3::Utils.s3          = Aws::S3::Client.new(settings)

data/lib/deb/s3/release.rb

@@ -103,28 +103,25 @@ 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 self.codename == "xenial" || self.codename == "jessie" || self.codename == "stretch"
-        if system("gpg -a #{key_param} #{Deb::S3::Utils.gpg_options} -s --clearsign #{release_tmp.path}")
-          local_file = release_tmp.path+".asc"
-          remote_file = "dists/#{@codename}/InRelease"
-          yield remote_file if block_given?
-          raise "Unable to locate InRelease file" unless File.exists?(local_file)
-          s3_store(local_file, remote_file, 'application/pgp-signature; charset=us-ascii', self.cache_control)
-          File.unlink(local_file)
-        else
-          raise "Signing the InRelease file failed."
-        end
+      if system("gpg -a #{key_param} --digest-algo SHA256 #{Deb::S3::Utils.gpg_options} -s --clearsign #{release_tmp.path}")
+        local_file = release_tmp.path+".asc"
+        remote_file = "dists/#{@codename}/InRelease"
+        yield remote_file if block_given?
+        raise "Unable to locate InRelease file" unless File.exists?(local_file)
+        s3_store(local_file, remote_file, 'application/pgp-signature; charset=us-ascii', self.cache_control)
+        File.unlink(local_file)
       else
-        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?
-          raise "Unable to locate Release signature file" unless File.exists?(local_file)
-          s3_store(local_file, remote_file, 'application/pgp-signature; charset=us-ascii', self.cache_control)
-          File.unlink(local_file)
-        else
-          raise "Signing the Release file failed."
-        end
+        raise "Signing the InRelease file failed."
+      end
+      if system("gpg -a #{key_param} --digest-algo SHA256 #{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?
+        raise "Unable to locate Release signature file" unless File.exists?(local_file)
+        s3_store(local_file, remote_file, 'application/pgp-signature; charset=us-ascii', self.cache_control)
+        File.unlink(local_file)
+      else
+        raise "Signing the Release file failed."
       end
     else
       # remove an existing Release.gpg, if it was there

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deb-s3
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Ken Robertson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Easily create and manage an APT repository on S3.