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

data/lib/dpl/providers/nuget.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Nuget < Provider
@@ -5,9 +7,9 @@ module Dpl
 
       full_name 'nuget'
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
       env :nuget, :dotnet
 
@@ -18,7 +20,7 @@ module Dpl
       opt '--skip_duplicate', 'Do not overwrite existing packages'
 
       msgs login: 'Authenticating with API key %{api_key}',
-           push:  'Pushing package %{src} to %{registry}'
+           push: 'Pushing package %{src} to %{registry}'
 
       cmds push: 'dotnet nuget push %{src} -k %{api_key} -s %{registry} %{push_opts}'
 
@@ -31,9 +33,9 @@ module Dpl
 
       private
 
-        def push_opts
-          opts_for(%i(no_symbols skip_duplicate), dashed: true)
-        end
+      def push_opts
+        opts_for(%i[no_symbols skip_duplicate], dashed: true)
+      end
     end
   end
 end

data/lib/dpl/providers/openshift.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Openshift < Provider
@@ -7,9 +9,9 @@ module Dpl
 
       full_name 'OpenShift'
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
       env :openshift
 
@@ -19,14 +21,14 @@ module Dpl
       opt '--app APP',         'OpenShift application', default: :repo_name
 
       cmds install: 'curl %{URL} | tar xz',
-           login:   './oc login --token=%{token} --server=%{server}',
+           login: './oc login --token=%{token} --server=%{server}',
            prepare: './oc project %{project}',
-           deploy:  './oc start-build %{app} --follow --commit %{git_sha}'
+           deploy: './oc start-build %{app} --follow --commit %{git_sha}'
 
       errs install: 'CLI tool installation failed',
-           login:   'Authentication failed',
+           login: 'Authentication failed',
            prepare: 'Unable to select project %{project}',
-           deploy:  'Deployment failed'
+           deploy: 'Deployment failed'
 
       URL = 'https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.1/linux/oc.tar.gz'
 

data/lib/dpl/providers/opsworks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Opsworks < Provider
@@ -7,9 +9,9 @@ module Dpl
 
       full_name 'AWS OpsWorks'
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
       gem 'aws-sdk-opsworks', '~> 1.0'
 
@@ -27,17 +29,17 @@ module Dpl
       opt '--update_on_success', 'When wait-until-deployed and updated-on-success are both not given, application source is updated to the current SHA. Ignored when wait-until-deployed is not given.', alias: :update_app_on_success
       opt '--custom_json JSON', 'Custom json options override (overwrites default configuration)'
 
-      msgs login:         'Using Access Key: %{access_key_id}',
+      msgs login: 'Using Access Key: %{access_key_id}',
            create_deploy: 'Creating deployment ... ',
-           done:          'Done: %s',
-           waiting:       'Deploying ',
-           failed:        'Failed.',
-           success:       'Success.',
-           update_app:    'Updating application source branch/revision setting.',
+           done: 'Done: %s',
+           waiting: 'Deploying ',
+           failed: 'Failed.',
+           success: 'Success.',
+           update_app: 'Updating application source branch/revision setting.',
            app_not_found: 'App %s not found.',
-           timeout:       'Timeout: failed to finish deployment within 10 minutes.',
+           timeout: 'Timeout: failed to finish deployment within 10 minutes.',
            service_error: 'Deployment failed. OpsWorks service error: %s',
-           comment:       'Deploy build %{build_number} via Travis CI'
+           comment: 'Deploy build %{build_number} via Travis CI'
 
       def login
         info :login
@@ -58,13 +60,13 @@ module Dpl
 
       def deploy_config
         compact(
-          stack_id: stack_id,
-          app_id: app_id,
+          stack_id:,
+          app_id:,
           command: { name: 'deploy' },
-          comment: comment,
-          custom_json: custom_json,
-          instance_ids: instance_ids,
-          layer_ids: layer_ids
+          comment:,
+          custom_json:,
+          instance_ids:,
+          layer_ids:
         )
       end
 
@@ -89,9 +91,9 @@ module Dpl
 
       def update_config
         {
-          app_id: app_id,
+          app_id:,
           app_source: {
-            revision: git_sha,
+            revision: git_sha
           }
         }
       end
@@ -118,7 +120,7 @@ module Dpl
 
       def describe_app
         data = opsworks.describe_apps(app_ids: [app_id])
-        error :app_not_found, app_id unless data[:apps] && data[:apps].any?
+        error :app_not_found, app_id unless data[:apps]&.any?
         data[:apps].first
       end
 
@@ -127,7 +129,7 @@ module Dpl
       end
 
       def opsworks
-        @opsworks ||= Aws::OpsWorks::Client.new(region: region, credentials: credentials)
+        @opsworks ||= Aws::OpsWorks::Client.new(region:, credentials:)
       end
 
       def credentials
@@ -135,7 +137,7 @@ module Dpl
       end
 
       def timeout(sec, &block)
-        Timeout::timeout(sec, &block)
+        Timeout.timeout(sec, &block)
       rescue Timeout::Error
         error :timeout
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'timeout'
 
 module Dpl
@@ -16,13 +18,13 @@ module Dpl
         TIMEOUTS = {
           timeout: 180,
           open_timeout: 180
-        }
+        }.freeze
 
-        gem 'octokit', '~> 4.15.0'
+        gem 'octokit', '~> 7'
 
         full_name 'GitHub Pages (API)'
 
-        description sq(<<-str)
+        description sq(<<-STR)
           This provider requests GitHub Pages build for the repository given by
           the `--repo` flag, or the current one, if the flag is not given.
           Note that `dpl` does not perform any check about the fitness of the request;
@@ -31,18 +33,18 @@ module Dpl
           For example, if your GitHub Pages is configured to use `gh-pages` but the
           deployment is run on the `master` branch, you would have to ensure that the
           `gh-pages` would be updated accordingly during the build.
-        str
+        STR
 
         opt '--repo SLUG', 'GitHub repo slug', default: :repo_slug
         opt '--token TOKEN', 'GitHub oauth token with repo permission', required: true, secret: true, alias: :github_token
 
-        msgs not_found: sq(<<-msg),
+        msgs not_found: sq(<<-MSG),
                GitHub Pages not found for %{slug}.
                Either the given token has insufficient scope (repo or public_repo), or
                GitHub Pages is not enabled for this repo (see https://github.com/%{slug}/settings)'
-             msg
+        MSG
              timeout: 'GitHub Pages build request timed out',
-             deploy:  'Requesting GitHub Pages build using API'
+             deploy: 'Requesting GitHub Pages build using API'
 
         def validate
           error :not_found unless pages_enabled?
@@ -56,7 +58,7 @@ module Dpl
           response = api.pages slug
           logger.debug response
 
-          Timeout::timeout(30) do
+          Timeout.timeout(30) do
             until response.status == 'built'
               response = api.pages slug
               logger.debug response
@@ -71,10 +73,9 @@ module Dpl
 
           info "Pages deployed to #{response.html_url}, using commit #{latest_pages_build.commit}"
           logger.debug latest_pages_build
-
-        rescue Octokit::Forbidden => fb
-          error fb.message
-        rescue Timeout::Error => to
+        rescue Octokit::Forbidden => e
+          error e.message
+        rescue Timeout::Error
           error :timeout
         end
 
@@ -96,10 +97,9 @@ module Dpl
 
         def pages_enabled?
           api.pages slug
-        rescue Octokit::NotFound => e
+        rescue Octokit::NotFound
           false
         end
-
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Pages
@@ -8,12 +10,12 @@ module Dpl
 
         full_name 'GitHub Pages'
 
-        description sq(<<-str)
+        description sq(<<-STR)
           tbd
-        str
+        STR
 
-        gem 'octokit', '~> 4.15.0'
-        gem 'public_suffix', '~> 3.0.3'
+        gem 'octokit', '~> 7'
+        gem 'public_suffix', '~> 5'
 
         required :token, :deploy_key
 
@@ -36,45 +38,45 @@ module Dpl
 
         needs :git
 
-        msgs login:               'Authenticated as %s',
-             invalid_token:       'The provided GitHub token is invalid (error: %s)',
+        msgs login: 'Authenticated as %s',
+             invalid_token: 'The provided GitHub token is invalid (error: %s)',
              insufficient_scopes: 'Dpl does not have permission to access %{url} using the provided GitHub token. Please make sure the token have the repo or public_repo scope.',
-             setup_deploy_key:    'Moving deploy key %{deploy_key} to %{path}',
-             check_deploy_key:    'Checking deploy key',
-             deploy:              'Deploying branch %{target_branch} to %{url}',
-             keep_history:        'The deployment is configured to preserve the target branch if it exists on remote.',
-             work_dir:            'Using temporary work directory %{work_dir}',
-             committer_from_gh:   'The repo is configured to use committer user and email.',
-             setup_dir:           'The source dir for deployment is %s',
-             git_clone:           'Cloning the branch %{target_branch} from the remote repo',
-             git_init:            'Initializing local git repo',
-             git_checkout:        'Checking out orphan branch %{target_branch}',
-             copy_files:          'Copying %{src_dir} contents to %{work_dir}',
-             git_config:          'Configuring git committer to be %{name} <%{email}>',
-             prepare:             'Preparing to deploy %{target_branch} branch to gh-pages',
-             git_push:            'Pushing to %{url}',
-             stop:                'There are no changes to commit, stopping.'
-
-        cmds git_clone:           'git clone --quiet --branch="%{target_branch}" --depth=1 "%{remote_url}" . > /dev/null 2>&1',
-             git_init:            'git init .',
-             git_checkout:        'git checkout --orphan "%{target_branch}"',
-             check_deploy_key:    'ssh -i %{key} -T git@%{url} 2>&1 | grep successful > /dev/null',
-             copy_files:          'rsync -rl --exclude .git --delete "%{src_dir}/" .',
-             git_config_email:    'git config user.email %{quoted_email}',
-             git_config_name:     'git config user.name %{quoted_name}',
-             deployment_file:     'touch "deployed at %{now} by %{name}"',
-             cname:               'echo "%{fqdn}" > CNAME',
-             git_add:             'git add -A .',
-             git_commit_hook:     'cp %{path} .git/hooks/pre-commit',
-             git_commit:          'git commit %{git_commit_opts} -q %{git_commit_msg_opts}',
-             git_show:            'git show --stat-count=10 HEAD',
-             git_push:            'git push%{git_push_opts} --quiet "%{remote_url}" "%{target_branch}":"%{target_branch}" > /dev/null 2>&1'
-
-        errs copy_files:          'Failed to copy %{src_dir}.',
-             check_deploy_key:    'Failed to authenticate using the deploy key',
-             git_init:            'Failed to create new git repo',
-             git_checkout:        'Failed to create the orphan branch',
-             git_push:            'Failed to push the build to %{url}:%{target_branch}'
+             setup_deploy_key: 'Moving deploy key %{deploy_key} to %{path}',
+             check_deploy_key: 'Checking deploy key',
+             deploy: 'Deploying branch %{target_branch} to %{url}',
+             keep_history: 'The deployment is configured to preserve the target branch if it exists on remote.',
+             work_dir: 'Using temporary work directory %{work_dir}',
+             committer_from_gh: 'The repo is configured to use committer user and email.',
+             setup_dir: 'The source dir for deployment is %s',
+             git_clone: 'Cloning the branch %{target_branch} from the remote repo',
+             git_init: 'Initializing local git repo',
+             git_checkout: 'Checking out orphan branch %{target_branch}',
+             copy_files: 'Copying %{src_dir} contents to %{work_dir}',
+             git_config: 'Configuring git committer to be %{name} <%{email}>',
+             prepare: 'Preparing to deploy %{target_branch} branch to gh-pages',
+             git_push: 'Pushing to %{url}',
+             stop: 'There are no changes to commit, stopping.'
+
+        cmds git_clone: 'git clone --quiet --branch="%{target_branch}" --depth=1 "%{remote_url}" . > /dev/null 2>&1',
+             git_init: 'git init .',
+             git_checkout: 'git checkout --orphan "%{target_branch}"',
+             check_deploy_key: 'ssh -i %{key} -T git@%{url} 2>&1 | grep successful > /dev/null',
+             copy_files: 'rsync -rl --exclude .git --delete "%{src_dir}/" .',
+             git_config_email: 'git config user.email %{quoted_email}',
+             git_config_name: 'git config user.name %{quoted_name}',
+             deployment_file: 'touch "deployed at %{now} by %{name}"',
+             cname: 'echo "%{fqdn}" > CNAME',
+             git_add: 'git add -A .',
+             git_commit_hook: 'cp %{path} .git/hooks/pre-commit',
+             git_commit: 'git commit %{git_commit_opts} -q %{git_commit_msg_opts}',
+             git_show: 'git show --stat-count=10 HEAD',
+             git_push: 'git push%{git_push_opts} --quiet "%{remote_url}" "%{target_branch}":"%{target_branch}" > /dev/null 2>&1'
+
+        errs copy_files: 'Failed to copy %{src_dir}.',
+             check_deploy_key: 'Failed to authenticate using the deploy key',
+             git_init: 'Failed to create new git repo',
+             git_checkout: 'Failed to create the orphan branch',
+             git_push: 'Failed to push the build to %{url}:%{target_branch}'
 
         def login
           token? ? login_token : setup_deploy_key
@@ -97,6 +99,7 @@ module Dpl
           git_clone? ? git_clone : git_init
           copy_files
           return info :stop if git_clone? && !git_dirty?
+
           git_config
           git_commit
           git_push
@@ -115,7 +118,7 @@ module Dpl
 
         def setup_deploy_key
           path = '~/.dpl/deploy_key'
-          info :setup_deploy_key, path: path
+          info(:setup_deploy_key, path:)
           mv deploy_key, path
           chmod 0600, path
           setup_git_ssh path
@@ -171,8 +174,8 @@ module Dpl
         end
 
         def git_commit_msg_opts
-          msg = interpolate(commit_message, vars: vars)
-          msg.split("\n").reject(&:empty?).map { |msg| %(-m #{quote(msg)}) }
+          msg = interpolate(commit_message, vars:)
+          msg.split("\n").reject(&:empty?).map { |message| %(-m #{quote(message)}) }
         end
 
         def git_push_opts
@@ -225,6 +228,9 @@ module Dpl
 
         def user
           @user ||= api.user
+        rescue StandardError => e
+          puts "ERR: #{e.inspect}"
+          puts e.backtrace
         end
 
         def src_dir
@@ -236,7 +242,7 @@ module Dpl
         end
 
         def api
-          @api ||= Octokit::Client.new(access_token: token, api_endpoint: api_endpoint)
+          @api ||= Octokit::Client.new(access_token: token, api_endpoint:)
         end
 
         def api_endpoint
@@ -248,7 +254,7 @@ module Dpl
         end
 
         def debug(*args)
-          info *args if verbose?
+          info(*args) if verbose?
         end
       end
     end

data/lib/dpl/providers/pages.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Pages < Provider
@@ -7,7 +9,7 @@ module Dpl
 
       env :github, :pages
 
-      opt '--strategy NAME', 'GitHub Pages deployment strategy', default: 'git', enum: %w(api git)
+      opt '--strategy NAME', 'GitHub Pages deployment strategy', default: 'git', enum: %w[api git]
     end
   end
 end

data/lib/dpl/providers/puppetforge.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Puppetforge < Provider
@@ -7,12 +9,12 @@ module Dpl
 
       full_name 'Puppet Forge'
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
-      gem 'puppet', '~> 6.26.0', require: 'puppet/face'
-      gem 'puppet-blacksmith', '~> 4.1.2', require: 'puppet_blacksmith'
+      gem 'puppet', '~> 7.25', require: 'puppet/face'
+      gem 'puppet-blacksmith', '~> 7', require: 'puppet_blacksmith'
 
       env :puppetforge
 

data/lib/dpl/providers/pypi.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module Providers
     class Pypi < Provider
@@ -7,9 +9,9 @@ module Dpl
 
       full_name 'PyPI'
 
-      description sq(<<-str)
+      description sq(<<-STR)
         tbd
-      str
+      STR
 
       env :pypi
 
@@ -30,21 +32,20 @@ module Dpl
       opt '--twine_version VER', format: VERSION
       opt '--wheel_version VER', format: VERSION
 
-      msgs login:        'Authenticated as %{username}',
-           upload_docs:  'Uploading documentation (skip using "skip_upload_docs: true")'
+      msgs login: 'Authenticated as %{username}',
+           upload_docs: 'Uploading documentation (skip using "skip_upload_docs: true")'
 
-      cmds setup_py:     'python setup.py %{distributions}',
-           twine_check:  'twine check dist/*',
+      cmds setup_py: 'python setup.py %{distributions}',
+           twine_check: 'twine check dist/*',
            twine_upload: 'twine upload %{skip_existing_option} -r pypi dist/*',
-           rm_dist:      'rm -rf dist/*',
-           upload_docs:  'python setup.py upload_docs %{docs_dir_option} -r %{server}'
+           rm_dist: 'rm -rf dist/*',
+           upload_docs: 'python setup.py upload_docs %{docs_dir_option} -r %{server}'
 
-      errs install:      'Failed to install pip, setuptools, twine or wheel.',
-           setup_py:     'setup.py failed',
-           twine_check:  'Twine check failed',
+      errs install: 'Failed to install pip, setuptools, twine or wheel.',
+           setup_py: 'setup.py failed',
+           twine_check: 'Twine check failed',
            twine_upload: 'Twine upload failed.',
-           upload_docs:  'Uploading docs failed.'
-
+           upload_docs: 'Uploading docs failed.'
 
       def install
         script :install
@@ -71,7 +72,7 @@ module Dpl
 
       private
 
-        PYPIRC = sq(<<-rc)
+      PYPIRC = sq(<<-RC)
           [distutils]
           index-servers = pypi
               pypi
@@ -79,46 +80,46 @@ module Dpl
           repository: %{server}
           username: %{username}
           password: %{password}
-        rc
-
-        def write_config
-          write_file('~/.pypirc', pypirc)
-        end
-
-        def pypirc
-          interpolate(PYPIRC, opts, secure: true)
-        end
-
-        def upload_docs
-          info :upload_docs
-          shell :upload_docs
-        end
-
-        def skip_existing_option
-          '--skip-existing' if skip_existing?
-        end
-
-        def docs_dir_option
-          '--upload-dir ' + docs_dir if docs_dir
-        end
-
-        def setuptools_arg
-          version_arg(:setuptools)
-        end
-
-        def twine_arg
-          version_arg(:twine)
-        end
-
-        def wheel_arg
-          version_arg(:wheel)
-        end
-
-        def version_arg(name)
-          arg = name.to_s
-          arg << "==#{send(:"#{name}_version")}" if send(:"#{name}_version") =~ VERSION
-          arg
-        end
+      RC
+
+      def write_config
+        write_file('~/.pypirc', pypirc)
+      end
+
+      def pypirc
+        interpolate(PYPIRC, opts, secure: true)
+      end
+
+      def upload_docs
+        info :upload_docs
+        shell :upload_docs
+      end
+
+      def skip_existing_option
+        '--skip-existing' if skip_existing?
+      end
+
+      def docs_dir_option
+        "--upload-dir #{docs_dir}" if docs_dir
+      end
+
+      def setuptools_arg
+        version_arg(:setuptools)
+      end
+
+      def twine_arg
+        version_arg(:twine)
+      end
+
+      def wheel_arg
+        version_arg(:wheel)
+      end
+
+      def version_arg(name)
+        arg = name.to_s
+        arg << "==#{send(:"#{name}_version")}" if send(:"#{name}_version") =~ VERSION
+        arg
+      end
     end
   end
 end