travis 1.11.1 → 1.13.0

data/lib/travis/cli/repo_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 require 'yaml'
 
@@ -9,7 +11,7 @@ module Travis
       on('-g', '--github-token TOKEN', 'identify by GitHub token')
       on('-r', '--repo SLUG', 'repository to use (will try to detect from current git clone)') do |c, slug|
         c.slug = slug
-        c.error "SLUG should be of the form OWNER/REPO" unless slug.split('/').compact.size == 2
+        c.error 'SLUG should be of the form OWNER/REPO' unless slug.split('/').compact.size == 2
       end
       on('-R', '--store-repo SLUG', 'like --repo, but remembers value for current directory') do |c, slug|
         c.slug = slug
@@ -17,12 +19,15 @@ module Travis
       end
 
       attr_accessor :slug
+
       abstract
 
       def setup
         setup_enterprise
-        error "Can't figure out GitHub repo name. Ensure you're in the repo directory, or specify the repo name via the -r option (e.g. travis <command> -r <owner>/<repo>)" unless self.slug ||= find_slug
-        error "GitHub repo name is invalid, it should be of the form 'owner/repo'" unless self.slug.include?("/")
+        unless self.slug ||= find_slug
+          error "Can't figure out GitHub repo name. Ensure you're in the repo directory, or specify the repo name via the -r option (e.g. travis <command> -r <owner>/<repo>)"
+        end
+        error "GitHub repo name is invalid, it should be of the form 'owner/repo'" unless self.slug.include?('/')
         self.api_endpoint = detect_api_endpoint
         super
         repository.load # makes sure we actually have access to the repo
@@ -36,140 +41,146 @@ module Travis
 
       private
 
-        def build(number_or_id)
-          return super if number_or_id.is_a? Integer
-          repository.build(number_or_id)
-        end
+      def build(number_or_id)
+        return super if number_or_id.is_a? Integer
 
-        def job(number_or_id)
-          return super if number_or_id.is_a? Integer
-          repository.job(number_or_id)
-        end
+        repository.build(number_or_id)
+      end
 
-        def branch(name)
-          repository.branch(name)
-        end
+      def job(number_or_id)
+        return super if number_or_id.is_a? Integer
 
-        def last_build
-          repository.last_build or error("no build yet for #{slug}")
-        end
+        repository.job(number_or_id)
+      end
 
-        def detected_endpoint?
-          !explicit_api_endpoint?
-        end
+      def branch(name)
+        repository.branch(name)
+      end
 
-        def find_slug
-          load_slug || begin
-            slug = detect_slug
-            interactive? ? store_slug(slug) : slug if slug
-          end
-        end
+      def last_build
+        repository.last_build or error("no build yet for #{slug}")
+      end
+
+      def detected_endpoint?
+        !explicit_api_endpoint?
+      end
 
-        def detect_slug
-          git_head    = `git name-rev --name-only HEAD 2>#{IO::NULL}`.chomp
-          git_remote  = `git config --get branch.#{git_head}.remote 2>#{IO::NULL}`.chomp
-          git_remote  = 'origin' if git_remote.empty?
-          git_info    = `git ls-remote --get-url #{git_remote} 2>#{IO::NULL}`.chomp
-
-          if parse_remote(git_info) =~ GIT_REGEX
-            detected_slug = $1
-            if interactive?
-              if agree("Detected repository as #{color(detected_slug, :info)}, is this correct? ") { |q| q.default = 'yes' }
-                detected_slug
-              else
-                ask("Repository slug (owner/name): ") { |q| q.default = detected_slug }
-              end
-            else
-              info "detected repository as #{color(detected_slug, :bold)}"
-              detected_slug
-            end
+      def find_slug
+        load_slug || begin
+          slug = detect_slug
+          if slug
+            interactive? ? store_slug(slug) : slug
           end
         end
+      end
+
+      def detect_slug
+        git_head    = `git name-rev --name-only HEAD 2>#{IO::NULL}`.chomp
+        git_remote  = `git config --get branch.#{git_head}.remote 2>#{IO::NULL}`.chomp
+        git_remote  = 'origin' if git_remote.empty?
+        git_info    = `git ls-remote --get-url #{git_remote} 2>#{IO::NULL}`.chomp
+
+        return unless parse_remote(git_info) =~ GIT_REGEX
 
-        def parse_remote(url)
-          if url =~ /^git@[^:]+:/
-            path = url.split(':').last
-            path = "/#{path}" unless path.start_with?('/')
-            path
+        detected_slug = ::Regexp.last_match(1)
+        if interactive?
+          if agree("Detected repository as #{color(detected_slug, :info)}, is this correct? ") do |q|
+               q.default = 'yes'
+             end
+            detected_slug
           else
-            URI.parse(url).path
+            ask('Repository slug (owner/name): ') { |q| q.default = detected_slug }
           end
+        else
+          info "detected repository as #{color(detected_slug, :bold)}"
+          detected_slug
         end
+      end
 
-        def load_slug
-          stored = `git config --get travis.slug`.chomp
-          stored unless stored.empty?
+      def parse_remote(url)
+        if url =~ /^git@[^:]+:/
+          path = url.split(':').last
+          path = "/#{path}" unless path.start_with?('/')
+          path
+        else
+          URI.parse(url).path
         end
+      end
 
-        def store_slug(value)
-          `git config travis.slug #{value}` if value
-          value
-        end
+      def load_slug
+        stored = `git config --get travis.slug`.chomp
+        stored unless stored.empty?
+      end
 
-        def repo_config
-          config['repos'] ||= {}
-          config['repos'][slug] ||= {}
-        end
+      def store_slug(value)
+        `git config travis.slug #{value}` if value
+        value
+      end
 
-        def detect_api_endpoint
-          if explicit_api_endpoint? or enterprise?
-            repo_config['endpoint'] = api_endpoint
-          elsif ENV['TRAVIS_ENDPOINT']
-            ENV['TRAVIS_ENDPOINT']
-          elsif config['default_endpoint'] and config['default_endpoint'] !~ TRAVIS
-            repo_config['endpoint'] ||= config['default_endpoint']
-          else
-            repo_config['endpoint'] ||= begin
-              load_gh
-              GH.head("/repos/#{slug}")
-              Travis::Client::ORG_URI
-            rescue GH::Error
-              Travis::Client::COM_URI
-            end
-          end
-        end
+      def repo_config
+        config['repos'] ||= {}
+        config['repos'][slug] ||= {}
+      end
 
-        def travis_config
-          @travis_config ||= begin
-            payload = YAML.load_file(travis_yaml)
-            payload.respond_to?(:to_hash) ? payload.to_hash : {}
+      def detect_api_endpoint
+        if explicit_api_endpoint? || enterprise?
+          repo_config['endpoint'] = api_endpoint
+        elsif ENV['TRAVIS_ENDPOINT']
+          ENV['TRAVIS_ENDPOINT']
+        elsif config['default_endpoint'] && config['default_endpoint'] !~ (TRAVIS)
+          repo_config['endpoint'] ||= config['default_endpoint']
+        else
+          repo_config['endpoint'] ||= begin
+            load_gh
+            GH.head("/repos/#{slug}")
+            Travis::Client::ORG_URI
+          rescue GH::Error
+            Travis::Client::COM_URI
           end
         end
+      end
 
-        def travis_yaml(dir = Dir.pwd)
-          path = File.expand_path('.travis.yml', dir)
-          if File.exist? path
-            path
-          else
-            parent = File.expand_path('..', dir)
-            error "no .travis.yml found" if parent == dir
-            travis_yaml(parent)
-          end
+      def travis_config
+        @travis_config ||= begin
+          payload = YAML.load_file(travis_yaml)
+          payload.respond_to?(:to_hash) ? payload.to_hash : {}
         end
+      end
 
-        def confirm_and_save_travis_config(confirm = true, file = travis_yaml)
-          if confirm
-            ans = ask [
-              nil,
-              color("Overwrite the config file #{travis_yaml} with the content below?", [:info, :yellow]),
-              color("This reformats the existing file.", [:info, :red]),
-              travis_config.to_yaml,
-              color("(y/N)", [:info, :yellow])
-            ].join("\n\n")
-            proceed = ans =~ /^y/i
-          else
-            proceed = true
-          end
-
-          save_travis_config if proceed
+      def travis_yaml(dir = Dir.pwd)
+        path = File.expand_path('.travis.yml', dir)
+        if File.exist? path
+          path
+        else
+          parent = File.expand_path('..', dir)
+          error 'no .travis.yml found' if parent == dir
+          travis_yaml(parent)
         end
+      end
 
-        def save_travis_config(file = travis_yaml)
-          yaml = travis_config.to_yaml
-          yaml.gsub! /^(\s+)('on'|true):/, "\\1on:"
-          yaml.gsub! /\A---\s*\n/, ''
-          File.write(file, yaml)
-        end
+      def confirm_and_save_travis_config(confirm = true, _file = travis_yaml)
+        if confirm
+          ans = ask [
+            nil,
+            color("Overwrite the config file #{travis_yaml} with the content below?", %i[info yellow]),
+            color('This reformats the existing file.', %i[info red]),
+            travis_config.to_yaml,
+            color('(y/N)', %i[info yellow])
+          ].join("\n\n")
+          proceed = ans =~ /^y/i
+        else
+          proceed = true
+        end
+
+        save_travis_config if proceed
+      end
+
+      def save_travis_config(file = travis_yaml)
+        yaml = travis_config.to_yaml
+        yaml.gsub!(/^(\s+)('on'|true):/, '\\1on:')
+        yaml.gsub!(/\A---\s*\n/, '')
+        File.write(file, yaml)
+      end
     end
   end
 end

data/lib/travis/cli/report.rb

@@ -1,65 +1,72 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 require 'travis/tools/system'
 
 module Travis
   module CLI
     class Report < ApiCommand
-      description "generates a report useful for filing issues"
+      description 'generates a report useful for filing issues'
       on '-r', '--known-repos', 'include repositories in report'
       skip :authenticate, :clear_error
 
       def run
-        display("System",    :general)
-        display("CLI",       :cli_info)
-        display("Session",   :session_info)
-        display("Endpoints", :endpoints)
-        display("Known Repositories", :known_repos) if known_repos?
+        display('System',    :general)
+        display('CLI',       :cli_info)
+        display('Session',   :session_info)
+        display('Endpoints', :endpoints)
+        display('Known Repositories', :known_repos) if known_repos?
         display_error
-        say "For issues with the command line tool, please visit #{color("https://github.com/travis-ci/travis.rb/issues", :underline)}."
-        say "For Travis CI in general, go to #{color("https://github.com/travis-ci/travis-ci/issues", :underline)} or email #{color("support@travis-ci.com", :underline)}."
+        say "For issues with the command line tool, please visit #{color(
+          'https://github.com/travis-ci/travis.rb/issues', :underline
+        )}."
+        say "For Travis CI in general, go to #{color('https://github.com/travis-ci/travis-ci/issues',
+                                                     :underline)} or email #{color('support@travis-ci.com',
+                                                                                   :underline)}."
       end
 
       def display_error
-        return unless error = load_file("error.log")
-        display("Last Exception", :say, color(error, :info))
+        return unless (error = load_file('error.log'))
+
+        display('Last Exception', :say, color(error, :info))
       end
 
       def display(title, method, *args)
-        say color(title, [:bold, :underline])
+        say color(title, %i[bold underline])
         send(method, *args) { |*a| list(*a) }
         puts
       end
 
       def list(key, value, additional = nil)
         value = case value
-                when Array then value.empty? ? 'none' : value.map(&:inspect).join(", ")
-                when true  then "yes"
-                when false then "no"
-                when nil   then "unknown"
+                when Array then value.empty? ? 'none' : value.map(&:inspect).join(', ')
+                when true  then 'yes'
+                when false then 'no'
+                when nil   then 'unknown'
                 else value.to_s
                 end
         additional &&= " (#{additional})"
-        say "#{key}:".ljust(known_repos? ? 50 : 25) << " " << color(value.to_s, :bold) << additional.to_s
+        say "#{key}:".ljust(known_repos? ? 50 : 25) << ' ' << color(value.to_s, :bold) << additional.to_s
       end
 
       def general
-        yield "Ruby",               Tools::System.ruby
-        yield "Operating System",   Tools::System.os
-        yield "RubyGems",           Tools::System.rubygems
+        yield 'Ruby',               Tools::System.ruby
+        yield 'Operating System',   Tools::System.os
+        yield 'RubyGems',           Tools::System.rubygems
       end
 
       def cli_info
-        yield "Version",            Travis::VERSION
-        yield "Plugins",            defined?(TRAVIS_PLUGINS) ? TRAVIS_PLUGINS : []
-        yield "Auto-Completion",    Tools::Completion.completion_installed?
-        yield "Last Version Check", last_check['at'] ? Time.at(last_check['at']) : 'never'
+        yield 'Version',            Travis::VERSION
+        yield 'Plugins',            defined?(TRAVIS_PLUGINS) ? TRAVIS_PLUGINS : []
+        yield 'Auto-Completion',    Tools::Completion.completion_installed?
+        yield 'Last Version Check', last_check['at'] ? Time.at(last_check['at']) : 'never'
       end
 
       def session_info
-        yield "API Endpoint",       api_endpoint
-        yield "Logged In",          user_info
-        yield "Verify SSL",         !insecure
-        yield "Enterprise",         enterprise?
+        yield 'API Endpoint',       api_endpoint
+        yield 'Logged In',          user_info
+        yield 'Verify SSL',         !insecure
+        yield 'Enterprise',         enterprise?
       end
 
       def endpoints
@@ -74,25 +81,25 @@ module Travis
         end
       end
 
-      def endpoint_name(url, prefix = "")
+      def endpoint_name(url, prefix = '')
         case url
         when Travis::Client::ORG_URI  then "#{prefix}org"
         when Travis::Client::COM_URI  then "#{prefix}com"
-        when /api-staging\.travis-ci/ then endpoint_name(url.sub("api-staging.", "api."), "staging-")
+        when /api-staging\.travis-ci/ then endpoint_name(url.sub('api-staging.', 'api.'), 'staging-')
         else
-          key, _ = config['enterprise'].detect { |k,v| v.start_with? url } if config['enterprise'].respond_to?(:detect)
-          key ? "enterprise %p" % key : "???"
+          key, = config['enterprise'].detect { |_k, v| v.start_with? url } if config['enterprise'].respond_to?(:detect)
+          key ? 'enterprise %p' % key : '???'
         end
       end
 
       def known_repos
-        config["repos"].each do |key, info|
+        config['repos'].each do |key, info|
           yield key, info['endpoint']
         end
       end
 
       def user_info
-        access_token ? "as %p" % user.login : "no"
+        access_token ? 'as %p' % user.login : 'no'
       rescue Travis::Client::Error => e
         e.message
       end

data/lib/travis/cli/repos.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 
 module Travis
   module CLI
     class Repos < ApiCommand
-      description "lists repositories the user has certain permissions on"
+      description 'lists repositories the user has certain permissions on'
       on('-m', '--match PATTERN', 'only list repositories matching the given pattern (shell style)')
       on('-o', '--owner LOGIN', 'only list repos for a certain owner')
       on('-n', '--name NAME', 'only list repos with a given name')
@@ -15,11 +17,12 @@ module Travis
       def run
         repositories.each do |repo|
           next say(repo.slug) unless interactive?
+
           state_color = repo.active? ? :green : :yellow
-          say color(repo.slug, [:bold, state_color]) + " "
-          say color("(" << attributes(repo).map { |n,v| "#{n}: #{v ? "yes" : "no"}" }.join(", ") << ")", state_color)
+          say "#{color(repo.slug, [:bold, state_color])} "
+          say color('(' << attributes(repo).map { |n, v| "#{n}: #{v ? 'yes' : 'no'}" }.join(', ') << ')', state_color)
           description = repo.description.lines.first.chomp unless repo.description.to_s.empty?
-          say "Description: #{description || "???"}"
+          say "Description: #{description || '???'}"
           empty_line unless repo == repositories.last
         end
       end
@@ -29,21 +32,23 @@ module Travis
           repos = session.hooks.concat(user.repositories).uniq
           session.preload(repos).sort_by(&:slug).select do |repo|
             next false unless match? repo.slug
-            next false unless active.nil? or repo.active?    == active
-            next false unless owner.nil?  or repo.owner_name == owner
-            next false unless name.nil?   or repo.name       == name
-            next false unless admin.nil?  or repo.admin?     == admin
+            next false unless active.nil? || (repo.active?    == active)
+            next false unless owner.nil?  || (repo.owner_name == owner)
+            next false unless name.nil?   || (repo.name       == name)
+            next false unless admin.nil?  || (repo.admin?     == admin)
+
             true
           end
         end
       end
 
       def attributes(repo)
-        { "active" => repo.active?, "admin" => repo.admin?, "push" => repo.push?, "pull" => repo.pull? }
+        { 'active' => repo.active?, 'admin' => repo.admin?, 'push' => repo.push?, 'pull' => repo.pull? }
       end
 
       def match?(string)
         return true if match.nil?
+
         flags = File::FNM_PATHNAME | File::FNM_DOTMATCH
         flags |= File::FNM_EXTGLOB if defined? File::FNM_EXTGLOB
         File.fnmatch?(match, string, flags)

data/lib/travis/cli/requests.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 
 module Travis
   module CLI
     class Requests < RepoCommand
-      description "lists recent requests"
+      description 'lists recent requests'
       on '-l', '--limit LIMIT', 'Maximum number requests to display'
 
       def run
@@ -16,18 +18,17 @@ module Travis
 
           case request.event_type
           when 'push'
-            result      = request.result || "received"
+            result      = request.result || 'received'
             message     = request.message
-            message   ||= "validation pending"  unless request.rejected? or request.accepted?
-            message   ||= "unknown reason"      unless request.accepted?
-            message   ||= "triggered new build" unless request.rejected?
-            description = "push to #{request.branch || request.tag || "???"}"
+            message   ||= 'validation pending'  unless request.rejected? || request.accepted?
+            message   ||= 'unknown reason'      unless request.accepted?
+            message   ||= 'triggered new build' unless request.rejected?
+            description = "push to #{request.branch || request.tag || '???'}"
           when 'pull_request'
-            result      = request.result || "received"
+            result      = request.result || 'received'
             message     = request.message
-            message   ||= "HEAD commit not updated" unless request.accepted?
-            message   ||= "triggered new build"     unless request.rejected?
-            description = "push to #{request.branch || request.tag || "???"}"
+            message   ||= 'HEAD commit not updated' unless request.accepted?
+            message   ||= 'triggered new build'     unless request.rejected?
             description = "PR ##{request.pull_request_number}"
           end
 
@@ -35,9 +36,9 @@ module Travis
             color(description, [:bold, style]),
             color(result, style),
             color("(#{message})", style)
-          ].join(" ").strip + "\n"
+          ].join(' ').strip + "\n"
 
-          say "  " + color(request.commit.short_sha, :bold) + " - " + request.commit.subject if request.commit
+          say "  #{color(request.commit.short_sha, :bold)} - #{request.commit.subject}" if request.commit
           say "  received at: #{formatter.time(request.created_at)}"
           empty_line
         end

data/lib/travis/cli/restart.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'travis/cli'
 
 module Travis
   module CLI
     class Restart < RepoCommand
-      description "restarts a build or job"
+      description 'restarts a build or job'
 
       def run(number = last_build.number)
         authenticate
@@ -11,7 +13,7 @@ module Travis
         error "could not find job or build #{repository.slug}##{number}" unless entity
         entity.restart
 
-        say "restarted", "#{entity.class.one} ##{entity.number} has been %s"
+        say 'restarted', "#{entity.class.one} ##{entity.number} has been %s"
       end
     end
   end