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

data/lib/dpl/providers/scalingo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Scalingo < Provider
@@ -5,38 +7,38 @@ module Dpl
 
       status :alpha
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
       env :scalingo
 
-      required :api_token, [:username, :password]
+      required :api_token, %i[username password]
 
       opt '--app APP', default: :repo_name
       opt '--api_token TOKEN', 'Scalingo API token', alias: :api_key, deprecated: :api_key
       opt '--username NAME', 'Scalingo username'
       opt '--password PASS', 'Scalingo password', secret: true
-      opt '--region REGION', 'Scalingo region', default: 'agora-fr1', enum: %w(agora-fr1 osc-fr1)
+      opt '--region REGION', 'Scalingo region', default: 'agora-fr1', enum: %w[agora-fr1 osc-fr1]
       opt '--remote REMOTE', 'Git remote name', default: 'scalingo-dpl'
       opt '--branch BRANCH', 'Git branch', default: 'master'
       opt '--timeout SEC', 'Timeout for Scalingo CLI commands', default: 60, type: :integer
 
       needs :git, :ssh_key
 
-      cmds login_key:   'timeout %{timeout} ./scalingo login --api-token %{api_token} > /dev/null',
+      cmds login_key: 'timeout %{timeout} ./scalingo login --api-token %{api_token} > /dev/null',
            login_creds: 'echo -e \"%{username}\n%{password}\" | timeout %{timeout} ./scalingo login > /dev/null',
-           add_key:     'timeout %{timeout} ./scalingo keys-add dpl_tmp_key %{key}',
-           remove_key:  'timeout %{timeout} ./scalingo keys-remove dpl_tmp_key',
-           git_setup:   './scalingo --app %{app} git-setup --remote %{remote}',
-           push:        'git push %{remote} HEAD:%{branch} -f'
+           add_key: 'timeout %{timeout} ./scalingo keys-add dpl_tmp_key %{key}',
+           remove_key: 'timeout %{timeout} ./scalingo keys-remove dpl_tmp_key',
+           git_setup: './scalingo --app %{app} git-setup --remote %{remote}',
+           push: 'git push %{remote} HEAD:%{branch} -f'
 
-      errs install:    'Failed to install the Scalingo CLI.',
-           login:      'Failed to authenticate with the Scalingo API.',
-           add_key:    'Failed to add the ssh key.',
+      errs install: 'Failed to install the Scalingo CLI.',
+           login: 'Failed to authenticate with the Scalingo API.',
+           add_key: 'Failed to add the ssh key.',
            remove_key: 'Failed to remove the ssh key.',
-           git_setup:  'Failed to add the git remote.',
-           push:       'Failed to push the app.'
+           git_setup: 'Failed to add the git remote.',
+           push: 'Failed to push the app.'
 
       def install
         script :install
@@ -47,8 +49,8 @@ module Dpl
         shell api_token ? :login_key : :login_creds, assert: err(:login)
       end
 
-      def add_key(key, type = nil)
-        shell :add_key, key: key
+      def add_key(key, _type = nil)
+        shell :add_key, key:
       end
 
       def setup

data/lib/dpl/providers/script.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Script < Provider
@@ -7,7 +9,7 @@ module Dpl
 
       summary 'Minimal provider that executes a custom command'
 
-      description sq(<<-str)
+      description sq(<<-STR)
         This deployment provider executes a single, custom command. This is
         usually a script that is contained in your repository, but it can be
         any command executable in the build environment.
@@ -18,7 +20,7 @@ module Dpl
 
         Deployment will be marked a failure if the script exits with nonzero
         status.
-      str
+      STR
 
       opt '-s', '--script SCRIPT', 'The script to execute', required: true
 

data/lib/dpl/providers/snap.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Snap < Provider
@@ -5,9 +7,9 @@ module Dpl
 
       status :stable
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
       env :snap
 
@@ -18,18 +20,19 @@ module Dpl
       apt 'snapd', 'snap'
 
       cmds apt_get_update: 'sudo apt-get update -qq',
-           update_snapd:   'sudo apt-get install snapd',
-           install:        'sudo snap install snapcraft --classic',
-           login:          'echo "%{token}" | snapcraft login --with -',
-           deploy:         'snapcraft push %{snap_path} --release=%{channel}'
+           update_snapd: 'sudo apt-get install snapd',
+           install: 'sudo snap install snapcraft --classic',
+           login: 'echo "%{token}" | snapcraft login --with -',
+           deploy: 'snapcraft push %{snap_path} --release=%{channel}'
 
-      msgs login:          'Attemping to login ...',
-           no_snaps:       'No snap found matching %{snap}',
+      msgs login: 'Attemping to login ...',
+           no_snaps: 'No snap found matching %{snap}',
            multiple_snaps: 'Multiple snaps found matching %{snap}: %{snap_paths}',
-           deploy:         'Pushing snap %{snap_path}'
+           deploy: 'Pushing snap %{snap_path}'
 
       def install
         return if which 'snapcraft'
+
         shell :apt_get_update
         shell :update_snapd
         shell :install

data/lib/dpl/providers/surge.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'open-uri'
 
 module Dpl
@@ -7,9 +9,9 @@ module Dpl
 
       status :stable
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
       node_js '>= 8.8.1'
 
@@ -25,7 +27,7 @@ module Dpl
       cmds deploy: 'surge %{project} %{domain}'
 
       msgs invalid_project: '%{project} is not a directory',
-           missing_domain:  'Please set the domain in .travis.yml or in a CNAME file in the project directory'
+           missing_domain: 'Please set the domain in .travis.yml or in a CNAME file in the project directory'
 
       def login
         ENV['SURGE_LOGIN'] ||= opts[:login]
@@ -33,8 +35,8 @@ module Dpl
       end
 
       def validate
-      	error :invalid_project if invalid_project?
-      	error :missing_domain  if missing_domain?
+        error :invalid_project if invalid_project?
+        error :missing_domain  if missing_domain?
       end
 
       def deploy

data/lib/dpl/providers/testfairy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dpl/version'
 require 'net/http'
 require 'securerandom'
@@ -11,9 +13,9 @@ module Dpl
 
       full_name 'TestFairy'
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
       gem 'json'
       gem 'multipart-post', '~> 2.0.0', require: 'net/http/post/multipart'
@@ -29,10 +31,10 @@ module Dpl
       opt '--advanced_options OPTS', 'Comma_separated list of advanced options', example: 'option1,option2'
 
       URL = 'https://upload.testfairy.com/api/upload'
-      UA  = "Travis CI dpl version=#{Dpl::VERSION}"
+      UA  = "Travis CI dpl version=#{Dpl::VERSION}".freeze
 
       msgs deploy: 'Uploading to TestFairy: %s',
-           done:   'Done. Check your build at %s'
+           done: 'Done. Check your build at %s'
 
       def deploy
         info :deploy, pretty_print(params)
@@ -43,55 +45,57 @@ module Dpl
 
       private
 
-        def params
-          @params ||= compact(
-            'api_key': api_key,
-            'apk_file': file(app_file),
-            'symbols_file': file(symbols_file),
-            'testers-groups': testers_groups,
-            'notify': bool(notify),
-            'auto-update': bool(auto_update),
-            'advanced-options': advanced_options,
-            'changelog': changelog
-          )
-        end
+      def params
+        @params ||= compact(
+          'api_key': api_key,
+          'apk_file': file(app_file),
+          'symbols_file': file(symbols_file),
+          'testers-groups': testers_groups,
+          'notify': bool(notify),
+          'auto-update': bool(auto_update),
+          'advanced-options': advanced_options,
+          'changelog': changelog
+        )
+      end
 
-        def changelog
-          git_log "--pretty=oneline --abbrev-commit #{commits}" if commits
-        end
+      def changelog
+        git_log "--pretty=oneline --abbrev-commit #{commits}" if commits
+      end
 
-        def commits
-          ENV['TRAVIS_COMMIT_RANGE']
-        end
+      def commits
+        ENV['TRAVIS_COMMIT_RANGE']
+      end
 
-        def request
-          Net::HTTP::Post::Multipart.new(uri.path, params, 'User-Agent' => UA)
-        end
+      def request
+        Net::HTTP::Post::Multipart.new(uri.path, params, 'User-Agent' => UA)
+      end
 
-        def http
-          Net::HTTP.start(uri.host, uri.port, :use_ssl => true)
-        end
+      def http
+        Net::HTTP.start(uri.host, uri.port, use_ssl: true)
+      end
 
-        def uri
-          @uri ||= URI.parse(URL)
-        end
+      def uri
+        @uri ||= URI.parse(URL)
+      end
 
-        def file(path)
-          UploadIO.new(path, '', File.basename(path)) if path
-        end
+      def file(path)
+        UploadIO.new(path, '', File.basename(path)) if path
+      end
 
-        def bool(obj)
-          obj ? 'on' : 'off' unless obj.nil?
+      def bool(obj)
+        unless obj.nil?
+          obj ? 'on' : 'off'
         end
+      end
 
-        def pretty_print(params)
-          params = params.map do |key, value|
-            value = obfuscate(value) if key == :api_key
-            value = value.path if value.respond_to?(:path)
-            [key, value]
-          end
-          JSON.pretty_generate(params.to_h)
+      def pretty_print(params)
+        params = params.map do |key, value|
+          value = obfuscate(value) if key == :api_key
+          value = value.path if value.respond_to?(:path)
+          [key, value]
         end
+        JSON.pretty_generate(params.to_h)
+      end
     end
   end
 end

data/lib/dpl/providers/transifex.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Transifex < Provider
@@ -5,13 +7,13 @@ module Dpl
 
       status :alpha
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
       python '>= 2.7', '!= 3.0', '!= 3.1', '!= 3.2', '!= 3.3', '< 3.8'
 
-      required :api_token, [:username, :password]
+      required :api_token, %i[username password]
 
       env :transifex
 
@@ -22,17 +24,17 @@ module Dpl
       opt '--cli_version VER', 'CLI version to install', default: '>=0.11'
 
       cmds status: 'tx status',
-           push:   'tx push --source --no-interactive'
+           push: 'tx push --source --no-interactive'
 
       msgs login:  'Writing ~/.transifexrc (user: %{username}, password: %{password})'
       errs push:   'Failure pushing to Transifex'
 
-      RC = sq(<<-rc)
+      RC = sq(<<-RC)
         [%{url}]
         hostname = %{url}
         username = %{username}
         password = %{password}
-      rc
+      RC
 
       def install
         pip_install 'transifex-client', 'tx', cli_version
@@ -50,21 +52,21 @@ module Dpl
 
       private
 
-        def write_rc
-          write_file '~/.transifexrc', interpolate(RC, opts, secure: true)
-        end
+      def write_rc
+        write_file '~/.transifexrc', interpolate(RC, opts, secure: true)
+      end
 
-        def username
-          super || 'api'
-        end
+      def username
+        super || 'api'
+      end
 
-        def password
-          super || api_token
-        end
+      def password
+        super || api_token
+      end
 
-        def url
-          hostname.start_with?('https://') ? hostname : "https://#{hostname}"
-        end
+      def url
+        hostname.start_with?('https://') ? hostname : "https://#{hostname}"
+      end
     end
   end
 end

data/lib/dpl/providers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dpl/providers/anynines'
 require 'dpl/providers/azure_web_apps'
 require 'dpl/providers/bintray'
@@ -31,7 +33,7 @@ require 'dpl/providers/npm'
 require 'dpl/providers/nuget'
 require 'dpl/providers/openshift'
 require 'dpl/providers/opsworks'
-require 'dpl/providers/packagecloud'
+# require 'dpl/providers/packagecloud'
 require 'dpl/providers/pages'
 require 'dpl/providers/puppetforge'
 require 'dpl/providers/pypi'

data/lib/dpl/string_ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class String
   def whitelist
     @is_whitelisted = true
@@ -18,4 +20,4 @@ class String
   def blacklisted?
     @is_whitelisted.nil? ? false : !@is_whitelisted
   end
-end
+end

data/lib/dpl/support/aws_sdk_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Silences "Struct::Tms is deprecated" warnings on Ruby 2.6.2 that would
 # otherwise spam hundereds of warnings, on apparently every single const
 # eager loaded (or something). The constant Tms is not used anywhere in
@@ -10,11 +12,12 @@ Aws::EagerLoader.class_eval do
     @loaded << klass_or_module
     klass_or_module.constants.each do |const_name|
       next if const_name == :Tms
+
       path = klass_or_module.autoload?(const_name)
       begin
         require(path) if path
         const = klass_or_module.const_get(const_name)
-        self.load(const) if Module === const && !@loaded.include?(const)
+        self.load(const) if const.is_a?(Module) && !@loaded.include?(const)
       rescue LoadError
       end
     end

data/lib/dpl/support/gems.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ripper'
 
 module Dpl
@@ -10,6 +12,7 @@ module Dpl
       def all
         Dir[glob].sort.inject([]) do |gems, path|
           next gems if except.any? { |str| path.include?(str) }
+
           gems + Parse.new(File.read(path)).gems
         end
       end
@@ -24,6 +27,7 @@ module Dpl
 
       class Parse < Struct.new(:code)
         def gems
+          return [] unless sexp
           walk(*sexp).flatten.each_slice(3).to_a
         end
 
@@ -54,9 +58,9 @@ module Dpl
             walk(*nodes[0])
           when :string_content
             nodes[0][1]
-          # when :void_stmt
-          # else
-          #   raise key.to_s
+            # when :void_stmt
+            # else
+            #   raise key.to_s
           end
         end
 

data/lib/dpl/support/gstore_patch.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 GStore::Client.class_eval do
   def sign(str)
     digest = OpenSSL::Digest.new('sha1') # use undeprecated constant
-    b64_hmac = Base64.encode64(OpenSSL::HMAC.digest(digest, @secret_key, str)).gsub("\n","")
+    Base64.encode64(OpenSSL::HMAC.digest(digest, @secret_key, str)).gsub("\n", '')
   end
 end

data/lib/dpl/support/version.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
+
 class Version
   InvalidVersion = Class.new(ArgumentError)
   InvalidRequire = Class.new(ArgumentError)
 
   MSGS = {
     version: 'Unable to parse version: %p',
-    require: 'Unable to parse requirement: %p',
-  }
+    require: 'Unable to parse requirement: %p'
+  }.freeze
 
   VERSION = /^(\d+)(?:\.(\d+))?(?:\.(\d+))?$/
   REQUIRE = /^(~>|>|>=|=|!=|<=|<) (\d+(?:\.\d+)?(?:\.\d+)?)$/
@@ -18,7 +19,7 @@ class Version
   end
 
   def satisfies?(str)
-    send *parse(str) || raise(InvalidRequire, MSGS[:require] % str)
+    send(*parse(str) || raise(InvalidRequire, MSGS[:require] % str))
   end
 
   def size
@@ -69,15 +70,15 @@ class Version
 
   private
 
-    attr_reader :nums
+  attr_reader :nums
 
-    def split(str)
-      str =~ VERSION && [$1, $2, $3].compact.map(&:to_i)
-    end
+  def split(str)
+    str =~ VERSION && [::Regexp.last_match(1), ::Regexp.last_match(2), ::Regexp.last_match(3)].compact.map(&:to_i)
+  end
 
-    def parse(str)
-      op, version = str =~ REQUIRE && [$1, $2]
-      op = '==' if op == '='
-      [op, Version.new(version)] if op
-    end
+  def parse(str)
+    op, version = str =~ REQUIRE && [::Regexp.last_match(1), ::Regexp.last_match(2)]
+    op = '==' if op == '='
+    [op, Version.new(version)] if op
+  end
 end

data/lib/dpl/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
-  VERSION = '2.0.3.beta.4'
+  VERSION = '2.0.3.beta.5'
 end

data/lib/dpl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'dpl/cli'
 require 'dpl/ctx'
 require 'dpl/provider'