buildbox 0.6.beta1 → 0.6.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bc1d049d31a8e693636be1d2ba1c70d5e77ad1c
-  data.tar.gz: d3c3d7a151a411f969a5bd7c78c287c2432963cc
+  metadata.gz: d09a24715e1c3a79b74647a1b775b7166cdcf952
+  data.tar.gz: 124c2dad15dbe1e38273803411e2eb73095cee42
 SHA512:
-  metadata.gz: 7b1183a3ed2a559bd6ec924962017ddb72dc5ec7c4bb74a123478c708f4c8a1093d87387c1f545357863a502e26ce8744b6c162695fe4aa96f6f468465689137
-  data.tar.gz: bb03588ca98125193bfd1d5238a14ea3d87e5b3c63a82c08e9bcb05c66fb3b86581ab2b1eebb05e14efb59de44b4291635bf8d4e8df7602aa1f5046e5856fde0
+  metadata.gz: 039183e2b691d6f18c4e009ec9468bed4225f3d90d15c200ea72773e86f53646a49c6ab8791ad12dd124f185f7f5b23481e005b1b978a4760b599f9cdf6d43b6
+  data.tar.gz: e87d1f3ce2c272bee640828402baf01e28eca316b4319bed05598f35de6c89cb7d5f926f1e038329782080ab515c42ed741a5983e3cef81cb7672466ac284daa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    buildbox (0.6.beta1)
+    buildbox (0.6.beta2)
       celluloid (~> 0.14)
       childprocess (~> 0.3)
       faraday (~> 0.8)
@@ -27,7 +27,6 @@ GEM
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
     ffi (1.9.3)
-    ffi (1.9.3-x86-mingw32)
     hashie (2.0.5)
     lockfile (2.1.0)
     mime-types (2.0)

data/lib/buildbox/agent.rb

@@ -8,7 +8,6 @@ module Buildbox
     def initialize(access_token, api = Buildbox::API.new)
       @api           = api
       @access_token  = access_token
-      @uploader_pool = Uploader.pool(:size => 10) # upload 10 things at a time
     end
 
     def process
@@ -46,13 +45,7 @@ module Buildbox
       files = Artifact.files_to_upload(build_directory, artifact_path)
 
       files.each_pair do |relative_path, absolute_path|
-        artifact = @api.create_artifact(@access_token, @current_build,
-                                        :path => relative_path,
-                                        :file_size => File.size(absolute_path))
-
-        @uploader_pool.upload(artifact[:uploader], absolute_path) do |state, response|
-          @api.update_artifact(@access_token, @current_build, artifact[:id], :state => state)
-        end
+        Celluloid::Actor[:uploader_pool].async.upload(@api, @access_token, @current_build, relative_path, absolute_path)
       end
     rescue => e
       error "There was an error uploading artifacts for path: #{artifact_path} (#{e.class.name}: #{e.message})"

data/lib/buildbox/server.rb

@@ -12,6 +12,7 @@ module Buildbox
 
     def start
       Celluloid.logger = @logger
+      Celluloid::Actor[:uploader_pool] = Uploader.pool
 
       agent_access_tokens.each do |access_token|
         @supervisors << Buildbox::Agent.supervise(access_token)

data/lib/buildbox/uploader.rb

@@ -6,15 +6,22 @@ module Buildbox
     include Celluloid
     include Celluloid::Logger
 
-    def upload(credentials, absolute_path, &block)
+    def upload(api, access_token, current_build, relative_path, absolute_path)
       info "Uploading #{absolute_path}"
 
-      action = credentials[:action]
-      data   = credentials[:data]
+      artifact = api.create_artifact(access_token, current_build,
+                                     :path => relative_path,
+                                     :file_size => File.size(absolute_path))
 
-      connection = Faraday.new(:url => action[:url]) do |faraday|
+
+      upload_action = artifact[:uploader][:action]
+      form_data     = artifact[:uploader][:data].to_hash.dup
+
+      connection = Faraday.new(:url => upload_action[:url]) do |faraday|
         faraday.request :multipart
 
+        faraday.response :raise_error
+
         faraday.options[:timeout] = 60
         faraday.options[:open_timeout] = 60
 
@@ -22,18 +29,30 @@ module Buildbox
       end
 
       mime_type = MIME::Types.type_for(absolute_path)[0].to_s
-      file_input_key = action[:file_input]
 
-      form_data = credentials[:data].to_hash.dup
+      file_input_key = upload_action[:file_input]
       form_data[file_input_key] = Faraday::UploadIO.new(absolute_path, mime_type)
 
-      yield("uploading")
+      api.update_artifact(access_token, current_build, artifact[:id], :state => 'uploading')
 
-      response = connection.post(action[:path], form_data)
+      upload_exception = nil
+      response         = nil
 
-      info "Finished uploading #{File.basename(absolute_path)} with a status of #{response.status}"
+      begin
+        response = connection.post(upload_action[:path], form_data)
+      rescue => e
+        upload_exception = e
+      end
+
+      if upload_exception
+        error "Error uploading #{File.basename(absolute_path)} with a status of (#{upload_exception.class.name}: #{upload_exception.message})"
+        finished_state = 'error'
+      else
+        info "Finished uploading #{File.basename(absolute_path)} with a status of #{response.status}"
+        finished_state = 'finished'
+      end
 
-      yield("finished")
+      api.update_artifact(access_token, current_build, artifact[:id], :state => finished_state)
     end
   end
 end

data/lib/buildbox/version.rb

@@ -1,3 +1,3 @@
 module Buildbox
-  VERSION = "0.6.beta1"
+  VERSION = "0.6.beta2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: buildbox
 version: !ruby/object:Gem::Version
-  version: 0.6.beta1
+  version: 0.6.beta2
 platform: ruby
 authors:
 - Keith Pitt