robot_sweatshop 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4ad8bb0e13b6949560dbc5540199d64ad5f0772
-  data.tar.gz: 181c02c2b6ca2c7b5f07e95e0c44a7257e32283f
+  metadata.gz: 44fc7ae765713f7f3d0375008ab550a19c034d0e
+  data.tar.gz: a7fc84ba9891e3eb244b65407b80428144dbd516
 SHA512:
-  metadata.gz: 5874e518f387f6d71e935f7cf93d1fbb660342baa1721981003a365dd9c1c0b1c2fd01aad267dda276cf512dcfad1d3108b661bbf90d30dc452a5273939ebe9e
-  data.tar.gz: 0131a56ffdac509ddcaab1d9c671ff9d9cf83012cd1d5522785631100cbab69cda8232d86ba79d77af94f0d43e84ddfdee36214e4a267b7e168d26e97583d874
+  metadata.gz: 03420bcbf4f02120c1d3a2a72c915929d08b89df47615722083dd9100d5916226c6ab732920837fdb182dcef830b9790787e9abeeb56dae39e3c7889a6b3dca1
+  data.tar.gz: 0f1c4c066484dee045d68334e501dda16d8d6b321c3d94797c3198a2e6f9496356744432cb4c955aea50b0de7abfcabece1fb615b69a7c85804420081b2c4aff

data/bin/sweatshop

@@ -8,7 +8,7 @@ require 'robot_sweatshop/config'
 require 'robot_sweatshop/create-config-directories'
 
 program :name, 'Robot Sweatshop'
-program :version, '0.4.2'
+program :version, '0.4.3'
 program :description, 'A lightweight, unopinionated CI server'
 program :help, 'Author', 'Justin Scott <jvscott@gmail.com>'
 

data/bin/sweatshop-assembler

@@ -12,6 +12,7 @@ using ExtendedEZMQ
 
 Contract Hash => Hash
 def sanitize(data)
+  return {} if data.empty?
   data = data.map { |key, value| {key => value.to_s} }
   data.reduce(:merge)
 end

data/robot_sweatshop.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name        = 'robot_sweatshop'
-  gem.version     = '0.4.2'
+  gem.version     = '0.4.3'
   gem.licenses    = 'MIT'
   gem.authors     = ['Justin Scott']
   gem.email       = 'jvscott@gmail.com'

data/test/assembler_spec.rb

@@ -34,7 +34,7 @@ describe 'the Job Assembler' do
     @client.close
   end
 
-  %w(Git JSON MinimalJob).each do |request|
+  %w(Git JSON MinimalJob EmptyJSON).each do |request|
     given "#{request} requests on the Conveyor" do
       setup do
         @client.request conveyor_enqueue(request)
@@ -58,6 +58,8 @@ describe 'the Job Assembler' do
       should 'build the context with a parsed payload' do
         if request == 'Git'
           assert_equal 'develop', @worker_data[:context]['branch']
+        elsif request == 'EmptyJSON'
+          assert_equal true, @worker_data[:context].empty?
         else
           assert_equal 'value', @worker_data[:context]['test1']
         end

data/test/data/payload_data.yaml

@@ -1,6 +1,7 @@
 ---
 # http://www.url-encode-decode.com/
 empty: ''
+emptyjson: '{}'
 nonjson: not json
 json: '{"test1": "value", "test2": "value"}'
 bitbucket: |

data/test/input_spec.rb

@@ -22,7 +22,7 @@ given 'the HTTP Input' do
   include InputHelper
   include OutputHelper
 
-  %w(Bitbucket Github JSON Empty).each do |format|
+  %w(Bitbucket Github JSON Empty EmptyJSON).each do |format|
     context "POSTing #{format} data" do
       setup do
         @conveyor = TestProcess.stub :conveyor

data/test/payload_parser_spec.rb

@@ -29,7 +29,7 @@ describe 'the Payload Parser' do
     @client.close
   end
 
-  %w(Bitbucket Github JSON Empty).each do |format|
+  %w(Bitbucket Github JSON Empty EmptyJSON).each do |format|
     given "valid #{format} payloads" do
       setup do
         payload = payload_parser_request format
@@ -46,7 +46,7 @@ describe 'the Payload Parser' do
         assert_kind_of Hash, @response[:data]
         keys = Payload.hash_keys
         keys = %w(test1 test2) if format == 'JSON'
-        keys = [] if format == 'Empty'
+        keys = [] if format =~ /Empty/
         keys.each do |key|
           payload = @response[:data]
           assert_not_nil payload[key]

data/test/shared/helpers/input.rb

@@ -50,10 +50,11 @@ module InputHelper
     format = 'Bitbucket' if type == 'Git' # develop branch
     format = 'Github' if type == 'IgnoredBranch' # master branch
     format = 'NonJSON' if type == 'NonJSON'
+    format = 'EmptyJSON' if type == 'EmptyJSON'
 
     job = 'test_job'
     job = 'git_job' if type == 'Git' || type == 'IgnoredBranch'
-    job = 'minimal_job' if type == 'MinimalJob'
+    job = 'minimal_job' if type == 'MinimalJob' || type == 'EmptyJSON'
     job = 'unknown_job' if type == 'UnknownJob' # TODO: why does commenting this out still pass payload parser?!
     job = 'empty_job' if type == 'EmptyJob'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: robot_sweatshop
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Justin Scott