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

data/lib/dpl/providers/anynines.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Anynines < Provider
@@ -5,9 +7,9 @@ module Dpl
 
       status :alpha
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
       env :anynines
 
@@ -23,17 +25,17 @@ module Dpl
       API = 'https://api.de.a9s.eu'
 
       cmds install: 'test $(uname) = "Linux" && rel="linux64-binary" || rel="macosx64"; wget "https://cli.run.pivotal.io/stable?release=${rel}&source=github" -qO cf.tgz && tar -zxvf cf.tgz && rm cf.tgz',
-           api:     './cf api %{url}',
-           login:   './cf login -u %{username} -p %{password} -o %{organization} -s %{space}',
-           push:    './cf push %{args}',
-           logout:  './cf logout'
+           api: './cf api %{url}',
+           login: './cf login -u %{username} -p %{password} -o %{organization} -s %{space}',
+           push: './cf push %{args}',
+           logout: './cf logout'
 
       errs install: 'Failed to install CLI tools',
-           api:     'Failed to set api',
-           login:   'Failed to login',
-           target:  'Failed to target organization %{organization}, space %{space}',
-           push:    'Failed to push app',
-           logout:  'Failed to logout'
+           api: 'Failed to set api',
+           login: 'Failed to login',
+           target: 'Failed to target organization %{organization}, space %{space}',
+           push: 'Failed to push app',
+           logout: 'Failed to logout'
 
       def install
         shell :install
@@ -54,16 +56,16 @@ module Dpl
 
       private
 
-        def url
-          API
-        end
+      def url
+        API
+      end
 
-        def args
-          args = []
-          args << quote(app_name)  if app_name?
-          args << "-f #{manifest}" if manifest?
-          args.join(' ')
-        end
+      def args
+        args = []
+        args << quote(app_name)  if app_name?
+        args << "-f #{manifest}" if manifest?
+        args.join(' ')
+      end
     end
   end
 end

data/lib/dpl/providers/azure_web_apps.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class AzureWebApps < Provider
@@ -7,9 +9,9 @@ module Dpl
 
       full_name 'Azure Web Apps'
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
       env :AZURE_WA
 
@@ -22,14 +24,14 @@ module Dpl
       needs :git
 
       cmds checkout: 'git checkout HEAD',
-           add:      'git add . --all --force',
-           commit:   'git commit -m "Cleanup commit"',
-           deploy:   'git push --force --quiet %{url} HEAD:refs/heads/master'
+           add: 'git add . --all --force',
+           commit: 'git commit -m "Cleanup commit"',
+           deploy: 'git push --force --quiet %{url} HEAD:refs/heads/master'
 
-      msgs commit:   'Committing changes to git',
-           deploy:   'Deploying to Azure Web App: %{site}'
+      msgs commit: 'Committing changes to git',
+           deploy: 'Deploying to Azure Web App: %{site}'
 
-      errs push:     'Failed pushing to Azure Web Apps'
+      errs push: 'Failed pushing to Azure Web Apps'
 
       URL = 'https://%s:%s@%s.scm.azurewebsites.net:443/%s.git'
 
@@ -43,19 +45,19 @@ module Dpl
 
       private
 
-        def url
-          URL % [username, password, target, site]
-        end
+      def url
+        format(URL, username, password, target, site)
+      end
 
-        def target
-          slot || site
-        end
+      def target
+        slot || site
+      end
 
-        def commit
-          shell :checkout
-          shell :add
-          shell :commit
-        end
+      def commit
+        shell :checkout
+        shell :add
+        shell :commit
+      end
     end
   end
 end

data/lib/dpl/providers/bintray.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'net/http'
 require 'uri'
 require 'find'
@@ -9,9 +11,9 @@ module Dpl
 
       status :stable
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
       gem 'json'
 
@@ -23,42 +25,42 @@ module Dpl
       opt '--passphrase PHRASE', 'Passphrase as configured on Bintray (if GPG signing is used)'
       opt '--url URL', default: 'https://api.bintray.com', internal: true
 
-      msgs missing_file:    'Missing descriptor file: %{file}',
-           invalid_file:    'Failed to parse descriptor file %{file}',
-           create_package:  'Creating package %{package_name}',
-           package_attrs:   'Adding attributes for package %{package_name}',
-           create_version:  'Creating version %{version_name}',
-           version_attrs:   'Adding attributes for version %{version_name}',
-           upload_file:     'Uploading file %{source} to %{target}',
-           sign_version:    'Signing version %s passphrase',
+      msgs missing_file: 'Missing descriptor file: %{file}',
+           invalid_file: 'Failed to parse descriptor file %{file}',
+           create_package: 'Creating package %{package_name}',
+           package_attrs: 'Adding attributes for package %{package_name}',
+           create_version: 'Creating version %{version_name}',
+           version_attrs: 'Adding attributes for version %{version_name}',
+           upload_file: 'Uploading file %{source} to %{target}',
+           sign_version: 'Signing version %s passphrase',
            publish_version: 'Publishing version %{version_name} of package %{package_name}',
-           missing_path:    'Path: %{path} does not exist.',
-           list_download:   'Listing %{path} in downloads',
-           retrying:        '%{code} response from Bintray. It may take some time for a version to be published, retrying in %{pause} sec ... (%{count}/%{max})',
-           giveup_retries:  'Too many retries failed, giving up, something went wrong.',
-           unexpected_code: 'Unexpected HTTP response code %s while checking if the %s exists' ,
-           request_failed:  '%s %s returned unexpected HTTP response code %s',
+           missing_path: 'Path: %{path} does not exist.',
+           list_download: 'Listing %{path} in downloads',
+           retrying: '%{code} response from Bintray. It may take some time for a version to be published, retrying in %{pause} sec ... (%{count}/%{max})',
+           giveup_retries: 'Too many retries failed, giving up, something went wrong.',
+           unexpected_code: 'Unexpected HTTP response code %s while checking if the %s exists',
+           request_failed: '%s %s returned unexpected HTTP response code %s',
            request_success: 'Bintray response: %s %s. %s'
 
       PATHS = {
-        packages:        '/packages/%{subject}/%{repo}',
-        package:         '/packages/%{subject}/%{repo}/%{package_name}',
-        package_attrs:   '/packages/%{subject}/%{repo}/%{package_name}/attributes',
-        versions:        '/packages/%{subject}/%{repo}/%{package_name}/versions',
-        version:         '/packages/%{subject}/%{repo}/%{package_name}/versions/%{version_name}',
-        version_attrs:   '/packages/%{subject}/%{repo}/%{package_name}/versions/%{version_name}/attributes',
-        version_sign:    '/gpg/%{subject}/%{repo}/%{package_name}/versions/%{version_name}',
+        packages: '/packages/%{subject}/%{repo}',
+        package: '/packages/%{subject}/%{repo}/%{package_name}',
+        package_attrs: '/packages/%{subject}/%{repo}/%{package_name}/attributes',
+        versions: '/packages/%{subject}/%{repo}/%{package_name}/versions',
+        version: '/packages/%{subject}/%{repo}/%{package_name}/versions/%{version_name}',
+        version_attrs: '/packages/%{subject}/%{repo}/%{package_name}/versions/%{version_name}/attributes',
+        version_sign: '/gpg/%{subject}/%{repo}/%{package_name}/versions/%{version_name}',
         version_publish: '/content/%{subject}/%{repo}/%{package_name}/%{version_name}/publish',
-        version_file:    '/content/%{subject}/%{repo}/%{package_name}/%{version_name}/%{target}',
-        file_metadata:   '/file_metadata/%{subject}/%{repo}/%{target}'
-      }
+        version_file: '/content/%{subject}/%{repo}/%{package_name}/%{version_name}/%{target}',
+        file_metadata: '/file_metadata/%{subject}/%{repo}/%{target}'
+      }.freeze
 
       MAP = {
-        package: %i(name desc licenses labels vcs_url website_url
-          issue_tracker_url public_download_numbers public_stats),
-        version: %i(name desc released vcs_tag github_release_notes_file
-          github_use_tag_release_notes attributes)
-      }
+        package: %i[name desc licenses labels vcs_url website_url
+                    issue_tracker_url public_download_numbers public_stats],
+        version: %i[name desc released vcs_tag github_release_notes_file
+                    github_use_tag_release_notes attributes]
+      }.freeze
 
       def install
         require 'json'
@@ -85,6 +87,7 @@ module Dpl
         info :create_package
         post(path(:packages), compact(only(package, *MAP[:package])))
         return unless package_attrs
+
         info :package_attrs
         post(path(:package_attrs), package_attrs)
       end
@@ -97,6 +100,7 @@ module Dpl
         info :create_version
         post(path(:versions), compact(only(version, *MAP[:version])))
         return unless version_attrs
+
         info :version_attrs
         post(path(:version_attrs), version_attrs)
       end
@@ -134,10 +138,11 @@ module Dpl
         end
       end
 
-      def retrying(opts, &block)
+      def retrying(opts)
         1.upto(opts[:max]) do |count|
           code = yield
           return if code < 400
+
           info :retrying, opts.merge(count: count, code: code)
           sleep opts[:pause]
         end
@@ -147,7 +152,8 @@ module Dpl
       def files
         return {} unless files = descriptor[:files]
         return @files if @files
-        keys = %i(path includePattern excludePattern uploadPattern matrixParams listInDownloads)
+
+        keys = %i[path includePattern excludePattern uploadPattern matrixParams listInDownloads]
         files = files.map { |file| file if file[:path] = path_for(file[:includePattern]) }
         @files = files.compact.map { |file| find(*file.values_at(*keys)) }.flatten
       end
@@ -172,9 +178,10 @@ module Dpl
 
       def path_for(str)
         ix = str.index('(')
-        path = ix.to_i == 0 ? str : str[0, ix]
+        path = ix.to_i.zero? ? str : str[0, ix]
         return path if File.exist?(path)
-        warn :missing_path, path: path
+
+        warn(:missing_path, path: path)
         nil
       end
 
@@ -236,7 +243,7 @@ module Dpl
 
       def descriptor
         @descriptor ||= symbolize(JSON.parse(File.read(file)))
-      rescue => e
+      rescue StandardError
         error :invalid_file
       end
 
@@ -291,7 +298,7 @@ module Dpl
       def parse(json)
         hash = JSON.parse(json)
         hash.is_a?(Hash) ? hash : {}
-      rescue
+      rescue StandardError
         {}
       end
 

data/lib/dpl/providers/bluemixcloudfoundry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Bluemixcloudfoundry < Provider
@@ -7,9 +9,9 @@ module Dpl
 
       full_name 'Bluemix Cloud Foundry'
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
       env :cloudfoundry
 
@@ -17,7 +19,7 @@ module Dpl
       opt '--password PASS',       'Bluemix password', required: true, secret: true
       opt '--organization ORG',    'Bluemix organization', required: true
       opt '--space SPACE',         'Bluemix space', required: true
-      opt '--region REGION',       'Bluemix region', default: 'ng', enum: %w(ng eu-gb eu-de au-syd)
+      opt '--region REGION',       'Bluemix region', default: 'ng', enum: %w[ng eu-gb eu-de au-syd]
       opt '--api URL',             'Bluemix api URL'
       opt '--app_name APP',        'Application name'
       opt '--buildpack PACK',      'Buildpack name or Git URL'
@@ -26,25 +28,25 @@ module Dpl
       opt '--logout', default: true, internal: true
 
       API = {
-        'ng':     'api.ng.bluemix.net',
-        'eu-gb':  'api.eu-gb.bluemix.net',
-        'eu-de':  'api.eu-de.bluemix.net',
+        'ng': 'api.ng.bluemix.net',
+        'eu-gb': 'api.eu-gb.bluemix.net',
+        'eu-de': 'api.eu-de.bluemix.net',
         'au-syd': 'api.au-syd.bluemix.net'
-      }
+      }.freeze
 
       cmds install: 'test $(uname) = "Linux" && rel="linux64-binary" || rel="macosx64"; wget "https://cli.run.pivotal.io/stable?release=${rel}&source=github" -qO cf.tgz && tar -zxvf cf.tgz && rm cf.tgz',
-           api:     './cf api %{api} %{skip_ssl_validation_opt}',
-           login:   './cf login -u %{username} -p %{password}',
-           target:  './cf target -o %{organization} -s %{space}',
-           push:    './cf push %{push_args}',
-           logout:  './cf logout'
+           api: './cf api %{api} %{skip_ssl_validation_opt}',
+           login: './cf login -u %{username} -p %{password}',
+           target: './cf target -o %{organization} -s %{space}',
+           push: './cf push %{push_args}',
+           logout: './cf logout'
 
       errs install: 'Failed to install CLI tools',
-           api:     'Failed to set api %{api}',
-           login:   'Failed to login',
-           target:  'Failed to target organization %{organization}, space %{space}',
-           push:    'Failed to push app',
-           logout:  'Failed to logout'
+           api: 'Failed to set api %{api}',
+           login: 'Failed to login',
+           target: 'Failed to target organization %{organization}, space %{space}',
+           push: 'Failed to push app',
+           logout: 'Failed to logout'
 
       msgs manifest_missing: 'Application must have a manifest.yml for unattended deployment'
 
@@ -72,25 +74,25 @@ module Dpl
 
       private
 
-        def push_args
-          args = []
-          args << quote(app_name)  if app_name?
-          args << "-f #{manifest}" if manifest?
-          args << "-b #{buildpack}" if buildpack?
-          args.join(' ')
-        end
-
-        def skip_ssl_validation_opt
-          '--skip-ssl-validation' if skip_ssl_validation?
-        end
-
-        def manifest_missing?
-          !File.exists?(manifest)
-        end
-
-        def api
-          super || API[region.to_sym]
-        end
+      def push_args
+        args = []
+        args << quote(app_name)  if app_name?
+        args << "-f #{manifest}" if manifest?
+        args << "-b #{buildpack}" if buildpack?
+        args.join(' ')
+      end
+
+      def skip_ssl_validation_opt
+        '--skip-ssl-validation' if skip_ssl_validation?
+      end
+
+      def manifest_missing?
+        !File.exist?(manifest)
+      end
+
+      def api
+        super || API[region.to_sym]
+      end
     end
   end
 end

data/lib/dpl/providers/boxfuse.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Boxfuse < Provider
@@ -5,9 +7,9 @@ module Dpl
 
       status :alpha
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
       env :boxfuse
 
@@ -23,10 +25,10 @@ module Dpl
       URL = 'https://files.boxfuse.com/com/boxfuse/client/boxfuse-commandline/1.33.0.1460/boxfuse-commandline-1.33.0.1460-linux-x64.tar.gz'
 
       cmds install: 'curl -L %{URL} | tar xz',
-           deploy:  'boxfuse/boxfuse run %{deploy_opts}'
+           deploy: 'boxfuse/boxfuse run %{deploy_opts}'
 
       def validate
-        # TODO check if the config file exists (it seems `boxfuse` doesn't)
+        # TODO: check if the config file exists (it seems `boxfuse` doesn't)
       end
 
       def install
@@ -39,12 +41,12 @@ module Dpl
 
       private
 
-        def deploy_opts
-          opts = [*opts_for(%i(user secret payload app env version), prefix: '-')]
-          opts << "-configfile=#{config_file}" if config_file?
-          opts << extra_args if extra_args?
-          opts.join(' ')
-        end
+      def deploy_opts
+        opts = [*opts_for(%i[user secret payload app env version], prefix: '-')]
+        opts << "-configfile=#{config_file}" if config_file?
+        opts << extra_args if extra_args?
+        opts.join(' ')
+      end
     end
   end
 end

data/lib/dpl/providers/cargo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Cargo < Provider
@@ -5,9 +7,9 @@ module Dpl
 
       status :stable
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
       env :cargo
 
@@ -22,9 +24,9 @@ module Dpl
 
       private
 
-        def publish_opts
-          opts_for(%i(token allow_dirty), dashed: true)
-        end
+      def publish_opts
+        opts_for(%i[token allow_dirty], dashed: true)
+      end
     end
   end
 end