buildbox 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50ef87e918e385b0169d8bc601aa29f94c6a7dbf
-  data.tar.gz: 8aeb7524a9a4df2b8f74fb80bcff2d6669d4b380
+  metadata.gz: eb5d520609a7709bb39f3101371b189843a1529f
+  data.tar.gz: 17c6f844295770f5db6e0ed00b8d96d9780ebbe6
 SHA512:
-  metadata.gz: 6c46f041eeb2929692d1f4a90d8a931cc10f9de14dab779b116737e4a2553d9d2f4159e36d71d332253269ee46a4649f6919113529d42fcb750e389c7b9e4de0
-  data.tar.gz: a3903b0189b3907b5ccea550ef619cb2f2ba7a40a27a5975c18c62b395c4f82493dc1ecb7cf372c60f11db344ca95cd13a79aaba01802675f57313533d1d4da2
+  metadata.gz: 71082a07bf307f1a53d1e294f2a84ebcbb0882a9194a289a35ee13b9ca1ebc69efd04f38428e63f5498008008346725e634b124a228b10f9602beae602814772
+  data.tar.gz: 0e2ad6bca3ac9228d49d3e09d5e012644839281bef5d4c18980e484156ce42aa73a8194f437e088cccffa8542d5dd71e15b853b7b489ce81610dd468cdbb91b9

data/.buildbox.toml

@@ -0,0 +1,2 @@
+[build]
+commands = [ "bundle", "rspec" ]

data/README.md

@@ -12,7 +12,7 @@ Then authenticate
 
 Then you can start monitoring for builds like so:
 
-    $ buildbox monitor:start
+    $ buildbox monitor:start --daemon
 
 For more help with the command line interface
 

data/lib/buildbox.rb

@@ -5,7 +5,7 @@ require "buildbox/build"
 require "buildbox/version"
 require "buildbox/client"
 require "buildbox/api"
-require "buildbox/worker"
+require "buildbox/queue"
 require "buildbox/pid_file"
 require "buildbox/configuration"
 require "buildbox/auth"

data/lib/buildbox/api.rb

@@ -6,6 +6,7 @@ module Buildbox
 
     def initialize(options)
       @options = options
+      @queue   = ::Queue.new
     end
 
     def crash(exception, information = {})
@@ -20,27 +21,56 @@ module Buildbox
       payload[:meta][:build_uuid]  = information[:build] if information[:build]
       payload[:meta][:client_version] = Buildbox::VERSION
 
-      request(:post, "crashes", :crash => payload)
+      request(:post, "crashes", payload)
     end
 
     def register(payload)
-      request(:post, "workers", :worker => payload)
+      request(:post, "workers", payload)
     end
 
     def login
       request(:get, "user")
     end
 
-    def update(build, payload)
-      request(:put, "workers/#{worker_uuid}/builds/#{build.uuid}", :build => payload)
-    end
-
     def builds(options = {})
       request(:get, "workers/#{worker_uuid}/builds")
     end
 
+    def update_build_state_async(*args)
+      async :update_build_state, args
+    end
+
+    def update_build_state(build_uuid, state)
+      request(:put, "workers/#{worker_uuid}/builds/#{build_uuid}", :state => state)
+    end
+
+    def update_build_result_async(*args)
+      async :update_build_result, args
+    end
+
+    def update_build_result(build_uuid, result_uuid, attributes)
+      request(:put, "workers/#{worker_uuid}/builds/#{build_uuid}/results/#{result_uuid}", attributes)
+    end
+
     private
 
+    def async(method, args)
+      @queue << [ method, args ]
+
+      if !@thread || !@thread.alive?
+        @thread = Thread.new do
+          loop do
+            async_call = @queue.pop
+            Thread.exit if async_call.nil?
+
+            self.send(async_call[0], *async_call[1])
+          end
+        end
+
+        @thread.abort_on_exception = true
+      end
+    end
+
     def http(uri)
       Net::HTTP.new(uri.host, uri.port).tap do |http|
         http.use_ssl     = uri.scheme == "https"
@@ -57,15 +87,14 @@ module Buildbox
                 end
 
       uri     = URI.parse(endpoint(path))
-      request = klass.new(uri.request_uri)
+      request = klass.new(uri.request_uri, 'Content-Type' => 'application/json',
+                                           'Accept' => 'application/json')
 
       if payload.nil?
         Buildbox.logger.debug "#{method.to_s.upcase} #{uri}"
       else
-        normalized_payload = normalize_payload(payload)
-        request.set_form_data normalized_payload
-
-        Buildbox.logger.debug "#{method.to_s.upcase} #{uri} #{normalized_payload.inspect}"
+        request.body = JSON.dump(payload)
+        Buildbox.logger.debug "#{method.to_s.upcase} #{uri} #{payload.inspect}"
       end
 
       Response.new http(uri).request(request)
@@ -79,37 +108,5 @@ module Buildbox
       (Buildbox.configuration.use_ssl ? "https://" : "http://") +
         "#{Buildbox.configuration.endpoint}/v#{Buildbox.configuration.api_version}/#{path}"
     end
-
-    # { :foo => { :bar => { :bang => "yolo" } } } => { "foo[bar][bang]" => "yolo" }
-    def normalize_payload(params, key=nil)
-      params = flatten_keys(params) if params.is_a?(Hash)
-      result = {}
-      params.each do |k,v|
-        case v
-        when Hash
-          result[k.to_s] = normalize_params(v)
-        when Array
-          v.each_with_index do |val,i|
-            result["#{k.to_s}[#{i}]"] = val.to_s
-          end
-        else
-          result[k.to_s] = v.to_s
-        end
-      end
-      result
-    end
-
-    def flatten_keys(hash, newhash={}, keys=nil)
-      hash.each do |k, v|
-        k = k.to_s
-        keys2 = keys ? keys+"[#{k}]" : k
-        if v.is_a?(Hash)
-          flatten_keys(v, newhash, keys2)
-        else
-          newhash[keys2] = v
-        end
-      end
-      newhash
-    end
   end
 end

data/lib/buildbox/build.rb

@@ -6,44 +6,61 @@ module Buildbox
       @uuid       = options[:uuid]
       @repository = options[:repository]
       @commit     = options[:commit]
-      @command    = options[:command] || "bundle && rspec"
+      @config     = options[:config]
     end
 
     def start(&block)
-      checkout
-      update
+      @block   = block
 
-      @result = command.run(@command) do |chunk|
-        yield(chunk) if block_given?
+      unless build_path.exist?
+        setup_build_path
+        clone_repository
       end
+
+      fetch_and_checkout
+      build
+
+      true
     end
 
     private
 
-    def checkout
-      unless build_path.exist?
-        build_path.mkpath
+    def setup_build_path
+      run %{mkdir -p "#{build_path}"}
+    end
 
-        command.run! %{git clone "#{@repository}" .}
-      end
+    def clone_repository
+      run %{git clone "#{@repository}" . -q}
     end
 
-    def update
-      command.run! %{git clean -fd}
-      command.run! %{git fetch}
-      command.run! %{git checkout -qf "#{@commit}"}
+    def fetch_and_checkout
+      run %{git clean -fd}
+      run %{git fetch}
+      run %{git checkout -qf "#{@commit}"}
     end
 
-    def build_path
-      Buildbox.root_path.join folder_name
+    def build
+      @config[:build][:commands].each { |command| run command }
     end
 
     def folder_name
       @repository.gsub(/[^a-zA-Z0-9]/, '-')
     end
 
-    def command
-      Buildbox::Command.new(build_path)
+    def build_path
+      Buildbox.root_path.join folder_name
+    end
+
+    def run(command)
+      path = build_path if build_path.exist?
+
+      result = Buildbox::Command.new(path).run(command) do |result, chunk|
+        @block.call(result)
+      end
+
+      @block.call(result)
+
+      result
     end
   end
 end

data/lib/buildbox/client.rb

@@ -18,11 +18,14 @@ module Buildbox
 
         loop do
           reload_configuration
-          process_build_queue
+          Buildbox::Queue.new.process
           wait_for_interval
         end
       rescue => e
-        api.crash(e, :build => @build)
+        Buildbox.logger.error "#{e.class.name}: #{e.message}"
+        e.backtrace.each { |line| Buildbox.logger.error line }
+
+        api.crash(e)
       ensure
         pid_file.delete
       end
@@ -51,18 +54,6 @@ module Buildbox
       Buildbox.configuration.update :worker_uuid, response.payload[:uuid]
     end
 
-    def process_build_queue
-      scheduled = api.builds.payload.first
-
-      if scheduled
-        # store build in an instance variable so we can report on it in
-        # the event of a crash
-        @build = Build.new(scheduled)
-        Buildbox::Worker.new(@build, api).run
-        @build = nil
-      end
-    end
-
     def reload_configuration
       Buildbox.configuration.reload
     end
@@ -81,6 +72,9 @@ module Buildbox
       end
     end
 
+    def worker
+    end
+
     def api
       @api ||= Buildbox::API.new(:api_key => Buildbox.configuration.api_key)
     end

data/lib/buildbox/command.rb

@@ -12,8 +12,8 @@ module Buildbox
     def run(command)
       Buildbox.logger.debug(command)
 
-      output = ""
       read_io, write_io, pid = nil
+      result = Buildbox::Result.new(command)
 
       begin
         dir = File.expand_path(@path)
@@ -33,9 +33,9 @@ module Buildbox
           begin
             chunk = read_io.read_nonblock(10240)
             if block_given?
-              yield chunk
+              yield result, chunk
             end
-            output += chunk
+            result.output += chunk
           rescue Errno::EAGAIN, Errno::EWOULDBLOCK
             # do select again
           rescue EOFError, Errno::EIO # EOFError from OSX, EIO is raised by ubuntu
@@ -49,9 +49,10 @@ module Buildbox
       Process.waitpid(pid)
 
       # output may be invalid UTF-8, as it is produced by the build command.
-      output = Buildbox::UTF8.clean(output)
+      result.finished    = true
+      result.exit_status = $?.exitstatus
 
-      Buildbox::Result.new(output.chomp, $?.exitstatus)
+      result
     end
 
     def run!(command)

data/lib/buildbox/configuration.rb

@@ -13,7 +13,7 @@ module Buildbox
     attr_accessor :api_version
 
     def initialize
-      @use_ssl       = false
+      @use_ssl       = true
       @endpoint      = 'api.buildbox.io'
       @api_version   = 1
     end

data/lib/buildbox/queue.rb

@@ -0,0 +1,28 @@
+module Buildbox
+  class Queue
+    def process
+      if scheduled = api.builds.payload.first
+        start Build.new(scheduled)
+      end
+    end
+
+    private
+
+    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
+
+      api.update_build_state_async(build.uuid, 'finished')
+    end
+
+    def api
+      @api ||= Buildbox::API.new(:api_key => Buildbox.configuration.api_key)
+    end
+  end
+end

data/lib/buildbox/result.rb

@@ -1,7 +1,36 @@
 module Buildbox
-  class Result < Struct.new(:output, :exit_status)
+  class Result
+    require 'securerandom'
+
+    attr_reader :uuid, :command
+    attr_accessor :output, :finished, :exit_status
+
+    def initialize(command)
+      @uuid     = SecureRandom.uuid
+      @output   = ""
+      @finished = false
+      @command  = command
+    end
+
+    def finished?
+      finished
+    end
+
     def success?
       exit_status == 0
     end
+
+    def as_json
+      { :uuid        => @uuid,
+        :command     => @command,
+        :output      => clean_output,
+        :exit_status => @exit_status }
+    end
+
+    private
+
+    def clean_output
+      Buildbox::UTF8.clean(@output).chomp
+    end
   end
 end

data/lib/buildbox/utf8.rb

@@ -46,5 +46,22 @@ module Buildbox
       end
       raise CannotFindEncoding, 'Cannot find an intermediate encoding for conversion to UTF-8'
     end
+
+    def self.clean_utf8_iconv
+      unless @iconv_loaded
+        begin
+          require 'iconv'
+        rescue LoadError
+          @iconv = nil
+        else
+          @iconv = Iconv.new('utf-8//translit//ignore', 'utf-8')
+          # On some systems (Linux appears to be vulnerable, FreeBSD not)
+          # iconv chokes on invalid utf-8 with //translit//ignore.
+          @iconv_fallback = Iconv.new('utf-8//ignore', 'utf-8')
+        end
+        @iconv_loaded = true
+      end
+      [@iconv, @iconv_fallback]
+    end
   end
 end

data/lib/buildbox/version.rb

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

data/spec/buildbox/buildbox/build_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Buildbox::Build do
-  let(:build) { Buildbox::Build.new(:uuid => '1234', :repo => "git@github.com:keithpitt/ci-ruby.git", :commit => "67b15b704e0", :command => "rspec") }
+  let(:build) { Buildbox::Build.new(:uuid => '1234', :repository => "git@github.com:keithpitt/ci-ruby.git", :commit => "67b15b704e0", :command => "rspec") }
 
   describe "#start" do
     let(:build_path) { double }

data/spec/buildbox/buildbox/command_spec.rb

@@ -39,7 +39,7 @@ describe Buildbox::Command do
 
     it "can collect output in chunks" do
       chunked_output = ''
-      result = command.run('echo hello world') do |chunk|
+      result = command.run('echo hello world') do |result, chunk|
         chunked_output += chunk
       end
 
@@ -52,7 +52,7 @@ describe Buildbox::Command do
       command = Buildbox::Command.new(nil, 0.1)
 
       chunked_output = ''
-      result = command.run('sleep 0.5; echo hello world') do |chunk|
+      result = command.run('sleep 0.5; echo hello world') do |result, chunk|
         chunked_output += chunk
       end
 
@@ -61,11 +61,13 @@ describe Buildbox::Command do
       chunked_output.should == "hello world\r\n"
     end
 
+    it 'passes a result object to the block'
+
     it "can collect chunks from within a thread" do
       chunked_output = ''
       result = nil
       worker_thread = Thread.new do
-        result = command.run('echo before sleep; sleep 1; echo after sleep') do |chunk|
+        result = command.run('echo before sleep; sleep 1; echo after sleep') do |result, chunk|
           chunked_output += chunk
         end
       end
@@ -103,7 +105,7 @@ describe Buildbox::Command do
 
     it "captures color'd output" do
       chunked_output = ''
-      result = command.run("rspec #{FIXTURES_PATH.join('rspec', 'test_spec.rb')} --color") do |chunk|
+      result = command.run("rspec #{FIXTURES_PATH.join('rspec', 'test_spec.rb')} --color") do |result, chunk|
         chunked_output += chunk
       end
 

data/spec/buildbox/buildbox/configuration_spec.rb

@@ -4,6 +4,6 @@ describe Buildbox::Configuration do
   subject(:configuration) { Buildbox::Configuration.new }
 
   it "has a default endpoint" do
-    configuration.endpoint.should =~ /buildboxci/
+    configuration.endpoint.should =~ /buildbox/
   end
 end

data/spec/integration/running_a_build_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'running a build' do
   let(:commit)    { "3e0c65433b241ff2c59220f80bcdcd2ebb7e4b96" }
   let(:command)   { "rspec test_spec.rb" }
-  let(:build)     { Buildbox::Build.new(:project_id => 1, :build_id => 1, :repo => FIXTURES_PATH.join("repo.git").to_s, :commit => commit, :command => command) }
+  let(:build)     { Buildbox::Build.new(:project_id => 1, :build_id => 1, :repository => FIXTURES_PATH.join("repo.git").to_s, :commit => commit, :command => command) }
 
   before do
     Buildbox.stub(:root_path).and_return(TEMP_PATH)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildbox
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Keith Pitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,6 +74,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .buildbox.toml
 - .gitignore
 - .rspec
 - Gemfile
@@ -90,11 +91,11 @@ files:
 - lib/buildbox/command.rb
 - lib/buildbox/configuration.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

data/lib/buildbox/worker.rb

@@ -1,25 +0,0 @@
-module Buildbox
-  class Worker
-    def initialize(build, api)
-      @build = build
-      @api   = api
-    end
-
-    def run
-      update(:started_at => Time.now)
-
-      chunks = ""
-      result = @build.start do |chunk|
-        update(:output => chunks += chunk)
-      end
-
-      update(:exit_status => result.exit_status, :output => result.output, :finished_at => Time.now)
-    end
-
-    private
-
-    def update(data)
-      @api.update(@build, data)
-    end
-  end
-end