travis 1.11.1 → 1.13.0

data/lib/travis/cli/sshkey.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 require 'travis/tools/ssl_key'
 require 'travis/tools/github'
@@ -5,7 +7,7 @@ require 'travis/tools/github'
 module Travis
   module CLI
     class Sshkey < RepoCommand
-      description "checks, updates or deletes an SSH key"
+      description 'checks, updates or deletes an SSH key'
       on '-D', '--delete',                  'remove SSH key'
       on '-d', '--description DESCRIPTION', 'set description'
       on '-u', '--upload FILE',             'upload key from given file'
@@ -30,25 +32,26 @@ module Travis
         say "Current SSH key: #{color(ssh_key.description, :info)}"
         say "Finger print:    #{color(ssh_key.fingerprint, :info)}"
       rescue Travis::Client::NotFound
-        say "No custom SSH key installed."
+        say 'No custom SSH key installed.'
         exit 1 if check?
       end
 
       def update_key(value, file)
         error "#{file} does not look like a private key" unless value.lines.first =~ /PRIVATE KEY/
         value = remove_passphrase(value)
-        self.description ||= ask("Key description: ") { |q| q.default = "Custom Key" } if interactive?
+        self.description ||= ask('Key description: ') { |q| q.default = 'Custom Key' } if interactive?
         say "Updating ssh key for #{color slug, :info} with key from #{color file, :info}"
         empty_line
-        ssh_key.update(:value => value, :description => description || file)
+        ssh_key.update(value:, description: description || file)
       end
 
       def delete_key
-        return if interactive? and not danger_zone? "Remove SSH key for #{color slug, :info}?"
+        return if interactive? && !danger_zone?("Remove SSH key for #{color slug, :info}?")
+
         say "Removing ssh key for #{color slug, :info}"
         ssh_key.delete
       rescue Travis::Client::NotFound
-        warn "no key found to remove"
+        warn 'no key found to remove'
       end
 
       def generate_key
@@ -56,38 +59,39 @@ module Travis
         github.with_token do |token|
           access_token = github_auth(token)
         end
-        unless access_token
-          raise Travis::Client::GitHubLoginFailed, "all GitHub tokens given were invalid"
-        end
+        raise Travis::Client::GitHubLoginFailed, 'all GitHub tokens given were invalid' unless access_token
+
         gh = GH.with(token: github_token)
         login = gh['user']['login']
         check_access(gh)
         empty_line
 
-        say "Generating RSA key."
+        say 'Generating RSA key.'
         private_key        = Tools::SSLKey.generate_rsa
         self.description ||= "key for fetching dependencies for #{slug} via #{login}"
 
-        say "Uploading public key to GitHub."
-        gh.post("/user/keys", :title => "#{description} (Travis CI)", :key => Tools::SSLKey.rsa_ssh(private_key.public_key))
+        say 'Uploading public key to GitHub.'
+        gh.post('/user/keys', title: "#{description} (Travis CI)",
+                              key: Tools::SSLKey.rsa_ssh(private_key.public_key))
 
-        say "Uploading private key to Travis CI."
-        ssh_key.update(:value => private_key.to_s, :description => description)
+        say 'Uploading private key to Travis CI.'
+        ssh_key.update(value: private_key.to_s, description:)
 
         empty_line
-        say "You can store the private key to reuse it for other repositories (travis sshkey --upload FILE)."
-        if agree("Store private key? ") { |q| q.default = "no" }
-          path = ask("Path: ") { |q| q.default = "id_travis_rsa" }
-          File.write(path, private_key.to_s)
-        end
+        say 'You can store the private key to reuse it for other repositories (travis sshkey --upload FILE).'
+        return unless agree('Store private key? ') { |q| q.default = 'no' }
+
+        path = ask('Path: ') { |q| q.default = 'id_travis_rsa' }
+        File.write(path, private_key.to_s)
       end
 
       def remove_passphrase(value)
         return value unless Tools::SSLKey.has_passphrase? value
-        return Tools::SSLKey.remove_passphrase(value, passphrase) || error("wrong pass phrase") if passphrase
-        error "Key is encrypted, but missing --passphrase option" unless interactive?
-        say "The private key is protected by a pass phrase."
-        result = Tools::SSLKey.remove_passphrase(value, ask("Enter pass phrase: ") { |q| q.echo = "*" }) until result
+        return Tools::SSLKey.remove_passphrase(value, passphrase) || error('wrong pass phrase') if passphrase
+
+        error 'Key is encrypted, but missing --passphrase option' unless interactive?
+        say 'The private key is protected by a pass phrase.'
+        result = Tools::SSLKey.remove_passphrase(value, ask('Enter pass phrase: ') { |q| q.echo = '*' }) until result
         empty_line
         result
       end
@@ -107,15 +111,15 @@ module Travis
             g.github_token  = github_token
             g.login_header  = proc { login_header }
             g.debug         = proc { |log| debug(log) }
-            g.after_tokens  = proc { g.explode = true and error("no suitable github token found") }
+            g.after_tokens  = proc { g.explode = true and error('no suitable github token found') }
           end
         end
       end
 
       def login_header
-        say "GitHub deprecated its Authorizations API exchanging a password for a token."
-        say "Please visit https://github.blog/2020-07-30-token-authentication-requirements-for-api-and-git-operations for more information."
-        say "Try running with #{color("--github-token", :info)} or #{color("--auto-token", :info)} ."
+        say 'GitHub deprecated its Authorizations API exchanging a password for a token.'
+        say 'Please visit https://github.blog/2020-07-30-token-authentication-requirements-for-api-and-git-operations for more information.'
+        say "Try running with #{color('--github-token', :info)} or #{color('--auto-token', :info)} ."
       end
     end
   end

data/lib/travis/cli/status.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 
 module Travis
   module CLI
     class Status < RepoCommand
-      description "checks status of the latest build"
+      description 'checks status of the latest build'
 
       on '-x', '--[no-]exit-code',    'sets the exit code to 1 if the build failed'
       on '-q', '--[no-]quiet',        'does not print anything'
@@ -11,8 +13,8 @@ module Travis
 
       def run
         say color(last_build.state, last_build.color), "build ##{last_build.number} %s" unless quiet?
-        exit 1 if exit_code?    and last_build.unsuccessful?
-        exit 1 if fail_pending? and last_build.pending?
+        exit 1 if exit_code?    && last_build.unsuccessful?
+        exit 1 if fail_pending? && last_build.pending?
       end
     end
   end

data/lib/travis/cli/sync.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 
 module Travis
   module CLI
     class Sync < ApiCommand
-      description "triggers a new sync with GitHub"
+      description 'triggers a new sync with GitHub'
 
       on '-c', '--check',      'only check the sync status'
       on '-b', '--background', 'will trigger sync but not block until sync is done'
@@ -13,16 +15,16 @@ module Travis
         authenticate
 
         if check?
-          say "#{"not " unless user.syncing?}syncing", "#{user.login} is currently %s"
-        elsif user.syncing? and not force?
-          error "user is already syncing"
+          say "#{'not ' unless user.syncing?}syncing", "#{user.login} is currently %s"
+        elsif user.syncing? && !force?
+          error 'user is already syncing'
         elsif background?
-          say "starting synchronization"
+          say 'starting synchronization'
           sync(false)
         else
-          say "synchronizing: "
+          say 'synchronizing: '
           sync
-          say color(" done", :success)
+          say color(' done', :success)
         end
       end
     end

data/lib/travis/cli/token.rb

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 
 module Travis
   module CLI
     class Token < ApiCommand
-      description "outputs the secret API token"
+      description 'outputs the secret API token'
 
       def run
         authenticate
-        say access_token, "Your access token is %s"
+        say access_token, 'Your access token is %s'
       end
     end
   end

data/lib/travis/cli/version.rb

@@ -1,17 +1,18 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 require 'travis/version'
 
 module Travis
   module CLI
     class Version < Command
-      description "outputs the client version"
+      description 'outputs the client version'
 
       def run
         say Travis::VERSION
       end
 
-      def check_version
-      end
+      def check_version; end
     end
   end
 end

data/lib/travis/cli/whatsup.rb

@@ -1,30 +1,32 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 
 module Travis
   module CLI
     class Whatsup < ApiCommand
-      description "lists most recent builds"
+      description 'lists most recent builds'
       on('-m', '--my-repos', 'Only display my own repositories')
 
       def run
-        say "nothing to show" if recent.empty?
+        say 'nothing to show' if recent.empty?
 
         recent.each do |repo|
           say [
             color(repo.slug, [:bold, repo.color]),
             color("#{repo.last_build.state}: ##{repo.last_build.number}", repo.color)
-          ].join(" ")
+          ].join(' ')
         end
       end
 
       private
 
-        def recent
-          @recent ||= begin
-            recent = my_repos ? repos : repos(:member => user.login)
-            recent.select { |repo| repo.last_build }
-          end
+      def recent
+        @recent ||= begin
+          recent = my_repos ? repos : repos(member: user.login)
+          recent.select { |repo| repo.last_build }
         end
+      end
     end
   end
 end

data/lib/travis/cli/whoami.rb

@@ -3,12 +3,12 @@ require 'travis/cli'
 module Travis
   module CLI
     class Whoami < ApiCommand
-      description "outputs the current user"
+      description 'outputs the current user'
 
       def run
         authenticate
         name = " (#{user.name})" unless user.name.to_s.empty?
-        say user.login, "You are %s" << name.to_s
+        say user.login, 'You are %s' << name.to_s
       end
     end
   end

data/lib/travis/cli.rb

@@ -1,58 +1,60 @@
+# frozen_string_literal: true
+
 begin
   require 'travis/client'
 rescue LoadError => e
-  if e.message == 'no such file to load -- json'
-    $stderr.puts "You should either run `gem install json` or upgrade your Ruby version!"
-    exit 1
-  else
-    raise e
-  end
+  raise e unless e.message == 'no such file to load -- json'
+
+  warn 'You should either run `gem install json` or upgrade your Ruby version!'
+  exit 1
 end
 
 require 'stringio'
 
 module Travis
   module CLI
-    autoload :Token,        'travis/cli/token'
-    autoload :ApiCommand,   'travis/cli/api_command'
-    autoload :Accounts,     'travis/cli/accounts'
-    autoload :Branches,     'travis/cli/branches'
-    autoload :Cache,        'travis/cli/cache'
-    autoload :Cancel,       'travis/cli/cancel'
-    autoload :Command,      'travis/cli/command'
-    autoload :Console,      'travis/cli/console'
-    autoload :Disable,      'travis/cli/disable'
-    autoload :Enable,       'travis/cli/enable'
-    autoload :Encrypt,      'travis/cli/encrypt'
-    autoload :EncryptFile,  'travis/cli/encrypt_file'
-    autoload :Endpoint,     'travis/cli/endpoint'
-    autoload :Env,          'travis/cli/env'
-    autoload :Help,         'travis/cli/help'
-    autoload :History,      'travis/cli/history'
-    autoload :Init,         'travis/cli/init'
-    autoload :Lint,         'travis/cli/lint'
-    autoload :Login,        'travis/cli/login'
-    autoload :Logout,       'travis/cli/logout'
-    autoload :Logs,         'travis/cli/logs'
-    autoload :Monitor,      'travis/cli/monitor'
-    autoload :Open,         'travis/cli/open'
-    autoload :Parser,       'travis/cli/parser'
-    autoload :Pubkey,       'travis/cli/pubkey'
-    autoload :Raw,          'travis/cli/raw'
-    autoload :RepoCommand,  'travis/cli/repo_command'
-    autoload :Report,       'travis/cli/report'
-    autoload :Repos,        'travis/cli/repos'
-    autoload :Restart,      'travis/cli/restart'
-    autoload :Requests,     'travis/cli/requests'
-    autoload :Settings,     'travis/cli/settings'
-    autoload :Setup,        'travis/cli/setup'
-    autoload :Show,         'travis/cli/show'
-    autoload :Sshkey,       'travis/cli/sshkey'
-    autoload :Status,       'travis/cli/status'
-    autoload :Sync,         'travis/cli/sync'
-    autoload :Version,      'travis/cli/version'
-    autoload :Whatsup,      'travis/cli/whatsup'
-    autoload :Whoami,       'travis/cli/whoami'
+    autoload :Token,           'travis/cli/token'
+    autoload :ApiCommand,      'travis/cli/api_command'
+    autoload :Accounts,        'travis/cli/accounts'
+    autoload :Branches,        'travis/cli/branches'
+    autoload :Cache,           'travis/cli/cache'
+    autoload :Cancel,          'travis/cli/cancel'
+    autoload :Command,         'travis/cli/command'
+    autoload :Console,         'travis/cli/console'
+    autoload :Disable,         'travis/cli/disable'
+    autoload :Enable,          'travis/cli/enable'
+    autoload :Encrypt,         'travis/cli/encrypt'
+    autoload :EncryptFile,     'travis/cli/encrypt_file'
+    autoload :Endpoint,        'travis/cli/endpoint'
+    autoload :Env,             'travis/cli/env'
+    autoload :Help,            'travis/cli/help'
+    autoload :History,         'travis/cli/history'
+    autoload :Init,            'travis/cli/init'
+    autoload :Lint,            'travis/cli/lint'
+    autoload :Login,           'travis/cli/login'
+    autoload :Logout,          'travis/cli/logout'
+    autoload :Logs,            'travis/cli/logs'
+    autoload :Monitor,         'travis/cli/monitor'
+    autoload :Open,            'travis/cli/open'
+    autoload :Parser,          'travis/cli/parser'
+    autoload :Pubkey,          'travis/cli/pubkey'
+    autoload :Raw,             'travis/cli/raw'
+    autoload :RegenerateToken, 'travis/cli/regenerate_token'
+    autoload :RemoveToken,     'travis/cli/remove_token'
+    autoload :RepoCommand,     'travis/cli/repo_command'
+    autoload :Report,          'travis/cli/report'
+    autoload :Repos,           'travis/cli/repos'
+    autoload :Restart,         'travis/cli/restart'
+    autoload :Requests,        'travis/cli/requests'
+    autoload :Settings,        'travis/cli/settings'
+    autoload :Setup,           'travis/cli/setup'
+    autoload :Show,            'travis/cli/show'
+    autoload :Sshkey,          'travis/cli/sshkey'
+    autoload :Status,          'travis/cli/status'
+    autoload :Sync,            'travis/cli/sync'
+    autoload :Version,         'travis/cli/version'
+    autoload :Whatsup,         'travis/cli/whatsup'
+    autoload :Whoami,          'travis/cli/whoami'
 
     extend self
 
@@ -66,11 +68,11 @@ module Travis
 
     def command(name)
       const_name = command_name(name)
-      constant   = CLI.const_get(const_name) if const_name =~ /^[A-Z][A-Za-z]+$/ and const_defined? const_name
+      constant   = CLI.const_get(const_name) if const_name =~ (/^[A-Z][A-Za-z]+$/) && const_defined?(const_name)
       if command? constant
         constant
       else
-        $stderr.puts "unknown command #{name}"
+        warn "unknown command #{name}"
         exit 1
       end
     end
@@ -80,8 +82,10 @@ module Travis
     end
 
     def silent
-      stderr, $stderr = $stderr, dummy_io
-      stdout, $stdout = $stdout, dummy_io
+      stderr = $stderr
+      $stderr = dummy_io
+      stdout = $stdout
+      $stdout = dummy_io
       yield
     ensure
       $stderr = stderr if stderr
@@ -90,37 +94,38 @@ module Travis
 
     private
 
-      def try_const_get(name)
-        CLI.const_get(name)
-      rescue Exception
-      end
+    def try_const_get(name)
+      CLI.const_get(name)
+    rescue Exception
+    end
 
-      def dummy_io
-        return StringIO.new unless defined? IO::NULL and IO::NULL
-        File.open(IO::NULL, 'w')
-      end
+    def dummy_io
+      return StringIO.new unless defined? IO::NULL && IO::NULL
 
-      def command?(constant)
-        constant.is_a? Class and constant < Command and not constant.abstract?
-      end
+      File.open(IO::NULL, 'w')
+    end
+
+    def command?(constant)
+      constant.is_a? Class and constant < Command and !constant.abstract?
+    end
 
-      def command_name(name)
-        case name
-        when nil, '-h', '-?' then 'Help'
-        when '-v'            then 'Version'
-        when /^--/           then command_name(name[2..-1])
-        else name.split('-').map(&:capitalize).join
-        end
+    def command_name(name)
+      case name
+      when nil, '-h', '-?' then 'Help'
+      when '-v'            then 'Version'
+      when /^--/           then command_name(name[2..])
+      else name.split('-').map(&:capitalize).join
       end
+    end
 
-      # can't use flatten as it will flatten hashes
-      def preparse(unparsed, args = [], opts = {})
-        case unparsed
-        when Hash  then opts.merge! unparsed
-        when Array then unparsed.each { |e| preparse(e, args, opts) }
-        else args << unparsed.to_s
-        end
-        [args, opts]
+    # can't use flatten as it will flatten hashes
+    def preparse(unparsed, args = [], opts = {})
+      case unparsed
+      when Hash  then opts.merge! unparsed
+      when Array then unparsed.each { |e| preparse(e, args, opts) }
+      else args << unparsed.to_s
       end
+      [args, opts]
+    end
   end
 end

data/lib/travis/client/account.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/client'
 
 module Travis
@@ -32,11 +34,11 @@ module Travis
       end
 
       def repos_count
-        load_attribute("repos_count") { repositories.count }
+        load_attribute('repos_count') { repositories.count }
       end
 
       def repositories
-        attributes['repositories'] ||= session.repos(:owner_name => login)
+        attributes['repositories'] ||= session.repos(owner_name: login)
       end
 
       def member?
@@ -47,10 +49,10 @@ module Travis
 
       private
 
-        def load_attribute(name, &block)
-          session.accounts if missing? name
-          block ? attributes.fetch(name.to_s, &block) : attributes[name.to_s]
-        end
+      def load_attribute(name, &block)
+        session.accounts if missing? name
+        block ? attributes.fetch(name.to_s, &block) : attributes[name.to_s]
+      end
     end
   end
 end

data/lib/travis/client/artifact.rb

@@ -1,12 +1,13 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'travis/client'
 require 'travis/tools/safe_string'
 
 module Travis
   module Client
     class Artifact < Entity
-      CHUNKED = "application/json; chunked=true; version=2, application/json; version=2"
-      TEXT    = "#{CHUNKED}, text/plain"
+      CHUNKED = 'application/json; chunked=true; version=2, application/json; version=2'
+      TEXT    = "#{CHUNKED}, text/plain".freeze
 
       # @!parse attr_reader :job_id, :type, :body
       attributes :job_id, :type, :body
@@ -15,11 +16,12 @@ module Travis
       has :job
 
       def delete_body(reason = {})
-        reason = { :reason => reason } unless reason.is_a? Hash
+        reason = { reason: } unless reason.is_a? Hash
         session.patch_raw("jobs/#{job_id}/log", reason)
         reload
-      rescue Travis::Client::Error => error
-        raise unless error.message == '409'
+      rescue Travis::Client::Error => e
+        raise unless e.message == '409'
+
         self
       end
 
@@ -39,32 +41,34 @@ module Travis
         attributes['current_body'] ||= begin
           body = load_attribute('body')
           if body.to_s.empty?
-            log  = session.get_raw("jobs/#{job_id}/log", nil, "Accept" => TEXT)
-            body = String === log ? log : log['log']['body']
+            log  = session.get_raw("jobs/#{job_id}/log", nil, 'Accept' => TEXT)
+            body = log.is_a?(String) ? log : log['log']['body']
           end
           body
         end
       end
 
       def body(stream = block_given?)
-        return current_body unless block_given? or stream
-        return yield(current_body) unless stream and job.pending?
+        return current_body unless block_given? || stream
+        return yield(current_body) unless stream && job.pending?
+
         number = 0
 
         session.listen(self) do |listener|
           listener.on 'job:log' do |event|
             next unless event.payload['number'] > number
+
             number = event.payload['number']
             yield event.payload['_log']
             listener.disconnect if event.payload['final']
           end
 
-          listener.on 'job:finished' do |event|
+          listener.on 'job:finished' do |_event|
             listener.disconnect
           end
 
           listener.on_connect do
-            data = session.get_raw("/logs/#{id}", nil, "Accept" => CHUNKED)['log']
+            data = session.get_raw("/logs/#{id}", nil, 'Accept' => CHUNKED)['log']
             if data['parts']
               data['parts'].each { |p| yield p['content'] }
               number = data['parts'].last['number'] if data['parts'].any?

data/lib/travis/client/auto_login.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/client'
 require 'travis/tools/github'
 require 'yaml'
@@ -12,12 +14,13 @@ module Travis
         @session     = session.session
         config_path  = ENV.fetch('TRAVIS_CONFIG_PATH') { File.expand_path('.travis', Dir.home) }
         @config_file = options.fetch(:config_file) { File.expand_path('config.yml', config_path) }
-        @auto_token  = options.fetch(:auto_token) { true }
-        @raise       = options.fetch(:raise) { true }
+        @auto_token  = options.fetch(:auto_token, true)
+        @raise       = options.fetch(:raise, true)
       end
 
       def authenticate
-        return if session.access_token = cli_token
+        return if (session.access_token = cli_token)
+
         github.with_token { |t| session.github_auth(t) }
       end
 
@@ -25,7 +28,7 @@ module Travis
         @github         ||= Tools::Github.new(session.config['github']) do |g|
           g.explode       = true
           g.auto_token    = @auto_token
-          g.after_tokens  = proc { raise NoTokenError, "no suitable github token found" } if @raise
+          g.after_tokens  = proc { raise NoTokenError, 'no suitable github token found' } if @raise
         end
       end
 

data/lib/travis/client/broadcast.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/client'
 
 module Travis