travis 1.11.0 → 1.12.0

data/lib/travis/cli/setup/sauce_connect.rb

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
   module CLI
     class Setup
       class SauceConnect < Service
-        description "Sauce Connet addon for Sauce Labs integration"
-        service_name "sauce_connect"
+        description 'Sauce Connet addon for Sauce Labs integration'
+        service_name 'sauce_connect'
 
         def run
           travis_config['addons'] ||= {}
           configure 'sauce_connect', {}, travis_config['addons'] do |config|
-            config['username']   = ask("Sauce Labs user: ").to_s
-            config['access_key'] = ask("Sauce Labs access key: ") { |q| q.echo = "*" }.to_s
-            encrypt(config, 'access_key') if agree("Encrypt access key? ") { |q| q.default = 'yes' }
+            config['username']   = ask('Sauce Labs user: ').to_s
+            config['access_key'] = ask('Sauce Labs access key: ') { |q| q.echo = '*' }.to_s
+            encrypt(config, 'access_key') if agree('Encrypt access key? ') { |q| q.default = 'yes' }
           end
         end
       end

data/lib/travis/cli/setup/service.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/cli/setup'
 
 module Travis
@@ -9,7 +11,7 @@ module Travis
         end
 
         def self.description(description = nil)
-          @description ||= ""
+          @description ||= ''
           @description = description if description
           @description
         end
@@ -36,39 +38,48 @@ module Travis
 
         private
 
-          def on(question, config, condition)
-            return unless agree(question) { |q| q.default = 'yes' }
-            config['on'] ||= {}
-            config['on'].merge! condition
-          end
+        def on(question, config, condition)
+          return unless agree(question) { |q| q.default = 'yes' }
 
-          def encrypt(config, key)
-            encrypted   = repository.encrypt(config.fetch(key))
-            config[key] = { 'secure' => encrypted }
-          end
+          config['on'] ||= {}
+          config['on'].merge! condition
+        end
 
-          def configure(key, value = {}, config = travis_config)
-            error "#{key} section already exists in .travis.yml, run with --force to override" if config.include? key and not force?
-            yield(config[key] = value)
-          end
+        def encrypt(config, key)
+          encrypted   = repository.encrypt(config.fetch(key))
+          config[key] = { 'secure' => encrypted }
+        end
 
-          def branch
-            @branch ||= `git rev-parse --symbolic-full-name --abbrev-ref HEAD`.chomp
+        def configure(key, value = {}, config = travis_config)
+          if config.include?(key) && !force?
+            error "#{key} section already exists in .travis.yml, run with --force to override"
           end
+          yield(config[key] = value)
+        end
 
-          def deploy(provider, verb = "deploy")
-            configure('deploy', 'provider' => provider) do |config|
-              yield config
-
-              on("#{verb.capitalize} only from #{repository.slug}? ", config, 'repo' => repository.slug)
-              on("#{verb.capitalize} from #{branch} branch? ", config, 'branch' => branch) if branch != 'master' and branch != 'HEAD'
+        def branch
+          @branch ||= `git rev-parse --symbolic-full-name --abbrev-ref HEAD`.chomp
+        end
 
-              config['skip_cleanup'] = 'true' if not ( config.has_key?('skip_cleanup') or config.fetch('edge', 'false') != 'false' )
+        def deploy(provider, verb = 'deploy')
+          configure('deploy', 'provider' => provider) do |config|
+            yield config
 
-              encrypt(config, 'password') if config['password'] and agree("Encrypt Password? ") { |q| q.default = 'yes' }
-              encrypt(config, 'api_key')  if config['api_key']  and agree("Encrypt API key? ") { |q| q.default = 'yes' }
+            on("#{verb.capitalize} only from #{repository.slug}? ", config, 'repo' => repository.slug)
+            if (branch != 'master') && (branch != 'HEAD')
+              on("#{verb.capitalize} from #{branch} branch? ", config,
+                 'branch' => branch)
             end
+
+            config['skip_cleanup'] = 'true' unless config.key?('skip_cleanup') || (config.fetch('edge',
+                                                                                                'false') != 'false')
+
+            encrypt(config, 'password') if config['password'] && agree('Encrypt Password? ') do |q|
+                                             q.default = 'yes'
+                                           end
+            encrypt(config, 'api_key')  if config['api_key']  && agree('Encrypt API key? ') { |q| q.default = 'yes' }
           end
+        end
       end
     end
   end

data/lib/travis/cli/setup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 
 module Travis
@@ -32,14 +34,14 @@ module Travis
       autoload :Deis,             'travis/cli/setup/deis'
       autoload :Service,          'travis/cli/setup/service'
 
-      description "sets up an addon or deploy target"
+      description 'sets up an addon or deploy target'
       on('-f', '--force', 'override config section if it already exists')
 
       def self.service(name)
         normal_name = Service.normalized_name(name)
         const_name  = constants(false).detect { |c| Service.normalized_name(c) == normal_name }
         constant    = const_get(const_name) if const_name
-        constant if constant and constant < Service and constant.known_as? name
+        constant if constant && (constant < Service) && constant.known_as?(name)
       end
 
       def self.services
@@ -47,7 +49,9 @@ module Travis
       end
 
       def help
-        services = self.class.services.map { |s| "\t" << color(s.service_name.ljust(20), :command) << color(s.description, :info) }.join("\n")
+        services = self.class.services.map do |s|
+          "\t" << color(s.service_name.ljust(20), :command) << color(s.description, :info)
+        end.join("\n")
         super("\nAvailable services:\n\n#{services}\n\n")
       end
 

data/lib/travis/cli/show.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 
 module Travis
   module CLI
     class Show < RepoCommand
-      description "displays a build or job"
+      description 'displays a build or job'
 
       def run(number = last_build.number)
-        number = repository.branch(number).number if number !~ /^\d+(\.\d+)?$/ and repository.branch(number)
+        number = repository.branch(number).number if number !~ /^\d+(\.\d+)?$/ && repository.branch(number)
         entity = job(number) || build(number)
 
         error "could not find job or build #{repository.slug}##{number}" unless entity
@@ -17,7 +19,7 @@ module Travis
           entity.commit.subject,
           entity.state,
           entity.color,
-          entity.pull_request? ? "pull request" : "push",
+          entity.pull_request? ? 'pull request' : 'push',
           entity.branch_info,
           entity.commit.short_sha,
           entity.commit.compare_url,
@@ -33,13 +35,13 @@ module Travis
               color("##{job.number} #{job.state}:".ljust(16), [job.color, :bold]),
               formatter.duration(job.duration).ljust(14),
               formatter.job_config(job.config),
-              (color("(failure allowed)", :info) if job.allow_failures?)
-            ].compact.join(" ").rstrip
+              (color('(failure allowed)', :info) if job.allow_failures?)
+            ].compact.join(' ').rstrip
           end
         else
           config = formatter.job_config(entity.config)
-          say color("Allow Failure: ", :info) + entity.allow_failures?.inspect
-          say color("Config:        ", :info) + config unless config.empty?
+          say color('Allow Failure: ', :info) + entity.allow_failures?.inspect
+          say color('Config:        ', :info) + config unless config.empty?
         end
       end
     end
@@ -56,4 +58,4 @@ __END__
 <[[ color("Compare URL:   ", :info) ]]>%s
 <[[ color("Duration:      ", :info) ]]>%s
 <[[ color("Started:       ", :info) ]]>%s
-<[[ color("Finished:      ", :info) ]]>%s
+<[[ color("Finished:      ", :info) ]]>%s

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,39 +59,39 @@ module Travis
         github.with_token do |token|
           access_token = github_auth(token)
         end
-        session.access_token = nil
-        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
@@ -108,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,12 +1,12 @@
+# 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'
@@ -66,11 +66,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 +80,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 +92,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