travis 1.0.3 → 1.1.0

data/lib/travis/client/commit.rb

@@ -0,0 +1,26 @@
+require 'travis/client'
+
+module Travis
+  module Client
+    class Commit < Entity
+      # @!parse attr_reader :sha, :branch, :message, :committed_at, :author_name, :author_email, :committer_name, :committer_email, :compare_url
+      attributes :sha, :branch, :message, :committed_at, :author_name, :author_email, :committer_name, :committer_email, :compare_url
+      time :committed_at
+
+      one :commit
+      many :commits
+
+      def subject
+        message.to_s.lines.first.strip
+      end
+
+      def short_sha
+        sha.to_s[0..6]
+      end
+
+      def inspect_info
+        short_sha + " " + subject.inspect
+      end
+    end
+  end
+end

data/lib/travis/client/entity.rb

@@ -9,6 +9,10 @@ module Travis
 
       MAP = {}
 
+      def self.relations
+        @relations ||= []
+      end
+
       def self.subclasses
         MAP.values.uniq
       end
@@ -17,6 +21,10 @@ module Travis
         MAP.fetch(key)
       end
 
+      def self.aka(name)
+        MAP[name.to_s] = self
+      end
+
       def self.one(key = nil)
         MAP[key.to_s] = self if key
         @one ||= key.to_s
@@ -29,16 +37,33 @@ module Travis
 
       def self.attributes(*list)
         @attributes ||= []
+
         list.each do |name|
           name = name.to_s
+          fail "can't call an attribute id" if name == "id"
+
           @attributes << name
           define_method(name) { load_attribute(name) }
           define_method("#{name}=") { |value| set_attribute(name, value) }
           define_method("#{name}?") { !!send(name) }
         end
+
         @attributes
       end
 
+      def self.time(*list)
+        list.each do |name|
+          define_method("#{name}=") { |value| set_attribute(name, time(value)) }
+        end
+      end
+
+      def self.has(*list)
+        list.each do |name|
+          relations << name
+          define_method(name) { relation(name.to_s) }
+        end
+      end
+
       def self.inspect_info(name)
         alias_method(:inspect_info, name)
         private(:inspect_info)
@@ -73,11 +98,12 @@ module Travis
       end
 
       def reload
-        session.reload(self)
+        relations.each { |e| session.reset(e) }
+        session.reset(self)
       end
 
       def load
-        reload unless complete?
+        session.reload(self) unless complete?
       end
 
       def missing?(key)
@@ -95,8 +121,26 @@ module Travis
         "#<#{klass}: #{inspect_info}>"
       end
 
+      def relations
+        self.class.relations.map { |r| public_send(r) }.flatten(1)
+      end
+
       private
 
+        def relation(name)
+          name   = name.to_s
+          entity = Entity.subclass_for(name)
+
+          if entity.many == name
+            Array(send("#{entity.one}_ids")).map do |id|
+              session.find_one(entity, id)
+            end
+          else
+            id = send("#{name}_id")
+            session.find_one(entity, id) unless id.nil?
+          end
+        end
+
         def inspect_info
           id
         end
@@ -106,7 +150,7 @@ module Travis
         end
 
         def load_attribute(name)
-          reload if missing? name
+          session.reload(self) if missing? name
           attributes[name.to_s]
         end
 

data/lib/travis/client/job.rb

@@ -0,0 +1,52 @@
+require 'travis/client'
+
+module Travis
+  module Client
+    class Job < Entity
+      include States
+
+      # @!parse attr_reader :repository_id, :build_id, :commit_id, :log_id, :number, :config, :state, :started_at, :finished_at, :queue, :allow_failure, :tags
+      attributes :repository_id, :build_id, :commit_id, :log_id, :number, :config, :state, :started_at, :finished_at, :queue, :allow_failure, :tags
+      time :started_at, :finished_at
+
+      alias allow_failure? allow_failure
+
+      # @!parse attr_reader :commit, :repository, :build
+      has :commit, :repository, :build, :log
+
+      one :job
+      many :jobs
+
+      def restart
+        session.restart(self)
+      end
+
+      def pull_request?
+        build.pull_request?
+      end
+
+      def push?
+        build.push?
+      end
+
+      def allow_failures?
+        return false unless config.include? 'matrix' and config['matrix'].include? 'allow_failures'
+        config['matrix']['allow_failures'].any? do |allow|
+          allow.all? { |key, value| config[key] == value }
+        end
+      end
+
+      def duration
+        attributes['duration'] ||= begin
+          start  = started_at  || Time.now
+          finish = finished_at || Time.now
+          (finish - start).to_i
+        end
+      end
+
+      def inspect_info
+        "#{repository.slug}##{number}"
+      end
+    end
+  end
+end

data/lib/travis/client/methods.rb

@@ -16,7 +16,7 @@ module Travis
       end
 
       def github_auth(github_token)
-        reply = session.post_raw("/auth/github?github_token=#{github_token}")
+        reply = session.post_raw("/auth/github", :github_token => github_token)
         session.access_token = reply["access_token"]
       end
 
@@ -37,9 +37,30 @@ module Travis
         session.find_one(Repository, id_or_slug)
       end
 
+      def build(id)
+        session.find_one(Build, id)
+      end
+
+      def job(id)
+        session.find_one(Job, id)
+      end
+
+      def artifact(id)
+        session.find_one(Artifact, id)
+      end
+
+      alias log artifact
+
       def user
         session.find_one(User)
       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
+        session.post_raw('/requests', "#{entity.class.one}_id" => entity.id)
+        entity.reload
+      end
     end
   end
 end

data/lib/travis/client/repository.rb

@@ -29,11 +29,17 @@ module Travis
         end
       end
 
-      attributes :slug, :description, :last_build_id, :last_build_number, :last_build_state, :last_build_duration, :last_build_language, :last_build_started_at, :last_build_finished_at
+      include States
+
+      # @!parse attr_reader :slug, :description
+      attributes :slug, :description, :last_build_id, :last_build_number, :last_build_state, :last_build_duration, :last_build_started_at, :last_build_finished_at
       inspect_info :slug
 
+      time :last_build_finished_at, :last_build_started_at
+
       one  :repo
       many :repos
+      aka  :repository
 
       def public_key
         attributes["public_key"] ||= begin
@@ -54,13 +60,72 @@ module Travis
         key.encrypt(value)
       end
 
-      def last_build_started_at=(time)
-        set_attribute(:last_build_started_at, time(time))
+      # @!parse attr_reader :last_build
+      def last_build
+        return unless last_build_id
+        attributes['last_build'] ||= begin
+          last_build               = session.find_one(Build, last_build_id)
+          last_build.number        = last_build_number
+          last_build.state         = last_build_state
+          last_build.duration      = last_build_duration
+          last_build.started_at    = last_build_started_at
+          last_build.finished_at   = last_build_finished_at
+          last_build.repository_id = id
+          last_build
+        end
+      end
+
+      def builds(params = nil)
+        return each_build unless params
+        session.find_many(Build, params.merge(:repository_id => id))
       end
 
-      def last_build_finished_at=(time)
-        set_attribute(:last_build_finished_at, time(time))
+      def build(number)
+        builds(:number => number.to_s).first
       end
+
+      def recent_builds
+        builds({})
+      end
+
+      def each_build(params = nil, &block)
+        return enum_for(__method__, params) unless block_given?
+        params ||= {}
+        chunk = builds(params)
+        until chunk.empty?
+          chunk.each(&block)
+          number = chunk.last.number
+          chunk  = number == '1' ? [] : builds(params.merge(:after_number => number))
+        end
+        self
+      end
+
+      def job(number)
+        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
+      end
+
+      def set_hook(flag)
+        result = session.put_raw('/hooks/', :hook => { :id => id, :active => flag })
+        result['result']
+      end
+
+      def disable
+        set_hook(false)
+      end
+
+      def enable
+        set_hook(true)
+      end
+
+      private
+
+        def state
+          last_build_state
+        end
     end
   end
 end

data/lib/travis/client/session.rb

@@ -9,11 +9,13 @@ module Travis
     class Session
       SSL_OPTIONS = { :ca_file => File.expand_path("../../cacert.pem", __FILE__) }
       include Methods
-      attr_reader :connection, :headers, :access_token
+      attr_reader :connection, :headers, :access_token, :instruments
 
       def initialize(options = Travis::Client::ORG_URI)
-        @headers = {}
-        @cache   = {}
+        @headers     = {}
+        @cache       = {}
+        @instruments = []
+        @config      = nil
 
         options = { :uri => options } unless options.respond_to? :each_pair
         options.each_pair { |key, value| public_send("#{key}=", value) }
@@ -29,7 +31,7 @@ module Travis
       def uri=(uri)
         clear_cache!
         self.connection = Faraday.new(:url => uri, :ssl => SSL_OPTIONS) do |faraday|
-          faraday.request   :json
+          faraday.request  :url_encoded
           faraday.response  :json
           faraday.response  :follow_redirects
           faraday.response  :raise_error
@@ -47,6 +49,7 @@ module Travis
       def connection=(connection)
         clear_cache!
         connection.headers.merge! headers
+        @config     = nil
         @connection = connection
         @headers    = connection.headers
       end
@@ -84,12 +87,22 @@ module Travis
         end
       end
 
+      def reset(entity)
+        entity.attributes.clear
+        entity
+      end
+
       def reload(entity)
+        reset(entity)
         result = fetch_one(entity.class, entity.id)
         entity.update_attributes(result.attributes) if result.attributes != entity.attributes
         result
       end
 
+      def config
+        @config ||= get_raw('/config')['config']
+      end
+
       def get(*args)
         result = {}
         get_raw(*args).each_pair do |key, value|
@@ -104,13 +117,19 @@ module Travis
       end
 
       def get_raw(*args)
-        connection.get(*args).body
-      rescue Faraday::Error::ClientError => e
-        handle_error(e)
+        raw(:get, *args)
       end
 
       def post_raw(*args)
-        connection.post(*args).body
+        raw(:post, *args)
+      end
+
+      def put_raw(*args)
+        raw(:put, *args)
+      end
+
+      def raw(verb, *args)
+        instrumented(verb.to_s.upcase, *args) { connection.public_send(verb, *args).body }
       rescue Faraday::Error::ClientError => e
         handle_error(e)
       end
@@ -135,8 +154,21 @@ module Travis
         self
       end
 
+      def instrument(&block)
+        instruments << block
+      end
+
       private
 
+        def instrumented(name, *args)
+          name   = [name, *args.map(&:inspect)].join(" ") if args.any?
+          result = nil
+          chain  = instruments + [proc { |n,l| result = yield }]
+          lift   = proc { chain.shift.call(name, lift) }
+          lift.call
+          result
+        end
+
         def create_entity(type, data)
           id     = Integer(data.fetch('id'))
           entity = cached(type, :id, id) { type.new(self, id) }

data/lib/travis/client/states.rb

@@ -0,0 +1,85 @@
+require 'travis/client'
+
+module Travis
+  module Client
+    module States
+      STATES  = %w[created queued started passed failed errored canceled]
+
+      def pending?
+        check_state
+        %w[created started queued].include? state
+      end
+
+      def started?
+        check_state
+        state != 'created' and state != 'queued'
+      end
+
+      def queued?
+        check_state
+        state != 'created'
+      end
+
+      def finished?
+        not pending?
+      end
+
+      def passed?
+        check_state
+        state == 'passed'
+      end
+
+      def errored?
+        check_state
+        state == 'errored'
+      end
+
+      def failed?
+        check_state
+        state == 'failed'
+      end
+
+      def canceled?
+        check_state
+        state == 'canceled'
+      end
+
+      def unsuccessful?
+        errored? or failed? or canceled?
+      end
+
+      def created?
+        check_state
+        !!state
+      end
+
+      def color
+        pending? ? 'yellow' : passed? ? 'green' : 'red'
+      end
+
+      def yellow?
+        color == 'yellow'
+      end
+
+      def green?
+        color == 'green'
+      end
+
+      def red?
+        color == 'red'
+      end
+
+      def running?
+        state == 'started'
+      end
+
+      alias successful? passed?
+
+      private
+
+        def check_state
+          raise Error, "unknown state %p for %p" % [state, self] unless STATES.include? state
+        end
+    end
+  end
+end

data/lib/travis/client/user.rb

@@ -3,6 +3,7 @@ require 'travis/client'
 module Travis
   module Client
     class User < Entity
+      # @!parse attr_reader :login, :name, :email, :gravatar_id, :locale, :is_syncing, :synced_at, :correct_scopes
       attributes :login, :name, :email, :gravatar_id, :locale, :is_syncing, :synced_at, :correct_scopes
       inspect_info :login
 
@@ -13,6 +14,11 @@ module Travis
         set_attribute(:synced_at, time(time))
       end
 
+      def sync
+        session.post_raw('/users/sync')
+        reload
+      end
+
       alias syncing? is_syncing
       alias correct_scopes? correct_scopes
     end

data/lib/travis/client.rb

@@ -1,10 +1,15 @@
 require 'backports/1.9.3' if RUBY_VERSION < '1.9.3'
 require 'travis/client/error'
+require 'travis/client/states'
 require 'travis/client/methods'
 require 'travis/client/session'
 require 'travis/client/entity'
 require 'travis/client/user'
 require 'travis/client/repository'
+require 'travis/client/build'
+require 'travis/client/artifact'
+require 'travis/client/commit'
+require 'travis/client/job'
 require 'travis/client/namespace'
 
 module Travis

data/lib/travis/tools/formatter.rb

@@ -0,0 +1,38 @@
+require 'time'
+
+module Travis
+  module Tools
+    class Formatter
+      DAY         = 24 * 60 * 60
+      TIME_FORMAT = "%Y-%m-%d %H:%M:%S"
+      CONFIG_KEYS = ['rvm', 'gemfile', 'env', 'jdk', 'otp_release', 'php', 'node_js', 'perl', 'python', 'scala', 'compiler']
+
+      def duration(seconds, suffix = nil)
+        return "none" if seconds.nil?
+        seconds          = (Time.now - seconds).to_i if seconds.is_a? Time
+        output           = []
+        minutes, seconds = seconds.divmod(60)
+        hours, minutes   = minutes.divmod(60)
+        output << "#{hours  } hrs" if hours > 0
+        output << "#{minutes} min" if minutes > 0
+        output << "#{seconds} sec" if seconds > 0 or output.empty?
+        output << suffix           if suffix
+        output.join(" ")
+      end
+
+      def time(time)
+        return "not yet" if time.nil? # or time > Time.now
+        #return duration(time, "ago") if Time.now - time < DAY
+        time.localtime.strftime(TIME_FORMAT)
+      end
+
+      def job_config(config)
+        output = []
+        config.each_pair do |key, value|
+          output << "#{key}: #{value}" if CONFIG_KEYS.include? key
+        end
+        output.join(", ")
+      end
+    end
+  end
+end

data/lib/travis/version.rb

@@ -1,3 +1,3 @@
 module Travis
-  VERSION = '1.0.3'
+  VERSION = '1.1.0'
 end

data/spec/cli/encrypt_spec.rb

@@ -18,6 +18,21 @@ describe Travis::CLI::Endpoint do
 
   example "cat foo | travis encrypt" do
     run_cli('encrypt') { |i| i.puts('foo') }
-    stdout.should match(/^".{60,}"\n$/)
+    stdout.should match(/\A".{60,}"\n\Z/)
+  end
+
+  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
+    run_cli('encrypt') { |i| i.puts("foo\nbar") }
+    stdout.should match(/\A".{60,}"\n\Z/)
+  end
+
+  example "travis encrypt rails/rails foo" do
+    run_cli('encrypt', 'rails/rails', 'foo').should be_success
+    stderr.should match(/WARNING/)
   end
 end

data/spec/cli/history_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe Travis::CLI::History do
+  example 'travis history' do
+    run_cli('history').should be_success
+    stdout.should be == "#6180 failed: master Associaton -> Association\n"
+  end
+
+  example 'travis history -a 6180' do
+    run_cli('history', '-a', '6180').should be_success
+    stdout.should be == ''
+  end
+
+  example 'travis history -b master' do
+    run_cli('history', '-b', 'master').should be_success
+    stdout.should be == "#6180 failed: master Associaton -> Association\n"
+  end
+
+  example 'travis history -b not-master' do
+    run_cli('history', '-b', 'not-master').should be_success
+    stdout.should be_empty
+  end
+
+  example 'travis history -p 5' do
+    run_cli('history', '-p', '5').should be_success
+    stdout.should be_empty
+  end
+end

data/spec/cli/logs_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe Travis::CLI::Logs do
+  example 'logs 6180.1' do
+    run_cli('logs', '6180.1', '-E').should be_success
+    stdout.should be == "$ export GEM=railties\n"
+  end
+end

data/spec/cli/open_spec.rb

@@ -0,0 +1,33 @@
+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"
+  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"
+  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"
+  end
+
+  example 'travis open -pg' do
+    run_cli('open', '-pg').should be_success
+    stdout.should be == "https://github.com/travis-ci/travis\n"
+  end
+
+  example 'travis open 6180 -pg' do
+    run_cli('open', '6180', '-pg').should be_success
+    stdout.should be == "https://github.com/rails/rails/compare/6581d798e830...a0265b98f16c\n"
+  end
+
+  example 'travis open 6180.1 -pg' do
+    run_cli('open', '6180.1', '-pg').should be_success
+    stdout.should be == "https://github.com/rails/rails/compare/6581d798e830...a0265b98f16c\n"
+  end
+end