travis 1.1.3 → 1.2.0

data/README.md

@@ -38,6 +38,7 @@ The [travis gem](https://rubygems.org/gems/travis) includes both a command line
         * [Artifacts](#artifacts)
         * [Users](#users)
         * [Commits](#commits)
+        * [Workers](#workers)
     * [Dealing with Sessions](#dealing-with-sessions)
     * [Using Namespaces](#using-namespaces)
 * [Installation](#installation)
@@ -89,6 +90,7 @@ Additionally, every API command understands the following options:
         --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
 
 By default, [General API Commands](#general-api-commands) will talk to [api.travis-ci.org](https://api.travis-ci.org). You can change this by supplying `--pro` for [api.travis-ci.com](https://api.travis-ci.com) or `--api-endpoint` with your own endpoint. Note that all [Repository Commands](#repository-commands) will try to figure out the API endpoint to talk to automatically depending on the project's visibility on GitHub.
 
@@ -96,6 +98,15 @@ You can supply an access token via `--token` if you want to make an authenticate
 
 The `--debug` option will print HTTP requests to STDERR. Like `--explode`, this is really helpful when contributing to this project.
 
+There are many libraries out there to do HTTP requests in Ruby. You can switch amongst common ones with `--adapter`:
+
+    $ travis show --adapter net-http
+    ...
+    $ gem install excon
+    ...
+    $ travis show --adapter excon
+    ...
+
 #### `console`
 
 Running `travis console` gives you an interactive Ruby session with all the [entities](#entities) imported into global namespace.
@@ -770,6 +781,19 @@ commit = repo.last_build.commit
 puts "Last tested commit: #{commit.short_sha} on #{commit.branch} by #{commit.author_name} - #{commit.subject}"
 ```
 
+#### Workers
+
+If a worker is running something, it will reference a `job` and a `repository`. Otherwise the values will be `nil`.
+
+``` ruby
+require 'travis'
+workers = Travis::Worker.find_all
+
+workers.each do |worker|
+  puts "#{worker.name}: #{worker.host} - #{worker.state} - #{worker.repository.slug if worker.repository}"
+end
+```
+
 ### Dealing with Sessions
 
 Under the hood the session is where the fun is happening. Most methods on the constants and entities just wrap methods on your session, so you don't have to pass the session around all the time or even see it if you don't want to.
@@ -832,7 +856,7 @@ session.clear_cache!  # empty identity map
 
 ``` ruby
 require 'travis/client'
-MyTravis = Travis::Namespaces.new("http://localhost:3000")
+MyTravis = Travis::Client::Namespaces.new("http://localhost:3000")
 
 MyTravis.access_token = "..."
 MyTravis::Repository.find("foo/bar")
@@ -844,7 +868,7 @@ Since namespaces are Modules, you can also include them.
 require 'travis/client'
 
 class MyTravis
-  include Travis::Namespaces.new
+  include Travis::Client::Namespaces.new
 end
 
 MyTravis::Repository.find('rails/rails')
@@ -862,6 +886,18 @@ If you have the old `travis-cli` gem installed, you should `gem uninstall travis
 
 ## Version History
 
+**Not yet released**
+
+* add `--adapter` to API endpoints
+* added branch to `show`
+* fix bug where colors were not used if stdin is a pipe
+* make `encrypt` options `--split` and `--add` work together properly
+* better handling of missing or empty `.travis.yml` when running `encrypt --add`
+* fix broken example code
+* no longer require network connection to automatically detect repository slug
+* add worker support to the ruby library
+* adjust artifacts/logs code to upstream api changes
+
 **v1.1.3** (January 26, 2013)
 
 * use persistent HTTP connections (performance for commands with multiple api requests)

data/lib/travis/cli/api_command.rb

@@ -22,6 +22,13 @@ module Travis
         end
       end
 
+      on('--adapter ADAPTER', 'Faraday adapter to use for HTTP requests') do |c, adapter|
+        adapter.gsub! '-', '_'
+        require "faraday/adapter/#{adapter}"
+        require 'typhoeus/adapters/faraday' if adapter == 'typhoeus'
+        c.session.faraday_adapter = adapter.to_sym
+      end
+
       def initialize(*)
         @session = Travis::Client.new
         super

data/lib/travis/cli/command.rb

@@ -12,7 +12,7 @@ module Travis
       extend Forwardable
       def_delegators :terminal, :agree, :ask, :choose
 
-      HighLine.use_color = !CLI.windows? && $stdin.tty?
+      HighLine.use_color = !CLI.windows? && $stdout.tty?
       HighLine.color_scheme = HighLine::ColorScheme.new do |cs|
         cs[:command]   = [ :bold             ]
         cs[:error]     = [ :red              ]

data/lib/travis/cli/encrypt.rb

@@ -33,11 +33,13 @@ module Travis
 
         if config_key
           travis_config = YAML.load_file(travis_yaml)
+          travis_config = {} if [[], false, nil].include? travis_config
           keys          = config_key.split('.')
           last_key      = keys.pop
           nested_config = keys.inject(travis_config) { |c,k| c[k] ||= {}}
+          nested_config = nested_config[last_key] ||= []
           encrypted.each do |encrypted|
-            nested_config[last_key] ||= [] << { 'secure' => encrypted }
+             nested_config << { 'secure' => encrypted }
           end
           File.write(travis_yaml, travis_config.to_yaml)
         else
@@ -54,7 +56,8 @@ module Travis
             path
           else
             parent = File.expand_path('..', dir)
-            travis_yaml(parent) if parent != dir
+            error "no .travis.yml found" if parent == dir
+            travis_yaml(parent)
           end
         end
     end

data/lib/travis/cli/repo_command.rb

@@ -3,7 +3,7 @@ require 'travis/cli'
 module Travis
   module CLI
     class RepoCommand < ApiCommand
-      GIT_REGEX = %r{Fetch URL: (?:https://|git://|git@)github\.com[:/](.*/.+?)(\.git)?$}
+      GIT_REGEX = %r{^(?:https://|git://|git@)github\.com[:/](.*/.+?)(\.git)?$}
       on('-r', '--repo SLUG') { |c, slug| c.slug = slug }
 
       attr_accessor :slug
@@ -43,7 +43,7 @@ module Travis
         end
 
         def find_slug
-          git_info = `git remote show origin 2>&1`
+          git_info = `git config --get remote.origin.url 2>&1`
           $1 if git_info =~ GIT_REGEX
         end
 

data/lib/travis/cli/show.rb

@@ -5,6 +5,7 @@ module Travis
     class Show < RepoCommand
       def run(number = last_build.number)
         entity = job(number) || build(number)
+        error "unknown build or job #{number}" unless entity
 
         say template(__FILE__) % [
           entity.class.one.capitalize,
@@ -13,6 +14,7 @@ module Travis
           entity.state,
           entity.color,
           entity.pull_request? ? "pull request" : "push",
+          entity.branch_info,
           entity.commit.compare_url,
           formatter.duration(entity.duration),
           formatter.time(entity.started_at),
@@ -44,6 +46,7 @@ __END__
 <[[ color("%s #%s: %s", :bold) ]]>
 <[[ color("State:         ", :info) ]]><[[ color(%p, :%s) ]]>
 <[[ color("Type:          ", :info) ]]>%s
+<[[ color("Branch:        ", :info) ]]>%s
 <[[ color("Compare URL:   ", :info) ]]>%s
 <[[ color("Duration:      ", :info) ]]>%s
 <[[ color("Started:       ", :info) ]]>%s

data/lib/travis/client.rb

@@ -10,6 +10,7 @@ require 'travis/client/build'
 require 'travis/client/artifact'
 require 'travis/client/commit'
 require 'travis/client/job'
+require 'travis/client/worker'
 require 'travis/client/namespace'
 
 module Travis

data/lib/travis/client/artifact.rb

@@ -17,9 +17,9 @@ module Travis
         attributes['clean_body'] ||= colorized_body.gsub(/\e[^m]+m/, '')
       end
 
-      one :artifact
-      many :artifacts
-      aka :log
+      one :log
+      many :logs
+      aka :artifact
     end
   end
 end

data/lib/travis/client/entity.rb

@@ -69,10 +69,14 @@ module Travis
         private(:inspect_info)
       end
 
+      def self.cast_id(id)
+        Integer(id)
+      end
+
       def initialize(session, id)
         @attributes = {}
         @session    = session
-        @id         = Integer(id)
+        @id         = self.class.cast_id(id)
       end
 
       def update_attributes(data)

data/lib/travis/client/job.rb

@@ -29,6 +29,10 @@ module Travis
         build.push?
       end
 
+      def branch_info
+        build.branch_info
+      end
+
       def allow_failures?
         return false unless config.include? 'matrix' and config['matrix'].include? 'allow_failures'
         config['matrix']['allow_failures'].any? do |allow|

data/lib/travis/client/methods.rb

@@ -37,6 +37,14 @@ module Travis
         session.find_one(Repository, id_or_slug)
       end
 
+      def worker(id)
+        session.find_one(Worker, id)
+      end
+
+      def workers(params = {})
+        session.find_many(Worker, params)
+      end
+
       def build(id)
         session.find_one(Build, id)
       end

data/lib/travis/client/namespace.rb

@@ -38,7 +38,6 @@ module Travis
           end
       end
 
-
       include Methods
       attr_accessor :session
 

data/lib/travis/client/repository.rb

@@ -104,7 +104,7 @@ module Travis
         build_number = number.to_s[/^\d+/]
         build        = build(build_number)
         job          = build.jobs.detect { |j| j.number == number } if number != build_number
-        job        ||= build.jobs.first if build.jobs.size == 1
+        job        ||= build.jobs.first if build and build.jobs.size == 1
         job
       end
 

data/lib/travis/client/session.rb

@@ -1,7 +1,6 @@
 require 'travis/client'
 
 require 'faraday'
-require 'faraday/adapter/net_http_persistent'
 require 'faraday_middleware'
 require 'json'
 
@@ -10,13 +9,14 @@ module Travis
     class Session
       SSL_OPTIONS = { :ca_file => File.expand_path("../../cacert.pem", __FILE__) }
       include Methods
-      attr_reader :connection, :headers, :access_token, :instruments
+      attr_reader :connection, :headers, :access_token, :instruments, :faraday_adapter
 
       def initialize(options = Travis::Client::ORG_URI)
-        @headers     = {}
-        @cache       = {}
-        @instruments = []
-        @config      = nil
+        @headers         = {}
+        @cache           = {}
+        @instruments     = []
+        @config          = nil
+        @faraday_adapter = :net_http_persistent
 
         options = { :uri => options } unless options.respond_to? :each_pair
         options.each_pair { |key, value| public_send("#{key}=", value) }
@@ -40,6 +40,11 @@ module Travis
         end
       end
 
+      def faraday_adapter=(adapter)
+        @faraday_adapter = adapter
+        self.uri &&= uri
+      end
+
       def access_token=(token)
         clear_cache!
         @access_token = token
@@ -104,9 +109,9 @@ module Travis
         @config ||= get_raw('/config')['config']
       end
 
-      def get(*args)
+      def load(data)
         result = {}
-        get_raw(*args).each_pair do |key, value|
+        (data || {}).each_pair do |key, value|
           type = Entity.subclass_for(key)
           if value.respond_to? :to_ary
             result[key] = value.to_ary.map { |e| create_entity(type, e) }
@@ -117,6 +122,10 @@ module Travis
         result
       end
 
+      def get(*args)
+        load get_raw(*args)
+      end
+
       def get_raw(*args)
         raw(:get, *args)
       end
@@ -171,7 +180,7 @@ module Travis
         end
 
         def create_entity(type, data)
-          id     = Integer(data.fetch('id'))
+          id     = type.cast_id(data.fetch('id'))
           entity = cached(type, :id, id) { type.new(self, id) }
           entity.update_attributes(data)
           entity
@@ -184,10 +193,6 @@ module Travis
           raise klass, message, e.backtrace
         end
 
-        def faraday_adapter
-          :net_http_persistent #Faraday.default_adapter
-        end
-
         def reset_entities
           subcaches do |subcache|
             subcache[:id].each_value { |e| e.attributes.clear } if subcache.include? :id

data/lib/travis/client/states.rb

@@ -3,7 +3,11 @@ require 'travis/client'
 module Travis
   module Client
     module States
-      STATES  = %w[created queued started passed failed errored canceled]
+      STATES  = %w[created queued started passed failed errored canceled ready]
+
+      def ready?
+        state == 'ready'
+      end
 
       def pending?
         check_state
@@ -54,7 +58,11 @@ module Travis
       end
 
       def color
-        pending? ? 'yellow' : passed? ? 'green' : 'red'
+        case state
+        when 'created', 'queued', 'started'   then 'yellow'
+        when 'passed', 'ready'                then 'green'
+        when 'errored', 'canceled', 'failed'  then 'red'
+        end
       end
 
       def yellow?

data/lib/travis/client/worker.rb

@@ -0,0 +1,32 @@
+require 'travis/client'
+
+module Travis
+  module Client
+    class Worker < Entity
+      include States
+
+      def self.cast_id(id)
+        String(id)
+      end
+
+      # @!parse attr_reader :name, :host, :state, :payload
+      attributes :name, :host, :state, :payload
+      inspect_info :name
+
+      one  :worker
+      many :workers
+
+      def payload=(value)
+        set_attribute(:payload, session.load(value))
+      end
+
+      def repository
+        payload['repo']
+      end
+
+      def job
+        payload['job']
+      end
+    end
+  end
+end

data/lib/travis/version.rb

@@ -1,3 +1,3 @@
 module Travis
-  VERSION = '1.1.3'
+  VERSION = '1.2.0'
 end

data/spec/cli/show_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Travis::CLI::Show do
   example 'show 6180.1' do
-    run_cli('show', '6180.1').should be_success
+    run_cli('show', '6180.1', '-E').should be_success
     stdout.should include("Config:        ")
     stdout.should include("env: GEM=railties")
   end

data/spec/client/worker_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Travis::Client::Worker do
+  let(:session) { Travis::Client.new }
+  subject { session.workers.first }
+
+  its(:id)         { should be == 'foo'                         }
+  its(:name)       { should be == 'ruby-1'                      }
+  its(:host)       { should be == 'ruby-1.worker.travis-ci.org' }
+  its(:state)      { should be == 'ready'                       }
+  its(:color)      { should be == 'green'                       }
+  its(:job)        { should be_a(Travis::Client::Job)           }
+  its(:repository) { should be_a(Travis::Client::Repository)    }
+
+  it { should be_ready }
+
+  describe 'without payload' do
+    subject { session.worker('foo') }
+    its(:payload)    { should be == {}}
+    its(:job)        { should be_nil  }
+    its(:repository) { should be_nil  }
+  end
+end

data/spec/support/fake_api.rb

@@ -647,8 +647,8 @@ module Travis
           {"config" => {"host" => "travis-ci.org"}}.to_json
         end
 
-        get '/artifacts/3168318' do
-          {"artifact"=>
+        get '/logs/3168318' do
+          {"log"=>
             {"id"=>3168318,
              "job_id"=>4125096,
              "type"=>"Log",
@@ -685,6 +685,26 @@ module Travis
           {"key"=>RAILS_KEY}.to_json
         end
 
+        get '/workers/' do
+          {"workers"=>
+            [{'id' => 'foo',
+              'name' => 'ruby-1',
+              'host' => 'ruby-1.worker.travis-ci.org',
+              'state' => 'ready',
+              'payload' => {
+                "job"=>{"id"=>4125096},
+                "repo"=>{"id"=>891}}}]}.to_json
+        end
+
+        get '/workers/foo' do
+          {"worker"=>
+             {'id' => 'foo',
+              'name' => 'ruby-1',
+              'host' => 'ruby-1.worker.travis-ci.org',
+              'state' => 'ready',
+              'payload' => nil}}.to_json
+        end
+
         post '/requests' do
           $params = params
           "{}"

data/spec/support/fake_github.rb

@@ -17,4 +17,4 @@ module GH
   end
 
   DefaultStack.replace(Remote, FakeRemote)
-end
+end

data/spec/support/helpers.rb

@@ -20,6 +20,7 @@ module Helpers
   end
 
   def run_cli(*args)
+    args << ENV['TRAVIS_OPTS'] if ENV['TRAVIS_OPTS']
     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.1.3"
+  s.version     = "1.2.0"
   s.description = "CLI and Ruby client library for Travis CI"
   s.homepage    = "https://github.com/travis-ci/travis"
   s.summary     = "Travis CI client"
@@ -73,6 +73,7 @@ Gem::Specification.new do |s|
     "lib/travis/client/session.rb",
     "lib/travis/client/states.rb",
     "lib/travis/client/user.rb",
+    "lib/travis/client/worker.rb",
     "lib/travis/pro.rb",
     "lib/travis/tools/formatter.rb",
     "lib/travis/tools/token_finder.rb",
@@ -98,6 +99,7 @@ Gem::Specification.new do |s|
     "spec/client/repository_spec.rb",
     "spec/client/session_spec.rb",
     "spec/client/user_spec.rb",
+    "spec/client/worker_spec.rb",
     "spec/client_spec.rb",
     "spec/pro_spec.rb",
     "spec/spec_helper.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-26 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -263,6 +263,7 @@ files:
 - lib/travis/client/session.rb
 - lib/travis/client/states.rb
 - lib/travis/client/user.rb
+- lib/travis/client/worker.rb
 - lib/travis/pro.rb
 - lib/travis/tools/formatter.rb
 - lib/travis/tools/token_finder.rb
@@ -288,6 +289,7 @@ files:
 - spec/client/repository_spec.rb
 - spec/client/session_spec.rb
 - spec/client/user_spec.rb
+- spec/client/worker_spec.rb
 - spec/client_spec.rb
 - spec/pro_spec.rb
 - spec/spec_helper.rb