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

data/lib/dpl/providers/engineyard.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Engineyard < Provider
@@ -5,13 +7,13 @@ module Dpl
 
       status :alpha
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
-      gem 'ey-core', '~> 3.5'
+      gem 'ey-core', '~> 3.6'
 
-      required :api_key, [:email, :password]
+      required :api_key, %i[email password]
 
       env :engineyard, :ey
 
@@ -23,19 +25,19 @@ module Dpl
       opt '--migrate CMD',   'Engine Yard migration commands'
       opt '--account NAME',  'Engine Yard account name'
 
-      msgs deploy:           'Deploying ...',
-           login:            'Authenticating via email and password ...',
-           write_rc:         'Authenticating via api token ...',
-           authenticated:    'Authenticated as %{name}',
-           invalid_migrate:  'Invalid migration command, try --migrate="rake db:migrate"',
-           envs:             'Checking environment ...',
-           no_env:           'No matching environment found',
-           too_many_envs:    'Multiple environments match, please be more specific: %s',
-           env_entry:        'environment=%s account=%s'
-
-      cmds login:  "ey-core login << str\n%{email}\n%{password}\nstr",
+      msgs deploy: 'Deploying ...',
+           login: 'Authenticating via email and password ...',
+           write_rc: 'Authenticating via api token ...',
+           authenticated: 'Authenticated as %{name}',
+           invalid_migrate: 'Invalid migration command, try --migrate="rake db:migrate"',
+           envs: 'Checking environment ...',
+           no_env: 'No matching environment found',
+           too_many_envs: 'Multiple environments match, please be more specific: %s',
+           env_entry: 'environment=%s account=%s'
+
+      cmds login: "ey-core login << str\n%{email}\n%{password}\nstr",
            whoami: 'ey-core whoami',
-           envs:   'ey-core environments',
+           envs: 'ey-core environments',
            deploy: 'ey-core deploy %{deploy_opts}'
 
       def login
@@ -54,58 +56,58 @@ module Dpl
 
       private
 
-        def authenticate
-          shell :login, echo: false, capture: true
-        end
+      def authenticate
+        shell :login, echo: false, capture: true
+      end
 
-        def whoami
-          shell(:whoami, echo: false, capture: true) =~ /email\s*:\s*"(.+)"/ && $1
-        end
+      def whoami
+        shell(:whoami, echo: false, capture: true) =~ /email\s*:\s*"(.+)"/ && ::Regexp.last_match(1)
+      end
 
-        def write_rc
-          info :write_rc
-          write_file '~/.ey-core', "https://api.engineyard.com/: #{api_key}"
-        end
+      def write_rc
+        info :write_rc
+        write_file '~/.ey-core', "https://api.engineyard.com/: #{api_key}"
+      end
 
-        def invalid_migrate?
-          migrate.is_a?(TrueClass) || migrate == 'true'
-        end
+      def invalid_migrate?
+        migrate.is_a?(TrueClass) || migrate == 'true'
+      end
 
-        def deploy_opts
-          opts = [%(--ref="#{git_sha}" --environment="#{env}")]
-          opts << opts_for(%i(app account))
-          opts << migrate_opt
-          opts.join(' ')
-        end
+      def deploy_opts
+        opts = [%(--ref="#{git_sha}" --environment="#{env}")]
+        opts << opts_for(%i[app account])
+        opts << migrate_opt
+        opts.join(' ')
+      end
 
-        def migrate_opt
-          migrate? ? opts_for(%i(migrate)) : '--no-migrate'
-        end
+      def migrate_opt
+        migrate? ? opts_for(%i[migrate]) : '--no-migrate'
+      end
 
-        def env
-          @env ||= super || detect_env(envs)
-        end
+      def env
+        @env ||= super || detect_env(envs)
+      end
 
-        def detect_env(envs)
-          case envs.size
-          when 1 then envs.first[:name]
-          when 0 then error :no_env
-          else too_many_envs(envs)
-          end
+      def detect_env(envs)
+        case envs.size
+        when 1 then envs.first[:name]
+        when 0 then error :no_env
+        else too_many_envs(envs)
         end
+      end
 
-        def envs
-          lines = shell(:envs, echo: false, capture: true).split("\n")[2..-1] || []
-          envs = lines.map { |line| line.split('|')[1..-1].map(&:strip) }
-          envs = envs.map { |pair| %i(name account).zip(pair).to_h }
-          envs.select { |env| env[:name] == opts[:env] } if env?
-          envs
-        end
+      def envs
+        lines = shell(:envs, echo: false, capture: true).split("\n")[2..] || []
+        envs = lines.map { |line| line.split('|')[1..].map(&:strip) }
+        envs = envs.map { |pair| %i[name account].zip(pair).to_h }
+        envs.select { |env| env[:name] == opts[:env] } if env?
+        envs
+      end
 
-        def too_many_envs(envs)
-          envs = envs.map { |env| msg(:env_entry) % env.values_at(:name, :account) }
-          error msg(:too_many_envs) % envs.join(', ')
-        end
+      def too_many_envs(envs)
+        envs = envs.map { |env| msg(:env_entry) % env.values_at(:name, :account) }
+        error msg(:too_many_envs) % envs.join(', ')
+      end
     end
   end
 end

data/lib/dpl/providers/firebase.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Firebase < Provider
@@ -5,9 +7,9 @@ module Dpl
 
       status :stable
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
       node_js '>= 8.0.0'
 
@@ -28,7 +30,7 @@ module Dpl
       msgs missing_config: 'Missing firebase.json'
 
       def validate
-        error :missing_config unless File.exists?('firebase.json')
+        error :missing_config unless File.exist?('firebase.json')
       end
 
       def deploy
@@ -36,7 +38,7 @@ module Dpl
       end
 
       def deploy_opts
-        opts_for(%i(project message token only force))
+        opts_for(%i[project message token only force])
       end
     end
   end

data/lib/dpl/providers/flynn.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Flynn < Provider
@@ -7,16 +9,16 @@ module Dpl
 
       full_name 'Flynn'
 
-      description sq(<<-str)
+      description sq(<<-STR)
         Flynn provider for Dpl
-      str
+      STR
 
       opt '--git URL', 'Flynn Git remote URL', required: true
 
       needs :git, :git_http_user_agent
 
       cmds fetch: 'git fetch origin $TRAVIS_BRANCH --unshallow',
-           push:  'git push %{remote} HEAD:refs/heads/master -f'
+           push: 'git push %{remote} HEAD:refs/heads/master -f'
 
       def deploy
         shell :fetch, assert: false
@@ -25,9 +27,9 @@ module Dpl
 
       private
 
-        def remote
-          git
-        end
+      def remote
+        git
+      end
     end
   end
 end

data/lib/dpl/providers/gae.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Gae < Provider
@@ -7,9 +9,9 @@ module Dpl
 
       full_name 'Google App Engine'
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
       python '>= 2.7.9'
 
@@ -26,20 +28,21 @@ module Dpl
 
       URL = 'https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz'
 
-      cmds install:   'curl -L %{URL} | tar xz -C ~ && ~/google-cloud-sdk/install.sh --path-update false --usage-reporting false --command-completion false',
-           login:     'gcloud -q auth activate-service-account --key-file %{keyfile}',
-           deploy:    'gcloud -q app deploy %{config} %{deploy_opts}',
-           cat_logs:  'find $HOME/.config/gcloud/logs -type f -print -exec cat {} \;'
+      cmds install: 'curl -L %{URL} | tar xz -C ~ && ~/google-cloud-sdk/install.sh --path-update false --usage-reporting false --command-completion false',
+           login: 'gcloud -q auth activate-service-account --key-file %{keyfile}',
+           deploy: 'gcloud -q app deploy %{config} %{deploy_opts}',
+           cat_logs: 'find $HOME/.config/gcloud/logs -type f -print -exec cat {} \;'
 
-      errs install:   'Failed to download Google Cloud SDK.',
-           login:     'Failed to authenticate.'
+      errs install: 'Failed to download Google Cloud SDK.',
+           login: 'Failed to authenticate.'
 
-      msgs failed:    'Deployment failed.'
+      msgs failed: 'Deployment failed.'
 
       path '~/google-cloud-sdk/bin'
 
       def install
         return unless install_sdk?
+
         shell :install
       end
 
@@ -54,22 +57,22 @@ module Dpl
 
       private
 
-        def deploy_opts
-          opts = [*opts_for(%i(project verbosity version))]
-          opts << '--no-promote' unless promote?
-          opts << '--no-stop-previous-version' unless stop_previous_version?
-          opts.join(' ')
-        end
-
-        def failed
-          warn :failed
-          shell :cat_logs
-          error ''
-        end
-
-        def project
-          super || File.dirname(build_dir)
-        end
+      def deploy_opts
+        opts = [*opts_for(%i[project verbosity version])]
+        opts << '--no-promote' unless promote?
+        opts << '--no-stop-previous-version' unless stop_previous_version?
+        opts.join(' ')
+      end
+
+      def failed
+        warn :failed
+        shell :cat_logs
+        error ''
+      end
+
+      def project
+        super || File.dirname(build_dir)
+      end
     end
   end
 end

data/lib/dpl/providers/gcs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'kconv'
 
 module Dpl
@@ -9,17 +11,17 @@ module Dpl
 
       full_name 'Google Cloud Store'
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
-      gem 'mime-types', '~> 3.2.2'
+      gem 'mime-types', '~> 3.4.1'
 
       python '>= 2.7.9'
 
       env :gcs
 
-      required :key_file, [:access_key_id, :secret_access_key]
+      required :key_file, %i[access_key_id secret_access_key]
 
       opt '--key_file FILE', 'Path to a GCS service account key JSON file'
       opt '--access_key_id ID', 'GCS Interoperable Access Key ID', secret: true
@@ -28,28 +30,28 @@ module Dpl
       opt '--local_dir DIR', 'Local directory to upload from', default: '.'
       opt '--upload_dir DIR', 'GCS directory to upload to'
       opt '--dot_match', 'Upload hidden files starting with a dot'
-      opt '--acl ACL', 'Access control to set for uploaded objects', default: 'private', enum: %w(private public-read public-read-write authenticated-read bucket-owner-read bucket-owner-full-control), see: 'https://cloud.google.com/storage/docs/reference-headers#xgoogacl'
+      opt '--acl ACL', 'Access control to set for uploaded objects', default: 'private', enum: %w[private public-read public-read-write authenticated-read bucket-owner-read bucket-owner-full-control], see: 'https://cloud.google.com/storage/docs/reference-headers#xgoogacl'
       opt '--detect_encoding', 'HTTP header Content-Encoding to set for files compressed with gzip and compress utilities.'
       opt '--cache_control HEADER', 'HTTP header Cache-Control to suggest that the browser cache the file.', see: 'https://cloud.google.com/storage/docs/xml-api/reference-headers#cachecontrol'
       opt '--glob GLOB', default: '**/*'
 
-      cmds install:   'curl -L %{URL} | tar xz -C ~ && ~/google-cloud-sdk/install.sh --quiet --path-update false --usage-reporting false --command-completion false',
+      cmds install: 'curl -L %{URL} | tar xz -C ~ && ~/google-cloud-sdk/install.sh --quiet --path-update false --usage-reporting false --command-completion false',
            login_key: 'gcloud auth activate-service-account --key-file=%{key_file}',
-           rsync:     'gsutil %{gs_opts} rsync %{rsync_opts} %{glob} %{target}',
-           copy:      'gsutil %{gs_opts} cp %{copy_opts} -r %{source} %{target}'
+           rsync: 'gsutil %{gs_opts} rsync %{rsync_opts} %{glob} %{target}',
+           copy: 'gsutil %{gs_opts} cp %{copy_opts} -r %{source} %{target}'
 
-      msgs login_key:   'Authenticating with service account key file %{key_file}',
+      msgs login_key: 'Authenticating with service account key file %{key_file}',
            login_creds: 'Authenticating with access key: %{access_key_id}'
 
-      errs copy:  'Failed uploading files.'
+      errs copy: 'Failed uploading files.'
 
       URL = 'https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz'
 
-      BOTO = sq(<<-str)
+      BOTO = sq(<<-STR)
         [Credentials]
         gs_access_key_id = %{access_key_id}
         gs_secret_access_key = %{secret_access_key}
-      str
+      STR
 
       path '~/google-cloud-sdk'
       move '/etc/boto.cfg'
@@ -70,61 +72,61 @@ module Dpl
 
       private
 
-        def login_key
-          shell :login_key
-        end
+      def login_key
+        shell :login_key
+      end
 
-        def login_creds
-          info :login_creds
-          write_boto
-        end
+      def login_creds
+        info :login_creds
+        write_boto
+      end
 
-        def write_boto
-          write_file '~/.boto', interpolate(BOTO, opts, secure: true), 0600
-        end
+      def write_boto
+        write_file '~/.boto', interpolate(BOTO, opts, secure: true), 0600
+      end
 
-        def files
-          Dir.glob(*glob_args).select { |path| File.file?(path) }
-        end
+      def files
+        Dir.glob(*glob_args).select { |path| File.file?(path) }
+      end
 
-        def copy(source)
-          to = [target.sub(%r(/$), ''), source].join('/')
-          shell :copy, gs_opts: gs_opts(source), source: source, target: to
-        end
+      def copy(source)
+        to = [target.sub(%r{/$}, ''), source].join('/')
+        shell :copy, gs_opts: gs_opts(source), source:, target: to
+      end
 
-        def dirname(path)
-          dir = File.dirname(path)
-          dir unless dir.empty? || dir == '.'
-        end
+      def dirname(path)
+        dir = File.dirname(path)
+        dir unless dir.empty? || dir == '.'
+      end
 
-        def gs_opts(path)
-          opts = []
-          opts << %(-h "Cache-Control:#{cache_control}") if cache_control?
-          opts << %(-h "Content-Encoding:#{encoding(path)}") if detect_encoding?
-          opts << %(-h "Content-type:#{mime_type(path)}") if mime_type(path)
-          opts.join(' ') + ' ' if opts.any?
-        end
+      def gs_opts(path)
+        opts = []
+        opts << %(-h "Cache-Control:#{cache_control}") if cache_control?
+        opts << %(-h "Content-Encoding:#{encoding(path)}") if detect_encoding?
+        opts << %(-h "Content-type:#{mime_type(path)}") if mime_type(path)
+        "#{opts.join(' ')} " if opts.any?
+      end
 
-        def copy_opts
-          opts = []
-          opts << %(-a "#{acl}") if acl?
-          opts.join(' ') + ' ' if opts.any?
-        end
+      def copy_opts
+        opts = []
+        opts << %(-a "#{acl}") if acl?
+        "#{opts.join(' ')} " if opts.any?
+      end
 
-        def target
-          "gs://#{bucket}/#{upload_dir}"
-        end
+      def target
+        "gs://#{bucket}/#{upload_dir}"
+      end
 
-        def mime_type(path)
-          type = MIME::Types.type_for(path).first
-          type.to_s if type
-        end
+      def mime_type(path)
+        type = MIME::Types.type_for(path).first
+        type&.to_s
+      end
 
-        def glob_args
-          args = [glob]
-          args << File::FNM_DOTMATCH if dot_match?
-          args
-        end
+      def glob_args
+        args = [glob]
+        args << File::FNM_DOTMATCH if dot_match?
+        args
+      end
     end
   end
 end