travis 1.11.0 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd56aab41cadf71c5d3e17baa3e32ef92c12b47df8433885cd93bfcdeba0a3ac
-  data.tar.gz: 31dfb62475ae626176823ce90347915da42e601c44f570cac6ee338bb4a923c1
+  metadata.gz: d0b5c4a5f4cbdfb25775698bedbd1cd824829126ef517f1f5b46dfe87269eb55
+  data.tar.gz: 49ef3fdf23e50443114305980b451502613322ae67b118cc21512a755b55aae3
 SHA512:
-  metadata.gz: 1f3035ba8ccbf3031a84796f3d16ca3f88d93512a7250b71a3d6f773e19b95b4662ccf96ee350331b89403c437ce98f1ae3f921cb4ec2249f6529a13c51eb258
-  data.tar.gz: c8277df2456d7e9386a6241804e91078a378014804073efaed2c5f6c91d75db8fe51ab4dd180f74cfe3242b4c4f3d55ccd0f04b6a2dbd89e2544b595e7fbfcc6
+  metadata.gz: c3d2c85a4a706274f514e593bb56adf3a25f95ba732030c9a47c49c2c0fdc1fbef46bbea4006d2efe555d48c70a80d057fe03d4536da5f713f443c9d5a770d3f
+  data.tar.gz: 28f140f38fbfa6f479ff816c4174480d408c90ed4b4f79229c3a4449bdba3abd492acea894d951f679a91be1583b192650109fb36c6efd1f7978a4be1f551d75

data/README.md

@@ -1,8 +1,8 @@
-# The Travis Client [![Build Status](https://travis-ci.com/travis-ci/travis.rb.svg?branch=master)](https://travis-ci.com/travis-ci/travis.rb)
+# The Travis Client [![Build Status](https://app.travis-ci.com/travis-ci/travis.rb.svg?branch=master)](https://app.travis-ci.com/github/travis-ci/travis.rb)
 
-![The Travis Mascot](http://about.travis-ci.org/images/travis-mascot-200px.png)
+![The Travis Mascot](https://about.travis-ci.org/images/travis-mascot-200px.png)
 
-The [travis gem](https://rubygems.org/gems/travis) includes both a [command line client](#command-line-client) and a [Ruby library](#ruby-library) to interface with a Travis CI service. Both work with [travis-ci.org](https://travis-ci.org), [travis-ci.com](https://travis-ci.com) or any custom Travis CI setup you might have. Check out the [installation instructions](#installation) to get it running in no time.
+The [travis gem](https://rubygems.org/gems/travis) includes both a [command line client](#command-line-client) and a [Ruby library](#ruby-library) to interface with a Travis CI service using GitHub account. Both work with [travis-ci.com](https://travis-ci.com) or any custom Travis CI setup you might have. Check out the [installation instructions](#installation) to get it running in no time.
 
 ## Table of Contents
 
@@ -81,7 +81,7 @@ The [travis gem](https://rubygems.org/gems/travis) includes both a [command line
 
 ## Command Line Client
 
-![](http://about.travis-ci.org/images/new-tricks.png)
+![](https://docs.travis-ci.com/images/new-tricks.png)
 
 There are three types of commands: [Non-API Commands](#non-api-commands), [General API Commands](#general-api-commands) and [Repository Commands](#repository-commands). All commands take the form of `travis COMMAND [ARGUMENTS] [OPTIONS]`. You can get a list of commands by running [`help`](#help).
 
@@ -2066,6 +2066,20 @@ See https://github.com/travis-ci/travis.rb/issues/768#issuecomment-700220351 for
 
 ## Version History
 
+### 1.12.0
+
+* Upgraded ruby version to 3.2 https://github.com/travis-ci/travis.rb/pull/848
+* Added API Key Reset Capabilities https://github.com/travis-ci/travis.rb/pull/842
+* Fix travis lint issues https://github.com/travis-ci/travis.rb/pull/840
+
+### 1.11.1
+
+* Fix `travis sshkey --generate` https://github.com/travis-ci/travis.rb/pull/820
+
+### 1.11.0
+
+* Removed authentication with password https://github.com/travis-ci/travis.rb/pull/811
+
 ### 1.10.1
 
 * Fix `travis monitor` command https://github.com/travis-ci/travis.rb/pull/770

data/Rakefile

@@ -1,26 +1,27 @@
-# encoding: utf-8
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.expand_path('lib', __dir__)
 windows = RUBY_PLATFORM =~ /mswin|mingw/
 
 require 'bundler/gem_tasks'
 
-desc "run specs"
-task(:spec) { ruby "-S rspec spec#{" -c" unless windows}" }
+desc 'run specs'
+task(:spec) { ruby "-S rspec spec#{' -c' unless windows}" }
 
-desc "generate gemspec, update readme"
-task :update => :completion do
+desc 'generate gemspec, update readme'
+task update: :completion do
   require 'travis/version'
   content = File.read('travis.gemspec')
 
   # fetch data
   fields = {
-    :authors => sort_by_commits_alpha(`git shortlog -sn`.b, /[^\d\s].*/).uniq,
-    :email   => sort_by_commits_alpha(`git shortlog -sne`.b, /[^<]+@[^>]+/).uniq,
-    :files   => `git ls-files`.b.split("\n").reject { |f| f =~ /^(\.|Gemfile)/ }
+    authors: sort_by_commits_alpha(`git shortlog -sn`.b, /[^\d\s].*/).uniq,
+    email: sort_by_commits_alpha(`git shortlog -sne`.b, /[^<]+@[^>]+/).uniq,
+    files: `git ls-files`.b.split("\n").reject { |f| f =~ /^(\.|Gemfile)/ }
   }
 
   # :(
-  fields[:email].delete("konstantin.haase@gmail.com")
+  fields[:email].delete('konstantin.haase@gmail.com')
 
   # insert data
   fields.each do |field, values|
@@ -31,7 +32,7 @@ task :update => :completion do
   end
 
   # set version
-  content.sub! /(s\.version.*=\s+).*/, "\\1\"#{Travis::VERSION}\""
+  content.sub!(/(s\.version.*=\s+).*/, "\\1\"#{Travis::VERSION}\"")
 
   # escape unicode
   content.gsub!(/./) { |c| c.bytesize > 1 ? "\\u{#{c.codepoints.first.to_s(16)}}" : c }
@@ -39,12 +40,13 @@ task :update => :completion do
   File.open('travis.gemspec', 'w') { |f| f << content }
 
   readme = File.read('README.md').b
-  readme.gsub! /^(\s+\$ travis version\n\s+).*$/, "\\1#{Travis::VERSION}"
-  readme.gsub! /(gem install travis -v )\S+/, "\\1#{Travis::VERSION}"
-  readme.gsub! /^\*\*#{Regexp.escape(Travis::VERSION)}\*\* \(not yet released?\)\n/i, "**#{Travis::VERSION}** (#{Time.now.strftime("%B %-d, %Y")})\n"
+  readme.gsub!(/^(\s+\$ travis version\n\s+).*$/, "\\1#{Travis::VERSION}")
+  readme.gsub!(/(gem install travis -v )\S+/, "\\1#{Travis::VERSION}")
+  readme.gsub!(/^\*\*#{Regexp.escape(Travis::VERSION)}\*\* \(not yet released?\)\n/i,
+               "**#{Travis::VERSION}** (#{Time.now.strftime('%B %-d, %Y')})\n")
 
   Travis::CLI.commands.each do |c|
-    readme.sub! /^(        \* \[\`#{c.command_name}\`\]\(##{c.command_name}\)).*$/, "\\1 - #{c.description}"
+    readme.sub!(/^(        \* \[`#{c.command_name}`\]\(##{c.command_name}\)).*$/, "\\1 - #{c.description}")
   end
 
   File.write('README.md', readme)
@@ -58,13 +60,13 @@ end
 task 'travis.gemspec' => :update
 task 'README.md'      => :update
 
-task :gemspec => :update
-task :default => :spec
-task :default => :gemspec unless windows or RUBY_VERSION < '2.0'
-task :test    => :spec
+task gemspec: :update
+task default: :spec
+task default: :gemspec unless windows || (RUBY_VERSION < '2.0')
+task test: :spec
 
 def sort_by_commits_alpha(shortlog_output, patt)
-  shortlog_output.split("\n").sort do |a,b|
+  shortlog_output.split("\n").sort do |a, b|
     a_comm, a_name = a.strip.split(/\t/)
     b_comm, b_name = b.strip.split(/\t/)
 

data/bin/travis

@@ -1,16 +1,18 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # :(
 Encoding.default_external = Encoding::UTF_8 if defined? Encoding
 
 # load travis library
-require 'bundler/setup' if File.exist? File.expand_path('../../Gemfile', __FILE__)
+require 'bundler/setup' if File.exist? File.expand_path('../Gemfile', __dir__)
 require 'travis/cli'
 
 # load plugins
-TRAVIS_PLUGINS = []
+TRAVIS_PLUGINS = [].freeze
 config_path    = ENV.fetch('TRAVIS_CONFIG_PATH') { File.expand_path('.travis', Dir.home) }
 Dir.glob(File.expand_path('*/init.rb', config_path)) do |file|
-  TRAVIS_PLUGINS << file.sub(config_path + '/', '').sub(/\/init\.rb$/, '')
+  TRAVIS_PLUGINS << file.sub("#{config_path}/", '').sub(%r{/init\.rb$}, '')
   load(file)
 end
 

data/examples/org_overview.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis'
 repos = Travis::Repository.find_all(owner_name: 'travis-ci')
 repos.each { |repo| puts "#{repo.slug} #{repo.last_build_state}" }

data/examples/pro_auth.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'travis/pro'
 require 'travis/tools/github'
 require 'highline/import' # so we can hide the password
 
-github_token = ask("GitHub token: ")
+github_token = ask('GitHub token: ')
 
 # Set up GitHub tool for doing the login handshake.
 github = Travis::Tools::Github.new(drop_token: true) do |g|

data/examples/stream.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require 'travis'
 
 Travis.listen do |listener|
-  listener.on("job:started")  { |e| puts "job started for #{e.repository.slug}"  }
-  listener.on("job:finished") { |e| puts "job finished for #{e.repository.slug}" }
-end
+  listener.on('job:started')  { |e| puts "job started for #{e.repository.slug}"  }
+  listener.on('job:finished') { |e| puts "job finished for #{e.repository.slug}" }
+end

data/lib/travis/auto_login.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis'
 require 'travis/client/auto_login'
 Travis::Client::AutoLogin.new(Travis).authenticate

data/lib/travis/cli/accounts.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 
 module Travis
   module CLI
     class Accounts < ApiCommand
-      description "displays accounts and their subscription status"
+      description 'displays accounts and their subscription status'
 
       def run
         authenticate
@@ -13,18 +15,19 @@ module Travis
             color(account.login, [color, :bold]),
             color("(#{account.name || account.login.capitalize}):", color),
             "#{description(account)},",
-            account.repos_count == 1 ? "1 repository" : "#{account.repos_count} repositories"
-          ].join(" ")
-        end
-        unless accounts.none?(&:on_trial?) or session.config['host'].nil?
-          say session.config['host'], "To set up a subscription, please visit %s."
+            account.repos_count == 1 ? '1 repository' : "#{account.repos_count} repositories"
+          ].join(' ')
         end
+        return if accounts.none?(&:on_trial?) || session.config['host'].nil?
+
+        say session.config['host'], 'To set up a subscription, please visit %s.'
       end
 
       def description(account)
-        return "subscribed"          if account.subscribed?
-        return "educational account" if account.educational?
-        "not subscribed"
+        return 'subscribed'          if account.subscribed?
+        return 'educational account' if account.educational?
+
+        'not subscribed'
       end
     end
   end

data/lib/travis/cli/api_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 require 'travis/tools/github'
 
@@ -7,24 +9,25 @@ module Travis
       include Travis::Client::Methods
       attr_accessor :enterprise_name
       attr_reader :session
+
       abstract
 
       on('-e', '--api-endpoint URL', 'Travis API server to talk to')
       on('-I', '--[no-]insecure', 'do not verify SSL certificate of API endpoint')
-      on('--pro', "short-cut for --api-endpoint '#{Travis::Client::COM_URI}'") { |c,_| c.api_endpoint = Travis::Client::COM_URI }
-      on('--com', "short-cut for --api-endpoint '#{Travis::Client::COM_URI}'") { |c,_| c.api_endpoint = Travis::Client::COM_URI }
-      on('--org', "short-cut for --api-endpoint '#{Travis::Client::ORG_URI}'") { |c,_| c.api_endpoint = Travis::Client::ORG_URI }
-      on('--staging', 'talks to staging system') { |c,_| c.api_endpoint = c.api_endpoint.gsub(/api/, 'api-staging') }
+      on('--pro', "short-cut for --api-endpoint '#{Travis::Client::COM_URI}'") { |c, _| c.api_endpoint = Travis::Client::COM_URI }
+      on('--com', "short-cut for --api-endpoint '#{Travis::Client::COM_URI}'") { |c, _| c.api_endpoint = Travis::Client::COM_URI }
+      on('--org', "short-cut for --api-endpoint '#{Travis::Client::ORG_URI}'") { |c, _| c.api_endpoint = Travis::Client::ORG_URI }
+      on('--staging', 'talks to staging system') { |c, _| c.api_endpoint = c.api_endpoint.gsub(/api/, 'api-staging') }
       on('-t', '--token [ACCESS_TOKEN]', 'access token to use') { |c, t| c.access_token = t }
 
-      on('--debug', 'show API requests') do |c,_|
+      on('--debug', 'show API requests') do |c, _|
         c.debug = true
         c.session.instrument do |info, request|
           c.time(info, request)
         end
       end
 
-      on('--debug-http', 'show HTTP(S) exchange') do |c,_|
+      on('--debug-http', 'show HTTP(S) exchange') do |c, _|
         c.session.debug_http = true
       end
 
@@ -34,19 +37,17 @@ module Travis
 
       on('--adapter ADAPTER', 'Faraday adapter to use for HTTP requests. If omitted, use Typhoeus if it is installed, ' \
         'and Net::HTTP otherwise. See https://lostisland.github.io/faraday/adapters/ for more info') do |c, adapter|
-        begin
-          adapter.gsub! '-', '_'
-          require "faraday/adapter/#{adapter}"
-          require 'typhoeus/adapters/faraday' if adapter == 'typhoeus'
-          c.session.faraday_adapter = adapter.to_sym
-        rescue LoadError => e
-          warn "\`--adapter #{adapter}\` is given, but it is not installed. Run \`gem install #{adapter}\` and try again"
-          exit 1
-        end
+        adapter.gsub! '-', '_'
+        require "faraday/adapter/#{adapter}"
+        require 'typhoeus/adapters/faraday' if adapter == 'typhoeus'
+        c.session.faraday_adapter = adapter.to_sym
+      rescue LoadError
+        warn "\`--adapter #{adapter}\` is given, but it is not installed. Run \`gem install #{adapter}\` and try again"
+        exit 1
       end
 
       def initialize(*)
-        @session = Travis::Client.new(:agent_info => "command #{command_name}")
+        @session = Travis::Client.new(agent_info: "command #{command_name}")
         super
       end
 
@@ -62,8 +63,8 @@ module Travis
         endpoint_config['access_token'] ||= access_token
         endpoint_config['insecure']       = insecure unless insecure.nil?
         self.insecure                     = endpoint_config['insecure']
-        session.ssl                       = { :verify => false } if insecure?
-        authenticate if pro? or enterprise?
+        session.ssl                       = { verify: false } if insecure?
+        authenticate if pro? || enterprise?
       end
 
       def enterprise?
@@ -90,12 +91,12 @@ module Travis
         user.sync
 
         steps = count = 1
-        while block and user.reload.syncing?
+        while block && user.reload.syncing?
           count += 1
           sleep(1)
 
-          if count % steps == 0
-            steps = count/10 + 1
+          if (count % steps).zero?
+            steps = count / 10 + 1
             output.print dot
           end
         end
@@ -103,84 +104,87 @@ module Travis
 
       private
 
-        def setup_enterprise
-          return unless setup_enterprise?
-          c = config['enterprise'] ||= {}
-          c[enterprise_name] = api_endpoint if explicit_api_endpoint?
-          c[enterprise_name] ||= write_to($stderr) do
-            error "enterprise setup not configured" unless interactive?
-            user_input                  = ask(color("Enterprise domain: ", :bold)).to_s
-            domain                      = user_input[%r{^(?:https?://)?(.*?)/?(?:/api/?)?$}, 1]
-            endpoint                    = "https://#{domain}/api"
-            config['default_endpoint']  = endpoint if agree("Use #{color domain, :bold} as default endpoint? ") { |q| q.default = 'yes' }
-            endpoint
-          end
-          self.api_endpoint             = c[enterprise_name]
-          self.insecure                 = insecure unless insecure.nil?
-          self.session.ssl.delete :ca_file
-          endpoint_config['enterprise'] = true
-          @setup_ennterpise             = true
-        end
-
-        def setup_enterprise?
-          @setup_ennterpise ||= false
-          !!enterprise_name and not @setup_ennterpise
+      def setup_enterprise
+        return unless setup_enterprise?
+
+        c = config['enterprise'] ||= {}
+        c[enterprise_name] = api_endpoint if explicit_api_endpoint?
+        c[enterprise_name] ||= write_to($stderr) do
+          error 'enterprise setup not configured' unless interactive?
+          user_input                  = ask(color('Enterprise domain: ', :bold)).to_s
+          domain                      = user_input[%r{^(?:https?://)?(.*?)/?(?:/api/?)?$}, 1]
+          endpoint                    = "https://#{domain}/api"
+          config['default_endpoint']  = endpoint if agree("Use #{color domain, :bold} as default endpoint? ") { |q| q.default = 'yes' }
+          endpoint
         end
+        self.api_endpoint             = c[enterprise_name]
+        self.insecure                 = insecure unless insecure.nil?
+        session.ssl.delete :ca_file
+        endpoint_config['enterprise'] = true
+        @setup_ennterpise             = true
+      end
 
-        def load_gh
+      def setup_enterprise?
+        @setup_ennterpise ||= false
+        !!enterprise_name and not @setup_ennterpise
+      end
 
-          gh_config       = session.config['github']
-          gh_config     &&= gh_config.inject({}) { |h,(k,v)| h.update(k.to_sym => v) }
-          gh_config     ||= {}
-          gh_config[:ssl] = Travis::Client::Session::SSL_OPTIONS
-          gh_config[:ssl] = { :verify => false } if gh_config[:api_url] and gh_config[:api_url] != "https://api.github.com"
-          gh_config.delete :scopes
+      def load_gh
+        gh_config       = session.config['github']
+        gh_config     &&= gh_config.inject({}) { |h, (k, v)| h.update(k.to_sym => v) }
+        gh_config     ||= {}
+        gh_config[:ssl] = Travis::Client::Session::SSL_OPTIONS
+        gh_config[:ssl] = { verify: false } if gh_config[:api_url] && gh_config[:api_url] != 'https://api.github.com'
+        gh_config.delete :scopes
 
+        if debug?
           gh_config[:instrumenter] = proc do |type, payload, &block|
             next block.call unless type == 'http.gh'
-            time("GitHub API: #{payload[:verb].to_s.upcase} #{payload[:url]}", block)
-          end if debug?
 
-          GH.set(gh_config)
+            time("GitHub API: #{payload[:verb].to_s.upcase} #{payload[:url]}", block)
+          end
         end
 
-        def github_endpoint
-          load_gh
-          GH.with({}).api_host
-        end
+        GH.set(gh_config)
+      end
 
-        def listen(*args)
-          super(*args) do |listener|
-            on_signal { listener.disconnect }
-            yield listener
-          end
-        end
+      def github_endpoint
+        load_gh
+        GH.with({}).api_host
+      end
 
-        def default_endpoint
-          ENV['TRAVIS_ENDPOINT'] || config['default_endpoint']
+      def listen(*args)
+        super(*args) do |listener|
+          on_signal { listener.disconnect }
+          yield listener
         end
+      end
 
-        def detected_endpoint
-          default_endpoint || Travis::Client::ORG_URI
-        end
+      def default_endpoint
+        ENV['TRAVIS_ENDPOINT'] || config['default_endpoint']
+      end
 
-        def endpoint_option
-          return ""       if org? and detected_endpoint?
-          return " --org" if org?
-          return " --pro" if pro?
+      def detected_endpoint
+        default_endpoint || Travis::Client::COM_URI
+      end
 
-          if config['enterprise']
-            key, _ = config['enterprise'].detect { |k,v| v.start_with? api_endpoint }
-            return " -X"        if key == "default"
-            return " -X #{key}" if key
-          end
+      def endpoint_option
+        return ""       if pro? and detected_endpoint?
+        return " --org" if org?
+        return " --pro" if pro?
 
-          " -e %p" % api_endpoint
+        if config['enterprise']
+          key, _ = config['enterprise'].detect { |k,v| v.start_with? api_endpoint }
+          return " -X"        if key == "default"
+          return " -X #{key}" if key
         end
 
-        def fetch_token
-          ENV['TRAVIS_TOKEN'] || endpoint_config['access_token']
-        end
+        " -e %p" % api_endpoint
+      end
+
+      def fetch_token
+        ENV['TRAVIS_TOKEN'] || endpoint_config['access_token']
+      end
     end
   end
 end

data/lib/travis/cli/branches.rb

@@ -1,25 +1,27 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 
 module Travis
   module CLI
     class Branches < RepoCommand
-      description "displays the most recent build for each branch"
+      description 'displays the most recent build for each branch'
 
       def run
         repository.last_on_branch.each do |build|
           say [
-            color("#{build.branch_info}:".ljust(longest + 2), [:info, :bold]),
+            color("#{build.branch_info}:".ljust(longest + 2), %i[info bold]),
             color("##{build.number.to_s.ljust(4)} #{build.state}".ljust(16), build.color),
             build.commit.subject
-          ].join(" ").strip + "\n"
+          ].join(' ').strip + "\n"
         end
       end
 
       private
 
-        def longest
-          repository.branches.keys.map { |b| b.size }.max
-        end
+      def longest
+        repository.branches.keys.map { |b| b.size }.max
+      end
     end
   end
 end

data/lib/travis/cli/cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 
 module Travis
@@ -16,61 +18,63 @@ module Travis
 
         warn "Deleted the following caches:\n" if delete?
         branches.each { |name, list| display_branch(name, list) }
-        size = caches.inject(0) { |s,c| s + c.size }
-        say "Overall size of above caches: " << formatter.file_size(size)
+        size = caches.inject(0) { |s, c| s + c.size }
+        say 'Overall size of above caches: ' << formatter.file_size(size)
       end
 
       private
 
-        def check_caches
-          return if caches.any?
-          say "no caches found"
-          exit
-        end
+      def check_caches
+        return if caches.any?
 
-        def display_branch(name, list)
-          say color(name ? "On branch #{name}:" : "Global:", :important)
-          list.each { |c| display_cache(c) }
-          puts
-        end
+        say 'no caches found'
+        exit
+      end
 
-        def display_cache(cache)
-          say [
-            color(cache.slug.ljust(space), :bold),
-            "last modified: " << formatter.time(cache.last_modified),
-            "size: " << formatter.file_size(cache.size)
-          ].join("  ") << "\n"
-        end
+      def display_branch(name, list)
+        say color(name ? "On branch #{name}:" : 'Global:', :important)
+        list.each { |c| display_cache(c) }
+        puts
+      end
 
-        def params
-          params = {}
-          params[:branch] = branch if branch?
-          params[:match]  = match  if match?
-          params
-        end
+      def display_cache(cache)
+        say [
+          color(cache.slug.ljust(space), :bold),
+          'last modified: ' << formatter.time(cache.last_modified),
+          'size: ' << formatter.file_size(cache.size)
+        ].join('  ') << "\n"
+      end
 
-        def caches
-          @caches ||= drop? ? repository.delete_caches(params) : repository.caches(params)
-        end
+      def params
+        params = {}
+        params[:branch] = branch if branch?
+        params[:match]  = match  if match?
+        params
+      end
 
-        def space
-          @space ||= caches.map(&:slug).map(&:size).max
-        end
+      def caches
+        @caches ||= drop? ? repository.delete_caches(params) : repository.caches(params)
+      end
 
-        def drop?
-          return false unless delete?
-          return true if force?
-          error "not deleting caches without --force" unless interactive?
-          error "aborted" unless danger_zone? "Do you really want to delete #{description}?"
-          true
-        end
+      def space
+        @space ||= caches.map(&:slug).map(&:size).max
+      end
+
+      def drop?
+        return false unless delete?
+        return true if force?
 
-        def description
-          description = color("all caches", :important)
-          description << " on branch #{color(branch, :important)}" if branch?
-          description << " that match #{color(match, :important)}" if match?
-          description
-        end
+        error 'not deleting caches without --force' unless interactive?
+        error 'aborted' unless danger_zone? "Do you really want to delete #{description}?"
+        true
+      end
+
+      def description
+        description = color('all caches', :important)
+        description << " on branch #{color(branch, :important)}" if branch?
+        description << " that match #{color(match, :important)}" if match?
+        description
+      end
     end
   end
 end