buildbox 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c49f0164d963671930c2f730f66da39aceb1adaa
-  data.tar.gz: ee406ff734ec3bc6c70b4bb778dcb2c62bcd92a0
+  metadata.gz: 1b76bf6bc33ef1f87601dedd4dc1a6eefed0ed2c
+  data.tar.gz: aaa97fcc886c1e55e7dd4fde4c91c2aaa514b269
 SHA512:
-  metadata.gz: 0cfa60a987d07bd4058cdc1965ac9ea7616b39a8afb7104160553a6086d1d7224af9fb787627cea0c090d4b0600ee94923d5ed4fcb15123738befccbe7490525
-  data.tar.gz: 39e976466076ec75a46bfa8d4d8c39ecf0ada9c8298ea1cb94fda9ecfe2316dd0da470b61ae1cbe46a4ae675ed465932fca809721f95006d8295071956a47a05
+  metadata.gz: f42ebc6c4718990e2b5dfdaa67828e923e3b1ecf1f5b228262f631c0e6451e63b21aaa6e86ce85b78554a08d978b2ff89102f04da697cc548aae156ea204d53e
+  data.tar.gz: ff5f689b68da01fcbd56e3b9da34cdcc31d9a404b3fef28bd11f6d7d8363d7f50cd93def71b5f29eb13cba26c2d9f8c6418a0b3a60e296719db0b8bc49376194

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    buildbox (0.1.1)
+    buildbox (0.1.4)
       celluloid (~> 0.14)
       faraday (~> 0.8)
       faraday_middleware (~> 0.9)

data/lib/buildbox.rb

@@ -1,4 +1,5 @@
 require 'pathname'
+require 'logger'
 
 module Buildbox
   autoload :API,           "buildbox/api"
@@ -10,13 +11,18 @@ module Buildbox
   autoload :Monitor,       "buildbox/monitor"
   autoload :Runner,        "buildbox/runner"
   autoload :Script,        "buildbox/script"
+  autoload :Server,        "buildbox/server"
   autoload :UTF8,          "buildbox/utf8"
   autoload :Worker,        "buildbox/worker"
   autoload :VERSION,       "buildbox/version"
 
   def self.config
     @config ||= Configuration.new.tap(&:reload)
- end
+  end
+
+  def self.logger
+    @logger ||= Logger.new(STDOUT).tap { |logger| logger.level = Logger::INFO }
+  end
 
   def self.root_path
     path = Pathname.new File.join(ENV['HOME'], ".buildbox")

data/lib/buildbox/api.rb

@@ -27,12 +27,13 @@ module Buildbox
       @connection ||= Faraday.new(:url => @config.api_endpoint) do |faraday|
         faraday.request  :json
 
-        faraday.response :logger
+        faraday.response :logger, Buildbox.logger
         faraday.response :mashify
 
         # json needs to come after mashify as it needs to run before the mashify
         # middleware.
         faraday.response :json
+        faraday.response :raise_error
 
         faraday.adapter Faraday.default_adapter
       end

data/lib/buildbox/cli.rb

@@ -51,7 +51,7 @@ module Buildbox
         end
 
         if command == "worker:start"
-          Buildbox::Worker.new(Buildbox.config.worker_access_token).start
+          Buildbox::Server.new.start
         elsif command == "worker:setup"
           if @argv.length == 0
             puts "No token provided"
@@ -59,7 +59,8 @@ module Buildbox
           end
 
           access_token = @argv.first
-          Buildbox.config.update(:worker_access_token => access_token)
+          worker_access_tokens = Buildbox.config.worker_access_tokens
+          Buildbox.config.update(:worker_access_tokens => worker_access_tokens << access_token)
 
           puts "Successfully added worker access token"
           puts "You can now start the worker with `buildbox worker:start`"

data/lib/buildbox/configuration.rb

@@ -4,8 +4,8 @@ require 'json'
 
 module Buildbox
   class Configuration < Hashie::Dash
-    property :worker_access_token, :default => nil
-    property :api_endpoint,        :default => "http://api.buildbox.io/v1"
+    property :worker_access_tokens, :default => []
+    property :api_endpoint,         :default => "https://api.buildbox.io/v1"
 
     def update(attributes)
       attributes.each_pair { |key, value| self[key] = value }

data/lib/buildbox/monitor.rb

@@ -12,12 +12,16 @@ module Buildbox
 
     def monitor
       loop do
-        @api.update_build(@build) if @build.started?
+        # There is an edge case where the build finishes between making the
+        # update_build http call, and breaking. So to make sure we're using the
+        # same build object throughout this call, we can just dup it.
+        build = @build.dup
+        @api.update_build(build) if build.started?
 
-        if @build.finished?
+        if build.finished?
           break
         else
-          sleep 1
+          sleep 3 # 3 seconds seems reasonable for now
         end
       end
     end

data/lib/buildbox/runner.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'celluloid'
-require 'tempfile'
 require 'fileutils'
 
 module Buildbox
@@ -29,7 +28,9 @@ module Buildbox
       build.output      = result.output
       build.exit_status = result.exit_status
 
-      info "#{namespace}/#{@build.number} finished"
+      File.delete(script_path)
+
+      info "#{namespace} ##{@build.number} finished with exit status #{result.exit_status}"
     end
 
     private
@@ -45,7 +46,7 @@ module Buildbox
     end
 
     def script_path
-      @script_path ||= Tempfile.new("buildbox-#{namespace.gsub(/\//, '-')}-#{@build.number}").path
+      @script_path ||= Buildbox.root_path.join("buildbox-#{namespace.gsub(/\//, '-')}-#{@build.number}")
     end
 
     def namespace

data/lib/buildbox/server.rb

@@ -0,0 +1,33 @@
+module Buildbox
+  class Server
+    INTERVAL = 5
+
+    def initialize(config = Buildbox.config, logger = Buildbox.logger)
+      @config = config
+      @logger = logger
+    end
+
+    def start
+      loop do
+        worker_access_tokens.each do |access_token|
+          Buildbox::Worker.new(access_token, api).work
+        end
+
+        @config.reload
+
+        @logger.info "Sleeping for #{INTERVAL} seconds"
+        sleep INTERVAL
+      end
+    end
+
+    private
+
+    def api
+      @api ||= Buildbox::API.new
+    end
+
+    def worker_access_tokens
+      @config.worker_access_tokens
+    end
+  end
+end

data/lib/buildbox/version.rb

@@ -1,3 +1,3 @@
 module Buildbox
-  VERSION = "0.1.1"
+  VERSION = "0.1.4"
 end

data/lib/buildbox/worker.rb

@@ -1,33 +1,38 @@
+require 'rubygems'
+require 'celluloid'
+
 module Buildbox
   class Worker
-    def initialize(access_token)
+    include Celluloid::Logger
+
+    def initialize(access_token, api)
+      @api          = api
       @access_token = access_token
     end
 
-    def start
-      loop do
-        projects.each do |project|
-          running_builds = api.scheduled_builds(project).map do |build|
-            Monitor.new(build, api).async.monitor
-            Runner.new(build).future(:start)
-          end
-
-          # wait for all the running builds to finish
-          running_builds.map(&:value)
-
-          sleep 5
-        end
+    def work
+      running_builds = scheduled_builds.map do |build|
+        Monitor.new(build, @api).async.monitor
+        Runner.new(build).future(:start)
       end
+
+      # wait for all the running builds to finish
+      running_builds.map(&:value)
     end
 
     private
 
-    def api
-      @api ||= Buildbox::API.new
+    def projects
+      @api.worker(:access_token => @access_token, :hostname => hostname).projects
+    rescue Faraday::Error::ClientError
+      warn "Worker #{@access_token} doesn't exist"
+      [] # return empty array to avoid breakage
     end
 
-    def projects
-      api.worker(:access_token => @access_token, :hostname => hostname).projects
+    def scheduled_builds
+      projects.map do |project|
+        @api.scheduled_builds(project)
+      end.flatten
     end
 
     def hostname

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildbox
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - Keith Pitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-24 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -107,6 +107,7 @@ files:
 - lib/buildbox/environment.rb
 - lib/buildbox/monitor.rb
 - lib/buildbox/runner.rb
+- lib/buildbox/server.rb
 - lib/buildbox/utf8.rb
 - lib/buildbox/version.rb
 - lib/buildbox/worker.rb