travis 1.11.1 → 1.13.0

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

data/spec/cli/help_spec.rb

@@ -1,33 +1,35 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::CLI::Help do
-  example "travis help" do
+  example 'travis help' do
     run_cli('help').should be_success
-    stdout.should include("Usage: travis COMMAND")
+    stdout.should include('Usage: travis COMMAND')
   end
 
-  example "travis --help" do
+  example 'travis --help' do
     run_cli('--help').should be_success
-    stdout.should include("Usage: travis COMMAND")
+    stdout.should include('Usage: travis COMMAND')
   end
 
-  example "travis -h" do
+  example 'travis -h' do
     run_cli('-h').should be_success
-    stdout.should include("Usage: travis COMMAND")
+    stdout.should include('Usage: travis COMMAND')
   end
 
-  example "travis -?" do
+  example 'travis -?' do
     run_cli('-?').should be_success
-    stdout.should include("Usage: travis COMMAND")
+    stdout.should include('Usage: travis COMMAND')
   end
 
-  example "travis help endpoint" do
+  example 'travis help endpoint' do
     run_cli('help', 'endpoint').should be_success
-    stdout.should include("Usage: travis endpoint [OPTIONS]")
+    stdout.should include('Usage: travis endpoint [OPTIONS]')
   end
 
-  example "travis endpoint --help" do
+  example 'travis endpoint --help' do
     run_cli('endpoint', '--help').should be_success
-    stdout.should include("Usage: travis endpoint [OPTIONS]")
+    stdout.should include('Usage: travis endpoint [OPTIONS]')
   end
 end

data/spec/cli/history_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::CLI::History do

data/spec/cli/init_spec.rb

@@ -1,20 +1,22 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::CLI::Init do
   old_path = Dir.pwd
   tmp_path = File.expand_path('travis-spec-init', Dir.tmpdir)
 
-  before(:each) do
+  before do
     FileUtils.mkdir_p(tmp_path)
     Dir.chdir(tmp_path)
     FileUtils.rm('.travis.yml') if File.exist?('.travis.yml')
   end
 
-  after(:each) do
+  after do
     Dir.chdir(old_path)
   end
 
-  example "travis init fakelanguage" do
+  example 'travis init fakelanguage' do
     run_cli('init', 'fakelanguage', '--skip-enable', '-r', 'travis-ci/travis.rb').should_not be_success
     stderr.should be == "unknown language fakelanguage\n"
   end
@@ -29,28 +31,28 @@ describe Travis::CLI::Init do
     end
 
     example "travis init #{language} (.travis.yml already exists, using --force)" do
-      File.open(".travis.yml", "w") { |f| f << "old file" }
+      File.open('.travis.yml', 'w') { |f| f << 'old file' }
       run_cli('init', language, '--force', '--skip-enable', '-r', 'travis-ci/travis.rb').should be_success
       stdout.should be == ".travis.yml file created!\n"
-      File.read(".travis.yml").should_not be == "old file"
+      File.read('.travis.yml').should_not be == 'old file'
     end
 
     example "travis init #{language} (.travis.yml already exists, not using --force)" do
-      File.open(".travis.yml", "w") { |f| f << "old file" }
+      File.open('.travis.yml', 'w') { |f| f << 'old file' }
       run_cli('init', language, '--skip-enable', '-r', 'travis-ci/travis.rb').should_not be_success
       stderr.should be == ".travis.yml already exists, use --force to override\n"
-      File.read('.travis.yml').should be == "old file"
+      File.read('.travis.yml').should be == 'old file'
     end
   end
 
   describe 'travis init c' do
-    it_should_behave_like 'travis init', 'c'
-
     let :result do
       run_cli('init', 'c', '--skip-enable', '-r', 'travis-ci/travis.rb')
       YAML.load_file('.travis.yml')
     end
 
+    it_behaves_like 'travis init', 'c'
+
     it 'sets compiler' do
       result.should include('compiler')
       result['compiler'].should include('clang')
@@ -59,17 +61,17 @@ describe Travis::CLI::Init do
   end
 
   describe 'travis init clojure' do
-    it_should_behave_like 'travis init', 'clojure'
+    it_behaves_like 'travis init', 'clojure'
   end
 
   describe 'travis init cpp' do
-    it_should_behave_like 'travis init', 'cpp'
-
     let :result do
       run_cli('init', 'cpp', '--skip-enable', '-r', 'travis-ci/travis.rb')
       YAML.load_file('.travis.yml')
     end
 
+    it_behaves_like 'travis init', 'cpp'
+
     it 'sets compiler' do
       result.should include('compiler')
       result['compiler'].should include('clang')
@@ -78,13 +80,13 @@ describe Travis::CLI::Init do
   end
 
   describe 'travis init erlang' do
-    it_should_behave_like 'travis init', 'erlang'
-
     let :result do
       run_cli('init', 'erlang', '--skip-enable', '-r', 'travis-ci/travis.rb')
       YAML.load_file('.travis.yml')
     end
 
+    it_behaves_like 'travis init', 'erlang'
+
     it 'sets compiler' do
       result.should include('otp_release')
       result['otp_release'].should include('R16B')
@@ -92,13 +94,13 @@ describe Travis::CLI::Init do
   end
 
   describe 'travis init go' do
-    it_should_behave_like 'travis init', 'go'
-
     let :result do
       run_cli('init', 'go', '--skip-enable', '-r', 'travis-ci/travis.rb')
       YAML.load_file('.travis.yml')
     end
 
+    it_behaves_like 'travis init', 'go'
+
     it 'sets compiler' do
       result.should include('go')
       result['go'].should include('1.0')
@@ -107,21 +109,21 @@ describe Travis::CLI::Init do
   end
 
   describe 'travis init groovy' do
-    it_should_behave_like 'travis init', 'groovy'
+    it_behaves_like 'travis init', 'groovy'
   end
 
   describe 'travis init haskell' do
-    it_should_behave_like 'travis init', 'haskell'
+    it_behaves_like 'travis init', 'haskell'
   end
 
   describe 'travis init java' do
-    it_should_behave_like 'travis init', 'java'
-
     let :result do
       run_cli('init', 'java', '--skip-enable', '-r', 'travis-ci/travis.rb')
       YAML.load_file('.travis.yml')
     end
 
+    it_behaves_like 'travis init', 'java'
+
     it 'sets compiler' do
       result.should include('jdk')
       result['jdk'].should include('oraclejdk7')
@@ -130,13 +132,13 @@ describe Travis::CLI::Init do
   end
 
   describe 'travis init node_js' do
-    it_should_behave_like 'travis init', 'node_js'
-
     let :result do
       run_cli('init', 'node_js', '--skip-enable', '-r', 'travis-ci/travis.rb')
       YAML.load_file('.travis.yml')
     end
 
+    it_behaves_like 'travis init', 'node_js'
+
     it 'sets compiler' do
       result.should include('node_js')
       result['node_js'].should include('stable')
@@ -146,17 +148,17 @@ describe Travis::CLI::Init do
   end
 
   describe 'travis init objective-c' do
-    it_should_behave_like 'travis init', 'objective-c'
+    it_behaves_like 'travis init', 'objective-c'
   end
 
   describe 'travis init perl' do
-    it_should_behave_like 'travis init', 'perl'
-
     let :result do
       run_cli('init', 'perl', '--skip-enable', '-r', 'travis-ci/travis.rb')
       YAML.load_file('.travis.yml')
     end
 
+    it_behaves_like 'travis init', 'perl'
+
     it 'sets compiler' do
       result.should include('perl')
       result['perl'].should include('5.16')
@@ -165,13 +167,13 @@ describe Travis::CLI::Init do
   end
 
   describe 'travis init php' do
-    it_should_behave_like 'travis init', 'php'
-
     let :result do
       run_cli('init', 'php', '--skip-enable', '-r', 'travis-ci/travis.rb')
       YAML.load_file('.travis.yml')
     end
 
+    it_behaves_like 'travis init', 'php'
+
     it 'sets compiler' do
       result.should include('php')
       result['php'].should include('5.5')
@@ -180,13 +182,13 @@ describe Travis::CLI::Init do
   end
 
   describe 'travis init python' do
-    it_should_behave_like 'travis init', 'python'
-
     let :result do
       run_cli('init', 'python', '--skip-enable', '-r', 'travis-ci/travis.rb')
       YAML.load_file('.travis.yml')
     end
 
+    it_behaves_like 'travis init', 'python'
+
     it 'sets compiler' do
       result.should include('python')
       result['python'].should include('2.7')
@@ -195,13 +197,13 @@ describe Travis::CLI::Init do
   end
 
   describe 'travis init ruby' do
-    it_should_behave_like 'travis init', 'ruby'
-
     let :result do
       run_cli('init', 'ruby', '--skip-enable', '-r', 'travis-ci/travis.rb')
       YAML.load_file('.travis.yml')
     end
 
+    it_behaves_like 'travis init', 'ruby'
+
     it 'sets compiler' do
       result.should include('rvm')
       result['rvm'].should     include('1.9.3')
@@ -211,13 +213,13 @@ describe Travis::CLI::Init do
   end
 
   describe 'travis init scala' do
-    it_should_behave_like 'travis init', 'scala'
-
     let :result do
       run_cli('init', 'scala', '--skip-enable', '-r', 'travis-ci/travis.rb')
       YAML.load_file('.travis.yml')
     end
 
+    it_behaves_like 'travis init', 'scala'
+
     it 'sets compiler' do
       result.should include('scala')
       result['scala'].should include('2.10.1')

data/spec/cli/logs_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::CLI::Logs do

data/spec/cli/open_spec.rb

@@ -1,24 +1,26 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Travis::CLI::Open do
   example 'travis open -p' do
     run_cli('open', '-p').should be_success
-    stdout.should match(/https:\/\/travis-ci.org\/[\w\W]*\/travis\.rb/)
+    stdout.should match(%r{https://travis-ci.org/[\w\W]*/travis\.rb})
   end
 
   example 'travis open 6180 -p' do
     run_cli('open', '6180', '-p').should be_success
-    stdout.should match(/https:\/\/travis-ci.org\/[\w\W]*\/travis\.rb\/builds\/4125095/)
+    stdout.should match(%r{https://travis-ci.org/[\w\W]*/travis\.rb/builds/4125095})
   end
 
   example 'travis open 6180.1 -p' do
     run_cli('open', '6180.1', '-p').should be_success
-    stdout.should match(/https:\/\/travis-ci.org\/[\w\W]*\/travis\.rb\/jobs\/4125096/)
+    stdout.should match(%r{https://travis-ci.org/[\w\W]*/travis\.rb/jobs/4125096})
   end
 
   example 'travis open -pg' do
     run_cli('open', '-pg').should be_success
-    stdout.should match(/https:\/\/github.com\/[\w\W]*\/travis\.rb/)
+    stdout.should match(%r{https://github.com/[\w\W]*/travis\.rb})
   end
 
   example 'travis open 6180 -pg' do

data/spec/cli/repo_command_spec.rb

@@ -1,25 +1,29 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'uri'
 
 describe Travis::CLI::RepoCommand do
   describe '#parse_remote' do
+    subject(:repo_command) { described_class.new }
+
     it 'handles git@github.com URIs' do
-      path = subject.send(:parse_remote, 'git@github.com:travis-ci/travis.rb.git')
+      path = repo_command.send(:parse_remote, 'git@github.com:travis-ci/travis.rb.git')
       path.should be == '/travis-ci/travis.rb.git'
     end
 
     it 'handles GitHub Enterprise URIS' do
-      path = subject.send(:parse_remote, 'git@example.com:travis-ci/travis.rb.git')
+      path = repo_command.send(:parse_remote, 'git@example.com:travis-ci/travis.rb.git')
       path.should be == '/travis-ci/travis.rb.git'
     end
 
     it 'handles HTTPS URIs' do
-      path = subject.send(:parse_remote, 'https://github.com/travis-ci/travis.rb.git')
+      path = repo_command.send(:parse_remote, 'https://github.com/travis-ci/travis.rb.git')
       path.should be == '/travis-ci/travis.rb.git'
     end
 
     it 'raises URI::InvalidURIError for invalid URIs' do
-      expect { subject.send(:parse_remote, "foo@example.com:baz/bar.git") }.to raise_error(URI::InvalidURIError)
+      expect { repo_command.send(:parse_remote, 'foo@example.com:baz/bar.git') }.to raise_error(URI::InvalidURIError)
     end
   end
 end

data/spec/cli/restart_spec.rb

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