bard 0.25.1 → 0.25.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7a425db1fb81e8ecc60ca4b660d29345e3b7298
-  data.tar.gz: 304d1b3704221e43956dd9961a2ff6e174c20f62
+  metadata.gz: a93db2ad80e6104a194831ff80a71668b59f492d
+  data.tar.gz: b97f43d932e49a5d10789e7ac5bcd14401745ce7
 SHA512:
-  metadata.gz: 3ff05948b025850324b60f1a66847940e10d411b9d0320632c484dd872ecf40ea82da1d44ea60a98f65edec3e2992d796250a048b14e4e9a864cae26cc85f2b3
-  data.tar.gz: 16c62d15b3c947c794d62208301ae3d3f273ff5832b5932a5c098ef485f884d90734f2e8267ecf0bff8ba159a32424bb690e4f45ffd5c3e958cc20e08c66560e
+  metadata.gz: 3a14f2fd1b3bc0b27e2b1dd7d2d11396c191613064f0285164728d7c07c821af5f1baa031259e9de318241ef42b90e8e76f2a198be60fc2d0dcd40e1f2962c49
+  data.tar.gz: 1cb87e22fb668b40b9a4ae3f56712afebac411871976921599cb03da5b8d3e595fba7a148f041a7121856c56abed414382b65841c500af81a4c567c6c186d871

data/lib/bard/ci.rb

@@ -1,19 +1,18 @@
 class Bard::CLI < Thor
   class CI < Struct.new(:project_name, :current_sha)
     def run
-      last_build_number = get_last_build_number
       last_time_elapsed = get_last_time_elapsed
       start
-      sleep(2) while last_build_number == get_last_build_number
+      sleep(2) until started?
 
       start_time = Time.new.to_i
-      while (self.last_response = `curl -s #{ci_host}/lastBuild/api/xml?token=botandrose`).include? "<building>true</building>"
+      while building?
         elapsed_time = Time.new.to_i - start_time
         yield elapsed_time, last_time_elapsed
         sleep(2)
       end
 
-      self.last_response =~ /<result>SUCCESS<\/result>/
+      success?
     end
 
     def exists?
@@ -29,24 +28,42 @@ class Bard::CLI < Thor
 
     private
 
+    def get_last_time_elapsed
+      response = `curl -s #{ci_host}/lastStableBuild/api/xml?token=botandrose`
+      response.match(/<duration>(\d+)<\/duration>/)
+      $1 ? $1.to_i / 1000 : nil
+    end
+
     def ci_host
       "http://botandrose:thecakeisalie!@ci.botandrose.com/job/#{project_name}"
     end
 
     def start
-      `curl -s -I -X POST '#{ci_host}/buildWithParameters?token=botandrose&GIT_REF=#{current_sha}'`
+      command = "curl -s -I -X POST '#{ci_host}/buildWithParameters?token=botandrose&GIT_REF=#{current_sha}'"
+      output = `#{command}`
+      @queueId = output[%r{Location: .+/queue/item/(\d+)/}, 1].to_i
     end
 
-    def get_last_build_number
-      response = `curl -s #{ci_host}/lastBuild/api/xml?token=botandrose`
-      response.match(/<number>(\d+)<\/number>/)
-      $1 ? $1.to_i : nil
+    def started?
+      command = "curl -s -g '#{ci_host}/api/json?depth=1&tree=builds[queueId,number]'"
+      output = `#{command}`
+      output =~ /"queueId":#{@queueId}\b/
     end
 
-    def get_last_time_elapsed
-      response = `curl -s #{ci_host}/lastStableBuild/api/xml?token=botandrose`
-      response.match(/<duration>(\d+)<\/duration>/)
-      $1 ? $1.to_i / 1000 : nil
+    def job_id
+      @job_id ||= begin
+        output = `curl -s -g '#{ci_host}/api/json?depth=1&tree=builds[queueId,number]'`
+        output[/"number":(\d+),"queueId":#{@queueId}\b/, 1].to_i
+      end
+    end
+
+    def building?
+      self.last_response = `curl -s #{ci_host}/#{job_id}/api/json?tree=building,result`
+      last_response.include? '"building":true'
+    end
+
+    def success?
+      last_response.include? '"result":"SUCCESS"'
     end
   end
 end

data/lib/bard/version.rb

@@ -1,4 +1,4 @@
 module Bard
-  VERSION = "0.25.1"
+  VERSION = "0.25.2"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard
 version: !ruby/object:Gem::Version
-  version: 0.25.1
+  version: 0.25.2
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor