travis 1.5.3 → 1.5.4

data/lib/travis/version.rb

@@ -1,3 +1,3 @@
 module Travis
-  VERSION = '1.5.3'
+  VERSION = '1.5.4'
 end

data/spec/cli/endpoint_spec.rb

@@ -22,6 +22,11 @@ describe Travis::CLI::Endpoint do
     stdout.should be == "http://localhost:3000/\n"
   end
 
+  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
     run_cli('endpoint', '-i').should be_success
     stdout.should be == "API endpoint: https://api.travis-ci.org/\n"

data/spec/cli/init_spec.rb

@@ -1,26 +1,28 @@
 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
-    FileUtils.mkdir_p "spec/tmp"
-    Dir.chdir "spec/tmp"
+    FileUtils.mkdir_p(tmp_path)
+    Dir.chdir(tmp_path)
     FileUtils.rm('.travis.yml') if File.exist?('.travis.yml')
   end
 
   after(:each) do
-    Dir.chdir ".."
-    FileUtils.rm('spec/tmp/.travis.yml') if File.exist?('spec/tmp/.travis.yml')
+    Dir.chdir(old_path)
   end
 
   example "travis init fakelanguage" do
-    run_cli('init', 'fakelanguage', '--skip-enable').should_not be_success
+    run_cli('init', 'fakelanguage', '--skip-enable', '-r', 'travis-ci/travis').should_not be_success
     stderr.should be == "unknown language fakelanguage\n"
   end
 
   shared_examples_for 'travis init' do |language|
     example "travis init #{language} (empty directory)" do
       File.exist?('.travis.yml').should be_false
-      run_cli('init', language, '--skip-enable').should be_success
+      run_cli('init', language, '--skip-enable', '-r', 'travis-ci/travis').should be_success
       stdout.should be == ".travis.yml file created!\n"
       File.exist?('.travis.yml').should be_true
       File.read('.travis.yml').should include("language: #{language}")
@@ -28,14 +30,14 @@ describe Travis::CLI::Init do
 
     example "travis init #{language} (.travis.yml already exists, using --force)" do
       File.open(".travis.yml", "w") { |f| f << "old file" }
-      run_cli('init', language, '--force', '--skip-enable').should be_success
+      run_cli('init', language, '--force', '--skip-enable', '-r', 'travis-ci/travis').should be_success
       stdout.should be == ".travis.yml file created!\n"
       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" }
-      run_cli('init', language, '--skip-enable').should_not be_success
+      run_cli('init', language, '--skip-enable', '-r', 'travis-ci/travis').should_not be_success
       stderr.should be == ".travis.yml already exists, use --force to override\n"
       File.read('.travis.yml').should be == "old file"
     end
@@ -45,7 +47,7 @@ describe Travis::CLI::Init do
     it_should_behave_like 'travis init', 'c'
 
     let :result do
-      run_cli('init', 'c', '--skip-enable')
+      run_cli('init', 'c', '--skip-enable', '-r', 'travis-ci/travis')
       YAML.load_file('.travis.yml')
     end
 
@@ -64,7 +66,7 @@ describe Travis::CLI::Init do
     it_should_behave_like 'travis init', 'cpp'
 
     let :result do
-      run_cli('init', 'cpp', '--skip-enable')
+      run_cli('init', 'cpp', '--skip-enable', '-r', 'travis-ci/travis')
       YAML.load_file('.travis.yml')
     end
 
@@ -79,7 +81,7 @@ describe Travis::CLI::Init do
     it_should_behave_like 'travis init', 'erlang'
 
     let :result do
-      run_cli('init', 'erlang', '--skip-enable')
+      run_cli('init', 'erlang', '--skip-enable', '-r', 'travis-ci/travis')
       YAML.load_file('.travis.yml')
     end
 
@@ -93,7 +95,7 @@ describe Travis::CLI::Init do
     it_should_behave_like 'travis init', 'go'
 
     let :result do
-      run_cli('init', 'go', '--skip-enable')
+      run_cli('init', 'go', '--skip-enable', '-r', 'travis-ci/travis')
       YAML.load_file('.travis.yml')
     end
 
@@ -116,7 +118,7 @@ describe Travis::CLI::Init do
     it_should_behave_like 'travis init', 'java'
 
     let :result do
-      run_cli('init', 'java', '--skip-enable')
+      run_cli('init', 'java', '--skip-enable', '-r', 'travis-ci/travis')
       YAML.load_file('.travis.yml')
     end
 
@@ -131,7 +133,7 @@ describe Travis::CLI::Init do
     it_should_behave_like 'travis init', 'node_js'
 
     let :result do
-      run_cli('init', 'node_js', '--skip-enable')
+      run_cli('init', 'node_js', '--skip-enable', '-r', 'travis-ci/travis')
       YAML.load_file('.travis.yml')
     end
 
@@ -150,7 +152,7 @@ describe Travis::CLI::Init do
     it_should_behave_like 'travis init', 'perl'
 
     let :result do
-      run_cli('init', 'perl', '--skip-enable')
+      run_cli('init', 'perl', '--skip-enable', '-r', 'travis-ci/travis')
       YAML.load_file('.travis.yml')
     end
 
@@ -165,7 +167,7 @@ describe Travis::CLI::Init do
     it_should_behave_like 'travis init', 'php'
 
     let :result do
-      run_cli('init', 'php', '--skip-enable')
+      run_cli('init', 'php', '--skip-enable', '-r', 'travis-ci/travis')
       YAML.load_file('.travis.yml')
     end
 
@@ -180,7 +182,7 @@ describe Travis::CLI::Init do
     it_should_behave_like 'travis init', 'python'
 
     let :result do
-      run_cli('init', 'python', '--skip-enable')
+      run_cli('init', 'python', '--skip-enable', '-r', 'travis-ci/travis')
       YAML.load_file('.travis.yml')
     end
 
@@ -195,7 +197,7 @@ describe Travis::CLI::Init do
     it_should_behave_like 'travis init', 'ruby'
 
     let :result do
-      run_cli('init', 'ruby', '--skip-enable')
+      run_cli('init', 'ruby', '--skip-enable', '-r', 'travis-ci/travis')
       YAML.load_file('.travis.yml')
     end
 
@@ -211,7 +213,7 @@ describe Travis::CLI::Init do
     it_should_behave_like 'travis init', 'scala'
 
     let :result do
-      run_cli('init', 'scala', '--skip-enable')
+      run_cli('init', 'scala', '--skip-enable', '-r', 'travis-ci/travis')
       YAML.load_file('.travis.yml')
     end
 

data/spec/client/repository_spec.rb

@@ -14,6 +14,7 @@ describe Travis::Client::Repository do
   its(:key) { should be_a(Travis::Client::Repository::Key) }
   its(:last_build) { should be_a(Travis::Client::Build) }
   its(:color) { should be == 'red' }
+  its(:github_language) { should be == 'Ruby' }
 
   it { should_not be_pending  }
   it { should     be_started  }

data/spec/client/session_spec.rb

@@ -54,6 +54,22 @@ describe Travis::Client::Session do
       Travis::Client::Session.new(:headers => {'foo' => 'bar'}, :uri => 'http://localhost:3000/').
         connection.headers['foo'].should be == 'bar'
     end
+
+    it 'sets a User-Agent' do
+      subject.headers['User-Agent'].should include("Travis/#{Travis::VERSION}")
+      subject.headers['User-Agent'].should include("Faraday/#{Faraday::VERSION}")
+      subject.headers['User-Agent'].should include("Rack/#{Rack.version}")
+      subject.headers['User-Agent'].should include("Ruby #{RUBY_VERSION}")
+    end
+
+    it 'allows adding custom infos to the User-Agent' do
+      subject.agent_info = "foo"
+      subject.headers['User-Agent'].should include("foo")
+      subject.headers['User-Agent'].should include("Travis/#{Travis::VERSION}")
+      subject.headers['User-Agent'].should include("Faraday/#{Faraday::VERSION}")
+      subject.headers['User-Agent'].should include("Rack/#{Rack.version}")
+      subject.headers['User-Agent'].should include("Ruby #{RUBY_VERSION}")
+    end
   end
 
   describe "find_one" do

data/spec/support/fake_api.rb

@@ -678,7 +678,8 @@ module Travis
              "last_build_duration"=>5019,
              "last_build_language"=>nil,
              "last_build_started_at"=>"2013-01-13T15:55:17Z",
-             "last_build_finished_at"=>nil}}.to_json
+             "last_build_finished_at"=>nil,
+             "github_language"=>"Ruby"}}.to_json
         end
 
         get '/repos/891/key' do

data/travis.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   # general infos
   s.name        = "travis"
-  s.version     = "1.5.3"
+  s.version     = "1.5.4"
   s.description = "CLI and Ruby client library for Travis CI"
   s.homepage    = "https://github.com/travis-ci/travis"
   s.summary     = "Travis CI client"
@@ -18,17 +18,18 @@ Gem::Specification.new do |s|
     "Max Barnash",
     "Aaron Hill",
     "Mathias Meyer",
+    "Jacob Burkhart",
     "Josh Kalderimis",
     "Justin Lambert",
-    "Adrien Brault",
-    "Laurent Petit",
-    "Daniel Chatfield",
+    "Adam Lavin",
+    "Benjamin Manns",
+    "Mario Visic",
     "Piotr Sarnacki",
     "Rapha\xC3\xABl Pinson",
     "Tobias Wilken",
-    "Mario Visic",
-    "Benjamin Manns",
-    "Jacob Burkhart"
+    "Laurent Petit",
+    "Daniel Chatfield",
+    "Adrien Brault"
   ]
 
   # generated from git shortlog -sne
@@ -39,17 +40,18 @@ Gem::Specification.new do |s|
     "i.am@anhero.ru",
     "aa1ronham@gmail.com",
     "meyer@paperplanes.de",
+    "josh.kalderimis@gmail.com",
     "jlambert@eml.cc",
-    "benmanns@gmail.com",
     "adrien.brault@gmail.com",
-    "laurent.petit@gmail.com",
+    "adam@lavoaster.co.uk",
     "chatfielddaniel@gmail.com",
+    "mario@mariovisic.com",
     "drogus@gmail.com",
     "raphael.pinson@camptocamp.com",
     "tw@cloudcontrol.de",
-    "mario@mariovisic.com",
-    "jburkhart@engineyard.com",
-    "josh.kalderimis@gmail.com"
+    "laurent.petit@gmail.com",
+    "benmanns@gmail.com",
+    "jburkhart@engineyard.com"
   ]
 
   # generated from git ls-files
@@ -60,6 +62,7 @@ Gem::Specification.new do |s|
     "bin/travis",
     "completion/extconf.rb",
     "completion/travis.sh",
+    "completion/travis.sh.erb",
     "example/org_overview.rb",
     "lib/travis.rb",
     "lib/travis/cacert.pem",
@@ -102,6 +105,15 @@ Gem::Specification.new do |s|
     "lib/travis/cli/repo_command.rb",
     "lib/travis/cli/restart.rb",
     "lib/travis/cli/setup.rb",
+    "lib/travis/cli/setup/cloud_control.rb",
+    "lib/travis/cli/setup/cloud_foundry.rb",
+    "lib/travis/cli/setup/engine_yard.rb",
+    "lib/travis/cli/setup/heroku.rb",
+    "lib/travis/cli/setup/nodejitsu.rb",
+    "lib/travis/cli/setup/open_shift.rb",
+    "lib/travis/cli/setup/ruby_gems.rb",
+    "lib/travis/cli/setup/sauce_connect.rb",
+    "lib/travis/cli/setup/service.rb",
     "lib/travis/cli/show.rb",
     "lib/travis/cli/status.rb",
     "lib/travis/cli/sync.rb",
@@ -129,6 +141,7 @@ Gem::Specification.new do |s|
     "lib/travis/client/worker.rb",
     "lib/travis/pro.rb",
     "lib/travis/tools/formatter.rb",
+    "lib/travis/tools/notification.rb",
     "lib/travis/tools/safe_string.rb",
     "lib/travis/tools/system.rb",
     "lib/travis/tools/token_finder.rb",
@@ -176,11 +189,12 @@ Gem::Specification.new do |s|
   s.add_dependency "highline",              "~> 1.6"
   s.add_dependency "netrc",                 "~> 0.7"
   s.add_dependency "backports"
-  s.add_dependency "gh"
+  s.add_dependency "gh",                    "~> 0.13"
   s.add_dependency "launchy",               "~> 2.1"
   s.add_dependency "pry",                   "~> 0.9"
-  s.add_dependency "typhoeus",              "~> 0.5"
+  s.add_dependency "typhoeus",              "~> 0.6"
   s.add_dependency "pusher-client",         "~> 0.3", ">= 0.3.1"
+  s.add_dependency "terminal-notifier",     ">= 1.4.2"
   s.add_development_dependency "rspec",     "~> 2.12"
   s.add_development_dependency "sinatra",   "~> 1.3"
   s.add_development_dependency "rack-test", "~> 0.6"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Konstantin Haase
@@ -10,21 +10,22 @@ authors:
 - Max Barnash
 - Aaron Hill
 - Mathias Meyer
+- Jacob Burkhart
 - Josh Kalderimis
 - Justin Lambert
-- Adrien Brault
-- Laurent Petit
-- Daniel Chatfield
+- Adam Lavin
+- Benjamin Manns
+- Mario Visic
 - Piotr Sarnacki
 - Raphaël Pinson
 - Tobias Wilken
-- Mario Visic
-- Benjamin Manns
-- Jacob Burkhart
+- Laurent Petit
+- Daniel Chatfield
+- Adrien Brault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -100,16 +101,16 @@ dependencies:
   name: gh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -144,14 +145,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: pusher-client
   requirement: !ruby/object:Gem::Requirement
@@ -172,6 +173,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: terminal-notifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -222,17 +237,18 @@ email:
 - i.am@anhero.ru
 - aa1ronham@gmail.com
 - meyer@paperplanes.de
+- josh.kalderimis@gmail.com
 - jlambert@eml.cc
-- benmanns@gmail.com
 - adrien.brault@gmail.com
-- laurent.petit@gmail.com
+- adam@lavoaster.co.uk
 - chatfielddaniel@gmail.com
+- mario@mariovisic.com
 - drogus@gmail.com
 - raphael.pinson@camptocamp.com
 - tw@cloudcontrol.de
-- mario@mariovisic.com
+- laurent.petit@gmail.com
+- benmanns@gmail.com
 - jburkhart@engineyard.com
-- josh.kalderimis@gmail.com
 executables:
 - travis
 extensions:
@@ -245,6 +261,7 @@ files:
 - bin/travis
 - completion/extconf.rb
 - completion/travis.sh
+- completion/travis.sh.erb
 - example/org_overview.rb
 - lib/travis.rb
 - lib/travis/cacert.pem
@@ -287,6 +304,15 @@ files:
 - lib/travis/cli/repo_command.rb
 - lib/travis/cli/restart.rb
 - lib/travis/cli/setup.rb
+- lib/travis/cli/setup/cloud_control.rb
+- lib/travis/cli/setup/cloud_foundry.rb
+- lib/travis/cli/setup/engine_yard.rb
+- lib/travis/cli/setup/heroku.rb
+- lib/travis/cli/setup/nodejitsu.rb
+- lib/travis/cli/setup/open_shift.rb
+- lib/travis/cli/setup/ruby_gems.rb
+- lib/travis/cli/setup/sauce_connect.rb
+- lib/travis/cli/setup/service.rb
 - lib/travis/cli/show.rb
 - lib/travis/cli/status.rb
 - lib/travis/cli/sync.rb
@@ -314,6 +340,7 @@ files:
 - lib/travis/client/worker.rb
 - lib/travis/pro.rb
 - lib/travis/tools/formatter.rb
+- lib/travis/tools/notification.rb
 - lib/travis/tools/safe_string.rb
 - lib/travis/tools/system.rb
 - lib/travis/tools/token_finder.rb
@@ -373,7 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: Travis CI client