deb-s3 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0fdcdc9b5f39dd0c26eaa1c9045dc5ce520697b4
-  data.tar.gz: 743c9ae0a9368dac628bbfdee71da2c6606b411b
+SHA256:
+  metadata.gz: ec462c0b2f303467f4894dd8aa080b8ba29132015af2c8d6b641a101ceb9d184
+  data.tar.gz: 497c2f2658e577d1357bfd48683aa6b03626efa32bd1686d4a28aa99fe64eec6
 SHA512:
-  metadata.gz: a2eacf16e2fd89c4af49c9229b0cf185d0de6efeaa70bbe5543b93a83c11d651abc838734560a36dd54703b56a51ad15a53cf87f479d3c7645e366714fe0340e
-  data.tar.gz: b3d97c88ef06bd7f908173e6e6ab466a98482231400f46f7e914d9a4f3a9564eab80e610c3df7939e1e15557828d1cf0f83deb11fd00312f2313406c6f7e9c5c
+  metadata.gz: 0da988ffe976866db0ee34ae7646ecbf7c7bb439e4ecbc6a77b03ae834b1f89c0ac417b8ff391845d2f9c24a1d94af898c1ff628c132ad1794b81adaf45e0751
+  data.tar.gz: 9ece8553037e9abe6d56110715e5a5d1249756fd353f9d7cbb5e0b270476f2ccfdadc7c6b4e3c62689a88d21dc56414313e5103f0e3f3ba4ec129cf398591be8

data/README.md

@@ -61,33 +61,32 @@ Usage:
   deb-s3 upload FILES
 
 Options:
-  -a, [--arch=ARCH]                                    # The architecture of the package in the APT repository.
-  -p, [--preserve-versions], [--no-preserve-versions]  # Whether to preserve other versions of a package in the repository when uploading one.
-  -l, [--lock], [--no-lock]                            # Whether to check for an existing lock on the repository to prevent simultaneous updates
-      [--fail-if-exists], [--no-fail-if-exists]        # Whether to overwrite any existing package that has the same filename in the pool or the same name and version in the manifest.
-  -b, [--bucket=BUCKET]                                # The name of the S3 bucket to upload to.
-      [--prefix=PREFIX]                                # The path prefix to use when storing on S3.
-  -o, [--origin=ORIGIN]                                # The origin to use in the repository Release file.
-      [--suite=SUITE]                                  # The suite to use in the repository Release file.
-  -c, [--codename=CODENAME]                            # The codename of the APT repository.
-                                                       # Default: stable
-  -m, [--component=COMPONENT]                          # The component of the APT repository.
-                                                       # Default: main
-      [--access-key-id=ACCESS_KEY_ID]                  # The access key for connecting to S3.
-      [--secret-access-key=SECRET_ACCESS_KEY]          # The secret key for connecting to S3.
-      [--endpoint=ENDPOINT]                            # The region endpoint for connecting to S3.
-                                                       # Default: s3.amazonaws.com
-      [--force-path-style], [--no-force-path-style]    # Use S3 path style instead of subdomains.
-      [--proxy-uri=PROXY_URI]                          # The URI of the proxy to send service requests through.
-      [--use-ssl], [--no-use-ssl]                      # Whether to use HTTP or HTTPS for request transport.
-                                                       # Default: true
-  -v, [--visibility=VISIBILITY]                        # The access policy for the uploaded files. Can be public, private, or authenticated.
-                                                       # Default: public
-      [--sign=SIGN]                                    # 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.
-      [--gpg-options=GPG_OPTIONS]                      # Additional command line options to pass to GPG when signing.
-  -e, [--encryption], [--no-encryption]                # Use S3 server side encryption.
-  -q, [--quiet], [--no-quiet]                          # Doesn't output information, just returns status appropriately.
-  -C, [--cache-control=CACHE_CONTROL]                  # Add cache-control headers to S3 objects.
+  -a, [--arch=ARCH]                                        # The architecture of the package in the APT repository.
+  -p, [--preserve-versions], [--no-preserve-versions]      # Whether to preserve other versions of a package in the repository when uploading one.
+  -l, [--lock], [--no-lock]                                # Whether to check for an existing lock on the repository to prevent simultaneous updates
+      [--fail-if-exists], [--no-fail-if-exists]            # Whether to overwrite any existing package that has the same filename in the pool or the same name and version in the manifest.
+      [--skip-package-upload], [--no-skip-package-upload]  # Whether to skip all package uploads.This is useful when hosting .deb files outside of the bucket.
+  -b, [--bucket=BUCKET]                                    # The name of the S3 bucket to upload to.
+      [--prefix=PREFIX]                                    # The path prefix to use when storing on S3.
+  -o, [--origin=ORIGIN]                                    # The origin to use in the repository Release file.
+      [--suite=SUITE]                                      # The suite to use in the repository Release file.
+  -c, [--codename=CODENAME]                                # The codename of the APT repository.
+                                                           # Default: stable
+  -m, [--component=COMPONENT]                              # The component of the APT repository.
+                                                           # Default: main
+      [--access-key-id=ACCESS_KEY_ID]                      # The access key for connecting to S3.
+      [--secret-access-key=SECRET_ACCESS_KEY]              # The secret key for connecting to S3.
+      [--s3-region=S3_REGION]                              # The region for connecting to S3.
+                                                           # Default: us-east-1
+      [--force-path-style], [--no-force-path-style]        # Use S3 path style instead of subdomains.
+      [--proxy-uri=PROXY_URI]                              # The URI of the proxy to send service requests through.
+  -v, [--visibility=VISIBILITY]                            # The access policy for the uploaded files. Can be public, private, or authenticated.
+                                                           # Default: public
+      [--sign=SIGN]                                        # GPG Sign the Release file when uploading a package, or when verifying it after removing a package. Use --sign with your GPG key ID to use a specific key (--sign=6643C242C18FE05B).
+      [--gpg-options=GPG_OPTIONS]                          # Additional command line options to pass to GPG when signing.
+  -e, [--encryption], [--no-encryption]                    # Use S3 server side encryption.
+  -q, [--quiet], [--no-quiet]                              # Doesn't output information, just returns status appropriately.
+  -C, [--cache-control=CACHE_CONTROL]                      # Add cache-control headers to S3 objects.
 
 Uploads the given files to a S3 bucket as an APT repository.
 ```
@@ -125,15 +124,13 @@ Options:
                                                      # Default: main
       [--access-key-id=ACCESS_KEY_ID]                # The access key for connecting to S3.
       [--secret-access-key=SECRET_ACCESS_KEY]        # The secret key for connecting to S3.
-      [--endpoint=ENDPOINT]                          # The region endpoint for connecting to S3.
-                                                     # Default: s3.amazonaws.com
+      [--s3-region=S3_REGION]                        # The region for connecting to S3.
+                                                     # Default: us-east-1
       [--force-path-style], [--no-force-path-style]  # Use S3 path style instead of subdomains.
       [--proxy-uri=PROXY_URI]                        # The URI of the proxy to send service requests through.
-      [--use-ssl], [--no-use-ssl]                    # Whether to use HTTP or HTTPS for request transport.
-                                                     # Default: true
   -v, [--visibility=VISIBILITY]                      # The access policy for the uploaded files. Can be public, private, or authenticated.
                                                      # Default: public
-      [--sign=SIGN]                                  # 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.
+      [--sign=SIGN]                                  # GPG Sign the Release file when uploading a package, or when verifying it after removing a package. Use --sign with your GPG key ID to use a specific key (--sign=6643C242C18FE05B).
       [--gpg-options=GPG_OPTIONS]                    # Additional command line options to pass to GPG when signing.
   -e, [--encryption], [--no-encryption]              # Use S3 server side encryption.
   -q, [--quiet], [--no-quiet]                        # Doesn't output information, just returns status appropriately.
@@ -168,15 +165,13 @@ Options:
                                                      # Default: main
       [--access-key-id=ACCESS_KEY_ID]                # The access key for connecting to S3.
       [--secret-access-key=SECRET_ACCESS_KEY]        # The secret key for connecting to S3.
-      [--endpoint=ENDPOINT]                          # The region endpoint for connecting to S3.
-                                                     # Default: s3.amazonaws.com
+      [--s3-region=S3_REGION]                        # The region for connecting to S3.
+                                                     # Default: us-east-1
       [--force-path-style], [--no-force-path-style]  # Use S3 path style instead of subdomains.
       [--proxy-uri=PROXY_URI]                        # The URI of the proxy to send service requests through.
-      [--use-ssl], [--no-use-ssl]                    # Whether to use HTTP or HTTPS for request transport.
-                                                     # Default: true
   -v, [--visibility=VISIBILITY]                      # The access policy for the uploaded files. Can be public, private, or authenticated.
                                                      # Default: public
-      [--sign=SIGN]                                  # 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.
+      [--sign=SIGN]                                  # GPG Sign the Release file when uploading a package, or when verifying it after removing a package. Use --sign with your GPG key ID to use a specific key (--sign=6643C242C18FE05B).
       [--gpg-options=GPG_OPTIONS]                    # Additional command line options to pass to GPG when signing.
   -e, [--encryption], [--no-encryption]              # Use S3 server side encryption.
   -q, [--quiet], [--no-quiet]                        # Doesn't output information, just returns status appropriately.

data/bin/deb-s3

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.expand_path('../../lib', __FILE__)
+require 'pathname'
+$:.unshift File.join(Pathname.new(__FILE__).realpath,'../../lib')
 
 require 'rubygems'
 require 'deb/s3/cli'

data/lib/deb/s3.rb

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

data/lib/deb/s3/cli.rb

@@ -56,6 +56,10 @@ class Deb::S3::CLI < Thor
   :type     => :string,
   :desc     => "The secret key for connecting to S3."
 
+  class_option :session_token,
+  :type     => :string,
+  :desc     => "The (optional) session token for connecting to S3."
+
   class_option :s3_region,
   :type     => :string,
   :desc     => "The region for connecting to S3.",
@@ -84,9 +88,9 @@ class Deb::S3::CLI < Thor
 
   class_option :sign,
   :type     => :string,
-  :desc     => "Sign the Release file when uploading a package, " +
+  :desc     => "GPG 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."
+    "Use --sign with your GPG key ID to use a specific key (--sign=6643C242C18FE05B)."
 
   class_option :gpg_options,
   :default => "",
@@ -190,7 +194,7 @@ class Deb::S3::CLI < Thor
 
         # If they've specified an arch type that doesn't match the package let them know
         if options.key?("arch") && options[:arch] != pkg.architecture
-          warn("You specified architecture #{options[:arch]} but package #{pkg.name} has architecture type of #{pkg.architecture}") 
+          warn("You specified architecture #{options[:arch]} but package #{pkg.name} has architecture type of #{pkg.architecture}")
         end
 
         # validate we have them
@@ -565,6 +569,7 @@ class Deb::S3::CLI < Thor
   def provider
     access_key_id     = options[:access_key_id]
     secret_access_key = options[:secret_access_key]
+    session_token     = options[:session_token]
 
     if access_key_id.nil? ^ secret_access_key.nil?
       error("If you specify one of --access-key-id or --secret-access-key, you must specify the other.")
@@ -572,6 +577,7 @@ class Deb::S3::CLI < Thor
     static_credentials = {}
     static_credentials[:access_key_id]     = access_key_id     if access_key_id
     static_credentials[:secret_access_key] = secret_access_key if secret_access_key
+    static_credentials[:session_token]     = session_token     if session_token
 
     static_credentials
   end

data/lib/deb/s3/release.rb

@@ -103,7 +103,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 self.codename == "xenial"
+      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"

data/lib/deb/s3/utils.rb

@@ -75,7 +75,7 @@ module Deb::S3::Utils
 
   def s3_store(path, filename=nil, content_type='application/octet-stream; charset=binary', cache_control=nil, fail_if_exists=false)
     filename = File.basename(path) unless filename
-    obj = s3_exists?(path)
+    obj = s3_exists?(filename)
 
     file_md5 = Digest::MD5.file(path)
 
@@ -97,7 +97,7 @@ module Deb::S3::Utils
     end
 
     # specify if encryption is required
-    options[:server_side_encryption] = :aes256 if Deb::S3::Utils.encryption
+    options[:server_side_encryption] = "AES256" if Deb::S3::Utils.encryption
 
     # upload the file
     File.open(path) do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deb-s3
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Ken Robertson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-08 00:00:00.000000000 Z
+date: 2018-03-16 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.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Easily create and manage an APT repository on S3.