travis-surveillance 0.0.3 → 0.0.4

data/README.md

@@ -4,19 +4,16 @@
 
 [![Build Status](https://secure.travis-ci.org/dylanegan/travis-surveillance.png?branch=master)](http://travis-ci.org/dylanegan/travis-surveillance)
 
-## Installation
+----------
 
 ```
 $ gem install travis-surveillance
+$ travis-surveillance --projects dylanegan/travis-surveillance
 ```
 
-## Usage
+![](https://github.com/dylanegan/travis-surveillance/raw/master/travis-surveillance-output.png)
 
-```
-travis-surveillance --projects dylanegan/travis-surveillance
-```
-
-## License
+----------
 
 Copyright (c) 2012 Dylan Egan
 

data/lib/travis/surveillance/build.rb

@@ -20,9 +20,6 @@ module Travis
         :result, :started_at]
       attr_accessor *ATTRIBUTES
 
-      alias_method :status, :result
-      alias_method :status=, :result=
-
       def initialize(attrs = {})
         self.attributes = attrs
 
@@ -36,6 +33,7 @@ module Travis
 
         job = Job.new(json.merge({'build' => self}))
         jobs << job
+        jobs.sort_by! { |j| j.id }
         job
       end
 
@@ -44,6 +42,10 @@ module Travis
           next if value.nil?
           if key == 'config'
             config.attributes = value
+          elsif key == 'matrix'
+            value.each do |job|
+              add_job(job)
+            end
           else
             send("#{key}=", (key[/_at$/] ? Time.parse(value) : value)) if ATTRIBUTES.include?(key.to_sym)
           end
@@ -51,7 +53,7 @@ module Travis
       end
 
       def building?
-        status.nil?
+        result.nil?
       end
 
       def config
@@ -69,7 +71,7 @@ module Travis
       end
 
       def failed?
-        !status.nil? && !passed?
+        !result.nil? && !passed?
       end
 
       def job_for(id)
@@ -81,7 +83,7 @@ module Travis
       end
 
       def passed?
-        !status.nil? && status.zero?
+        !result.nil? && result.zero?
       end
 
       def state
@@ -94,6 +96,10 @@ module Travis
         end
       end
 
+      def url
+        @url ||= project.url + "/builds/#{@id}"
+      end
+
       private
 
       def get_details
@@ -105,7 +111,13 @@ module Travis
       end
 
       def populate
-        self.attributes = get_details
+        self.attributes = get_details unless satisfied?
+      end
+
+      def satisfied?
+        ATTRIBUTES.each do |attr|
+          return false if ![:finished_at, :result].include?(attr) && send(attr).nil?
+        end
       end
     end
   end

data/lib/travis/surveillance/cli.rb

@@ -8,6 +8,59 @@ require "travis/surveillance"
 module Travis
   module Surveillance
     module CLI
+      class Artist
+        attr_accessor :project
+
+        def initialize(project)
+          @project = project
+        end
+
+        def draw
+          if project.builds.any? && builds = project.builds.reverse
+            print "\x1b[2J\x1b[H"
+
+            latest = builds.first
+
+            table = Terminal::Table.new title: "#{project.owner}/#{project.name} (#{project.url})", style: { width: 120 } do |t|
+              t << ["Build", "#{latest.number} (#{latest.url})"]
+              t << ["Duration", latest.duration] unless latest.building?
+              t << ["Branch", latest.branch]
+              t << ["Commit", latest.commit]
+              t << ["Compare URL", latest.compare_url]
+              t << ["Author", latest.author_name]
+              t << ["Message", latest.message.length > 80 ? "#{latest.message[0..80]}..." : latest.message]
+            end
+
+            print table
+            print "\n\n"
+
+            table = Terminal::Table.new title: "Build Matrix", headings: ['Job', 'State', 'Duration', 'Runtime', 'ENV'], style: { width: 120 } do |t|
+              latest.jobs.each do |job|
+                t << [job.number, job.state, job.duration, job.runtime, job.config.env]
+              end
+            end
+
+            print table
+
+            if builds.size > 1
+              print "\n\n"
+
+              table = Terminal::Table.new :title => "Build History", :headings => ['Build', 'State', 'Branch', 'Message', 'Duration'], style: { width: 120 } do |t|
+                builds.each do |build|
+                  next if build == latest
+                  t << [build.number, build.state, build.branch, (build.message.length > 30 ? "#{build.message[0..30]}..." : build.message), build.duration]
+                end
+              end
+
+              print table
+            end
+          end
+
+          print "\x1b[H"
+          $stdout.flush
+        end
+      end
+
       class Logger
         def self.log(data, &block)
           Scrolls.log(data, &block)
@@ -37,51 +90,11 @@ module Travis
           end
 
           surveyor = Travis::Surveillance::Surveyor.new(Travis::Surveillance::Project.new(project))
-          project = surveyor.project
+          artist = Artist.new(surveyor.project)
+          artist.draw
 
           surveyor.survey do
-            if project.builds.any? && builds = project.builds.sort_by { |b| b.id }.reverse
-              print "\x1b[2J\x1b[H"
-
-              latest = builds.first
-
-              table = Terminal::Table.new title: "#{project.owner}/#{project.name}", style: { width: 120 } do |t|
-                t << ["Build", latest.number]
-                t << ["Duration", latest.duration] unless latest.building?
-                t << ["Branch", latest.branch]
-                t << ["Commit", latest.commit]
-                t << ["Compare URL", latest.compare_url]
-                t << ["Author", latest.author_name]
-                t << ["Message", latest.message.length > 80 ? "#{latest.message[0..80]} ..." : latest.message]
-              end
-
-              print table
-              print "\n\n"
-
-              table = Terminal::Table.new title: "Build Matrix", headings: ['Job', 'State', 'Duration', 'Runtime', 'ENV'], style: { width: 120 } do |t|
-                latest.jobs.sort_by { |j| j.id }.each do |job|
-                  t << [job.number, job.state, job.duration, job.runtime, job.config.env]
-                end
-              end
-
-              print table
-
-              if builds.size > 1
-                print "\n\n"
-
-                table = Terminal::Table.new :title => "Build History", :headings => ['Build', 'State', 'Branch', 'Message', 'Duration'], style: { width: 120 } do |t|
-                  builds.each do |build|
-                    next if build == latest
-                    t << [build.number, build.state, build.branch, (build.message.length > 30 ? "#{build.message[0..30]} ..." : build.message), build.duration]
-                  end
-                end
-
-                print table
-              end
-            end
-
-            print "\x1b[H"
-            $stdout.flush
+            artist.draw
           end
         end
       end

data/lib/travis/surveillance/job.rb

@@ -19,9 +19,6 @@ module Travis
       ATTRIBUTES = [:build, :finished_at, :id, :number, :result, :started_at]
       attr_accessor *ATTRIBUTES
 
-      alias_method :status, :result
-      alias_method :status=, :result=
-
       def initialize(attrs = {})
         self.attributes = attrs
 
@@ -54,15 +51,15 @@ module Travis
       end
 
       def failed?
-        !status.nil? && !passed?
+        !result.nil? && !passed?
       end
 
       def passed?
-        !status.nil? && status.zero?
+        !result.nil? && result.zero?
       end
 
       def running?
-        status.nil?
+        result.nil?
       end
 
       def runtime
@@ -96,7 +93,13 @@ module Travis
       end
 
       def populate
-        self.attributes = get_details
+        self.attributes = get_details unless satisfied?
+      end
+
+      def satisfied?
+        ATTRIBUTES.each do |attr|
+          return false if ![:finished_at, :result].include?(attr) && send(attr).nil?
+        end
       end
     end
   end

data/lib/travis/surveillance/project.rb

@@ -1,14 +1,20 @@
 module Travis
   module Surveillance
     class Project
-      attr_accessor :description, :id, :name, :owner, :slug, :status
+      ATTRIBUTES = [:description, :id, :slug]
+      attr_accessor *ATTRIBUTES
 
-      def initialize(name)
-        @owner, @name = name.split('/')
-        @slug         = name
+      def initialize(slug)
+        self.attributes = { 'slug' => slug }
         populate
       end
 
+      def attributes=(attrs = {})
+        attrs.each do |key, value|
+          send("#{key}=", value) if ATTRIBUTES.include?(key.to_sym)
+        end
+      end
+
       def add_build(json)
         if build = build_for(json['id'])
           return build
@@ -16,6 +22,7 @@ module Travis
 
         build = Build.new(json.merge({'project' => self}))
         builds << build
+        builds.sort_by! { |b| b.id }
         build
       end
 
@@ -39,6 +46,22 @@ module Travis
         !status.nil? && status.zero?
       end
 
+      def name
+        @name ||= @slug.split('/')[1]
+      end
+
+      def owner
+        @owner ||= @slug.split('/')[0]
+      end
+
+      def status
+        builds.last.result if builds.any?
+      end
+
+      def url
+        @url ||= "http://travis-ci.org/#{@slug}"
+      end
+
       private
 
       def get_details
@@ -49,11 +72,24 @@ module Travis
         end
       end
 
+      def get_builds
+        if Travis::Surveillance.mocking?
+          if File.exists?(File.dirname(__FILE__) + "/../../../spec/support/builds/#{slug.gsub('/', '-')}.json")
+            JSON.parse(IO.read(File.dirname(__FILE__) + "/../../../spec/support/builds/#{slug.gsub('/', '-')}.json"))
+          else
+            []
+          end
+        else
+          JSON.parse(open("http://travis-ci.org/#{slug}/builds.json").read)
+        end
+      end
+
       def populate
-        details = get_details
-        @description = details['description']
-        @id          = details['id']
-        @status      = details['last_build_status']
+        self.attributes = details = get_details
+
+        get_builds.reverse.each do |build_json|
+          add_build(build_json)
+        end if details['last_build_id']
       end
     end
   end

data/lib/travis/surveillance/surveyor.rb

@@ -1,7 +1,7 @@
 require "json"
 require "open-uri"
 
-gem "pusher-client-merman"
+gem "pusher-client-merman" # https://github.com/pusher/pusher-ruby-client/issues/4
 require "pusher-client"
 PusherClient.logger.level = Logger::INFO
 
@@ -78,7 +78,6 @@ module Travis
 
         Travis::Surveillance.log({ surveyor: true, build: true, finished: true, id: build.id, number: build.number })
         build.attributes = json['build']
-        @project.status = build.status
       end
 
       def payload_to_job_started(payload)

data/lib/travis/surveillance/version.rb

@@ -1,5 +1,5 @@
 module Travis
   module Surveillance
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/support/builds/11.json

@@ -0,0 +1,16 @@
+{
+  "id":11,
+  "number":"1",
+  "config":{
+    "language":"ruby"
+  },
+  "started_at":"2012-08-04T13:28:29Z",
+  "commit":"af0d1c46e019ff61f1faaba7003ebf912ab245d6",
+  "branch":"master",
+  "message":"Test",
+  "compare_url":"https://github.com/dylanegan/travis-surveillance/compare/74791a0faacf...af0d1c46e019",
+  "committed_at":"2012-08-04T13:28:22Z",
+  "author_name":"Dylan Egan",
+  "committer_name":"Dylan Egan",
+  "result":0
+}

data/spec/support/builds/12.json

@@ -0,0 +1,16 @@
+{
+  "id":12,
+  "number":"2",
+  "config":{
+    "language":"ruby"
+  },
+  "started_at":"2012-08-04T13:38:29Z",
+  "commit":"asklj23289dd0983212019dhkjsdlkj290820329",
+  "branch":"master",
+  "message":"Second Build",
+  "compare_url":"https://github.com/dylanegan/travis-surveillance/compare/af0d1c46e019...asklj23289dd",
+  "committed_at":"2012-08-04T13:38:22Z",
+  "author_name":"Dylan Egan",
+  "committer_name":"Dylan Egan",
+  "result":0
+}

data/spec/support/builds/dylanegan-travis-surveillance-existing.json

@@ -0,0 +1,39 @@
+[{
+  "id":11,
+  "number":"1",
+  "config":{
+    "language":"ruby"
+  },
+  "started_at":"2012-08-04T13:28:29Z",
+  "commit":"af0d1c46e019ff61f1faaba7003ebf912ab245d6",
+  "branch":"master",
+  "message":"Test",
+  "compare_url":"https://github.com/dylanegan/travis-surveillance/compare/74791a0faacf...af0d1c46e019",
+  "committed_at":"2012-08-04T13:28:22Z",
+  "author_name":"Dylan Egan",
+  "committer_name":"Dylan Egan",
+  "result":0,
+  "matrix": [{
+    "id":11,
+    "number":"11.1"
+  }]
+}, {
+  "id":12,
+  "number":"2",
+  "config":{
+    "language":"ruby"
+  },
+  "started_at":"2012-08-04T13:38:29Z",
+  "commit":"asklj23289dd0983212019dhkjsdlkj290820329",
+  "branch":"master",
+  "message":"Second Build",
+  "compare_url":"https://github.com/dylanegan/travis-surveillance/compare/af0d1c46e019...asklj23289dd",
+  "committed_at":"2012-08-04T13:38:22Z",
+  "author_name":"Dylan Egan",
+  "committer_name":"Dylan Egan",
+  "result":0,
+  "matrix": [{
+    "id":12,
+    "number":"12.1"
+  }]
+}]

data/spec/support/jobs/11.json

@@ -0,0 +1,10 @@
+{
+  "id":11,
+  "number":"11.2",
+  "started_at":"2012-08-04T13:38:29Z",
+  "config": {
+    "env":"NO_SIMPLECOV=true",
+    "rvm":"1.9.2"
+  },
+  "result":0
+}

data/spec/support/jobs/12.json

@@ -0,0 +1,10 @@
+{
+  "id":12,
+  "number":"12.1",
+  "started_at":"2012-08-04T13:38:29Z",
+  "config": {
+    "env":"NO_SIMPLECOV=true",
+    "rvm":"1.9.2"
+  },
+  "result":0
+}

data/spec/support/projects/dylanegan-travis-surveillance-existing.json

@@ -0,0 +1,14 @@
+{
+  "id":11,
+  "slug":"dylanegan/travis-surveillance-existing",
+  "description":"",
+  "public_key":"-----BEGIN RSA PUBLIC KEY-----\nMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCPeL3PD+uSXgaF4bvK4BMfCB3g\nple4P8PD+klPMQi3FTjXgyzPqsbiTaeKka0WNtmd+BXKIdczxrbjqNIAPurE3NeT\nM8aPbnkW0HNZ+oL1AsZveUyxjwMqN6iwrPbuLEKnueSpTcBOPBk3TY7Lec/HmlPV\n2PZM4LHOgmFA1P29pwIDAQAB\n-----END RSA PUBLIC KEY-----\n",
+  "last_build_id":11,
+  "last_build_number":"1",
+  "last_build_status":0,
+  "last_build_result":0,
+  "last_build_duration":113,
+  "last_build_language":null,
+  "last_build_started_at":"2012-08-03T09:13:51Z",
+  "last_build_finished_at":"2012-08-03T09:14:31Z"
+}

data/spec/support/pusher/dylanegan-travis-surveillance-build-started.json

@@ -4,6 +4,7 @@
     "number":"1",
     "result":null,
     "matrix": [{
+      "id":1,
       "number":"1.1"
     }]
   },

data/spec/travis/surveillance/build_spec.rb

@@ -54,6 +54,22 @@ describe Travis::Surveillance::Build do
     it "should have a started_at" do
       @build.started_at.must_equal Time.parse("2012-08-04T13:28:29Z")
     end
+
+    it "should have a url" do
+      @build.url.must_equal "http://travis-ci.org/dylanegan/travis-surveillance/builds/1"
+    end
+  end
+
+  describe "with history" do
+    before do
+      @history = Travis::Surveillance::Project.new("dylanegan/travis-surveillance-existing")
+      @build = @history.add_build({'id' => 11})
+    end
+
+    it "should have jobs" do
+      @build.jobs.wont_be_empty
+      @build.jobs.first.id.must_equal 11
+    end
   end
 
   describe "a finished build" do
@@ -71,15 +87,15 @@ describe Travis::Surveillance::Build do
       @build.finished_at.must_equal Time.parse("2012-08-04T13:28:59Z")
     end
 
-    it "should have a status" do
-      @build.status.must_equal 1
+    it "should have a result" do
+      @build.result.must_equal 1
     end
   end
 
-  describe "status" do
+  describe "result" do
     describe "when nil" do
       before do
-        @build.status = nil
+        @build.result = nil
       end
 
       it "should be building" do
@@ -91,7 +107,7 @@ describe Travis::Surveillance::Build do
 
     describe "when zero" do
       before do
-        @build.status = 0
+        @build.result = 0
       end
 
       it "should have passed" do
@@ -103,7 +119,7 @@ describe Travis::Surveillance::Build do
 
     describe "when one" do
       before do
-        @build.status = 1
+        @build.result = 1
       end
 
       it "should have failed" do

data/spec/travis/surveillance/job_spec.rb

@@ -48,15 +48,15 @@ describe Travis::Surveillance::Job do
       @job.finished_at.must_equal Time.parse("2012-08-04T13:28:59Z")
     end
 
-    it "should have a status" do
-      @job.status.must_equal 1
+    it "should have a result" do
+      @job.result.must_equal 1
     end
   end
 
-  describe "status" do
+  describe "result" do
     describe "when nil" do
       before do
-        @job.status = nil
+        @job.result = nil
       end
 
       it "should be running" do
@@ -68,7 +68,7 @@ describe Travis::Surveillance::Job do
 
     describe "when zero" do
       before do
-        @job.status = 0
+        @job.result = 0
       end
 
       it "should have passed" do
@@ -80,7 +80,7 @@ describe Travis::Surveillance::Job do
 
     describe "when one" do
       before do
-        @job.status = 1
+        @job.result = 1
       end
 
       it "should have failed" do

data/spec/travis/surveillance/project_spec.rb

@@ -21,44 +21,54 @@ describe Travis::Surveillance::Project do
     @project.description.must_equal ""
   end
 
-  it "should have a status" do
-    @project.status.must_equal 0
+  it "should have a url" do
+    @project.url.must_equal "http://travis-ci.org/dylanegan/travis-surveillance"
+  end
+
+  describe "with history" do
+    before do
+      @history = Travis::Surveillance::Project.new("dylanegan/travis-surveillance-existing")
+    end
+
+    it "should have builds" do
+      @history.builds.wont_be_empty
+      @history.builds.first.id.must_equal 11
+    end
+
+    it "should have a status" do
+      @history.status.must_equal 0
+      @history.passed?.must_equal true
+    end
   end
 
   describe "status" do
     describe "when nil" do
-      before do
-        @project.status = nil
-      end
-
       it "should be building" do
-        @project.building?.must_equal true
-        @project.failed?.must_equal false
-        @project.passed?.must_equal false
+        @project.stub :status, nil do
+          @project.building?.must_equal true
+          @project.failed?.must_equal false
+          @project.passed?.must_equal false
+        end
       end
     end
 
     describe "when zero" do
-      before do
-        @project.status = 0
-      end
-
       it "should have passed" do
-        @project.building?.must_equal false
-        @project.failed?.must_equal false
-        @project.passed?.must_equal true
+        @project.stub :status, 0 do
+          @project.building?.must_equal false
+          @project.failed?.must_equal false
+          @project.passed?.must_equal true
+        end
       end
     end
 
     describe "when one" do
-      before do
-        @project.status = 1
-      end
-
       it "should have failed" do
-        @project.building?.must_equal false
-        @project.failed?.must_equal true
-        @project.passed?.must_equal false
+        @project.stub :status, 1 do
+          @project.building?.must_equal false
+          @project.failed?.must_equal true
+          @project.passed?.must_equal false
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis-surveillance
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-05 00:00:00.000000000 Z
+date: 2012-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -132,8 +132,14 @@ files:
 - logs/.gitignore
 - spec/helper.rb
 - spec/support/builds/1.json
+- spec/support/builds/11.json
+- spec/support/builds/12.json
+- spec/support/builds/dylanegan-travis-surveillance-existing.json
 - spec/support/jobs/1.json
+- spec/support/jobs/11.json
+- spec/support/jobs/12.json
 - spec/support/jobs/2.json
+- spec/support/projects/dylanegan-travis-surveillance-existing.json
 - spec/support/projects/dylanegan-travis-surveillance.json
 - spec/support/pusher/dylanegan-travis-surveillance-build-finished.json
 - spec/support/pusher/dylanegan-travis-surveillance-build-started.json
@@ -145,6 +151,7 @@ files:
 - spec/travis/surveillance/project_spec.rb
 - spec/travis/surveillance/surveyor_spec.rb
 - spec/travis/surveillance_spec.rb
+- travis-surveillance-output.png
 - travis-surveillance.gemspec
 - travis-surveillance.jpg
 homepage: https://github.com/dylanegan/travis-surveillance
@@ -174,8 +181,14 @@ summary: Veille sur un projet.
 test_files:
 - spec/helper.rb
 - spec/support/builds/1.json
+- spec/support/builds/11.json
+- spec/support/builds/12.json
+- spec/support/builds/dylanegan-travis-surveillance-existing.json
 - spec/support/jobs/1.json
+- spec/support/jobs/11.json
+- spec/support/jobs/12.json
 - spec/support/jobs/2.json
+- spec/support/projects/dylanegan-travis-surveillance-existing.json
 - spec/support/projects/dylanegan-travis-surveillance.json
 - spec/support/pusher/dylanegan-travis-surveillance-build-finished.json
 - spec/support/pusher/dylanegan-travis-surveillance-build-started.json