buildbox 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb5d520609a7709bb39f3101371b189843a1529f
-  data.tar.gz: 17c6f844295770f5db6e0ed00b8d96d9780ebbe6
+  metadata.gz: 5ae40618215e45c8217f4089029f72106f0b3201
+  data.tar.gz: cba478aafb75089f7796eb58b36ebbe7058533b9
 SHA512:
-  metadata.gz: 71082a07bf307f1a53d1e294f2a84ebcbb0882a9194a289a35ee13b9ca1ebc69efd04f38428e63f5498008008346725e634b124a228b10f9602beae602814772
-  data.tar.gz: 0e2ad6bca3ac9228d49d3e09d5e012644839281bef5d4c18980e484156ce42aa73a8194f437e088cccffa8542d5dd71e15b853b7b489ce81610dd468cdbb91b9
+  metadata.gz: 2f59b811b325337a6a3b0686358915e643d3dc2fe5d6ef5808ef946bfbfdb0f054d8145a0cfbf9b09ba4ea5d7de071c613c84ed5c2a99379f948814c8d87cf09
+  data.tar.gz: 7553cc4351956d502101f57a0827f02ab33bc346b6c89614fc003f4d7223a5bf3deaf5cd78f0e268526acc159e013e9adfeccb3df36a9a251384ce532cd056e8

data/lib/buildbox.rb

@@ -5,11 +5,12 @@ require "buildbox/build"
 require "buildbox/version"
 require "buildbox/client"
 require "buildbox/api"
-require "buildbox/queue"
+require "buildbox/worker"
 require "buildbox/pid_file"
 require "buildbox/configuration"
 require "buildbox/auth"
 require "buildbox/response"
+require "buildbox/observer"
 
 module Buildbox
   require 'fileutils'

data/lib/buildbox/build.rb

@@ -9,8 +9,8 @@ module Buildbox
       @config     = options[:config]
     end
 
-    def start(&block)
-      @block   = block
+    def start(observer = nil)
+      @observer = observer
 
       unless build_path.exist?
         setup_build_path
@@ -52,13 +52,19 @@ module Buildbox
     end
 
     def run(command)
-      path = build_path if build_path.exist?
+      path    = build_path if build_path.exist?
+      started = false
 
       result = Buildbox::Command.new(path).run(command) do |result, chunk|
-        @block.call(result)
+        if started
+          @observer.chunk(result)
+        else
+          @observer.started(result)
+          started = true
+        end
       end
 
-      @block.call(result)
+      @observer.finished(result)
 
       result
     end

data/lib/buildbox/client.rb

@@ -18,7 +18,7 @@ module Buildbox
 
         loop do
           reload_configuration
-          Buildbox::Queue.new.process
+          Buildbox::Worker.new.process
           wait_for_interval
         end
       rescue => e

data/lib/buildbox/command.rb

@@ -15,6 +15,11 @@ module Buildbox
       read_io, write_io, pid = nil
       result = Buildbox::Result.new(command)
 
+      # hack: this is so the observer class can raise a started event.
+      # instead of having a block passed to this command, we should implement
+      # a proper command observer
+      yield result
+
       begin
         dir = File.expand_path(@path)
 

data/lib/buildbox/observer.rb

@@ -0,0 +1,59 @@
+module Buildbox
+  class Observer
+    INTERVAL = 3 # feels like a good number
+
+    def initialize(api, build_uuid)
+      @api        = api
+      @build_uuid = build_uuid
+
+      @queue    = Queue.new
+      @results  = {}
+      @threads  = {}
+    end
+
+    def started(result)
+      @results[result.uuid] = result
+
+      update(result.uuid)
+    end
+
+    def chunk(result)
+      update_on_interval(result.uuid)
+    end
+
+    def finished(result)
+      # kill off the interval updater
+      thread = @threads[result.uuid]
+      thread.kill if thread && thread.alive?
+
+      update(result.uuid)
+    end
+
+    private
+
+    # every INTERVAL seconds, read from the result and update the server with the output.
+    # if we don't do updates every INTERVAL like this, then we end up spamming the server
+    # with every chunk we get from the command runner (which ends up being every line), and in the case
+    # of a bundle install for example, it may have 100 lines, we end up doing 100 updates to the server.
+    def update_on_interval(uuid)
+      return if @threads[uuid]
+
+      @threads[uuid] = Thread.new do
+        loop do
+          update(uuid)
+          sleep INTERVAL
+        end
+      end
+
+      @threads[uuid].abort_on_exception = true
+    end
+
+    def update(uuid)
+      result       = @results[uuid]
+      json         = result.as_json
+      json[:state] = json.delete(:finished) ? 'finished' : 'started'
+
+      @api.update_build_result_async(@build_uuid, json.delete(:uuid), json)
+    end
+  end
+end

data/lib/buildbox/version.rb

@@ -1,3 +1,3 @@
 module Buildbox
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/buildbox/{queue.rb → worker.rb}

@@ -1,5 +1,5 @@
 module Buildbox
-  class Queue
+  class Worker
     def process
       if scheduled = api.builds.payload.first
         start Build.new(scheduled)
@@ -10,14 +10,7 @@ module Buildbox
 
     def start(build)
       api.update_build_state(build.uuid, 'started')
-
-      build.start do |result|
-        json         = result.as_json
-        json[:state] = json.delete(:finished) ? 'finished' : 'started'
-
-        api.update_build_result_async(build.uuid, json.delete(:uuid), json)
-      end
-
+      build.start Buildbox::Observer.new(api, build.uuid)
       api.update_build_state_async(build.uuid, 'finished')
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildbox
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Keith Pitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,12 +90,13 @@ files:
 - lib/buildbox/client.rb
 - lib/buildbox/command.rb
 - lib/buildbox/configuration.rb
+- lib/buildbox/observer.rb
 - lib/buildbox/pid_file.rb
-- lib/buildbox/queue.rb
 - lib/buildbox/response.rb
 - lib/buildbox/result.rb
 - lib/buildbox/utf8.rb
 - lib/buildbox/version.rb
+- lib/buildbox/worker.rb
 - spec/buildbox/buildbox/build_spec.rb
 - spec/buildbox/buildbox/command_spec.rb
 - spec/buildbox/buildbox/configuration_spec.rb