travis 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e9ba04f7bc2ce5298cc1449e4d2835b26539b2f
-  data.tar.gz: 3dc663c0c3726335d2e5393023ddf1ba4c187bb4
+  metadata.gz: 8f0be4644ffa1b11b883f5f9caa3b927e093a807
+  data.tar.gz: 90949786ac2590427e6539f9c3ac614cbb0a982b
 SHA512:
-  metadata.gz: d08eecff707521d33acd5466764e151cb7e687fe4b191ffa12ee5ea2cb481ec9aa9aed8a4cef5b80b544757c97b97bbdded7c03daeffd86a4a0e0b3423b5d326
-  data.tar.gz: 70f7ea86abb1f3260ccae4d34d337d61d00f7ba7579507d2be669e149fc9c6c2bb0e9fffcff91e1c6f2f16c87393ba3829fd1065a2c77a0ae0327f10ba78714e
+  metadata.gz: e20f8818e813c06e6fbd6fecb1714ab41b73c8b121a84c281891346a9652cd63171a6fb846527446ae40375bb6111b0c87928a2805b6f0ac996f8fb1b986b9d6
+  data.tar.gz: f60857f3566cc107eb1b188459571dd5fe99e6b612dedc5c64e98ae8b6732711e5750e91b0f1db849ee21ee31ce4ea59d0bfadf7fc7db8c41cfddc5640e3915c

data/README.md

@@ -1,8 +1,8 @@
-# The Travis Client
+# The Travis Client [![Build Status](https://travis-ci.org/travis-ci/travis.png?branch=master)](https://travis-ci.org/travis-ci/travis)
 
-[![Build Status](https://travis-ci.org/travis-ci/travis.png?branch=master)](https://travis-ci.org/travis-ci/travis)
+![The Travis Mascot](http://about.travis-ci.org/images/travis-mascot-600px.png)
 
-The [travis gem](https://rubygems.org/gems/travis) includes both a command line client and a Ruby library to interface with a Travis CI service. Both work with [travis-ci.org](https://travis-ci.org), [travis-ci.com](https://travis-ci.com) or any custom Travis CI setup you might have.
+The [travis gem](https://rubygems.org/gems/travis) includes both a [command line client](#command-line-client) and a [Ruby library](#ruby-library) to interface with a Travis CI service. Both work with [travis-ci.org](https://travis-ci.org), [travis-ci.com](https://travis-ci.com) or any custom Travis CI setup you might have. Check out the [installation instructions](#installation) to get it running in no time.
 
 ## Table of Contents
 
@@ -25,6 +25,7 @@ The [travis gem](https://rubygems.org/gems/travis) includes both a command line
         * [`enable`](#enable)
         * [`encrypt`](#encrypt)
         * [`history`](#history)
+        * [`init`](#init)
         * [`logs`](#logs)
         * [`open`](#open)
         * [`pubkey`](#pubkey)
@@ -47,11 +48,18 @@ The [travis gem](https://rubygems.org/gems/travis) includes both a command line
     * [Dealing with Sessions](#dealing-with-sessions)
     * [Using Namespaces](#using-namespaces)
 * [Installation](#installation)
+    * [Updating your Ruby](#updating-your-ruby)
+        * [Mac OSX via Homebrew](#mac-osx-via-homebrew)
+        * [Windows](#windows)
+        * [Other Unix systems](#other-unix-systems)
+        * [Ruby versioning tools](#ruby-versioning-tools)
     * [Upgrading from travis-cli](#upgrading-from-travis-cli)
 * [Version History](#version-history)
 
 ## Command Line Client
 
+![](http://about.travis-ci.org/images/new-tricks.png)
+
 There are three types of commands: [Non-API Commands](#non-api-commands), [General API Commands](#general-api-commands) and [Repository Commands](#repository-commands). All commands take the form of `travis COMMAND [ARGUMENTS] [OPTIONS]`. You can get a list of commands by running [`help`](#help).
 
 ### Non-API Commands
@@ -324,7 +332,6 @@ If you don't want the sync to be triggered, use `--skip-sync`.
         -e, --api-endpoint URL           Travis API server to talk to
             --pro                        short-cut for --api-endpoint 'https://api.travis-ci.com/'
             --org                        short-cut for --api-endpoint 'https://api.travis-ci.org/'
-            --staging                    talks to staging system
         -t, --token [ACCESS_TOKEN]       access token to use
             --debug                      show API requests
             --adapter ADAPTER            Faraday adapter to use for HTTP requests
@@ -428,6 +435,55 @@ Or a certain Pull Request:
     #49 passed:   Pull Request #5 improve output
     #48 passed:   Pull Request #5 let it generate accessor for line splitting automatically
 
+#### `init`
+
+    Usage: travis init [language] [file] [options]
+        -h, --help                       Display help
+        -i, --[no-]interactive           be interactive and colorful
+        -E, --[no-]explode               don't rescue exceptions
+            --skip-version-check         don't check if travis client is up to date
+        -e, --api-endpoint URL           Travis API server to talk to
+            --pro                        short-cut for --api-endpoint 'https://api.travis-ci.com/'
+            --org                        short-cut for --api-endpoint 'https://api.travis-ci.org/'
+        -t, --token [ACCESS_TOKEN]       access token to use
+            --debug                      show API requests
+            --adapter ADAPTER            Faraday adapter to use for HTTP requests
+        -r, --repo SLUG                  repository to use (will try to detect from current git clone)
+        -s, --skip-sync                  don't trigger a sync if the repo is unknown
+        -f, --force                      override .travis.yml if it already exists
+        -k, --skip-enable                do not enable project, only add .travis.yml
+        -p, --print-conf                 print generated config instead of writing to file
+            --script VALUE               sets script option in .travis.yml (can be used more than once)
+            --before-script VALUE        sets before_script option in .travis.yml (can be used more than once)
+            --after-script VALUE         sets after_script option in .travis.yml (can be used more than once)
+            --after-success VALUE        sets after_success option in .travis.yml (can be used more than once)
+            --install VALUE              sets install option in .travis.yml (can be used more than once)
+            --before-install VALUE       sets before_install option in .travis.yml (can be used more than once)
+            --compiler VALUE             sets compiler option in .travis.yml (can be used more than once)
+            --otp-release VALUE          sets otp_release option in .travis.yml (can be used more than once)
+            --go VALUE                   sets go option in .travis.yml (can be used more than once)
+            --jdk VALUE                  sets jdk option in .travis.yml (can be used more than once)
+            --node-js VALUE              sets node_js option in .travis.yml (can be used more than once)
+            --perl VALUE                 sets perl option in .travis.yml (can be used more than once)
+            --php VALUE                  sets php option in .travis.yml (can be used more than once)
+            --python VALUE               sets python option in .travis.yml (can be used more than once)
+            --rvm VALUE                  sets rvm option in .travis.yml (can be used more than once)
+            --scala VALUE                sets scala option in .travis.yml (can be used more than once)
+            --env VALUE                  sets env option in .travis.yml (can be used more than once)
+            --gemfile VALUE              sets gemfile option in .travis.yml (can be used more than once)
+
+When setting up a new project, you can run `travis init` to generate a `.travis.yml` and [enable](#enable) the project:
+
+    $ travis init java
+    .travis.yml file created!
+    travis-ci/java-example: enabled :)
+
+You can also set certain values via command line flags (see list above):
+
+    $ travis init c --compiler clang
+    .travis.yml file created!
+    travis-ci/c-example: enabled :)
+
 #### `logs`
 
 Given a job number, logs simply prints out that job's logs.
@@ -506,7 +562,6 @@ Helps you configure Travis addons.
         -e, --api-endpoint URL           Travis API server to talk to
             --pro                        short-cut for --api-endpoint 'https://api.travis-ci.com/'
             --org                        short-cut for --api-endpoint 'https://api.travis-ci.org/'
-            --staging                    talks to staging system
         -t, --token [ACCESS_TOKEN]       access token to use
             --debug                      show API requests
             --adapter ADAPTER            Faraday adapter to use for HTTP requests
@@ -661,7 +716,7 @@ Or with your own client instance:
 ``` ruby
 require 'travis/client'
 
-client = Travis::Client.new
+client = Travis::Client.new(access_token: "...")
 puts "Hello #{client.user.name}"
 ```
 
@@ -996,9 +1051,60 @@ MyTravis::Repository.find('rails/rails')
 
 ## Installation
 
-Make sure you have at least [Ruby](http://www.ruby-lang.org/en/downloads/) 1.8.7 (2.0.0 recommended) installed. Then run:
+Make sure you have at least [Ruby](http://www.ruby-lang.org/en/downloads/) 1.9.3 (2.0.0 recommended) installed.
+
+You can check your Ruby version by running `ruby -v`:
+
+    $ ruby -v
+    ruby 2.0.0p195 (2013-05-14 revision 40734) [x86_64-darwin12.3.0]
+
+Then run:
+
+    $ gem install travis -v 1.4.0 --no-rdoc --no-ri
+
+Now make sure everything is working:
+
+    $ travis verision
+    1.4.0
 
-    $ gem install travis --no-rdoc --no-ri
+### Updating your Ruby
+
+If you have an outdated Ruby version, you should use your package system or a Ruby Installer to install a recent Ruby.
+
+#### Mac OSX via Homebrew
+
+Mac OSX prior to 10.9 ships with a very dated Ruby version. You can use [Homebrew](http://mxcl.github.io/homebrew/) to install a recent version:
+
+    $ brew install ruby
+    $ gem update --system
+
+#### Windows
+
+On Windows, we recommend using the [RubyInstaller](http://rubyinstaller.org/), which includes the latest version of Ruby.
+
+#### Other Unix systems
+
+On other Unix systems, like Linux, use your package system to install Ruby. Please inquire before hand which package you might actually want to install, as for some distributions `ruby` might actually still be 1.8.7 or older.
+
+Ubuntu and Debian:
+
+    $ sudo apt-get install ruby1.9.3 ruby-switch
+    $ sudo ruby-switch --set ruby1.9.3
+
+Fedora Core:
+
+    $ sudo yum install ruby
+
+Arch Linux:
+
+    $ sudo pacman -S ruby
+
+
+#### Ruby versioning tools
+
+Alternatively, you can use a Ruby version management tool such as [rvm](https://rvm.io/rvm/install/), [rbenv](http://rbenv.org/) or [https://github.com/postmodern/chruby](chruby). This is only recommended if you need to run multiple versions of Ruby.
+
+You can of course always compile Ruby from source, though then you are left with the hassle of keeping it up to date and making sure that everything is set up properly.
 
 ### Upgrading from travis-cli
 
@@ -1006,6 +1112,15 @@ If you have the old `travis-cli` gem installed, you should `gem uninstall travis
 
 ## Version History
 
+**1.4.0** (July 26, 2013)
+
+* Add `travis init`
+* Improve install documentation, especially for people from outside the Ruby community
+* Improve error message on an expired token
+* Add Account entity to library
+* Switch to Typhoeus as default HTTP adapter
+* Fix tests for forks
+
 **1.3.1** (July 21, 2013)
 
 * Add `travis whatsup --my-repos`, which corresponds to the "My Repositories" tab in the web interface

data/Rakefile

@@ -5,20 +5,21 @@ windows = RUBY_PLATFORM =~ /mswin|mingw/
 desc "run specs"
 task(:spec) { ruby "-S rspec spec#{" -c" unless windows}" }
 
-desc "generate gemspec"
-task 'travis.gemspec' do
+desc "generate gemspec, update readme"
+task 'update' do
   require 'travis/version'
   content = File.read('travis.gemspec')
 
   # fetch data
   fields = {
-    :authors => `git shortlog -sn`.b.scan(/[^\d\s].*/),
+    :authors => `git shortlog -sn`.b.scan(/[^\d\s].*/).map { |a| a == 'petems' ? 'Peter Souter' : a },
     :email   => `git shortlog -sne`.b.scan(/[^<]+@[^>]+/),
     :files   => `git ls-files`.b.split("\n").reject { |f| f =~ /^(\.|Gemfile)/ }
   }
 
   # :(
   fields[:email].delete("konstantin.haase@gmail.com")
+  fields[:authors]
 
   # insert data
   fields.each do |field, values|
@@ -35,9 +36,17 @@ task 'travis.gemspec' do
   content.gsub!(/./) { |c| c.bytesize > 1 ? "\\u{#{c.codepoints.first.to_s(16)}}" : c }
 
   File.open('travis.gemspec', 'w') { |f| f << content }
+
+  readme = File.read('README.md').b
+  readme.gsub! /^(\s+\$ travis verision\n\s+).*$/, "\\1#{Travis::VERSION}"
+  readme.gsub! /(gem install travis -v )\S+/, "\\1#{Travis::VERSION}"
+  File.write('README.md', readme)
 end
 
-task :gemspec => 'travis.gemspec'
+task 'travis.gemspec' => :update
+task 'README.md'      => :update
+
+task :gemspec => :update
 task :default => :spec
 task :default => :gemspec unless windows or ENV['CI']
 task :test    => :spec

data/lib/travis/cli/command.rb

@@ -133,7 +133,9 @@ module Travis
         store_config
       rescue StandardError => e
         raise(e) if explode?
-        error e.message
+        message = e.message
+        message += " - need to run `travis login` again?" if Travis::Client::Error === e and message == 'access denied'
+        error message
       end
 
       def command_name

data/lib/travis/cli/init/c.yml

@@ -0,0 +1,4 @@
+language: c
+compiler:
+- clang
+- gcc

data/lib/travis/cli/init/clojure.yml

@@ -0,0 +1 @@
+language: clojure

data/lib/travis/cli/init/cpp.yml

@@ -0,0 +1,4 @@
+language: cpp
+compiler:
+- clang
+- gcc

data/lib/travis/cli/init/erlang.yml

@@ -0,0 +1,3 @@
+language: erlang
+otp_release:
+- R16B

data/lib/travis/cli/init/go.yml

@@ -0,0 +1,4 @@
+language: go
+go:
+- "1.0"
+- "1.1"

data/lib/travis/cli/init/groovy.yml

@@ -0,0 +1 @@
+language: groovy

data/lib/travis/cli/init/haskell.yml

@@ -0,0 +1 @@
+language: haskell

data/lib/travis/cli/init/java.yml

@@ -0,0 +1,4 @@
+language: java
+jdk:
+- oraclejdk7
+- openjdk6

data/lib/travis/cli/init/node_js.yml

@@ -0,0 +1,4 @@
+language: node_js
+node_js:
+- "0.11"
+- "0.10"

data/lib/travis/cli/init/objective-c.yml

@@ -0,0 +1 @@
+language: objective-c

data/lib/travis/cli/init/perl.yml

@@ -0,0 +1,4 @@
+language: perl
+perl:
+- "5.16"
+- "5.14"

data/lib/travis/cli/init/php.yml

@@ -0,0 +1,4 @@
+language: php
+php:
+- "5.5"
+- "5.4"

data/lib/travis/cli/init/python.yml

@@ -0,0 +1,5 @@
+language: python
+python:
+- "2.7"
+- "3.3"
+- "pypy"

data/lib/travis/cli/init/ruby.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+- 2.0.0
+- 1.9.3
+- jruby-19mode
+- rbx-19mode

data/lib/travis/cli/init/scala.yml

@@ -0,0 +1,4 @@
+language: scala
+scala:
+- "2.10.1"
+- "2.9.3"

data/lib/travis/cli/init.rb

@@ -0,0 +1,57 @@
+require 'travis/cli'
+
+module Travis
+  module CLI
+    class Init < Enable
+      on('-f', '--force', 'override .travis.yml if it already exists')
+      on('-k', '--skip-enable', 'do not enable project, only add .travis.yml')
+      on('-p', '--print-conf', 'print generated config instead of writing to file')
+
+      options = %w[
+        script before_script after_script after_success install before_install
+        compiler otp_release go jdk node_js perl php python rvm scala
+        env gemfile
+      ]
+
+      options.each do |option|
+        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
+      end
+
+      attr_writer :travis_config
+
+      def run(language = nil, file = '.travis.yml')
+        error ".travis.yml already exists, use --force to override" if File.exist?(file) and not force? and not print_conf?
+        language ||= ask('Main programming language used: ') { |q| q.default = detect_language }
+        self.travis_config = template(language).merge(custom_config)
+
+        if print_conf?
+          puts travis_config.to_yaml
+        else
+          save_travis_config(file)
+          say("#{file} file created!")
+        end
+
+        super() unless skip_enable?
+      end
+
+      def custom_config
+        @custom_config ||= {}
+      end
+
+      private
+
+        def template(language)
+          file = File.expand_path("../init/#{language}.yml", __FILE__)
+          error "unknown language #{language}" unless File.exist? file
+          YAML.load_file(file)
+        end
+
+        def detect_language
+          'ruby'
+        end
+    end
+  end
+end

data/lib/travis/cli/repo_command.rb

@@ -88,11 +88,11 @@ module Travis
           end
         end
 
-        def save_travis_config
+        def save_travis_config(file = travis_yaml)
           yaml = travis_config.to_yaml
           yaml.gsub! /^(\s+)('on'|true):/, "\\1on:"
-          yaml.gsub! /\A---\n/, ''
-          File.write(travis_yaml, yaml)
+          yaml.gsub! /\A---\s*\n/, ''
+          File.write(file, yaml)
         end
     end
   end

data/lib/travis/cli.rb

@@ -25,6 +25,7 @@ module Travis
     autoload :Endpoint,     'travis/cli/endpoint'
     autoload :Help,         'travis/cli/help'
     autoload :History,      'travis/cli/history'
+    autoload :Init,         'travis/cli/init'
     autoload :Login,        'travis/cli/login'
     autoload :Logs,         'travis/cli/logs'
     autoload :Open,         'travis/cli/open'

data/lib/travis/client/account.rb

@@ -0,0 +1,14 @@
+require 'travis/client'
+
+module Travis
+  module Client
+    class Account < Entity
+      attributes :name, :login, :type, :repos_count
+
+      one :account
+      many :accounts
+
+      inspect_info :login
+    end
+  end
+end

data/lib/travis/client/methods.rb

@@ -63,6 +63,10 @@ module Travis
         session.find_one(User)
       end
 
+      def accounts
+        session.find_many(Account)
+      end
+
       def restart(entity)
         # btw, internally we call this reset, not restart, as it resets the state machine
         # but we thought that would be too confusing
@@ -71,4 +75,4 @@ module Travis
       end
     end
   end
-end
+end

data/lib/travis/client/session.rb

@@ -2,6 +2,8 @@ require 'travis/client'
 
 require 'faraday'
 require 'faraday_middleware'
+require 'typhoeus/adapters/faraday'
+
 require 'json'
 
 module Travis
@@ -16,13 +18,13 @@ module Travis
         @cache           = {}
         @instruments     = []
         @config          = nil
-        @faraday_adapter = :net_http_persistent
+        @faraday_adapter = :typhoeus
 
         options = { :uri => options } unless options.respond_to? :each_pair
         options.each_pair { |key, value| public_send("#{key}=", value) }
 
         raise ArgumentError, "neither :uri nor :connection specified" unless connection
-        headers['Accept'] ||= 'application/vnd.travis-ci.2+json, */*; q=0.01'
+        headers['Accept'] ||= 'application/json; version=2'
       end
 
       def uri

data/lib/travis/client.rb

@@ -12,6 +12,7 @@ require 'travis/client/commit'
 require 'travis/client/job'
 require 'travis/client/worker'
 require 'travis/client/namespace'
+require 'travis/client/account'
 
 module Travis
   module Client

data/lib/travis/version.rb

@@ -1,3 +1,3 @@
 module Travis
-  VERSION = '1.3.1'
+  VERSION = '1.4.0'
 end

data/spec/cli/init_spec.rb

@@ -0,0 +1,224 @@
+require 'spec_helper'
+
+describe Travis::CLI::Init do
+  before(:each) do
+    FileUtils.mkdir_p "spec/tmp"
+    Dir.chdir "spec/tmp"
+    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')
+  end
+
+  example "travis init fakelanguage" do
+    run_cli('init', 'fakelanguage', '--skip-enable').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
+      stdout.should be == ".travis.yml file created!\n"
+      File.exist?('.travis.yml').should be_true
+      File.read('.travis.yml').should include("language: #{language}")
+    end
+
+    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
+      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
+      stderr.should be == ".travis.yml already exists, use --force to override\n"
+      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')
+      YAML.load_file('.travis.yml')
+    end
+
+    it 'sets compiler' do
+      result.should include('compiler')
+      result['compiler'].should include('clang')
+      result['compiler'].should include('gcc')
+    end
+  end
+
+  describe 'travis init clojure' do
+    it_should_behave_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')
+      YAML.load_file('.travis.yml')
+    end
+
+    it 'sets compiler' do
+      result.should include('compiler')
+      result['compiler'].should include('clang')
+      result['compiler'].should include('gcc')
+    end
+  end
+
+  describe 'travis init erlang' do
+    it_should_behave_like 'travis init', 'erlang'
+
+    let :result do
+      run_cli('init', 'erlang', '--skip-enable')
+      YAML.load_file('.travis.yml')
+    end
+
+    it 'sets compiler' do
+      result.should include('otp_release')
+      result['otp_release'].should include('R16B')
+    end
+  end
+
+  describe 'travis init go' do
+    it_should_behave_like 'travis init', 'go'
+
+    let :result do
+      run_cli('init', 'go', '--skip-enable')
+      YAML.load_file('.travis.yml')
+    end
+
+    it 'sets compiler' do
+      result.should include('go')
+      result['go'].should include('1.0')
+      result['go'].should include('1.1')
+    end
+  end
+
+  describe 'travis init groovy' do
+    it_should_behave_like 'travis init', 'groovy'
+  end
+
+  describe 'travis init haskell' do
+    it_should_behave_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')
+      YAML.load_file('.travis.yml')
+    end
+
+    it 'sets compiler' do
+      result.should include('jdk')
+      result['jdk'].should include('oraclejdk7')
+      result['jdk'].should include('openjdk6')
+    end
+  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')
+      YAML.load_file('.travis.yml')
+    end
+
+    it 'sets compiler' do
+      result.should include('node_js')
+      result['node_js'].should include('0.11')
+      result['node_js'].should include('0.10')
+    end
+  end
+
+  describe 'travis init objective-c' do
+    it_should_behave_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')
+      YAML.load_file('.travis.yml')
+    end
+
+    it 'sets compiler' do
+      result.should include('perl')
+      result['perl'].should include('5.16')
+      result['perl'].should include('5.14')
+    end
+  end
+
+  describe 'travis init php' do
+    it_should_behave_like 'travis init', 'php'
+
+    let :result do
+      run_cli('init', 'php', '--skip-enable')
+      YAML.load_file('.travis.yml')
+    end
+
+    it 'sets compiler' do
+      result.should include('php')
+      result['php'].should include('5.5')
+      result['php'].should include('5.4')
+    end
+  end
+
+  describe 'travis init python' do
+    it_should_behave_like 'travis init', 'python'
+
+    let :result do
+      run_cli('init', 'python', '--skip-enable')
+      YAML.load_file('.travis.yml')
+    end
+
+    it 'sets compiler' do
+      result.should include('python')
+      result['python'].should include('2.7')
+      result['python'].should include('3.3')
+    end
+  end
+
+  describe 'travis init ruby' do
+    it_should_behave_like 'travis init', 'ruby'
+
+    let :result do
+      run_cli('init', 'ruby', '--skip-enable')
+      YAML.load_file('.travis.yml')
+    end
+
+    it 'sets compiler' do
+      result.should include('rvm')
+      result['rvm'].should     include('1.9.3')
+      result['rvm'].should     include('2.0.0')
+      result['rvm'].should_not include('1.8.7')
+    end
+  end
+
+  describe 'travis init scala' do
+    it_should_behave_like 'travis init', 'scala'
+
+    let :result do
+      run_cli('init', 'scala', '--skip-enable')
+      YAML.load_file('.travis.yml')
+    end
+
+    it 'sets compiler' do
+      result.should include('scala')
+      result['scala'].should include('2.10.1')
+      result['scala'].should include('2.9.3')
+    end
+  end
+end

data/spec/cli/open_spec.rb

@@ -3,22 +3,22 @@ require 'spec_helper'
 describe Travis::CLI::Open do
   example 'travis open -p' do
     run_cli('open', '-p').should be_success
-    stdout.should be == "https://travis-ci.org/travis-ci/travis\n"
+    stdout.should match(/https:\/\/travis-ci.org\/[\w\W]*\/travis/)
   end
 
   example 'travis open 6180 -p' do
     run_cli('open', '6180', '-p').should be_success
-    stdout.should be == "https://travis-ci.org/travis-ci/travis/builds/4125095\n"
+    stdout.should match(/https:\/\/travis-ci.org\/[\w\W]*\/travis\/builds\/4125095/)
   end
 
   example 'travis open 6180.1 -p' do
     run_cli('open', '6180.1', '-p').should be_success
-    stdout.should be == "https://travis-ci.org/travis-ci/travis/jobs/4125096\n"
+    stdout.should match(/https:\/\/travis-ci.org\/[\w\W]*\/travis\/jobs\/4125096/)
   end
 
   example 'travis open -pg' do
     run_cli('open', '-pg').should be_success
-    stdout.should be == "https://github.com/travis-ci/travis\n"
+    stdout.should match(/https:\/\/github.com\/[\w\W]*\/travis/)
   end
 
   example 'travis open 6180 -pg' do

data/spec/client/account_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Travis::Client::Account do
+  let(:session) { Travis::Client.new }
+  subject { session.accounts.first }
+  its(:id) { should be == 123 }
+  its(:name) { should be == 'Konstantin Haase' }
+  its(:login) { should be == 'rkh' }
+  its(:type) { should be == 'user' }
+  its(:repos_count) { should be == 200 }
+  its(:inspect) { should be == "#<Travis::Client::Account: rkh>" }
+end

data/spec/support/fake_api.rb

@@ -656,7 +656,7 @@ module Travis
               "$ export GEM=railties\n"}}.to_json
         end
 
-        get '/repos/travis-ci/travis' do
+        get '/repos/*/travis' do
           # hack hack
           request.path_info = '/repos/rails/rails'
           pass
@@ -705,6 +705,16 @@ module Travis
               'payload' => nil}}.to_json
         end
 
+        get '/accounts/' do
+          {"accounts"=>
+          [{'id' => 123,
+            'name' => "Konstantin Haase",
+            'login' => 'rkh',
+            'type' => 'user',
+            'repos_count' => 200
+          }]}.to_json
+        end
+
         post '/requests' do
           $params = params
           "{}"

data/travis.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   # general infos
   s.name        = "travis"
-  s.version     = "1.3.1"
+  s.version     = "1.4.0"
   s.description = "CLI and Ruby client library for Travis CI"
   s.homepage    = "https://github.com/travis-ci/travis"
   s.summary     = "Travis CI client"
@@ -13,25 +13,29 @@ Gem::Specification.new do |s|
   s.authors = [
     "Konstantin Haase",
     "Henrik Hodne",
+    "Peter Souter",
     "Max Barnash",
     "Mario Visic",
     "Piotr Sarnacki",
-    "Adrien Brault",
     "Rapha\xC3\xABl Pinson",
+    "Laurent Petit",
+    "Adrien Brault",
     "Justin Lambert",
-    "Laurent Petit"
+    "Aaron Hill"
   ]
 
   # generated from git shortlog -sne
   s.email = [
     "konstantin.mailinglists@googlemail.com",
     "me@henrikhodne.com",
+    "p.morsou@gmail.com",
     "i.am@anhero.ru",
     "drogus@gmail.com",
-    "adrien.brault@gmail.com",
     "raphael.pinson@camptocamp.com",
-    "jlambert@eml.cc",
     "laurent.petit@gmail.com",
+    "adrien.brault@gmail.com",
+    "jlambert@eml.cc",
+    "aa1ronham@gmail.com",
     "mario@mariovisic.com"
   ]
 
@@ -55,6 +59,22 @@ Gem::Specification.new do |s|
     "lib/travis/cli/endpoint.rb",
     "lib/travis/cli/help.rb",
     "lib/travis/cli/history.rb",
+    "lib/travis/cli/init.rb",
+    "lib/travis/cli/init/c.yml",
+    "lib/travis/cli/init/clojure.yml",
+    "lib/travis/cli/init/cpp.yml",
+    "lib/travis/cli/init/erlang.yml",
+    "lib/travis/cli/init/go.yml",
+    "lib/travis/cli/init/groovy.yml",
+    "lib/travis/cli/init/haskell.yml",
+    "lib/travis/cli/init/java.yml",
+    "lib/travis/cli/init/node_js.yml",
+    "lib/travis/cli/init/objective-c.yml",
+    "lib/travis/cli/init/perl.yml",
+    "lib/travis/cli/init/php.yml",
+    "lib/travis/cli/init/python.yml",
+    "lib/travis/cli/init/ruby.yml",
+    "lib/travis/cli/init/scala.yml",
     "lib/travis/cli/login.rb",
     "lib/travis/cli/logs.rb",
     "lib/travis/cli/open.rb",
@@ -72,6 +92,7 @@ Gem::Specification.new do |s|
     "lib/travis/cli/whatsup.rb",
     "lib/travis/cli/whoami.rb",
     "lib/travis/client.rb",
+    "lib/travis/client/account.rb",
     "lib/travis/client/artifact.rb",
     "lib/travis/client/build.rb",
     "lib/travis/client/commit.rb",
@@ -93,6 +114,7 @@ Gem::Specification.new do |s|
     "spec/cli/endpoint_spec.rb",
     "spec/cli/help_spec.rb",
     "spec/cli/history_spec.rb",
+    "spec/cli/init_spec.rb",
     "spec/cli/login_spec.rb",
     "spec/cli/logs_spec.rb",
     "spec/cli/open_spec.rb",
@@ -102,6 +124,7 @@ Gem::Specification.new do |s|
     "spec/cli/token_spec.rb",
     "spec/cli/version_spec.rb",
     "spec/cli/whoami_spec.rb",
+    "spec/client/account_spec.rb",
     "spec/client/build_spec.rb",
     "spec/client/commit_spec.rb",
     "spec/client/job_spec.rb",
@@ -130,7 +153,7 @@ Gem::Specification.new do |s|
   s.add_dependency "gh"
   s.add_dependency "launchy",               "~> 2.1"
   s.add_dependency "pry",                   "~> 0.9"
-  s.add_dependency "net-http-persistent",   "~> 2.8"
+  s.add_dependency "typhoeus"
   s.add_development_dependency "rspec",     "~> 2.12"
   s.add_development_dependency "sinatra",   "~> 1.3"
   s.add_development_dependency "rack-test", "~> 0.6"

metadata

@@ -1,22 +1,24 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Konstantin Haase
 - Henrik Hodne
+- Peter Souter
 - Max Barnash
 - Mario Visic
 - Piotr Sarnacki
-- Adrien Brault
 - Raphaël Pinson
-- Justin Lambert
 - Laurent Petit
+- Adrien Brault
+- Justin Lambert
+- Aaron Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-21 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -131,19 +133,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: net-http-persistent
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -190,12 +192,14 @@ description: CLI and Ruby client library for Travis CI
 email:
 - konstantin.mailinglists@googlemail.com
 - me@henrikhodne.com
+- p.morsou@gmail.com
 - i.am@anhero.ru
 - drogus@gmail.com
-- adrien.brault@gmail.com
 - raphael.pinson@camptocamp.com
-- jlambert@eml.cc
 - laurent.petit@gmail.com
+- adrien.brault@gmail.com
+- jlambert@eml.cc
+- aa1ronham@gmail.com
 - mario@mariovisic.com
 executables:
 - travis
@@ -220,6 +224,22 @@ files:
 - lib/travis/cli/endpoint.rb
 - lib/travis/cli/help.rb
 - lib/travis/cli/history.rb
+- lib/travis/cli/init.rb
+- lib/travis/cli/init/c.yml
+- lib/travis/cli/init/clojure.yml
+- lib/travis/cli/init/cpp.yml
+- lib/travis/cli/init/erlang.yml
+- lib/travis/cli/init/go.yml
+- lib/travis/cli/init/groovy.yml
+- lib/travis/cli/init/haskell.yml
+- lib/travis/cli/init/java.yml
+- lib/travis/cli/init/node_js.yml
+- lib/travis/cli/init/objective-c.yml
+- lib/travis/cli/init/perl.yml
+- lib/travis/cli/init/php.yml
+- lib/travis/cli/init/python.yml
+- lib/travis/cli/init/ruby.yml
+- lib/travis/cli/init/scala.yml
 - lib/travis/cli/login.rb
 - lib/travis/cli/logs.rb
 - lib/travis/cli/open.rb
@@ -237,6 +257,7 @@ files:
 - lib/travis/cli/whatsup.rb
 - lib/travis/cli/whoami.rb
 - lib/travis/client.rb
+- lib/travis/client/account.rb
 - lib/travis/client/artifact.rb
 - lib/travis/client/build.rb
 - lib/travis/client/commit.rb
@@ -258,6 +279,7 @@ files:
 - spec/cli/endpoint_spec.rb
 - spec/cli/help_spec.rb
 - spec/cli/history_spec.rb
+- spec/cli/init_spec.rb
 - spec/cli/login_spec.rb
 - spec/cli/logs_spec.rb
 - spec/cli/open_spec.rb
@@ -267,6 +289,7 @@ files:
 - spec/cli/token_spec.rb
 - spec/cli/version_spec.rb
 - spec/cli/whoami_spec.rb
+- spec/client/account_spec.rb
 - spec/client/build_spec.rb
 - spec/client/commit_spec.rb
 - spec/client/job_spec.rb
@@ -304,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Travis CI client