travis 1.11.1 → 1.12.0

data/lib/travis/cli/encrypt.rb

@@ -1,38 +1,39 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'travis/cli'
 
 module Travis
   module CLI
     class Encrypt < RepoCommand
-      description "encrypts values for the .travis.yml"
+      description 'encrypts values for the .travis.yml'
       attr_accessor :config_key
 
       on('-a', '--add [KEY]', 'adds it to .travis.yml under KEY (default: env.global)') do |c, value|
         c.config_key = value || 'env.global'
       end
 
-      on('-s', '--[no-]split', "treat each line as a separate input")
+      on('-s', '--[no-]split', 'treat each line as a separate input')
       on('-p', '--append',     "don't override existing values, instead treat as list")
-      on('-x', '--override',   "override existing value")
+      on('-x', '--override',   'override existing value')
 
       def run(*args)
         confirm = force_interactive.nil? || force_interactive
-        error "cannot combine --override and --append"   if append?   and override?
-        error "--append without --add makes no sense"    if append?   and not add?
-        error "--override without --add makes no sense"  if override? and not add?
-        self.override |= !config_key.start_with?('env.') if add?      and not append?
+        error 'cannot combine --override and --append'   if append?   && override?
+        error '--append without --add makes no sense'    if append?   && !add?
+        error '--override without --add makes no sense'  if override? && !add?
+        self.override |= !config_key.start_with?('env.') if add?      && !append?
 
-        if args.first =~ %r{\w+/\w+} && !args.first.include?("=")
-          warn "WARNING: The name of the repository is now passed to the command with the -r option:"
+        if args.first =~ %r{\w+/\w+} && !args.first.include?('=')
+          warn 'WARNING: The name of the repository is now passed to the command with the -r option:'
           warn "    #{command("encrypt [...] -r #{args.first}")}"
-          warn "  If you tried to pass the name of the repository as the first argument, you"
+          warn '  If you tried to pass the name of the repository as the first argument, you'
           warn "  probably won't get the results you wanted.\n"
         end
 
-        data = args.join(" ")
+        data = args.join(' ')
 
         if data.empty?
-          say color("Reading from stdin, press Ctrl+D when done", :info) if $stdin.tty?
+          say color('Reading from stdin, press Ctrl+D when done', :info) if $stdin.tty?
           data = $stdin.read
         end
 
@@ -41,69 +42,68 @@ module Travis
         encrypted = data.map { |data| repository.encrypt(data) }
 
         if config_key
-          set_config encrypted.map { |e| { 'secure' => e } }
+          set_config(encrypted.map { |e| { 'secure' => e } })
           confirm_and_save_travis_config confirm
         else
-          list = encrypted.map { |data| format(data.inspect, "  secure: %s") }
+          list = encrypted.map { |data| format(data.inspect, '  secure: %s') }
           say(list.join("\n"), template(__FILE__), :none)
         end
-      rescue OpenSSL::PKey::RSAError => error
-        error "#{error.message.sub(" for key size", "")} - consider using "    <<
-          color("travis encrypt-file", [:red, :bold]) <<
-          color(" or ", :red)                         <<
-          color("travis env set", [:red, :bold])
+      rescue OpenSSL::PKey::RSAError => e
+        error "#{e.message.sub(' for key size', '')} - consider using " <<
+              color('travis encrypt-file', %i[red bold]) <<
+              color(' or ', :red) <<
+              color('travis env set', %i[red bold])
       end
 
       private
 
-        def add?
-          !!config_key
-        end
+      def add?
+        !!config_key
+      end
 
-        def set_config(result)
-          parent_config[last_key] = merge_config(result)
-        end
+      def set_config(result)
+        parent_config[last_key] = merge_config(result)
+      end
 
-        def merge_config(result)
-          case subconfig = (parent_config[last_key] unless override?)
-          when nil   then result.size == 1 ? result.first : result
-          when Array then subconfig + result
-          else            result.unshift(subconfig)
-          end
+      def merge_config(result)
+        case subconfig = (parent_config[last_key] unless override?)
+        when nil   then result.size == 1 ? result.first : result
+        when Array then subconfig + result
+        else            result.unshift(subconfig)
         end
+      end
 
-        def subconfig
-        end
+      def subconfig; end
 
-        def key_chain
-          @key_chain ||= config_key.split('.')
-        end
+      def key_chain
+        @key_chain ||= config_key.split('.')
+      end
 
-        def last_key
-          key_chain.last
-        end
+      def last_key
+        key_chain.last
+      end
 
-        def parent_config
-          @parent_config ||= traverse_config(travis_config, *key_chain[0..-2])
-        end
+      def parent_config
+        @parent_config ||= traverse_config(travis_config, *key_chain[0..-2])
+      end
 
-        def traverse_config(hash, key = nil, *rest)
-          return hash unless key
+      def traverse_config(hash, key = nil, *rest)
+        return hash unless key
 
-          hash[key] = case value = hash[key]
-                      when nil  then {}
-                      when Hash then value
-                      else { 'matrix' => Array(value) }
-                      end
+        hash[key] = case value = hash[key]
+                    when nil  then {}
+                    when Hash then value
+                    else { 'matrix' => Array(value) }
+                    end
 
-          traverse_config(hash[key], *rest)
-        end
+        traverse_config(hash[key], *rest)
+      end
 
-        def warn_env_assignments(data)
-          if /env/.match(config_key) && data.find { |d| /=/.match(d).nil? }
-            warn "Environment variables in #{config_key} should be formatted as FOO=bar"
-          end
-        end
+      def warn_env_assignments(data)
+        return unless /env/.match(config_key) && data.find { |d| /=/.match(d).nil? }
+
+        warn "Environment variables in #{config_key} should be formatted as FOO=bar"
+      end
     end
   end
 end

data/lib/travis/cli/encrypt_file.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'travis/cli'
 require 'travis/tools/system'
 
@@ -11,6 +12,7 @@ module Travis
   module CLI
     class EncryptFile < RepoCommand
       attr_accessor :stage
+
       description 'encrypts a file and adds decryption steps to .travis.yml'
       on '-K', '--key KEY', 'encryption key to be used (randomly generated otherwise)'
       on '--iv IV', 'encryption IV to be used (randomly generated otherwise)'
@@ -18,7 +20,8 @@ module Travis
       on '-f', '--force', 'override output file if it exists'
       on '-p', '--print-key', 'print (possibly generated) key and iv'
       on '-w', '--decrypt-to PATH', 'where to write the decrypted file to on the Travis CI VM'
-      on '-a', '--add [STAGE]', 'automatically add command to .travis.yml (default stage is before_install)' do |c, stage|
+      on '-a', '--add [STAGE]',
+         'automatically add command to .travis.yml (default stage is before_install)' do |c, stage|
         c.stage = stage || 'before_install'
       end
 
@@ -37,7 +40,7 @@ module Travis
           write_file(output_path, result, force)
           return if decrypt?
 
-          error "requires --decrypt-to option when reading from stdin" unless decrypt_to?
+          error 'requires --decrypt-to option when reading from stdin' unless decrypt_to?
 
           set_env_vars(input_path)
 
@@ -52,8 +55,8 @@ module Travis
         super
         self.key        ||= SecureRandom.hex(32) unless decrypt?
         self.iv         ||= SecureRandom.hex(16) unless decrypt?
-        error "key must be 64 characters long and a valid hex number" unless key =~ /^[a-f0-9]{64}$/
-        error "iv must be 32 characters long and a valid hex number"  unless iv  =~ /^[a-f0-9]{32}$/
+        error 'key must be 64 characters long and a valid hex number' unless key =~ /^[a-f0-9]{64}$/
+        error 'iv must be 32 characters long and a valid hex number'  unless iv  =~ /^[a-f0-9]{32}$/
       end
 
       def print_command(command)
@@ -69,13 +72,15 @@ module Travis
       end
 
       def decrypt_command(path)
-        "openssl aes-256-cbc -K $#{env_name(path, :key)} -iv $#{env_name(path, :iv)} -in #{escape_path(path)} -out #{escape_path(decrypt_to)} -d"
+        "openssl aes-256-cbc -K $#{env_name(path,
+                                            :key)} -iv $#{env_name(path,
+                                                                   :iv)} -in #{escape_path(path)} -out #{escape_path(decrypt_to)} -d"
       end
 
       def set_env_vars(input_path)
-        say "storing secure env variables for decryption"
-        repository.env_vars.upsert env_name(input_path, :key), key, :public => false
-        repository.env_vars.upsert env_name(input_path, :iv),  iv,  :public => false
+        say 'storing secure env variables for decryption'
+        repository.env_vars.upsert env_name(input_path, :key), key, public: false
+        repository.env_vars.upsert env_name(input_path, :iv),  iv,  public: false
       end
 
       def env_name(input_path, name)
@@ -84,20 +89,24 @@ module Travis
       end
 
       def notes(input_path, output_path)
-        say "\nkey: #{color(key, :info)}\niv:  #{color(iv,  :info)}" if print_key?
+        say "\nkey: #{color(key, :info)}\niv:  #{color(iv, :info)}" if print_key?
         empty_line
         say "Make sure to add #{color(output_path, :info)} to the git repository."
-        say "Make sure #{color("not", :underline)} to add #{color(input_path, :info)} to the git repository." if input_path != '-'
+        if input_path != '-'
+          say "Make sure #{color('not',
+                                 :underline)} to add #{color(input_path,
+                                                             :info)} to the git repository."
+        end
         say "Commit all changes to your #{color('.travis.yml', :info)}."
       end
 
       def transcode(input_path)
         description = "stdin#{' (waiting for input)' if $stdin.tty?}" if input_path == '-'
-        say "#{decrypt ? "de" : "en"}crypting #{color(description || input_path, :info)} for #{color(slug, :info)}"
+        say "#{decrypt ? 'de' : 'en'}crypting #{color(description || input_path, :info)} for #{color(slug, :info)}"
 
         data     = input_path == '-' ? $stdin.read : File.binread(input_path)
         aes      = OpenSSL::Cipher.new('AES-256-CBC')
-        decrypt  ? aes.decrypt : aes.encrypt
+        decrypt ? aes.decrypt : aes.encrypt
         aes.key  = [key].pack('H*')
         aes.iv   = [iv].pack('H*')
 
@@ -106,6 +115,7 @@ module Travis
 
       def decrypt_to_for(input_path)
         return if input_path == '-'
+
         if input_path.start_with? Dir.home
           input_path.sub(Dir.home, '~')
         else
@@ -114,18 +124,19 @@ module Travis
       end
 
       def escape_path(path)
-        Shellwords.escape(path).sub(/^\\~\//, '~\/')
+        Shellwords.escape(path).sub(%r{^\\~/}, '~\/')
       end
 
       def output_path_for(input_path)
         case input_path
         when '-'           then return '-'
-        when /^(.+)\.enc$/ then return $1 if     decrypt?
-        when /^(.+)\.dec$/ then return $1 unless decrypt?
+        when /^(.+)\.enc$/ then return ::Regexp.last_match(1) if     decrypt?
+        when /^(.+)\.dec$/ then return ::Regexp.last_match(1) unless decrypt?
         end
 
-        if interactive? and input_path =~ /(\.enc|\.dec)$/
-          exit 1 unless danger_zone? "File extension of input file is #{color($1, :info)}, are you sure that is correct?"
+        if interactive? && input_path =~ /(\.enc|\.dec)$/ && !(danger_zone? "File extension of input file is #{color(::Regexp.last_match(1),
+                                                                                                                     :info)}, are you sure that is correct?")
+          exit 1
         end
 
         "#{input_path}.#{decrypt ? 'dec' : 'enc'}"

data/lib/travis/cli/endpoint.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 
 module Travis
   module CLI
     class Endpoint < ApiCommand
-      description "displays or changes the API endpoint"
+      description 'displays or changes the API endpoint'
 
       skip :authenticate
       on '--drop-default', 'delete stored default endpoint'
@@ -11,19 +13,19 @@ module Travis
       on '--github', 'display github endpoint'
 
       def run_github
-        error "--github cannot be combined with --drop-default" if drop_default?
-        error "--github cannot be combined with --set-default" if set_default?
+        error '--github cannot be combined with --drop-default' if drop_default?
+        error '--github cannot be combined with --set-default' if set_default?
         load_gh
-        say github_endpoint.to_s, "GitHub endpoint: %s"
+        say github_endpoint.to_s, 'GitHub endpoint: %s'
       end
 
       def run_travis
-        if drop_default? and was = config['default_endpoint']
+        if drop_default? && (was = config['default_endpoint'])
           config.delete('default_endpoint')
-          say was, "default API endpoint dropped (was %s)"
+          say was, 'default API endpoint dropped (was %s)'
         else
           config['default_endpoint'] = api_endpoint if set_default?
-          say api_endpoint, "API endpoint: %s#{" (stored as default)" if set_default?}"
+          say api_endpoint, "API endpoint: %s#{' (stored as default)' if set_default?}"
         end
       end
 

data/lib/travis/cli/env.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 require 'shellwords'
 
@@ -5,11 +7,11 @@ module Travis
   module CLI
     class Env < RepoCommand
       on('-P', '--[no-]public',   'make new values public')
-      on('-p', '--[no-]private',  'make new values private') { |c,v| c.public = !v }
+      on('-p', '--[no-]private',  'make new values private') { |c, v| c.public = !v }
       on('-u', '--[no-]unescape', 'do not escape values')
       on('-f', '--force',         'do not ask for confirmation when clearing out all variables')
 
-      description "show or modify build environment variables"
+      description 'show or modify build environment variables'
       subcommands :list, :set, :unset, :copy, :clear
 
       def setup
@@ -19,8 +21,8 @@ module Travis
       end
 
       def set(name, value)
-        options ||= { :public => public } if public != nil
-        say color('[+] ', [:green, :bold]) + "setting environment variable #{color "$#{name}", :info}"
+        options ||= { public: } unless public.nil?
+        say color('[+] ', %i[green bold]) + "setting environment variable #{color "$#{name}", :info}"
         value = Shellwords.escape(value) unless unescape?
         env_vars.upsert(name, value, options || {})
       end
@@ -41,21 +43,24 @@ module Travis
 
       def clear
         exit   if env_vars.empty?
-        exit 1 if interactive? and not force? and not danger_zone? "Clear out all env variables for #{color(repository.slug, :bold)}?"
+        exit 1 if interactive? && !force? && !danger_zone?("Clear out all env variables for #{color(
+          repository.slug, :bold
+        )}?")
         remove_vars
       end
 
       def remove_vars
         env_vars.each do |var|
-          next if block_given? and not yield(var)
-          say color('[x] ', [:red, :bold]) + "removing environment variable #{color "$#{var.name}", :info}"
+          next if block_given? && !yield(var)
+
+          say color('[x] ', %i[red bold]) + "removing environment variable #{color "$#{var.name}", :info}"
           var.delete
         end
       end
 
       def list
         say color("# environment variables for #{color repository.slug, :bold}", :info)
-        env_vars.each { |v| say "#{v.name}=" << color(v.value || "[secure]", :bold) }
+        env_vars.each { |v| say "#{v.name}=" << color(v.value || '[secure]', :bold) }
       end
 
       def env_vars

data/lib/travis/cli/help.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 
 module Travis
   module CLI
     class Help < Command
-      description "helps you out when in dire need of information"
+      description 'helps you out when in dire need of information'
 
       CommandGroup = Struct.new(:cmds, :header)
 
@@ -22,7 +24,7 @@ module Travis
               say "        #{color(cmd.command_name, :command).ljust(22)} #{color(cmd.description, :info)}"
             end
           end
-          say "\nrun `#$0 help COMMAND` for more info"
+          say "\nrun `#{$PROGRAM_NAME} help COMMAND` for more info"
         end
       end
 
@@ -33,20 +35,20 @@ module Travis
       def api_commands
         CLI.commands.select do |cmd|
           cmd.ancestors.include?(CLI::ApiCommand) &&
-          !cmd.ancestors.include?(CLI::RepoCommand)
-        end.sort_by {|c| c.command_name}
+            !cmd.ancestors.include?(CLI::RepoCommand)
+        end.sort_by { |c| c.command_name }
       end
 
       def repo_commands
         CLI.commands.select do |cmd|
           cmd.ancestors.include? CLI::RepoCommand
-        end.sort_by {|c| c.command_name}
+        end.sort_by { |c| c.command_name }
       end
 
       def other_commands
-        CLI.commands.select do |cmd|
-          !cmd.ancestors.include? CLI::ApiCommand
-        end.sort_by {|c| c.command_name}
+        CLI.commands.reject do |cmd|
+          cmd.ancestors.include? CLI::ApiCommand
+        end.sort_by { |c| c.command_name }
       end
     end
   end

data/lib/travis/cli/history.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 
 module Travis
@@ -15,9 +17,10 @@ module Travis
 
       def run
         countdown = Integer(limit || 10) unless all?
-        params    = { :after_number => after } if after
+        params    = { after_number: after } if after
         repository.each_build(params) do |build|
           next unless display? build
+
           display(build)
 
           if countdown
@@ -29,21 +32,22 @@ module Travis
 
       private
 
-        def display?(build)
-          return build.pr_number   == pull_request.to_i if pull_request
-          return build.branch_info == branch            if branch
-          true
-        end
+      def display?(build)
+        return build.pr_number   == pull_request.to_i if pull_request
+        return build.branch_info == branch            if branch
 
-        def display(build)
-          say [
-            date? && color(formatter.time(build.finished_at || build.started_at), build.color),
-            color("##{build.number} #{build.state}:".ljust(16), [build.color, :bold]),
-            color("#{build.branch_info}", :info),
-            committer? && build.commit.author_name.ljust(25),
-            build.commit.subject
-          ].compact.join(" ").strip + "\n"
-        end
+        true
+      end
+
+      def display(build)
+        say [
+          date? && color(formatter.time(build.finished_at || build.started_at), build.color),
+          color("##{build.number} #{build.state}:".ljust(16), [build.color, :bold]),
+          color(build.branch_info.to_s, :info),
+          committer? && build.commit.author_name.ljust(25),
+          build.commit.subject
+        ].compact.join(' ').strip + "\n"
+      end
     end
   end
 end

data/lib/travis/cli/init.rb

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 
 module Travis
   module CLI
     class Init < Enable
       LANGUAGE_MAPPING = {
-        "node"         => "node_js",
-        "node.js"      => "node_js",
-        "javascript"   => "node_js",
-        "coffeescript" => "node_js",
-        "c++"          => "cpp",
-        "obj-c"        => "objective-c"
-      }
+        'node' => 'node_js',
+        'node.js' => 'node_js',
+        'javascript' => 'node_js',
+        'coffeescript' => 'node_js',
+        'c++' => 'cpp',
+        'obj-c' => 'objective-c'
+      }.freeze
 
-      description "generates a .travis.yml and enables the project"
+      description 'generates a .travis.yml and enables the project'
 
       on('-f', '--force', 'override .travis.yml if it already exists')
       on('-k', '--skip-enable', 'do not enable project, only add .travis.yml')
@@ -25,7 +27,8 @@ module Travis
       ]
 
       options.each do |option|
-        on "--#{option.gsub('_', '-')} VALUE", "sets #{option} option in .travis.yml (can be used more than once)" do |c, value|
+        on "--#{option.gsub('_', '-')} VALUE",
+           "sets #{option} option in .travis.yml (can be used more than once)" do |c, value|
           c.custom_config[option] &&= Array(c.custom_config[option]) << value
           c.custom_config[option] ||= value
         end
@@ -39,11 +42,11 @@ module Travis
       end
 
       def help
-        super("Available languages: #{self.class.languages.join(", ")}\n\n")
+        super("Available languages: #{self.class.languages.join(', ')}\n\n")
       end
 
       def run(language = nil, file = '.travis.yml')
-        error "#{file} already exists, use --force to override" if File.exist?(file) and not force? and not print_conf?
+        error "#{file} already exists, use --force to override" if File.exist?(file) && !force? && !print_conf?
         language ||= ask('Main programming language used: ') { |q| q.default = detect_language }
         self.travis_config = template(language).merge(custom_config)
 
@@ -63,21 +66,21 @@ module Travis
 
       private
 
-        def template_name(language)
-          asset_path("init/#{language}.yml")
-        end
+      def template_name(language)
+        asset_path("init/#{language}.yml")
+      end
 
-        def template(language)
-          language = language.to_s.downcase
-          language = LANGUAGE_MAPPING[language] || language
-          file = template_name(language)
-          error "unknown language #{language}" unless File.exist? file
-          YAML.load_file(file)
-        end
+      def template(language)
+        language = language.to_s.downcase
+        language = LANGUAGE_MAPPING[language] || language
+        file = template_name(language)
+        error "unknown language #{language}" unless File.exist? file
+        YAML.load_file(file)
+      end
 
-        def detect_language
-          repository.github_language || "Ruby"
-        end
+      def detect_language
+        repository.github_language || 'Ruby'
+      end
     end
   end
 end

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