travis 1.11.1 → 1.13.0

data/lib/travis/cli/lint.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 require 'yaml'
 
@@ -9,15 +11,15 @@ module Travis
       on '-x', '--[no-]exit-code', 'sets the exit code to 1 if there are warning'
 
       def run(file = nil)
-        file ||= '.travis.yml' if $stdin.tty? or $stdin.eof?
+        file ||= '.travis.yml' if $stdin.tty? || $stdin.eof?
 
-        if file and file != '-'
+        if file && (file != '-')
           debug "reading #{file}"
           error "file does not exist: #{color(file, :bold)}" unless File.exist? file
           error "cannot read #{color(file, :bold)}"          unless File.readable? file
           content = File.read(file)
         else
-          debug "reading stdin"
+          debug 'reading stdin'
           file    = 'STDIN'
           content = $stdin.read
         end
@@ -32,24 +34,24 @@ module Travis
 
         unless quiet?
           if lint.ok?
-            say "valid", color("Hooray, #{file} looks %s :)", :success)
+            say 'valid', color("Hooray, #{file} looks %s :)", :success)
           else
             say "Warnings for #{color(file, :info)}:"
             lint.warnings.each do |warning|
-              say color('[x]', [:red, :bold]) + " "
+              say "#{color('[x]', %i[red bold])} "
               if warning.key.any?
                 say [
                   color('in ', :info),
-                  color(warning.key.join('.'), [:info, :bold, :underline]),
+                  color(warning.key.join('.'), %i[info bold underline]),
                   color(' section:', :info), ' '
                 ].join
               end
-              say warning.message.gsub(/"(.*?)"/) { color($1, [:info, :important]) }
+              say warning.message.gsub(/"(.*?)"/) { color(::Regexp.last_match(1), %i[info important]) }
             end
           end
         end
 
-        exit 1 if lint.warnings? and exit_code?
+        exit 1 if lint.warnings? && exit_code?
       end
     end
   end

data/lib/travis/cli/login.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 require 'travis/tools/github'
 require 'json'
@@ -7,16 +9,17 @@ module Travis
     class Login < ApiCommand
       skip :authenticate
 
-      description "authenticates against the API and stores the token"
+      description 'authenticates against the API and stores the token'
       on('-g', '--github-token TOKEN', 'identify by GitHub token')
-      on('-T', '--auto-token',         'try to figure out who you are automatically (might send another apps token to Travis, token will not be stored)')
+      on('-T', '--auto-token',
+         'try to figure out who you are automatically (might send another apps token to Travis, token will not be stored)')
       on('--list-github-token',        'instead of actually logging in, list found GitHub tokens')
       on('--skip-token-check',         'don\'t verify the token with github')
 
       attr_accessor :user_login
 
       def list_token
-        github.after_tokens = proc { }
+        github.after_tokens = proc {}
         github.each_token do |token|
           say token
         end
@@ -26,7 +29,10 @@ module Travis
         session.access_token = nil
         github.with_token do |token|
           endpoint_config['access_token'] = github_auth(token)
-          error("user mismatch: logged in as %p instead of %p" % [user.login, user_login]) if user_login and user.login != user_login
+          if user_login && (user.login != user_login)
+            error(format('user mismatch: logged in as %p instead of %p', user.login,
+                         user_login))
+          end
           unless user.correct_scopes?
             error(
               "#{user.login} has not granted Travis CI the required permissions. " \
@@ -37,9 +43,9 @@ module Travis
           success("Successfully logged in as #{user.login}!")
         end
 
-        unless session.access_token
-          raise Travis::Client::GitHubLoginFailed, "all GitHub tokens given were invalid"
-        end
+        return if session.access_token
+
+        raise Travis::Client::GitHubLoginFailed, 'all GitHub tokens given were invalid'
       end
 
       def run
@@ -58,15 +64,15 @@ module Travis
             g.drop_token    = !list_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/logout.rb

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 
 module Travis
   module CLI
     class Logout < ApiCommand
-      description "deletes the stored API token"
+      description 'deletes the stored API token'
 
       def run
         session.logout
         endpoint_config.delete('access_token')
-        success("Successfully logged out!")
+        success('Successfully logged out!')
       end
     end
   end

data/lib/travis/cli/logs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 require 'travis/tools/safe_string'
 require 'travis/tools/system'
@@ -6,8 +8,12 @@ module Travis
   module CLI
     class Logs < RepoCommand
       attr_accessor :delete, :reason
-      description "streams test logs"
-      on('-d', '--delete [REASON]', 'remove logs') { |c, reason| c.delete, c.reason = true, reason }
+
+      description 'streams test logs'
+      on('-d', '--delete [REASON]', 'remove logs') do |c, reason|
+        c.delete = true
+        c.reason = reason
+      end
       on('-f', '--force', 'do not ask user to confirm deleting the logs')
       on('--[no-]stream', 'only print current logs, do not stream')
 
@@ -25,17 +31,19 @@ module Travis
 
       def delete_log(job)
         unless force?
-          error "not deleting logs without --force" unless interactive?
-          error "aborted" unless danger_zone? "Do you really want to delete the build log for #{color(job.inspect_info, :underline)}?"
+          error 'not deleting logs without --force' unless interactive?
+          error 'aborted' unless danger_zone? "Do you really want to delete the build log for #{color(job.inspect_info,
+                                                                                                      :underline)}?"
         end
 
-        warn "deleting log for #{color(job.inspect_info, [:bold, :info])}"
+        warn "deleting log for #{color(job.inspect_info, %i[bold info])}"
         job.delete_log(reason || {})
       end
 
       def display_log(job)
-        info "displaying logs for #{color(job.inspect_info, [:bold, :info])}"
+        info "displaying logs for #{color(job.inspect_info, %i[bold info])}"
         return print_log(job.log.body) unless stream?
+
         job.log.body { |part| print_log(part) }
       ensure
         print "\e[0m" if interactive?
@@ -47,19 +55,20 @@ module Travis
 
       private
 
-        def job(number)
-          number = last_build.number + number if number.start_with? '.'
-          job    = super(number) || build(number) || branch(number)
-          job    = job.jobs.first if job.respond_to? :jobs
-          job
-        end
+      def job(number)
+        number = last_build.number + number if number.start_with? '.'
+        job    = super(number) || build(number) || branch(number)
+        job    = job.jobs.first if job.respond_to? :jobs
+        job
+      end
 
-        def check_websocket
-          require 'websocket-native' if stream?
-        rescue LoadError => e
-          raise e if e.respond_to?(:path) and e.path != 'websocket-native'
-          info "speed up log streaming by installing the websocket-native gem"
-        end
+      def check_websocket
+        require 'websocket-native' if stream?
+      rescue LoadError => e
+        raise e if e.respond_to?(:path) && (e.path != 'websocket-native')
+
+        info 'speed up log streaming by installing the websocket-native gem'
+      end
     end
   end
-end
+end

data/lib/travis/cli/monitor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 require 'travis/tools/notification'
 
@@ -9,10 +11,10 @@ module Travis
 
       on('-r', '--repo SLUG', 'monitor given repository (can be used more than once)') do |c, slug|
         c.repos << slug
-        c.send(:error, "SLUG should be of the form OWNER/REPO") unless slug.split('/').compact.size == 2
+        c.send(:error, 'SLUG should be of the form OWNER/REPO') unless slug.split('/').compact.size == 2
       end
 
-      types = Tools::Notification::DEFAULT.map(&:to_s).join(", ")
+      types = Tools::Notification::DEFAULT.map(&:to_s).join(', ')
       on('-n', '--[no-]notify [TYPE]', "send out desktop notifications (optional type: #{types})") do |c, type|
         c.setup_notification(type)
       end
@@ -75,6 +77,7 @@ module Travis
 
       def monitor?(entity)
         return true if all?
+
         entity.pull_request? ? pull? : push?
       end
 
@@ -84,26 +87,26 @@ module Travis
           color(entity.inspect_info, [entity.color, :bold]),
           color(entity.state, entity.color),
           color(entity.commit.subject, entity.color)
-        ].join(" ")
+        ].join(' ')
         notification.notify(entity.repository.slug, [
           entity.class.name[/[^:]+$/],
           entity.number,
-          entity.state + ":",
+          "#{entity.state}:",
           entity.commit.subject
-        ].join(" "))
+        ].join(' '))
       end
 
       def handle_event(event)
         entity = event.job          || event.build
         time   = entity.finished_at || entity.started_at
         display(entity, time) if monitor? entity
-      rescue Travis::Client::Error => error
-        raise error if explode?
+      rescue Travis::Client::Error => e
+        raise e if explode?
       end
 
       def run
         listen(*repos) do |listener|
-          listener.on_connect { say description, "Monitoring #{"builds for " if builds?}%s:" }
+          listener.on_connect { say description, "Monitoring #{'builds for ' if builds?}%s:" }
           listener.on(*events) { |e| handle_event(e) }
         end
       end

data/lib/travis/cli/open.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 require 'launchy'
 
 module Travis
   module CLI
     class Open < RepoCommand
-      description "opens a build or job in the browser"
+      description 'opens a build or job in the browser'
 
       on('-g', '--github', 'Open the corresponding project, compare view or pull request on GitHub')
       on('-p', '--print',  'Print out the URL instead of opening it in a browser')
@@ -12,7 +14,7 @@ module Travis
       def run(number = nil)
         url = url_for(number)
         if print?
-          say url, "web view: %s"
+          say url, 'web view: %s'
         else
           Launchy.open(url)
         end
@@ -20,20 +22,21 @@ module Travis
 
       private
 
-        def url_for(number)
-          return repo_url unless number
-          entity = job(number) || build(number)
-          error "could not find job or build #{repository.slug}##{number}" unless entity
-          github ? entity.commit.compare_url : "#{repo_url}/#{entity.class.many}/#{entity.id}"
-        end
+      def url_for(number)
+        return repo_url unless number
 
-        def repo_url
-          "https://#{host}/#{slug}"
-        end
+        entity = job(number) || build(number)
+        error "could not find job or build #{repository.slug}##{number}" unless entity
+        github ? entity.commit.compare_url : "#{repo_url}/#{entity.class.many}/#{entity.id}"
+      end
 
-        def host
-          github ? "github.com" : session.config['host']
-        end
+      def repo_url
+        "https://#{host}/#{slug}"
+      end
+
+      def host
+        github ? 'github.com' : session.config['host']
+      end
     end
   end
 end

data/lib/travis/cli/parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 require 'optparse'
 

data/lib/travis/cli/pubkey.rb

@@ -1,13 +1,15 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'travis/cli'
 
 module Travis
   module CLI
     class Pubkey < RepoCommand
       attr_accessor :key_format
+
       description "prints out a repository's public key"
-      on('-p', '--pem', 'encode in format used by pem') { |c,_| c.key_format = :pem }
-      on('-f', '--fingerprint', 'display fingerprint')  { |c,_| c.key_format = :fingerprint }
+      on('-p', '--pem', 'encode in format used by pem') { |c, _| c.key_format = :pem }
+      on('-f', '--fingerprint', 'display fingerprint')  { |c, _| c.key_format = :fingerprint }
 
       def run
         error "#{key_format} format not supported by #{api_endpoint}" unless key
@@ -16,15 +18,15 @@ module Travis
 
       private
 
-        def key
-          key = repository.public_key
-          case self.key_format ||= :ssh
-          when :fingerprint then key.fingerprint
-          when :pem         then key.to_s
-          when :ssh         then key.to_ssh
-          else raise "unknown format #{key_format}"
-          end
+      def key
+        key = repository.public_key
+        case self.key_format ||= :ssh
+        when :fingerprint then key.fingerprint
+        when :pem         then key.to_s
+        when :ssh         then key.to_ssh
+        else raise "unknown format #{key_format}"
         end
+      end
     end
   end
 end

data/lib/travis/cli/raw.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
-require 'pp'
 
 module Travis
   module CLI
     class Raw < ApiCommand
-      description "makes an (authenticated) API call and prints out the result"
+      description 'makes an (authenticated) API call and prints out the result'
 
       skip :authenticate
       on('--[no-]json', 'display as json')
@@ -13,7 +14,7 @@ module Travis
         reply = session.get_raw(resource)
         json? ? say(reply.to_json) : pp(reply)
       rescue Travis::Client::NotFound
-        error "resource not found"
+        error 'resource not found'
       end
     end
   end

data/lib/travis/cli/regenerate_token.rb

@@ -0,0 +1,15 @@
+require 'travis/cli'
+
+module Travis
+  module CLI
+    class RegenerateToken < ApiCommand
+      description "regenerates the stored API token"
+
+      def run
+        token = session.regenerate_token['token']
+        endpoint_config['access_token'] = token
+        success("Successfully regenerated the token!")
+      end
+    end
+  end
+end

data/lib/travis/cli/remove_token.rb

@@ -0,0 +1,15 @@
+require 'travis/cli'
+
+module Travis
+  module CLI
+    class RemoveToken < ApiCommand
+      description "deletes the stored API token"
+
+      def run
+        session.remove_token
+        endpoint_config['access_token'] = nil
+        success("Successfully removed the access token!")
+      end
+    end
+  end
+end