travis-surveillance 0.0.1 → 0.0.2

data/README.md

@@ -2,6 +2,8 @@
 
 > I'll work anytime, anywhere.
 
+[![Build Status](https://secure.travis-ci.org/dylanegan/travis-surveillance.png?branch=master)](http://travis-ci.org/dylanegan/travis-surveillance)
+
 ## Installation
 
 ```

data/lib/travis/surveillance/build.rb

@@ -26,7 +26,7 @@ module Travis
       def initialize(attrs = {})
         self.attributes = attrs
 
-        populate unless @number
+        populate
       end
 
       def add_job(json)

data/lib/travis/surveillance/cli.rb

@@ -37,23 +37,30 @@ module Travis
           end
 
           surveyor = Travis::Surveillance::Surveyor.new(Travis::Surveillance::Project.new(project))
-
           project = surveyor.project
-          print "\x1b[2J\x1b[H"
-          print "Project: #{project.owner}/#{project.name}\n\n"
-          print "\x1b[H"
-          $stdout.flush
 
           surveyor.survey do
-            print "\x1b[2J\x1b[H"
-            print "Project: #{project.owner}/#{project.name}\n\n"
-
             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 => "Latest Build: #{latest.number}", :headings => ['Job', 'State', 'Duration', 'ENV'] do |t|
+              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 > 100 ? "#{latest.message[0..100]} ..." : 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.config.env]
+                  t << [job.number, job.state, job.duration, job.runtime, job.config.env]
                 end
               end
 
@@ -62,7 +69,7 @@ module Travis
               if builds.size > 1
                 print "\n\n"
 
-                table = Terminal::Table.new :title => "Build History", :headings => ['Build', 'State', 'Branch', 'Message', 'Duration'] do |t|
+                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, build.duration]

data/lib/travis/surveillance/job.rb

@@ -65,6 +65,16 @@ module Travis
         status.nil?
       end
 
+      def runtime
+        return @runtime if @runtime
+        @runtime = build.config.language.dup
+        case @runtime
+        when "ruby"
+          @runtime << " #{config.rvm}"
+        end
+        @runtime
+      end
+
       def state
         if running?
           'running'

data/lib/travis/surveillance/surveyor.rb

@@ -67,7 +67,7 @@ module Travis
         return unless json = parse_and_check(payload)
 
         unless build = @project.build_for(json['build']['id'])
-          Travis::Surveillance.log({ surveyor: true, build: true, started: true, id: json['build']['id'] })
+          Travis::Surveillance.log({ surveyor: true, build: true, started: true, id: json['build']['id'], number: json['build']['number'] })
           @project.add_build(json['build'])
         end
       end
@@ -76,7 +76,7 @@ module Travis
         json, build = parse_and_check_and_build(payload)
         return unless build
 
-        Travis::Surveillance.log({ surveyor: true, build: true, finished: true, id: build.id })
+        Travis::Surveillance.log({ surveyor: true, build: true, finished: true, id: build.id, number: build.number })
         build.attributes = json['build']
         @project.status = build.status
       end

data/lib/travis/surveillance/version.rb

@@ -1,5 +1,5 @@
 module Travis
   module Surveillance
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/spec/support/jobs/2.json

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

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

@@ -0,0 +1,5 @@
+{
+  "id":2,
+  "build_id":1,
+  "repository_id":143690
+}

data/spec/travis/surveillance/job_spec.rb

@@ -24,6 +24,10 @@ describe Travis::Surveillance::Job do
       @job.number.must_equal "1.1"
     end
 
+    it "should have a runtime" do
+      @job.runtime.must_equal "ruby 1.9.3"
+    end
+
     it "should have a started_at" do
       @job.started_at.must_equal Time.parse("2012-08-04T13:28:29Z")
     end

data/spec/travis/surveillance/surveyor_spec.rb

@@ -28,6 +28,14 @@ describe Travis::Surveillance::Surveyor do
       @project.builds.last.jobs.last.running?.must_equal true
     end
 
+    it "should handle multiple job:started" do
+      @surveyor.socket.simulate_received('build:started', pusher_json_for(@project.slug, 'build:started'), 'common')
+      @surveyor.socket.simulate_received('job:started', pusher_json_for(@project.slug, 'job:started'), 'common')
+      @surveyor.socket.simulate_received('job:started', pusher_json_for(@project.slug, 'job:started:2'), 'common')
+      @project.builds.last.jobs.first.runtime.must_equal "ruby 1.9.3"
+      @project.builds.last.jobs.last.runtime.must_equal "ruby 1.9.2"
+    end
+
     it "should handle job:finished" do
       @surveyor.socket.simulate_received('build:started', pusher_json_for(@project.slug, 'build:started'), 'common')
       @surveyor.socket.simulate_received('job:started', pusher_json_for(@project.slug, 'job:started'), 'common')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis-surveillance
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -133,10 +133,12 @@ files:
 - spec/helper.rb
 - spec/support/builds/1.json
 - spec/support/jobs/1.json
+- spec/support/jobs/2.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
 - spec/support/pusher/dylanegan-travis-surveillance-job-finished.json
+- spec/support/pusher/dylanegan-travis-surveillance-job-started-2.json
 - spec/support/pusher/dylanegan-travis-surveillance-job-started.json
 - spec/travis/surveillance/build_spec.rb
 - spec/travis/surveillance/job_spec.rb
@@ -173,10 +175,12 @@ test_files:
 - spec/helper.rb
 - spec/support/builds/1.json
 - spec/support/jobs/1.json
+- spec/support/jobs/2.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
 - spec/support/pusher/dylanegan-travis-surveillance-job-finished.json
+- spec/support/pusher/dylanegan-travis-surveillance-job-started-2.json
 - spec/support/pusher/dylanegan-travis-surveillance-job-started.json
 - spec/travis/surveillance/build_spec.rb
 - spec/travis/surveillance/job_spec.rb