travis 1.2.8 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf0bedc3ebeb0308526c8df70e1961f840b499a3
-  data.tar.gz: 42789765d91dc5975f884cc8f34468be355bf020
+  metadata.gz: 43bd32ce16eb549066ab5484c7da1736b64f60ff
+  data.tar.gz: 999f1b38a292b48c210df8046d798852880e12dc
 SHA512:
-  metadata.gz: 6e57f58c84db9bbe82efac4f7f35a4111730ac1fdb1c9ae9546c3d43f98353507bef69564382e126d71dfe10885428757af12a02be6dfbe6be66fc64308bb03e
-  data.tar.gz: 45aa4e29b71736c48bccb28e63d59609b75a0106749e8c53362108fd1e014a2b19041ac29d0179ca79fc1181bd5bfc837d97998e55e6f1663cce465059644df4
+  metadata.gz: 1927ceed3d07a753e7ccde4dd7e952daded43bb974c069a59d88efbf71d5d604c789bfbfd2325b213e854cbb1b71252a9194ec72e5f9ac2a8303a0797bd49f89
+  data.tar.gz: 64ab6d079c38d482810cfebdba22e9b3a5c7fe3cc546252d336e57c4188e9a4f9df1772e052dfe887ca82e301cd5575a9c821959cfb95544731a08dd09368db4

data/README.md

@@ -20,6 +20,7 @@ The [travis gem](https://rubygems.org/gems/travis) includes both a command line
         * [`whatsup`](#whatsup)
         * [`whoami`](#whoami)
     * [Repository Commands](#repository-commands)
+        * [`branches`](#branches)
         * [`disable`](#disable)
         * [`enable`](#enable)
         * [`encrypt`](#encrypt)
@@ -28,6 +29,7 @@ The [travis gem](https://rubygems.org/gems/travis) includes both a command line
         * [`open`](#open)
         * [`pubkey`](#pubkey)
         * [`restart`](#restart)
+        * [`setup`](#setup)
         * [`show`](#show)
         * [`status`](#status)
 * [Ruby Library](#ruby-library)
@@ -260,6 +262,23 @@ Additionally, you can specify the Repository to talk to by providing `--repo own
 
 It will also automatically pick [Travis Pro](https://travis-ci.com) if it is a private project. You can of course override this decission with `--pro`, `--org` or `--api-endpoint URL`
 
+#### `branches`
+
+Displays the most recent build for each branch:
+
+    $ travis branches
+    hh-add-warning-old-style:                  #35   passed     Add a warning if old-style encrypt is being used
+    hh-multiline-encrypt:                      #55   passed     Merge branch 'master' into hh-multiline-encrypt
+    rkh-show-logs-history:                     #72   passed     regenerate gemspec
+    rkh-debug:                                 #75   passed     what?
+    hh-add-clear-cache-to-global-session:      #135  passed     Add clear_cache(!) to Travis::Namespace
+    hh-annotations:                            #146  passed     Initial annotation support
+    hh-remove-newlines-from-encrypted-string:  #148  errored    Remove all whitespace from an encrypted string
+    version-check:                             #157  passed     check travis version for updates from time to time
+    master:                                    #163  passed     add Repository#branches and Repository#branch(name)
+
+For more fine grained control and older builds on a specific branch, see [`history`](#history).
+
 #### `disable`
 
 If you want to turn of a repository temporarily or indefinitely, you can do so with the `disable` command:
@@ -453,6 +472,33 @@ Or a single job:
     $ travis restart 57.1
     job #57.1 has been restarted
 
+#### `setup`
+
+Helps you configure Travis addons.
+
+    Usage: bin/travis setup service [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/'
+            --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
+        -r, --repo SLUG                  repository to use (will try to detect from current git clone)
+        -f, --force                      override config section if it already exists
+
+Available services: `heroku`, `nodejitsu`, `openshift` and `sauce_connect`.
+
+Example:
+
+    $ travis setup heroku
+    Deploy only from travis-ci/travis-chat? |yes|
+    Encrypt API key? |yes|
+
 #### `show`
 
 Displays general infos about the latest build:
@@ -491,6 +537,25 @@ Any other build:
     #1.5 failed:     38 sec         rvm: jruby
     #1.6 failed:     27 sec         rvm: rbx
 
+The last build for a given branch:
+
+    $ travis show rkh-debug
+    Build #75: what?
+    State:         passed
+    Type:          push
+    Branch:        rkh-debug
+    Compare URL:   https://github.com/travis-ci/travis/compare/8d4aa5254359...7ef33d5e5993
+    Duration:      6 min 16 sec
+    Started:       2013-01-19 18:51:17
+    Finished:      2013-01-19 18:52:43
+
+    #75.1 passed:    1 min 10 sec   rvm: 1.8.7
+    #75.2 passed:    51 sec         rvm: 1.9.2
+    #75.3 passed:    36 sec         rvm: 1.9.3
+    #75.4 passed:    48 sec         rvm: 2.0.0
+    #75.5 failed:    1 min 26 sec   rvm: jruby (failure allowed)
+    #75.6 passed:    1 min 25 sec   rvm: rbx
+
 Or a job:
 
     $ travis show 77.3
@@ -731,6 +796,17 @@ You can restart a build, if the current user has sufficient permissions on the r
 rails.last_build.restart
 ```
 
+You can also retrieve a Hash mapping branch names to the latest build on that given branch via `branches` or use the `branch` method to get the last build for a specific branch:
+
+``` ruby
+if rails.branch('4-0-stable').green?
+  puts "Time for another 4.0.x release!"
+end
+
+count = rails.branches.size
+puts "#{count} rails branches tested on travis"
+```
+
 #### Jobs
 
 Jobs behave a lot like [builds](#builds), and similar to them, you probably don't have the id ready. You can get the jobs from a build:
@@ -908,6 +984,15 @@ If you have the old `travis-cli` gem installed, you should `gem uninstall travis
 
 ## Version History
 
+**1.3.0** (July 20, 2013)
+
+* Add `travis setup [heroku|openshift|nodejitsu|sauce_connect]`
+* Add `travis branches`
+* Add Repository#branch and Repository#branches
+* Improve `--help`
+* Improve error message when calling `travis logs` with a matrix build number
+* Check if travis gem is up to date from time to time (CLI only, not when used as library)
+
 **1.2.8** (July 19, 2013)
 
 * Make pubkey print out key in ssh encoding, add --pem flag for old format

data/lib/travis/cli.rb

@@ -16,6 +16,7 @@ module Travis
   module CLI
     autoload :Token,        'travis/cli/token'
     autoload :ApiCommand,   'travis/cli/api_command'
+    autoload :Branches,     'travis/cli/branches'
     autoload :Command,      'travis/cli/command'
     autoload :Console,      'travis/cli/console'
     autoload :Disable,      'travis/cli/disable'
@@ -32,6 +33,7 @@ module Travis
     autoload :Raw,          'travis/cli/raw'
     autoload :RepoCommand,  'travis/cli/repo_command'
     autoload :Restart,      'travis/cli/restart'
+    autoload :Setup,        'travis/cli/setup'
     autoload :Show,         'travis/cli/show'
     autoload :Status,       'travis/cli/status'
     autoload :Sync,         'travis/cli/sync'

data/lib/travis/cli/branches.rb

@@ -0,0 +1,23 @@
+require 'travis/cli'
+
+module Travis
+  module CLI
+    class Branches < RepoCommand
+      def run
+        repository.last_on_branch.each do |build|
+          say [
+            color("#{build.branch_info}:".ljust(longest + 2), [:info, :bold]),
+            color("##{build.number.to_s.ljust(4)} #{build.state}".ljust(16), build.color),
+            build.commit.subject
+          ].join(" ").strip + "\n"
+        end
+      end
+
+      private
+
+        def longest
+          repository.branches.keys.map { |b| b.size }.max
+        end
+    end
+  end
+end

data/lib/travis/cli/command.rb

@@ -1,9 +1,11 @@
 require 'travis/cli'
 require 'travis/tools/formatter'
+require 'travis/version'
 
 require 'highline'
 require 'forwardable'
 require 'yaml'
+require 'timeout'
 
 module Travis
   module CLI
@@ -33,6 +35,7 @@ module Travis
       end
 
       on('-E', '--[no-]explode', "don't rescue exceptions")
+      on('--skip-version-check', "don't check if travis client is up to date")
 
       def self.command_name
         name[/[^:]*$/].downcase
@@ -95,9 +98,30 @@ module Travis
       def setup
       end
 
+      def check_version
+        return if skip_version_check?
+        return if Time.now.to_i - config['last_version_check'].to_i < 3600
+        version = Travis::VERSION
+
+        Timeout.timeout 1.0 do
+          response       = Faraday.get('https://rubygems.org/api/v1/gems/travis.json', {}, 'If-None-Match' => config['etag'].to_s)
+          config['etag'] = response.headers['etag']
+          version        = JSON.parse(response.body)['version'] if response.status == 200
+        end
+
+        if Travis::VERSION >= version
+          config['last_version_check'] = Time.now.to_i
+        else
+          error "Outdated CLI version (#{Travis::VERSION}, current is #{version}), " \
+            "run `gem install travis -v #{version}` or use --skip-version-check."
+        end
+      rescue Timeout::Error, Faraday::Error::ClientError
+      end
+
       def execute
         check_arity(method(:run), *arguments)
         load_config
+        check_version
         setup
         run(*arguments)
         store_config

data/lib/travis/cli/encrypt.rb

@@ -1,6 +1,5 @@
 # encoding: utf-8
 require 'travis/cli'
-require 'yaml'
 
 module Travis
   module CLI
@@ -33,7 +32,7 @@ module Travis
 
         if config_key
           set_config encrypted.map { |e| { 'secure' => e } }
-          File.write(travis_yaml, travis_config.to_yaml)
+          save_travis_config
         else
           list = encrypted.map { |data| format(data.inspect, "  secure: %s") }
           say(list.join("\n"), template(__FILE__), :none)
@@ -42,13 +41,6 @@ module Travis
 
       private
 
-        def travis_config
-          @travis_config ||= begin
-            payload = YAML.load_file(travis_yaml)
-            payload.respond_to?(:to_hash) ? payload.to_hash : {}
-          end
-        end
-
         def set_config(result)
           parent_config[last_key] = merge_config(result)
         end
@@ -87,17 +79,6 @@ module Travis
 
           traverse_config(hash[key], *rest)
         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
-        end
     end
   end
 end

data/lib/travis/cli/logs.rb

@@ -4,7 +4,7 @@ module Travis
   module CLI
     class Logs < RepoCommand
       def run(number = last_build.number)
-        error "##{number} is not a job" unless job = job(number)
+        error "##{number} is not a job, try #{number}.1" unless job = job(number)
         say log(job)
       end
 

data/lib/travis/cli/repo_command.rb

@@ -1,10 +1,11 @@
 require 'travis/cli'
+require 'yaml'
 
 module Travis
   module CLI
     class RepoCommand < ApiCommand
       GIT_REGEX = %r{^(?:https://|git://|git@)github\.com[:/](.*/.+?)(\.git)?$}
-      on('-r', '--repo SLUG') { |c, slug| c.slug = slug }
+      on('-r', '--repo SLUG', 'repository to use (will try to detect from current git clone)') { |c, slug| c.slug = slug }
 
       attr_accessor :slug
       abstract
@@ -68,6 +69,31 @@ module Travis
             end
           end
         end
+
+        def travis_config
+          @travis_config ||= begin
+            payload = YAML.load_file(travis_yaml)
+            payload.respond_to?(:to_hash) ? payload.to_hash : {}
+          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
+        end
+
+        def save_travis_config
+          yaml = travis_config.to_yaml
+          yaml.gsub! /^(\s+)('on'|true):/, "\\1on:"
+          yaml.gsub! /\A---\n/, ''
+          File.write(travis_yaml, yaml)
+        end
     end
   end
 end

data/lib/travis/cli/setup.rb

@@ -0,0 +1,80 @@
+require 'travis/cli'
+require 'json'
+
+module Travis
+  module CLI
+    class Setup < RepoCommand
+      on('-f', '--force', 'override config section if it already exists')
+
+      def run(service)
+        error "unknown service #{service}" unless respond_to? "setup_#{service}"
+        public_send "setup_#{service}"
+      end
+
+      def setup_heroku
+        configure 'deploy', 'provider' => 'heroku' do |config|
+          config['api_key'] = `heroku auth:token 2>/dev/null`.strip
+          config['api_key'] = ask("Heroku API token: ") { |q| q.echo = "*" }.to_s if config['api_key'].empty?
+          config['app']     = `heroku apps:info 2>/dev/null`.scan(/^=== (.+)$/).flatten.first
+          config['app']     = ask("Heroku application name: ") { |q| q.default = repository.name }.to_s if config['app'].nil?
+          config['on']      = { 'repo' => repository.slug } if agree("Deploy only from #{repository.slug}? ") { |q| q.default = 'yes' }
+          encrypt(config, 'api_key') if agree("Encrypt API key? ") { |q| q.default = 'yes' }
+        end
+      end
+
+      def setup_openshift
+        configure 'deploy', 'provider' => 'openshift' do |config|
+          config['user']     = ask("OpenShift user: ").to_s
+          config['password'] = ask("OpenShift password: ") { |q| q.echo = "*" }.to_s
+          config['app']      = ask("OpenShift application name: ") { |q| q.default = repository.name }.to_s
+          config['domain']   = ask("OpenShift domain: ").to_s
+          config['on']       = { 'repo' => repository.slug } if agree("Deploy only from #{repository.slug}? ") { |q| q.default = 'yes' }
+          encrypt(config, 'password') if agree("Encrypt password? ") { |q| q.default = 'yes' }
+        end
+      end
+
+      def setup_nodejitsu
+        configure 'deploy', 'provider' => 'nodejitsu' do |config|
+          jitsu_file = File.expand_path('.jitsuconf', ENV['HOME'])
+
+          if File.exist? jitsu_file
+            jitsu_conf        = JSON.parse(File.read(jitsu_file))
+            config['user']    = jitsu_conf['username']
+            config['api_key'] = jitsu_conf['apiToken']
+          end
+
+          config['user']    ||= ask("Nodejitsu user: ").to_s
+          config['api_key'] ||= ask("Nodejitsu API token: ") { |q| q.echo = "*" }.to_s
+          config['on']        = { 'repo' => repository.slug } if agree("Deploy only from #{repository.slug}? ") { |q| q.default = 'yes' }
+          encrypt(config, 'api_key') if agree("Encrypt API key? ") { |q| q.default = 'yes' }
+        end
+      end
+
+      def setup_sauce_connect
+        travis_config['addons'] ||= {}
+        configure 'sauce_connect', {}, travis_config['addons'] do |config|
+          config['username']   = ask("Sauce Labs user: ").to_s
+          config['access_key'] = ask("Sauce Labs access key: ") { |q| q.echo = "*" }.to_s
+          encrypt(config, 'access_key') if agree("Encrypt access key? ") { |q| q.default = 'yes' }
+        end
+      end
+
+      alias setup_sauce_lab setup_sauce_connect
+      alias setup_sauce     setup_sauce_connect
+
+      private
+
+        def encrypt(config, key)
+          encrypted   = repository.encrypt(config.fetch(key))
+          config[key] = { 'secure' => encrypted }
+        end
+
+        def configure(key, value = {}, config = travis_config)
+          error "#{key} section already exists in .travis.yml, run with --force to override" if config.include? key and not force?
+          result = yield(config[key] = value)
+          save_travis_config
+          result
+        end
+    end
+  end
+end

data/lib/travis/cli/show.rb

@@ -4,7 +4,9 @@ module Travis
   module CLI
     class Show < RepoCommand
       def run(number = last_build.number)
+        number = repository.branch(number).number if number !~ /^\d+(\.\d+)?$/ and repository.branch(number)
         entity = job(number) || build(number)
+
         error "unknown build or job #{number}" unless entity
 
         say template(__FILE__) % [

data/lib/travis/cli/version.rb

@@ -7,6 +7,9 @@ module Travis
       def run
         say Travis::VERSION
       end
+
+      def check_version
+      end
     end
   end
 end

data/lib/travis/client/build.rb

@@ -16,6 +16,7 @@ module Travis
 
       one :build
       many :builds
+      aka :branches
 
       def restart
         session.restart(self)

data/lib/travis/client/repository.rb

@@ -64,6 +64,10 @@ module Travis
         end
       end
 
+      def name
+        slug[/[^\/]+$/]
+      end
+
       def public_key=(key)
         key = Key.new(key) unless key.is_a? Key
         set_attribute(:public_key, key)
@@ -104,6 +108,19 @@ module Travis
         builds({})
       end
 
+      def last_on_branch(name = nil)
+        return branch(name) if name
+        attributes['last_on_branch'] ||= session.get('branches', :repository_id => id)['branches']
+      end
+
+      def branches
+        last_on_branch.map { |b| { b.commit.branch => b } }.inject(:merge)
+      end
+
+      def branch(name)
+        last_on_branch.detect { |b| b.commit.branch == name.to_s }
+      end
+
       def each_build(params = nil, &block)
         return enum_for(__method__, params) unless block_given?
         params ||= {}

data/lib/travis/version.rb

@@ -1,3 +1,3 @@
 module Travis
-  VERSION = '1.2.8'
+  VERSION = '1.3.0'
 end

data/spec/support/helpers.rb

@@ -21,6 +21,7 @@ module Helpers
 
   def run_cli(*args)
     args << ENV['TRAVIS_OPTS'] if ENV['TRAVIS_OPTS']
+    args << '--skip-version-check'
     capture do
       yield $stdin if block_given?
       $stdin.rewind

data/travis.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   # general infos
   s.name        = "travis"
-  s.version     = "1.2.8"
+  s.version     = "1.3.0"
   s.description = "CLI and Ruby client library for Travis CI"
   s.homepage    = "https://github.com/travis-ci/travis"
   s.summary     = "Travis CI client"
@@ -46,6 +46,7 @@ Gem::Specification.new do |s|
     "lib/travis/cacert.pem",
     "lib/travis/cli.rb",
     "lib/travis/cli/api_command.rb",
+    "lib/travis/cli/branches.rb",
     "lib/travis/cli/command.rb",
     "lib/travis/cli/console.rb",
     "lib/travis/cli/disable.rb",
@@ -62,6 +63,7 @@ Gem::Specification.new do |s|
     "lib/travis/cli/raw.rb",
     "lib/travis/cli/repo_command.rb",
     "lib/travis/cli/restart.rb",
+    "lib/travis/cli/setup.rb",
     "lib/travis/cli/show.rb",
     "lib/travis/cli/status.rb",
     "lib/travis/cli/sync.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.3.0
 platform: ruby
 authors:
 - Konstantin Haase
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -211,6 +211,7 @@ files:
 - lib/travis/cacert.pem
 - lib/travis/cli.rb
 - lib/travis/cli/api_command.rb
+- lib/travis/cli/branches.rb
 - lib/travis/cli/command.rb
 - lib/travis/cli/console.rb
 - lib/travis/cli/disable.rb
@@ -227,6 +228,7 @@ files:
 - lib/travis/cli/raw.rb
 - lib/travis/cli/repo_command.rb
 - lib/travis/cli/restart.rb
+- lib/travis/cli/setup.rb
 - lib/travis/cli/show.rb
 - lib/travis/cli/status.rb
 - lib/travis/cli/sync.rb