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

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler'
 require 'term/ansicolor'
 require 'pathname'
@@ -26,7 +28,7 @@ def gem_version
   ENV['DPL_VERSION'] || Dpl::VERSION
 end
 
-def confirm(verb = "release")
+def confirm(verb = 'release')
   unless @ready
     answer = cli.ask "Ready to #{verb} `dpl` version #{gem_version}? (y/n)"
     if answer !~ /^y/i
@@ -41,63 +43,63 @@ def dpl_bin
   File.join(Gem.bindir, 'dpl')
 end
 
-gemspecs = FileList[File.join(top, "dpl-*.gemspec")]
+gemspecs = FileList[File.join(top, 'dpl-*.gemspec')]
 
 providers = gemspecs.map { |f| /dpl-(?<provider>.*)\.gemspec/ =~ f && provider }
 
-desc "Build dpl gem"
+desc 'Build dpl gem'
 file "dpl-#{gem_version}.gem" do
-  logger.info green("Building dpl gem")
-  ruby "-S gem build dpl.gemspec"
+  logger.info green('Building dpl gem')
+  ruby '-S gem build dpl.gemspec'
 end
 
-desc "Install dpl gem"
+desc 'Install dpl gem'
 file dpl_bin => "dpl-#{gem_version}.gem" do
-  logger.info green("Installing dpl gem")
+  logger.info green('Installing dpl gem')
   ruby "-S gem install dpl-#{gem_version}.gem"
 end
 
-task :default => [:spec, Rake::FileTask[dpl_bin]] do
-  Rake::Task["spec_providers"].invoke
-  Rake::Task["check_providers"].invoke
+task default: [:spec, Rake::FileTask[dpl_bin]] do
+  Rake::Task['spec_providers'].invoke
+  Rake::Task['check_providers'].invoke
 end
 
-desc "Run spec on all providers"
+desc 'Run spec on all providers'
 task :spec_providers do
   providers.each do |provider|
     Rake::Task["spec-#{provider}"].invoke
   end
 end
 
-desc "Check all provider gems install correctly"
+desc 'Check all provider gems install correctly'
 task :check_providers do
   providers.each do |provider|
     Rake::Task["check-#{provider}"].invoke
   end
 end
 
-desc "Build all gems"
-task :build => "dpl-#{gem_version}.gem" do
+desc 'Build all gems'
+task build: "dpl-#{gem_version}.gem" do
   providers.each do |provider|
     Rake::Task["dpl-#{provider}-#{gem_version}.gem"].invoke
   end
 end
 
-desc "Uninstall all gems"
+desc 'Uninstall all gems'
 task :uninstall do
   providers.each do |provider|
     Rake::Task["uninstall-#{provider}"].invoke
   end
-  logger.info red("Uninstalling dpl")
-  sh "gem uninstall -aIx dpl"
+  logger.info red('Uninstalling dpl')
+  sh 'gem uninstall -aIx dpl'
 end
 
-desc "Release all gems"
+desc 'Release all gems'
 task :release do
   confirm
   released = []
   providers.each do |provider|
-    while !released.include? provider
+    until released.include? provider
       logger.info "checking dpl-#{provider}"
 
       cli = Faraday.new url: 'https://rubygems.org'
@@ -113,12 +115,12 @@ task :release do
             if Rake::Task["release-#{provider}"].invoke
               released << provider
             end
-          rescue => e
+          rescue StandardError
             Rake::Task["release-#{provider}"].reenable
           end
         end
-      rescue Faraday::Error => e
-        logger.info yellow("connection failed. retrying")
+      rescue Faraday::Error
+        logger.info yellow('connection failed. retrying')
         retry
       end
     end
@@ -127,10 +129,10 @@ task :release do
   sh "gem push dpl-#{gem_version}.gem"
 end
 
-desc "Yank all gems"
-task :yank, [:version] do |t, args|
+desc 'Yank all gems'
+task :yank, [:version] do |_t, args|
   version = args.version
-  confirm "yank"
+  confirm 'yank'
   logger.info green("Yanking `dpl` version #{version}")
   sh "gem yank dpl -v #{version}"
   providers.each do |provider|
@@ -140,17 +142,17 @@ end
 
 task :deep_clean do
   Rake::Task[:clean].invoke
-  sh "git clean -dfx"
+  sh 'git clean -dfx'
 end
 
 task :clean do
-  rm_rf "stubs"
-  rm_rf "vendor"
-  rm_rf "dpl-*.gem"
+  rm_rf 'stubs'
+  rm_rf 'vendor'
+  rm_rf 'dpl-*.gem'
   Rake::Task[:uninstall].invoke
 end
 
-desc "Run dpl specs"
+desc 'Run dpl specs'
 task :spec do
   ruby '-S rspec spec/cli_spec.rb spec/provider_spec.rb'
 end
@@ -160,13 +162,13 @@ providers.each do |provider|
   file "Gemfile-#{provider}" do |t|
     gemfile = top + t.name
     logger.info green("Writing #{gemfile}")
-    gemfile.write %Q(source 'https://rubygems.org'\ngemspec :name => "dpl-#{provider}"\n)
+    gemfile.write %(source 'https://rubygems.org'\ngemspec :name => "dpl-#{provider}"\n)
   end
 
-  desc %Q(Run dpl-#{provider} specs)
+  desc %(Run dpl-#{provider} specs)
   task "spec-#{provider}", [:lines] => [Rake::FileTask[dpl_bin], "Gemfile-#{provider}"] do |_t, args|
-    tail = args.lines ? ":#{args.lines}" : ""
-    sh "rm -f $HOME/.npmrc"
+    tail = args.lines ? ":#{args.lines}" : ''
+    sh 'rm -f $HOME/.npmrc'
     logger.info green("Running `bundle install` for #{provider}")
     sh 'bash', '-cl', "bundle install --gemfile=Gemfile-#{provider} --path=vendor/cache/dpl-#{provider} --retry=3 --binstubs=stubs"
     logger.info green("Running specs for #{provider}")

data/bin/dpl

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
-$: << File.expand_path('../../lib', __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH << File.expand_path('../lib', __dir__)
 
 $stdout.sync = true
 $stderr.sync = true

data/dpl.gemspec

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+$LOAD_PATH << 'lib'
+
+require 'dpl/version'
+
+Gem::Specification.new do |s|
+  s.version       = Dpl::VERSION
+  s.name          = 'dpl'
+  s.authors       = ['Konstantin Haase', 'Hiro Asari', 'Sven Fuchs']
+  s.email         = ['konstantin@travis-ci.com', 'hiro@travis-ci.com', 'sven@travis-ci.com']
+  s.homepage      = 'https://github.com/travis-ci/dpl'
+  s.summary       = 'Dpl runs deployments at Travis CI'
+  s.description   = 'Dpl (dee-pee-ell) is a tool made for continuous deployment, running deployments at Travis CI.'
+  s.license       = 'MIT'
+  s.require_path  = 'lib'
+  s.required_ruby_version = '>= 3'
+
+  s.executables   = ['dpl']
+  s.files         = Dir['{config/**/*,lib/**/*,[A-Z]*}'].reject { _1.match(/dpl.+\.gem/) }
+
+  s.add_runtime_dependency 'travis-cl'
+  s.add_runtime_dependency 'travis-packagecloud-ruby'
+  s.add_development_dependency 'rake', '~> 13.0'
+end

data/lib/dpl/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cl'
 
 module Dpl
@@ -47,6 +49,7 @@ module Dpl
 
     def with_cmd_opt(args, cmd, pos)
       return args unless opt = args.detect { |arg| arg.start_with?("--#{cmd}") }
+
       ix = args.index(opt)
       args.delete(opt)
       value = opt.include?('=') ? opt.split('=').last : args.delete_at(ix)
@@ -56,39 +59,41 @@ module Dpl
 
     STRATEGIES = {
       'heroku' => 'api',
-      'pages'  => 'git'
-    }
+      'pages' => 'git'
+    }.freeze
 
-    def with_strategy_default(args, cmd)
+    def with_strategy_default(args, _cmd)
       return args unless default = STRATEGIES[args.first]
+
       args.insert(1, default) if args[1].nil? || args[1].to_s.start_with?('--')
       args
     end
 
-    def error(e)
-      msg = "\e[31m#{e.message}\e[0m"
-      msg = [msg, *e.backtrace].join("\n") if backtrace?(e)
+    def error(err)
+      msg = "\e[31m#{err.message}\e[0m"
+      msg = [msg, *err.backtrace].join("\n") if backtrace?(err)
       abort msg
     end
 
-    def backtrace?(e)
-      e.respond_to?(:backtrace?) && e.backtrace?
+    def backtrace?(err)
+      err.respond_to?(:backtrace?) && err.backtrace?
     end
 
-    def unknown_provider(e)
-      msg = "\e[31m#{e.message}\e[0m"
-      msg << "\nDid you mean: #{e.suggestions.join(', ')}?" if e.suggestions.any?
+    def unknown_provider(err)
+      msg = "\e[31m#{err.message}\e[0m"
+      msg << "\nDid you mean: #{err.suggestions.join(', ')}?" if err.suggestions.any?
       abort msg
     end
 
-    def unknown_option(e)
-      msg = "\e[31m#{e.message}\e[0m"
-      msg << "\nDid you mean: #{e.suggestions.join(', ')}?" if e.suggestions.any?
+    def unknown_option(err)
+      msg = "\e[31m#{err.message}\e[0m"
+      msg << "\nDid you mean: #{err.suggestions.join(', ')}?" if err.suggestions.any?
       abort msg
     end
 
     def suggestions(name)
       return [] unless defined?(DidYouMean)
+
       DidYouMean::SpellChecker.new(dictionary: providers).correct(name)
     end
   end

data/lib/dpl/ctx/bash.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+require 'English'
 require 'cl'
 require 'fileutils'
 require 'logger'
@@ -14,7 +17,8 @@ module Dpl
       attr_accessor :folds, :stdout, :stderr, :last_out, :last_err
 
       def initialize(stdout = $stdout, stderr = $stderr)
-        @stdout, @stderr = stdout, stderr
+        @stdout = stdout
+        @stderr = stderr
         @folds = 0
         super('dpl', abort: false)
       end
@@ -25,7 +29,7 @@ module Dpl
       # closes the fold.
       #
       # @param msg [String] the message that will appear on the log fold
-      def fold(msg, &block)
+      def fold(msg)
         self.folds += 1
         print "travis_fold:start:dpl.#{folds}\r\e[K"
         time do
@@ -41,13 +45,13 @@ module Dpl
       # Starts a travis time log tag, calls the block, and closes the tag,
       # including timing information. This makes a timing badge appear on
       # the surrounding log fold.
-      def time(&block)
+      def time
         id = SecureRandom.hex[0, 8]
-        start = Time.now.to_i * (10 ** 9)
+        start = Time.now.to_i * (10**9)
         print "travis_time:start:#{id}\r\e[K"
         yield
       ensure
-        finish = Time.now.to_i * (10 ** 9)
+        finish = Time.now.to_i * (10**9)
         duration = finish - start
         print "\ntravis_time:end:#{id}:start=#{start},finish=#{finish},duration=#{duration}\r\e[K"
       end
@@ -135,6 +139,7 @@ module Dpl
       def apts_get(packages)
         packages = packages.reject { |name, cmd = name| which(cmd || name) }
         return unless packages.any?
+
         apt_update
         packages.each { |package, cmd| apt_get(package, cmd || package, update: false) }
       end
@@ -148,6 +153,7 @@ module Dpl
       # @param cmd [String] an executable installed by the package, defaults to the package name
       def apt_get(package, cmd = package, opts = {})
         return if which(cmd)
+
         apt_update unless opts[:update].is_a?(FalseClass)
         shell "sudo apt-get -qq install #{package}", retry: true
       end
@@ -177,7 +183,7 @@ module Dpl
           # Gem.loaded_specs.clear
           gemfile do
             source 'https://rubygems.org'
-            gems.each { |g| gem *g }
+            gems.each { |g| gem(*g) }
           end
           # https://github.com/bundler/bundler/issues/7181
           ENV.replace(env)
@@ -265,8 +271,8 @@ module Dpl
           send(cmd.capture? ? :open3 : :system, cmd.cmd, cmd.opts)
         end
 
-        info cmd.success % { out: last_out } if success? && cmd.success?
-        error cmd.error % { err: last_err } if failed? && cmd.assert?
+        info format(cmd.success, out: last_out) if success? && cmd.success?
+        error format(cmd.error, err: last_err) if failed? && cmd.assert?
 
         success? && cmd.capture? ? last_out.chomp : @last_status
       end
@@ -324,12 +330,12 @@ module Dpl
       # Internal, and not to be used by implementors. $? is a read-only
       # variable, so we use a method that we can stub during tests.
       def last_process_status
-        $?.success?
+        $CHILD_STATUS.success?
       end
 
       # Whether or not the current Ruby process runs with superuser priviledges.
       def sudo?
-        Process::UID.eid == 0
+        Process::UID.eid.zero?
       end
 
       # Returns current repository name
@@ -491,14 +497,14 @@ module Dpl
       def move_files(paths)
         paths.each do |path|
           target = "#{tmp_dir}/#{File.basename(path)}"
-          mv(path, target) if File.exists?(path)
+          mv(path, target) if File.exist?(path)
         end
       end
 
       def unmove_files(paths)
         paths.each do |path|
           source = "#{tmp_dir}/#{File.basename(path)}"
-          mv(source, path) if File.exists?(source)
+          mv(source, path) if File.exist?(source)
         end
       end
 

data/lib/dpl/ctx/test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cl'
 require 'stringio'
 require 'dpl/helper/squiggle'
@@ -42,7 +44,11 @@ module Dpl
       def gem_require(name, version = nil, opts = {})
         # not sure why this is needed. bundler should take care of this, but
         # it does not for octokit for whatever reason
-        require opts[:require] || name rescue nil
+        begin
+          require opts[:require] || name
+        rescue StandardError
+          nil
+        end
         cmds << "[gem:require] #{name} (#{version}, #{opts})"
       end
 
@@ -54,16 +60,17 @@ module Dpl
         cmds << "[pip:install] #{name} (#{cmd}, #{version})"
       end
 
-      def ssh_keygen(name, file)
+      def ssh_keygen(_name, file)
         File.open(file, 'w+') { |f| f.write('private-key') }
         File.open("#{file}.pub", 'w+') { |f| f.write('ssh-rsa public-key') }
       end
 
-      def shell(cmd, opts = {})
+      def shell(cmd, _opts = {})
         info cmd.msg if cmd.msg?
         info cmd.echo if cmd.echo?
         cmds << cmd.cmd
         return stdout[cmd.key] if stdout.key?(cmd.key)
+
         cmd.capture? ? 'captured_stdout' : true
       end
 
@@ -128,15 +135,15 @@ module Dpl
         true
       end
 
-      def git_log(args)
+      def git_log(_args)
         'commits'
       end
 
       def git_ls_files
-        %w(one two)
+        %w[one two]
       end
 
-      def git_ls_remote?(url, ref)
+      def git_ls_remote?(_url, _ref)
         true
       end
 
@@ -168,7 +175,7 @@ module Dpl
         '1'
       end
 
-      def which(cmd)
+      def which(_cmd)
         false
       end
 
@@ -177,10 +184,9 @@ module Dpl
         'tmp'
       end
 
-      def sleep(*)
-      end
+      def sleep(*); end
 
-      def encoding(path)
+      def encoding(_path)
         'text'
       end
 
@@ -195,7 +201,7 @@ module Dpl
       end
 
       def file_size(path)
-        File.size(path.sub("#{File.expand_path('~')}", './home'))
+        File.size(path.sub(File.expand_path('~').to_s, './home'))
       end
 
       def move_files(paths)
@@ -222,19 +228,19 @@ module Dpl
         cmds << [:chmod, perm, path].join(' ')
       end
 
-      def write_file(path, content, chmod = nil)
+      def write_file(path, content, _chmod = nil)
         path = File.expand_path(path)
-        path = path.sub("#{File.expand_path('~')}", './home')
+        path = path.sub(File.expand_path('~').to_s, './home')
         FileUtils.mkdir_p(File.dirname(path))
         File.open(path, 'w+') { |f| f.write(content) }
       end
 
       def write_netrc(machine, login, password)
-        write_file('~/.netrc', sq(<<-rc))
+        write_file('~/.netrc', sq(<<-RC))
           machine #{machine}
             login #{login}
             password #{password}
-        rc
+        RC
       end
 
       def tty?

data/lib/dpl/ctx.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'dpl/ctx/bash'
 require 'dpl/ctx/test'

data/lib/dpl/helper/assets.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 module Dpl
@@ -5,7 +7,7 @@ module Dpl
     class Asset < Struct.new(:provider, :namespace, :name)
       include FileUtils
 
-      DIR = File.expand_path('../../assets', __FILE__)
+      DIR = File.expand_path('../assets', __dir__)
 
       def copy(target)
         cp path, File.expand_path(target)
@@ -16,7 +18,7 @@ module Dpl
       end
 
       def exists?
-        File.exists?(path)
+        File.exist?(path)
       end
 
       def unknown

data/lib/dpl/helper/cmd.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   # Represents a shell command
   class Cmd < Struct.new(:provider, :key, :opts)
@@ -141,27 +143,27 @@ module Dpl
 
     private
 
-      def lookup(type, *keys)
-        str = provider.send(type, *keys) if provider
-        str || keys.detect { |key| key.is_a?(String) }
-      end
+    def lookup(type, *keys)
+      str = provider.send(type, *keys) if provider
+      str || keys.detect { |key| key.is_a?(String) }
+    end
 
-      def missing(type, *keys)
-        raise("Could not find #{type}: #{keys.compact.map(&:inspect).join(', ')}")
-      end
+    def missing(type, *keys)
+      raise("Could not find #{type}: #{keys.compact.map(&:inspect).join(', ')}")
+    end
 
-      def interpolate(str, args, opts = {})
-        provider ? provider.interpolate(str, args, opts) : str
-      end
+    def interpolate(str, args, opts = {})
+      provider ? provider.interpolate(str, args, opts) : str
+    end
 
-      def silence(str)
-        "#{str} > /dev/null 2>&1"
-      end
+    def silence(str)
+      "#{str} > /dev/null 2>&1"
+    end
 
-      # Activates the Python virtualenv for the given Python version.
-      def python(cmd)
-        # "bash -c 'source $HOME/virtualenv/python#{opts[:python]}/bin/activate; #{cmd.gsub(/'/, "'\\\\''")}'"
-        "source $HOME/virtualenv/python#{opts[:python]}/bin/activate && #{cmd}"
-      end
+    # Activates the Python virtualenv for the given Python version.
+    def python(cmd)
+      # "bash -c 'source $HOME/virtualenv/python#{opts[:python]}/bin/activate; #{cmd.gsub(/'/, "'\\\\''")}'"
+      "source $HOME/virtualenv/python#{opts[:python]}/bin/activate && #{cmd}"
+    end
   end
 end

data/lib/dpl/helper/config_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dpl
   module ConfigFile
     def self.included(base)
@@ -29,14 +31,14 @@ module Dpl
       end
 
       def parse(path)
-        str = File.exists?(path) ? File.read(path) : ''
+        str = File.exist?(path) ? File.read(path) : ''
         opts = str.lines.select { |line| line.include?('=') }.map(&:strip)
         opts = opts.map { |pair| pair.split('=', 2) }.to_h
-        opts.map { |key, value| [strip_prefix(key).to_sym, value] }.to_h
+        opts.transform_keys { |key| strip_prefix(key).to_sym }
       end
 
       def strip_prefix(str)
-        opts[:prefix] ? str.sub(/^#{opts[:prefix]}[\-_]?/, '') : str
+        opts[:prefix] ? str.sub(/^#{opts[:prefix]}[-_]?/, '') : str
       end
     end