travis 1.11.0 → 1.12.0

data/lib/travis/tools/github.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+require 'English'
 require 'travis/tools/system'
 require 'yaml'
 require 'json'
@@ -11,21 +14,21 @@ module Travis
       GITHUB_HOST = 'github.com'
 
       attr_accessor :api_url, :scopes, :github_token, :drop_token, :callback, :explode, :after_tokens,
-        :login_header, :auto_token, :note,
-        :hub_path, :oauth_paths, :composer_path, :git_config_keys, :debug, :no_token, :check_token
+                    :login_header, :auto_token, :note,
+                    :hub_path, :oauth_paths, :composer_path, :git_config_keys, :debug, :no_token, :check_token
 
       def initialize(options = nil)
         @check_token     = true
-        @ask_login       = proc { raise "ask_login callback not set" }
-        @after_tokens    = proc { }
+        @ask_login       = proc { raise 'ask_login callback not set' }
+        @after_tokens    = proc {}
         @debug           = proc { |_| }
         @hub_path        = ENV['HUB_CONFIG'] || '~/.config/hub'
         @oauth_paths     = ['~/.github-oauth-token']
-        @composer_path   = "~/.composer/config.json"
+        @composer_path   = '~/.composer/config.json'
         @note            = 'temporary token'
         @git_config_keys = %w[github.token github.oauth-token]
         @scopes          = ['user', 'user:email', 'repo'] # overridden by value from /config
-        options.each_pair { |k,v| send("#{k}=", v) if respond_to? "#{k}=" } if options
+        options&.each_pair { |k, v| send("#{k}=", v) if respond_to? "#{k}=" }
         yield self if block_given?
       end
 
@@ -37,12 +40,13 @@ module Travis
         require 'gh' unless defined? GH
         possible_tokens { |t| yield(t) if acceptable?(t) }
       ensure
-        callback, self.callback = self.callback, nil
-        callback.call if callback
+        callback = self.callback
+        self.callback = nil
+        callback&.call
       end
 
-      def with_session(&block)
-        with_token { |t| GH.with(:token => t) { yield(t) } }
+      def with_session
+        with_token { |t| GH.with(token: t) { yield(t) } }
       end
 
       def possible_tokens(&block)
@@ -66,6 +70,7 @@ module Travis
 
       def git_tokens
         return unless System.has? 'git'
+
         git_config_keys.each do |key|
           `git config --get-all #{key}`.each_line do |line|
             token = line.strip
@@ -83,11 +88,11 @@ module Travis
 
       def hub_tokens
         hub.fetch(host, []).each do |entry|
-          yield entry["oauth_token"] if entry["oauth_token"]
+          yield entry['oauth_token'] if entry['oauth_token']
         end
       end
 
-      def oauth_file_tokens(&block)
+      def oauth_file_tokens
         oauth_paths.each do |path|
           file(path) do |content|
             token = content.strip
@@ -103,12 +108,12 @@ module Travis
       end
 
       def issuepost_token(&block)
-        security(:generic, :w, "-l issuepost.github.access_token",  "issuepost token", &block) if host == 'github.com'
+        security(:generic, :w, '-l issuepost.github.access_token', 'issuepost token', &block) if host == 'github.com'
       end
 
       def github_for_mac_token(&block)
         command = '-s "github.com/mac"'
-        security(:internet, :w, command, "GitHub for Mac token", &block) if host == 'github.com'
+        security(:internet, :w, command, 'GitHub for Mac token', &block) if host == 'github.com'
       end
 
       def host
@@ -117,57 +122,62 @@ module Travis
 
       def api_host
         return GITHUB_API unless api_url
+
         api_url[%r{^(?:https?://)?([^/]+)}, 1]
       end
 
       def acceptable?(token)
         return true unless check_token
-        gh   = GH.with(:token => token)
-        user = gh['user']
+
+        gh = GH.with(token:)
+        gh['user']
 
         true
-      rescue GH::Error => error
-        debug "token is not acceptable: #{gh_error(error)}"
+      rescue GH::Error => e
+        debug "token is not acceptable: #{gh_error(e)}"
         false
       end
 
       private
 
-        def gh_error(error)
-          raise error if explode
-          if error.info.key? :response_body
-            JSON.parse(error.info[:response_body])["message"].to_s
-          else
-            "Unknown error"
-          end
-        end
+      def gh_error(error)
+        raise error if explode
 
-        def debug(line)
-          return unless @debug
-          @debug.call "Tools::Github: #{line}"
+        if error.info.key? :response_body
+          JSON.parse(error.info[:response_body])['message'].to_s
+        else
+          'Unknown error'
         end
+      end
 
-        def security(type, key, arg, name)
-          return false unless System.has? 'security'
-          return false unless system "security find-#{type}-password #{arg} 2>/dev/null >/dev/null"
-          debug "requesting to load #{name} from keychain"
-          result = %x[security find-#{type}-password #{arg} -#{key} 2>&1].chomp
-          $?.success? ? yield(result) : debug("request denied")
-        rescue => e
-          raise e if explode
-        end
+      def debug(line)
+        return unless @debug
 
-        def file(path, default = nil)
-          path        &&= File.expand_path(path)
-          @file       ||= {}
-          @file[path] ||= if path and File.readable?(path)
-            debug "reading #{path}"
-            yield File.read(path)
-          end
-          @file[path] || default
-        rescue => e
-          raise e if explode
-        end
+        @debug.call "Tools::Github: #{line}"
+      end
+
+      def security(type, key, arg, name)
+        return false unless System.has? 'security'
+        return false unless system "security find-#{type}-password #{arg} 2>/dev/null >/dev/null"
+
+        debug "requesting to load #{name} from keychain"
+        result = `security find-#{type}-password #{arg} -#{key} 2>&1`.chomp
+        $CHILD_STATUS.success? ? yield(result) : debug('request denied')
+      rescue StandardError => e
+        raise e if explode
+      end
+
+      def file(path, default = nil)
+        path        &&= File.expand_path(path)
+        @file       ||= {}
+        @file[path] ||= if path && File.readable?(path)
+                          debug "reading #{path}"
+                          yield File.read(path)
+                        end
+        @file[path] || default
+      rescue StandardError => e
+        raise e if explode
+      end
     end
   end
 end

data/lib/travis/tools/notification.rb

@@ -1,31 +1,35 @@
-require "travis"
-require "travis/tools/system"
-require "travis/tools/assets"
-require "cgi"
+# frozen_string_literal: true
+
+require 'travis'
+require 'travis/tools/system'
+require 'travis/tools/assets'
+require 'cgi'
 
 module Travis
   module Tools
     module Notification
-      extend self
-      DEFAULT = [:osx, :growl, :libnotify]
+      module_function
+
+      DEFAULT = %i[osx growl libnotify].freeze
       ICON    = Assets['notifications/icon.png']
 
       def new(*list)
         list.concat(DEFAULT) if list.empty?
         notification = list.map { |n| get(n) }.detect { |n| n.available? }
-        raise ArgumentError, "no notification system found (looked for #{list.join(", ")})" unless notification
+        raise ArgumentError, "no notification system found (looked for #{list.join(', ')})" unless notification
+
         notification
       end
 
       def get(name)
         const = constants.detect { |c| c.to_s[/[^:]+$/].downcase == name.to_s }
-        raise ArgumentError, "unknown notifications type %p" % name unless const
+        raise ArgumentError, 'unknown notifications type %p' % name unless const
+
         const_get(const).new
       end
 
       class Dummy
-        def notify(title, body)
-        end
+        def notify(title, body); end
 
         def available?
           true
@@ -33,14 +37,15 @@ module Travis
       end
 
       class OSX
-        BIN_PATH = Assets["notifications/Travis CI.app/Contents/MacOS/Travis CI"]
+        BIN_PATH = Assets['notifications/Travis CI.app/Contents/MacOS/Travis CI']
 
         def notify(title, body)
           system BIN_PATH, '-message', body.to_s, '-title', title.to_s, '-sender', 'org.travis-ci.Travis-CI'
         end
 
         def available?
-          System.mac? and System.recent_version?(System.os_version.to_s, '10.8') and System.running? "NotificationCenter"
+          System.mac? and System.recent_version?(System.os_version.to_s,
+                                                 '10.8') and System.running? 'NotificationCenter'
         end
       end
 
@@ -50,7 +55,7 @@ module Travis
         end
 
         def available?
-          System.has? 'growlnotify' and System.running? "Growl"
+          System.has? 'growlnotify' and System.running? 'Growl'
         end
       end
 

data/lib/travis/tools/safe_string.rb

@@ -1,10 +1,13 @@
+# frozen_string_literal: true
+
 module Travis
   module Tools
     module SafeString
-      extend self
+      module_function
 
       def encoded(string)
         return string unless string.respond_to? :encode
+
         string.encode 'utf-8'
       rescue Encoding::UndefinedConversionError
         string.force_encoding 'utf-8'

data/lib/travis/tools/ssl_key.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'openssl'
 require 'base64'
 
 module Travis
   module Tools
     module SSLKey
-      extend self
+      module_function
 
       def generate_rsa(size = 2048)
         OpenSSL::PKey::RSA.generate(size)
@@ -40,7 +42,8 @@ module Travis
       end
 
       def to_byte_array(num, *significant)
-        return significant if num.between?(-1, 0) and significant[0][7] == num[7]
+        return significant if num.between?(-1, 0) && (significant[0][7] == num[7])
+
         to_byte_array(*num.divmod(256)) + significant
       end
     end

data/lib/travis/tools/system.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Travis
   module Tools
     module System
-      extend self
+      module_function
 
       def recent_version?(version, minimum)
         version = version.split('.').map { |s| s.to_i }
@@ -10,7 +12,7 @@ module Travis
       end
 
       def windows?
-        File::ALT_SEPARATOR == "\\"
+        File::ALT_SEPARATOR == '\\'
       end
 
       def mac?
@@ -22,7 +24,7 @@ module Travis
       end
 
       def unix?
-        not windows?
+        !windows?
       end
 
       def os
@@ -52,7 +54,7 @@ module Travis
       end
 
       def ruby_version
-        "%s-p%s" % [RUBY_VERSION, RUBY_PATCHLEVEL]
+        format('%s-p%s', RUBY_VERSION, RUBY_PATCHLEVEL)
       end
 
       def ruby
@@ -65,22 +67,25 @@ module Travis
       end
 
       def rubygems
-        return "no RubyGems" unless defined? Gem
+        return 'no RubyGems' unless defined? Gem
+
         "RubyGems #{Gem::VERSION}"
       end
 
       def description(*args)
-        [ full_os, ruby, rubygems, *args.flatten].compact.uniq.join("; ")
+        [full_os, ruby, rubygems, *args.flatten].compact.uniq.join('; ')
       end
 
       def has?(command)
         return false unless unix?
+
         @has ||= {}
         @has.fetch(command) { @has[command] = system "command -v #{command} 2>/dev/null >/dev/null" }
       end
 
       def running?(app)
         return false unless unix?
+
         system "/usr/bin/pgrep -u $(whoami) #{app} >/dev/null"
       end
     end

data/lib/travis/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Travis
-  VERSION = '1.11.0'
+  VERSION = '1.12.0'
 end

data/lib/travis.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Travis
   autoload :Client,   'travis/client'
   autoload :CLI,      'travis/cli'
   autoload :Pro,      'travis/pro'
   autoload :Version,  'travis/version'
 
-  include Client::Namespace.new(Client::ORG_URI)
+  include Client::Namespace.new(Client::COM_URI)
 end

data/spec/cli/api_command_spec.rb

@@ -1,16 +1,19 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::CLI::ApiCommand do
   describe 'enterprise' do
     travis_config_path = ENV['TRAVIS_CONFIG_PATH']
+    subject(:api_command) { described_class.new }
 
     before do
       ENV['TRAVIS_CONFIG_PATH'] = File.expand_path '../support', File.dirname(__FILE__)
-      config = subject.send(:load_file, 'fake_travis_config.yml')
-      subject.config = YAML.load(config)
+      config = api_command.send(:load_file, 'fake_travis_config.yml')
+      api_command.config = YAML.load(config)
 
-      subject.api_endpoint = 'https://travis-ci-enterprise/api'
-      subject.enterprise_name = 'default'
+      api_command.api_endpoint = 'https://travis-ci-enterprise/api'
+      api_command.enterprise_name = 'default'
     end
 
     after do
@@ -19,19 +22,19 @@ describe Travis::CLI::ApiCommand do
 
     describe '#setup_enterprise' do
       before do
-        subject.send(:setup_enterprise)
+        api_command.send(:setup_enterprise)
       end
 
       it 'keeps verifying peers' do
-        subject.insecure.should be_falsey
+        api_command.insecure.should be_falsey
       end
 
       it 'uses default CAs' do
-        subject.session.ssl.should_not include(:ca_file)
+        api_command.session.ssl.should_not include(:ca_file)
       end
 
       it 'flags endpoint' do
-        subject.endpoint_config.should include('enterprise' => true)
+        api_command.endpoint_config.should include('enterprise' => true)
       end
     end
   end

data/spec/cli/cancel_spec.rb

@@ -1,15 +1,13 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::CLI::Cancel do
   example 'travis cancel' do
     run_cli('cancel', '-t', 'token').should be_success
-    $params['id'].should be == "4125095"
-    $params['entity'].should be == "builds"
   end
 
   example 'travis cancel 6180.1' do
     run_cli('cancel', '6180.1', '-t', 'token').should be_success
-    $params['id'].should be == "4125096"
-    $params['entity'].should be == "jobs"
   end
 end

data/spec/cli/encrypt_file_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'fileutils'
 require 'digest'
@@ -5,22 +7,22 @@ require 'digest'
 describe Travis::CLI::EncryptFile do
   CMD_TARGET = 'README.md'
 
-  before :each do
-    Digest.stub(:hexencode).and_return "randomhex" # to avoid relying on Dir.pwd value for hex
+  before do
+    Digest.stub(:hexencode).and_return 'randomhex' # to avoid relying on Dir.pwd value for hex
   end
 
-  after :each do
+  after do
     FileUtils.rm_f "#{CMD_TARGET}.enc"
   end
 
   example "travis encrypt-file #{CMD_TARGET}" do
     run_cli('encrypt-file', CMD_TARGET).should be_success
-    File.exists?("#{CMD_TARGET}.enc").should be true
+    File.exist?("#{CMD_TARGET}.enc").should be true
   end
 
   example "travis encrypt-file #{CMD_TARGET} -a" do
-    run_cli('encrypt-file', CMD_TARGET, '-a') { |i| i.puts "n" }.should be_success
-    stdout.should match /Overwrite the config file/
-    File.exists?("#{CMD_TARGET}.enc").should be true
+    run_cli('encrypt-file', CMD_TARGET, '-a') { |i| i.puts 'n' }.should be_success
+    stdout.should match(/Overwrite the config file/)
+    File.exist?("#{CMD_TARGET}.enc").should be true
   end
 end

data/spec/cli/encrypt_spec.rb

@@ -1,67 +1,69 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::CLI::Encrypt do
-  example "travis encrypt foo" do
+  example 'travis encrypt foo' do
     run_cli('encrypt', 'foo').should be_success
     stdout.should match(/^".{60,}"\n$/)
   end
 
-  example "travis encrypt foo -r rails/rails" do
+  example 'travis encrypt foo -r rails/rails' do
     run_cli('encrypt', 'foo', '-r', 'rails/rails').should be_success
     stdout.should match(/^".{60,}"\n$/)
   end
 
-  example "travis encrypt foo -i" do
+  example 'travis encrypt foo -i' do
     run_cli('encrypt', 'foo', '-i', '--skip-completion-check', '-r', 'travis-ci/travis.rb').should be_success
     stdout.should start_with("Please add the following to your .travis.yml file:\n\n  secure: ")
   end
 
-  example "cat foo | travis encrypt" do
+  example 'cat foo | travis encrypt' do
     run_cli('encrypt') { |i| i.puts('foo') }
     stdout.should match(/\A".{60,}"\n\Z/)
   end
 
-  example "cat foo\\nbar | travis encrypt -s" do
+  example 'cat foo\\nbar | travis encrypt -s' do
     run_cli('encrypt', '-s') { |i| i.puts("foo\nbar") }
     stdout.should match(/\A(".{60,}"\n){2}\Z/)
   end
 
-  example "cat foo\\nbar | travis encrypt" do
+  example 'cat foo\\nbar | travis encrypt' do
     run_cli('encrypt') { |i| i.puts("foo\nbar") }
     stdout.should match(/\A".{60,}"\n\Z/)
   end
 
-  example "travis encrypt rails/rails foo" do
+  example 'travis encrypt rails/rails foo' do
     run_cli('encrypt', 'rails/rails', 'foo').should be_success
     stderr.should match(/WARNING/)
   end
 
-  example "travis encrypt foo=foo/bar" do
-    run_cli("encrypt", "foo=foo/bar").should be_success
+  example 'travis encrypt foo=foo/bar' do
+    run_cli('encrypt', 'foo=foo/bar').should be_success
     stderr.should_not match(/WARNING/)
   end
 
-  example "travis encrypt FOO bar -a" do
+  example 'travis encrypt FOO bar -a' do
     described_class.any_instance.stub(:save_travis_config)
-    run_cli("encrypt", "FOO", "bar", "-a") { |i| i.puts "foo" }.should be_success
+    run_cli('encrypt', 'FOO', 'bar', '-a') { |i| i.puts 'foo' }.should be_success
     stderr.should match(/Environment variables in env\.global should be formatted as FOO=bar/)
   end
 
-  example "travis encrypt FOO bar -a foo" do
+  example 'travis encrypt FOO bar -a foo' do
     described_class.any_instance.stub(:save_travis_config)
-    run_cli("encrypt", "FOO", "bar", "-a", "foo") { |i| i.puts "foo" }.should be_success
+    run_cli('encrypt', 'FOO', 'bar', '-a', 'foo') { |i| i.puts 'foo' }.should be_success
     stdout.should match(/Overwrite the config file/)
   end
 
-  example "travis encrypt FOO bar -a --no-interactive" do
+  example 'travis encrypt FOO bar -a --no-interactive' do
     described_class.any_instance.stub(:save_travis_config)
-    run_cli("encrypt", "FOO", "bar", "-a", "--no-interactive").should be_success
+    run_cli('encrypt', 'FOO', 'bar', '-a', '--no-interactive').should be_success
     stderr.should match(/Environment variables in env\.global should be formatted as FOO=bar/)
   end
 
-  example "travis encrypt FOO=bar -a foo --no-interactive" do
+  example 'travis encrypt FOO=bar -a foo --no-interactive' do
     described_class.any_instance.stub(:save_travis_config)
-    run_cli("encrypt", "FOO=bar", "-a", "foo", "--no-interactive").should be_success
+    run_cli('encrypt', 'FOO=bar', '-a', 'foo', '--no-interactive').should be_success
     stdout.should be_empty
   end
 end

data/spec/cli/endpoint_spec.rb

@@ -1,39 +1,41 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::CLI::Endpoint do
-  example "travis endpoint" do
+  example 'travis endpoint' do
     run_cli('endpoint').should be_success
-    stdout.should be == "https://api.travis-ci.org/\n"
+    stdout.should be == "https://api.travis-ci.com/\n"
   end
 
-  example "travis endpoint --pro" do
+  example 'travis endpoint --pro' do
     run_cli('endpoint', '--pro').should be_success
     stdout.should be == "https://api.travis-ci.com/\n"
   end
 
-  example "travis endpoint --com" do
+  example 'travis endpoint --com' do
     run_cli('endpoint', '--com').should be_success
     stdout.should be == "https://api.travis-ci.com/\n"
   end
 
-  example "travis endpoint -e http://localhost:3000/" do
+  example 'travis endpoint -e http://localhost:3000/' do
     run_cli('endpoint', '-e', 'http://localhost:3000/').should be_success
     stdout.should be == "http://localhost:3000/\n"
   end
 
-  example "TRAVIS_ENDPOINT=http://localhost:3000/ travis endpoint" do
-    ENV['TRAVIS_ENDPOINT'] = "http://localhost:3000/"
+  example 'TRAVIS_ENDPOINT=http://localhost:3000/ travis endpoint' do
+    ENV['TRAVIS_ENDPOINT'] = 'http://localhost:3000/'
     run_cli('endpoint').should be_success
     stdout.should be == "http://localhost:3000/\n"
   end
 
-  example "travis endpoint --github" do
+  example 'travis endpoint --github' do
     run_cli('endpoint', '--github').should be_success
     stdout.should be == "https://api.github.com\n"
   end
 
-  example "travis endpoint -i" do
+  example 'travis endpoint -i' do
     run_cli('endpoint', '-i').should be_success
-    stdout.should be == "API endpoint: https://api.travis-ci.org/\n"
+    stdout.should be == "API endpoint: https://api.travis-ci.com/\n"
   end
 end