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

data/lib/dpl/providers/heroku/api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Heroku
@@ -8,22 +10,22 @@ module Dpl
 
         full_name 'Heroku API'
 
-        description sq(<<-str)
+        description sq(<<-STR)
           tbd
-        str
+        STR
 
         opt '--api_key KEY', 'Heroku API key', required: true, secret: true
         opt '--version VERSION', internal: true # used in triggering a build, not sure this should be exposed?
 
-        msgs pack:    'Creating application archive',
-             upload:  'Uploading application archive',
-             build:   'Triggering Heroku build (deployment)',
+        msgs pack: 'Creating application archive',
+             upload: 'Uploading application archive',
+             build: 'Triggering Heroku build (deployment)',
              pending: 'Heroku build still pending',
-             failed:  'Heroku build failed'
+             failed: 'Heroku build failed'
 
-        cmds pack:    'tar -zcf %{escaped_archive_file} --exclude .git .',
-             upload:  'curl %{curl_opts} %{escaped_put_url} -X PUT -H "Content-Type:" -H "Accept: application/vnd.heroku+json; version=3" -H "User-Agent: %{user_agent}" --data-binary @%{escaped_archive_file}',
-             log:     'curl %{curl_opts} %{escaped_output_stream_url} -H "Accept: application/vnd.heroku+json; version=3" -H "User-Agent: %{user_agent}"'
+        cmds pack: 'tar -zcf %{escaped_archive_file} --exclude .git .',
+             upload: 'curl %{curl_opts} %{escaped_put_url} -X PUT -H "Content-Type:" -H "Accept: application/vnd.heroku+json; version=3" -H "User-Agent: %{user_agent}" --data-binary @%{escaped_archive_file}',
+             log: 'curl %{curl_opts} %{escaped_output_stream_url} -H "Accept: application/vnd.heroku+json; version=3" -H "User-Agent: %{user_agent}"'
 
         attr_reader :data
 
@@ -37,84 +39,84 @@ module Dpl
 
         private
 
-          def pack
-            shell :pack
-          end
+        def pack
+          shell :pack
+        end
 
-          def upload
-            shell :upload, echo: false
-          end
+        def upload
+          shell :upload, echo: false
+        end
 
-          def build
-            info :build
-            res = http.post("/apps/#{app}/builds") do |req|
-              req.headers['Content-Type'] = 'application/json'
-              req.body = JSON.dump(source_blob: { url: get_url, version: version })
-            end
-            handle_error(res) unless res.success?
-            @data = symbolize(JSON.parse(res.body))
+        def build
+          info :build
+          res = http.post("/apps/#{app}/builds") do |req|
+            req.headers['Content-Type'] = 'application/json'
+            req.body = JSON.dump(source_blob: { url: get_url, version: })
           end
+          handle_error(res) unless res.success?
+          @data = symbolize(JSON.parse(res.body))
+        end
 
-          def log
-            shell :log, echo: false
-          end
+        def log
+          shell :log, echo: false
+        end
 
-          def verify
-            loop do
-              case build_status
-              when 'pending'
-                info :pending
-                sleep 5
-              when 'succeeded'
-                break
-              else
-                error :failed
-              end
+        def verify
+          loop do
+            case build_status
+            when 'pending'
+              info :pending
+              sleep 5
+            when 'succeeded'
+              break
+            else
+              error :failed
             end
           end
+        end
 
-          def build_status
-            res = http.get("/apps/#{app}/builds/#{build_id}")
-            JSON.parse(res.body)['status']
-          end
+        def build_status
+          res = http.get("/apps/#{app}/builds/#{build_id}")
+          JSON.parse(res.body)['status']
+        end
 
-          def archive_file
-            expand("~/.dpl.#{app}.tgz")
-          end
+        def archive_file
+          expand("~/.dpl.#{app}.tgz")
+        end
 
-          def get_url
-            source['get_url']
-          end
+        def get_url
+          source['get_url']
+        end
 
-          def put_url
-            source['put_url']
-          end
+        def put_url
+          source['put_url']
+        end
 
-          def source
-            # this says the endpoint /sources is deprecated: https://devcenter.heroku.com/articles/platform-api-reference#source
-            # this says to use /apps/example-app/sources: https://devcenter.heroku.com/articles/build-and-release-using-the-api#sources-endpoint
-            @source ||= begin
-              res = http.post('/sources')
-              handle_error(res) unless res.success?
-              JSON.parse(res.body)['source_blob']
-            end
+        def source
+          # this says the endpoint /sources is deprecated: https://devcenter.heroku.com/articles/platform-api-reference#source
+          # this says to use /apps/example-app/sources: https://devcenter.heroku.com/articles/build-and-release-using-the-api#sources-endpoint
+          @source ||= begin
+            res = http.post('/sources')
+            handle_error(res) unless res.success?
+            JSON.parse(res.body)['source_blob']
           end
+        end
 
-          def build_id
-            data[:id]
-          end
+        def build_id
+          data[:id]
+        end
 
-          def output_stream_url
-            data[:output_stream_url]
-          end
+        def output_stream_url
+          data[:output_stream_url]
+        end
 
-          def version
-            super || git_sha
-          end
+        def version
+          super || git_sha
+        end
 
-          def curl_opts
-            tty? ? '' : '-sS'
-          end
+        def curl_opts
+          tty? ? '' : '-sS'
+        end
       end
     end
   end

data/lib/dpl/providers/heroku/git.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Heroku
@@ -8,11 +10,11 @@ module Dpl
 
         full_name 'Heroku Git'
 
-        description sq(<<-str)
+        description sq(<<-STR)
           tbd
-        str
+        STR
 
-        required :api_key, [:username, :password]
+        required :api_key, %i[username password]
 
         opt '--api_key KEY',   'Heroku API key', secret: true
         opt '--username USER', 'Heroku username', alias: :user
@@ -22,7 +24,7 @@ module Dpl
         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 prepare
           write_netrc if write_netrc?
@@ -35,17 +37,17 @@ module Dpl
 
         private
 
-          def remote
-            git || "https://git.heroku.com/#{app}.git"
-          end
+        def remote
+          git || "https://git.heroku.com/#{app}.git"
+        end
 
-          def write_netrc?
-            remote.start_with?('https://')
-          end
+        def write_netrc?
+          remote.start_with?('https://')
+        end
 
-          def write_netrc
-            super('git.heroku.com', email, api_key || password)
-          end
+        def write_netrc
+          super('git.heroku.com', email, api_key || password)
+        end
       end
     end
   end

data/lib/dpl/providers/heroku.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Heroku < Provider
@@ -5,30 +7,29 @@ module Dpl
 
       abstract
 
-      gem 'faraday', '~> 0.9.2'
-      gem 'json'
+      gem 'faraday', '~> 1'
       gem 'netrc', '~> 0.11.0'
       gem 'rendezvous', '~> 0.1.3'
 
       env :heroku
 
-      opt '--strategy NAME', 'Heroku deployment strategy', default: 'api', enum: %w(api git)
+      opt '--strategy NAME', 'Heroku deployment strategy', default: 'api', enum: %w[api git]
       opt '--app APP', 'Heroku app name', default: :repo_name
       opt '--log_level LEVEL', internal: true
 
-      msgs login:     'Authenticating ... ',
-           restart:   'Restarting dynos ... ',
-           validate:  'Checking for app %{app} ... ',
-           run_cmd:   'Running command %s ... ',
-           success:   'success.',
+      msgs login: 'Authenticating ... ',
+           restart: 'Restarting dynos ... ',
+           validate: 'Checking for app %{app} ... ',
+           run_cmd: 'Running command %s ... ',
+           success: 'success.',
            api_error: 'API request failed: %s (see %s)'
 
       URL = 'https://api.heroku.com'
 
       HEADERS = {
         'Accept': 'application/vnd.heroku+json; version=3',
-        'User-Agent': user_agent,
-      }
+        'User-Agent': user_agent
+      }.freeze
 
       attr_reader :email
 
@@ -36,7 +37,7 @@ module Dpl
         print :login
         res = http.get('/account')
         handle_error(res) unless res.success?
-        @email = JSON.parse(res.body)["email"]
+        @email = JSON.parse(res.body)['email']
         info :success
       end
 
@@ -60,7 +61,7 @@ module Dpl
         print :run_cmd, cmd
         res = http.post "/apps/#{app}/dynos" do |req|
           req.headers['Content-Type'] = 'application/json'
-          req.body = { command: cmd, attach: true}.to_json
+          req.body = { command: cmd, attach: true }.to_json
         end
         handle_error(res) unless res.success?
         rendezvous(JSON.parse(res.body)['attach_url'])
@@ -68,39 +69,40 @@ module Dpl
 
       private
 
-        def http
-          @http ||= Faraday.new(url: URL, headers: headers) do |http|
-            http.basic_auth(username, password) if username && password
-            http.response :logger, logger, &method(:filter) if log_level?
-            http.adapter Faraday.default_adapter
-          end
+      def http
+        @http ||= Faraday.new(url: URL, headers:) do |http|
+          http.basic_auth(username, password) if username && password
+          http.response :logger, logger, &method(:filter) if log_level?
+          http.adapter Faraday.default_adapter
         end
+      end
 
-        def headers
-          return HEADERS.dup if username && password
-          HEADERS.merge('Authorization': "Bearer #{api_key}")
-        end
+      def headers
+        return HEADERS.dup if username && password
 
-        def filter(logger)
-          logger.filter(/(.*Authorization: ).*/,'\1[REDACTED]')
-        end
+        HEADERS.merge('Authorization': "Bearer #{api_key}")
+      end
 
-        def logger
-          super(log_level)
-        end
+      def filter(logger)
+        logger.filter(/(.*Authorization: ).*/, '\1[REDACTED]')
+      end
 
-        def handle_error(response)
-          body = JSON.parse(response.body)
-          error :api_error, body['message'], body['url']
-        end
+      def logger
+        super(log_level)
+      end
 
-        def rendezvous(url)
-          Rendezvous.start(url: url)
-        end
+      def handle_error(response)
+        body = JSON.parse(response.body)
+        error :api_error, body['message'], body['url']
+      end
+
+      def rendezvous(url)
+        Rendezvous.start(url:)
+      end
 
-        # overwritten in Git, meaningless in Api
-        def username; end
-        def password; end
+      # overwritten in Git, meaningless in Api
+      def username; end
+      def password; end
     end
   end
 end