dpl 2.0.3.beta.4 → 2.0.3.beta.5

data/lib/dpl/providers/releases.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dpl/helper/github'
 
 module Dpl
@@ -11,17 +13,17 @@ module Dpl
 
       full_name 'GitHub Releases'
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
-      gem 'octokit', '~> 4.15.0'
-      gem 'mime-types', '~> 3.2.2'
-      gem 'public_suffix', '~> 3.0.3'
+      gem 'octokit', '~> 7'
+      gem 'mime-types', '~> 3.4.1'
+      gem 'public_suffix', '~> 5'
 
       env :github, :releases
 
-      required :token, [:username, :password]
+      required :token, %i[username password]
 
       opt '--token TOKEN', 'GitHub oauth token (needs public_repo or repo permission)', secret: true, alias: :api_key
       opt '--username LOGIN', 'GitHub login name', alias: :user
@@ -42,24 +44,24 @@ module Dpl
 
       needs :git
 
-      msgs deploy:               'Deploying to repo: %{slug}',
-           local_tag:            'Current tag is: %{local_tag}',
-           login:                'Authenticated as %s',
-           insufficient_scopes:  'Dpl does not have permission to upload assets. Make sure your token has the repo or public_repo scope.',
-           insufficient_perm:    'Release resource not found. Make sure your token belongs to an account which has push permission to this repo.',
-           overwrite_existing:   'File %s already exists, overwriting.',
-           skip_existing:        'File %s already exists, skipping.',
-           upload_file:          'Uploading file %s ...',
-           set_tag_name:         'Setting tag_name to %s',
+      msgs deploy: 'Deploying to repo: %{slug}',
+           local_tag: 'Current tag is: %{local_tag}',
+           login: 'Authenticated as %s',
+           insufficient_scopes: 'Dpl does not have permission to upload assets. Make sure your token has the repo or public_repo scope.',
+           insufficient_perm: 'Release resource not found. Make sure your token belongs to an account which has push permission to this repo.',
+           overwrite_existing: 'File %s already exists, overwriting.',
+           skip_existing: 'File %s already exists, skipping.',
+           upload_file: 'Uploading file %s ...',
+           set_tag_name: 'Setting tag_name to %s',
            set_target_commitish: 'Setting target_commitish to %s',
-           missing_file:         'File %s does not exist.',
-           not_a_file:           '%s is not a file, skipping.'
+           missing_file: 'File %s does not exist.',
+           not_a_file: '%s is not a file, skipping.'
 
       cmds git_fetch_tags:       'git fetch --tags'
 
       URL = 'https://api.github.com/repos/%s/releases/%s'
 
-      OCTOKIT_OPTS = %i(
+      OCTOKIT_OPTS = %i[
         repo
         name
         body
@@ -67,12 +69,12 @@ module Dpl
         release_number
         tag_name
         target_commitish
-      )
+      ].freeze
 
       TIMEOUTS = {
         timeout: 180,
         open_timeout: 180
-      }
+      }.freeze
 
       def validate
         info :deploy
@@ -99,6 +101,7 @@ module Dpl
         file = normalize_filename(path)
         asset = asset(file)
         return info :skip_existing, file if asset && !overwrite?
+
         delete(asset, file) if asset
         info :upload_file, file
         api.upload_asset(url, path, name: file, content_type: content_type(path))
@@ -119,12 +122,14 @@ module Dpl
 
       def with_tag(opts)
         return opts if tag_name? || draft?
+
         info :set_tag_name, local_tag
         opts.merge(tag_name: local_tag)
       end
 
       def with_target_commitish(opts)
         return opts if target_commitish? || !same_repo?
+
         info :set_target_commitish, git_sha
         opts.merge(target_commitish: git_sha)
       end
@@ -137,7 +142,7 @@ module Dpl
 
       def url
         if release_number?
-          URL % [slug, release_number]
+          format(URL, slug, release_number)
         elsif release
           release.rels[:self].href
         else
@@ -202,7 +207,7 @@ module Dpl
       end
 
       def creds
-        username && password ? { login: username, password: password } : { access_token: token }
+        username && password ? { login: username, password: } : { access_token: token }
       end
 
       def files
@@ -212,13 +217,15 @@ module Dpl
       end
 
       def exists?(file)
-        return true if File.exists?(file)
+        return true if File.exist?(file)
+
         error :missing_file, file
         false
       end
 
       def file?(file)
         return true if File.file?(file)
+
         warn :not_a_file, file
         false
       end

data/lib/dpl/providers/rubygems.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Rubygems < Provider
@@ -5,15 +7,15 @@ module Dpl
 
       status :stable
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
       gem 'gems', '~> 1.1.1'
 
       env :rubygems
 
-      required :api_key, [:username, :password]
+      required :api_key, %i[username password]
 
       opt '--api_key KEY', 'Rubygems api key', secret: true
       opt '--username USER', 'Rubygems user name', alias: :user
@@ -24,12 +26,12 @@ module Dpl
       opt '--host URL'
 
       msgs login_api_key: 'Authenticating with api key %{api_key}',
-           login_creds:   'Authenticating with username %{username} and password %{password}',
-           setup:         'Setting up host %{host}',
-           gem_lookup:    'Looking up gem %{gem} ... ',
-           gem_found:     'found.',
+           login_creds: 'Authenticating with username %{username} and password %{password}',
+           setup: 'Setting up host %{host}',
+           gem_lookup: 'Looking up gem %{gem} ... ',
+           gem_found: 'found.',
            gem_not_found: 'no such gem.',
-           gem_push:      'Pushing gem %{gem}'
+           gem_push: 'Pushing gem %{gem}'
 
       cmds gem_build: 'gem build %{gemspec}'
 
@@ -37,6 +39,7 @@ module Dpl
 
       def setup
         return unless host?
+
         info :setup
         Gems.host = host
       end
@@ -58,36 +61,37 @@ module Dpl
 
       private
 
-        def login_api_key
-          info :login_api_key
-          Gems.key = api_key
-        end
+      def login_api_key
+        info :login_api_key
+        Gems.key = api_key
+      end
 
-        def login_creds
-          info :login_creds
-          Gems.username, Gems.password = username, password
-        end
+      def login_creds
+        info :login_creds
+        Gems.username = username
+        Gems.password = password
+      end
 
-        def build
-          Dir[gemspec_glob].each do |gemspec|
-            shell :gem_build, gemspec: gemspec.whitelist
-          end
+      def build
+        Dir[gemspec_glob].each do |gemspec|
+          shell :gem_build, gemspec: gemspec.whitelist
         end
+      end
 
-        def push
-          Dir["#{gem}-*.gem"].each do |file|
-            info :gem_push, gem: file.whitelist
-            info Gems.push(File.new(file), *[host].compact)
-          end
+      def push
+        Dir["#{gem}-*.gem"].each do |file|
+          info :gem_push, gem: file.whitelist
+          info Gems.push(File.new(file), *[host].compact)
         end
+      end
 
-        def gemspec_glob
-          super || "#{gemspec || gem}.gemspec"
-        end
+      def gemspec_glob
+        super || "#{gemspec || gem}.gemspec"
+      end
 
-        def gemspec
-          super.gsub('.gemspec', '') if gemspec?
-        end
+      def gemspec
+        super.gsub('.gemspec', '') if gemspec?
+      end
     end
   end
 end

data/lib/dpl/providers/s3.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 # we want this, don't we?
@@ -12,12 +14,12 @@ module Dpl
 
       full_name 'AWS S3'
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
-      gem 'aws-sdk-s3', '~> 1.0'
-      gem 'mime-types', '~> 3.2.2'
+      gem 'aws-sdk-s3', '~> 1'
+      gem 'mime-types', '~> 3.4.1'
 
       env :aws, :s3
       config '~/.aws/credentials', '~/.aws/config', prefix: 'aws'
@@ -31,12 +33,12 @@ module Dpl
       opt '--local_dir DIR', 'Local directory to upload from', default: '.', example: '~/travis/build (absolute path) or ./build (relative path)'
       opt '--glob GLOB', 'Files to upload', default: '**/*'
       opt '--dot_match', 'Upload hidden files starting with a dot'
-      opt '--acl ACL', 'Access control for the uploaded objects', default: 'private', enum: %w(private public_read public_read_write authenticated_read bucket_owner_read bucket_owner_full_control)
+      opt '--acl ACL', 'Access control for the uploaded objects', default: 'private', enum: %w[private public_read public_read_write authenticated_read bucket_owner_read bucket_owner_full_control]
       opt '--detect_encoding', 'HTTP header Content-Encoding for files compressed with gzip and compress utilities'
       opt '--cache_control STR', 'HTTP header Cache-Control to suggest that the browser cache the file', type: :array, default: 'no-cache', enum: [/^no-cache.*/, /^no-store.*/, /^max-age=\d+.*/, /^s-maxage=\d+.*/, /^no-transform/, /^public/, /^private/], note: 'accepts mapping values to globs', eg: 'public: *.css,*.js'
       opt '--expires DATE', 'Date and time that the cached object expires', type: :array, format: /^"?\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} .+"?.*$/, note: 'accepts mapping values to globs', eg: '2020-01-01 00:00:00 UTC: *.css,*.js'
       opt '--default_text_charset CHARSET', 'Default character set to append to the content-type of text files'
-      opt '--storage_class CLASS', 'S3 storage class to upload as', default: 'STANDARD', enum: %w(STANDARD STANDARD_IA REDUCED_REDUNDANCY)
+      opt '--storage_class CLASS', 'S3 storage class to upload as', default: 'STANDARD', enum: %w[STANDARD STANDARD_IA REDUCED_REDUNDANCY]
       opt '--server_side_encryption', 'Use S3 Server Side Encryption (SSE-AES256)'
       opt '--index_document_suffix SUFFIX', 'Index document suffix of a S3 website'
       opt '--overwrite', 'Whether or not to overwrite existing files', default: true
@@ -44,15 +46,15 @@ module Dpl
       opt '--max_threads NUM', 'The number of threads to use for S3 file uploads', default: 5, max: 15, type: :integer
       opt '--verbose', 'Be verbose about uploading files'
 
-      msgs login:                 'Using Access Key: %{access_key_id}',
-           default_uri_schema:    'S3 endpoint does not specify a scheme; defaulting to https',
-           access_denied:         'It looks like you tried to write to a bucket that is not yours or does not exist. Please create the bucket before trying to write to it.',
-           checksum_error:        'AWS secret key does not match the access key id',
+      msgs login: 'Using Access Key: %{access_key_id}',
+           default_uri_schema: 'S3 endpoint does not specify a scheme; defaulting to https',
+           access_denied: 'It looks like you tried to write to a bucket that is not yours or does not exist. Please create the bucket before trying to write to it.',
+           checksum_error: 'AWS secret key does not match the access key id',
            invalid_access_key_id: 'Invalid S3 access key id',
-           upload:                'Uploading %s files with up to %s threads ...',
-           upload_file:           'Uploading %s to %s with %s',
-           upload_skipped:        'Skipping %{file}, already exists',
-           upload_failed:         'Failed to upload %s',
+           upload: 'Uploading %s files with up to %s threads ...',
+           upload_file: 'Uploading %s to %s with %s',
+           upload_skipped: 'Skipping %{file}, already exists',
+           upload_failed: 'Failed to upload %s',
            index_document_suffix: 'Setting index document suffix to %s'
 
       DEFAULT_CONTENT_TYPE = 'application/octet-stream'
@@ -80,166 +82,170 @@ module Dpl
 
       private
 
-        def upload
-          info :upload, files.length, max_threads
-          threads = max_threads.times.map { |i| Thread.new(&method(:upload_files)) }
-          threads.each(&:join)
-          info "\n" unless verbose?
-        end
+      def upload
+        info :upload, files.length, max_threads
+        threads = max_threads.times.map { |_i| Thread.new(&method(:upload_files)) }
+        threads.each(&:join)
+        info "\n" unless verbose?
+      end
 
-        def upload_files
-          while file = files.pop
-            opts = upload_opts(file)
-            progress(file, opts)
-            upload_file(file, opts)
-          end
+      def upload_files
+        while file = files.pop
+          opts = upload_opts(file)
+          progress(file, opts)
+          upload_file(file, opts)
         end
+      end
 
-        def progress(file, data)
-          if verbose?
-            info :upload_file, file, upload_dir || '/', to_pairs(data)
-          else
-            print '.'
-          end
+      def progress(file, data)
+        if verbose?
+          info :upload_file, file, upload_dir || '/', to_pairs(data)
+        else
+          print '.'
         end
+      end
 
-        def upload_file(file, opts)
-          object = bucket.object(upload_path(file))
-          return warn :upload_skipped, file: file if !overwrite && object.exists?
-          info :upload_file, file, upload_dir || '/', to_pairs(opts)
-          object.upload_file(file, opts) || warn(:upload_failed, file)
-        end
+      def upload_file(file, opts)
+        object = bucket.object(upload_path(file))
+        return warn :upload_skipped, file: file if !overwrite && object.exists?
 
-        def index_document_suffix
-          info :index_document_suffix, super
-          body = { website_configuration: { index_document: { suffix: super } } }
-          bucket.website.put(body)
-        end
+        info :upload_file, file, upload_dir || '/', to_pairs(opts)
+        object.upload_file(file, opts) || warn(:upload_failed, file)
+      end
 
-        def upload_path(file)
-          [upload_dir, file].compact.join('/')
-        end
+      def index_document_suffix
+        info :index_document_suffix, super
+        body = { website_configuration: { index_document: { suffix: super } } }
+        bucket.website.put(body)
+      end
 
-        def upload_opts(file)
-          compact(
-            acl: acl,
-            content_type: content_type(file),
-            content_encoding: detect_encoding? ? encoding(file) : nil,
-            cache_control: match_opt(cache_control, file),
-            expires: match_opt(expires, file),
-            storage_class: storage_class,
-            server_side_encryption: server_side_encryption
-          )
-        end
+      def upload_path(file)
+        [upload_dir, file].compact.join('/')
+      end
 
-        def files
-          @files ||= Dir.glob(*glob).reject { |path| File.directory?(path) }
-        end
+      def upload_opts(file)
+        compact(
+          acl:,
+          content_type: content_type(file),
+          content_encoding: detect_encoding? ? encoding(file) : nil,
+          cache_control: match_opt(cache_control, file),
+          expires: match_opt(expires, file),
+          storage_class:,
+          server_side_encryption:
+        )
+      end
 
-        def glob
-          [super, dot_match? ? File::FNM_DOTMATCH : nil].compact
-        end
+      def files
+        @files ||= Dir.glob(*glob).reject { |path| File.directory?(path) }
+      end
 
-        def acl
-          super.gsub(/_/, '-') if acl?
-        end
+      def glob
+        [super, dot_match? ? File::FNM_DOTMATCH : nil].compact
+      end
 
-        def server_side_encryption
-          'AES256' if server_side_encryption?
-        end
+      def acl
+        super.gsub(/_/, '-') if acl?
+      end
 
-        def content_type(file)
-          return DEFAULT_CONTENT_TYPE unless type = MIME::Types.type_for(file).first
-          type = "#{type}; charset=#{default_text_charset}" if encoding(file) == 'text' && default_text_charset?
-          type.to_s
-        end
+      def server_side_encryption
+        'AES256' if server_side_encryption?
+      end
 
-        def compact(hash)
-          hash.reject { |_, value| value.nil? }.to_h
-        end
+      def content_type(file)
+        return DEFAULT_CONTENT_TYPE unless type = MIME::Types.type_for(file).first
 
-        def endpoint
-          @endpoint ||= normalize_endpoint(super) if endpoint?
-        end
+        type = "#{type}; charset=#{default_text_charset}" if encoding(file) == 'text' && default_text_charset?
+        type.to_s
+      end
 
-        def normalize_endpoint(url)
-          uri = URI.parse(url)
-          return uri if uri.scheme
-          info :default_uri_scheme
-          URI.parse("https://#{url}")
-        end
+      def compact(hash)
+        hash.reject { |_, value| value.nil? }.to_h
+      end
 
-        def handle_error(e)
-          case e
-          when Aws::S3::Errors::InvalidAccessKeyId
-            error :invalid_access_key_id
-          when Aws::S3::Errors::ChecksumError
-            error :checksum_error
-          when Aws::S3::Errors::AccessDenied
-            error :access_denied
-          else
-            error e.message
-          end
-        end
+      def endpoint
+        @endpoint ||= normalize_endpoint(super) if endpoint?
+      end
 
-        def bucket
-          @bucket ||= Aws::S3::Resource.new(client: client).bucket(super)
-        end
+      def normalize_endpoint(url)
+        uri = URI.parse(url)
+        return uri if uri.scheme
 
-        def client
-          Aws::S3::Client.new(s3_opts)
-        end
+        info :default_uri_scheme
+        URI.parse("https://#{url}")
+      end
 
-        def s3_opts
-          compact(
-            region: region,
-            credentials: credentials,
-            endpoint: endpoint,
-            force_path_style: force_path_style?
-          )
+      def handle_error(err)
+        case err
+        when Aws::S3::Errors::InvalidAccessKeyId
+          error :invalid_access_key_id
+        when Aws::S3::Errors::ChecksumError
+          error :checksum_error
+        when Aws::S3::Errors::AccessDenied
+          error :access_denied
+        else
+          error err.message
         end
+      end
 
-        def credentials
-          Aws::Credentials.new(access_key_id, secret_access_key)
-        end
+      def bucket
+        @bucket ||= Aws::S3::Resource.new(client:).bucket(super)
+      end
 
-        def to_pairs(hash)
-          hash.map { |pair| pair.join('=') }.join(' ')
-        end
+      def client
+        Aws::S3::Client.new(s3_opts)
+      end
 
-        def match_opt(strs, file)
-          maps = Array(strs).map { |str| Mapping.new(str, file) }
-          maps.map(&:value).compact.first
-        end
+      def s3_opts
+        compact(
+          region:,
+          credentials:,
+          endpoint:,
+          force_path_style: force_path_style?
+        )
+      end
 
-        class Mapping < Struct.new(:str, :file)
-          MATCH = File::FNM_DOTMATCH | File::FNM_EXTGLOB
+      def credentials
+        Aws::Credentials.new(access_key_id, secret_access_key)
+      end
+
+      def to_pairs(hash)
+        hash.map { |pair| pair.join('=') }.join(' ')
+      end
+
+      def match_opt(strs, file)
+        maps = Array(strs).map { |str| Mapping.new(str, file) }
+        maps.map(&:value).compact.first
+      end
+
+      class Mapping < Struct.new(:str, :file)
+        MATCH = File::FNM_DOTMATCH | File::FNM_EXTGLOB
 
-          def value
-            str, glob = parse
-            unquote(str) if match?(glob)
-          end
+        def value
+          str, glob = parse
+          unquote(str) if match?(glob)
+        end
+
+        private
 
-          private
+        def unquote(str)
+          str =~ /^"(.*)"$/ && ::Regexp.last_match(1) || str
+        end
 
-            def unquote(str)
-              str =~ /^"(.*)"$/ && $1 || str
-            end
+        def match?(glob)
+          glob.nil? || File.fnmatch?(normalize(glob), file, MATCH)
+        end
 
-            def match?(glob)
-              glob.nil? || File.fnmatch?(normalize(glob), file, MATCH)
-            end
+        def normalize(glob)
+          return glob if glob.include?('{')
 
-            def normalize(glob)
-              return glob if glob.include?('{')
-              "{#{glob.split(',').map(&:strip).join(',')}}"
-            end
+          "{#{glob.split(',').map(&:strip).join(',')}}"
+        end
 
-            def parse
-              parts = str.split(': ')
-              parts.size > 1 ? [parts[0..-2].join(': '), parts.last] : parts
-            end
+        def parse
+          parts = str.split(': ')
+          parts.size > 1 ? [parts[0..-2].join(': '), parts.last] : parts
         end
+      end
     end
   end
 end