jackal-cfn 0.2.20 → 0.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bda5713d227f3483f95292f4c1d5637d2108e487
-  data.tar.gz: 64a6507a873182488b9a749b31158cb893441fd1
+  metadata.gz: 15f415b007eb56efb5bdea8203145bf22237be04
+  data.tar.gz: 6a14b2e02d211245ebe684e462ec43ab8f9c9bd6
 SHA512:
-  metadata.gz: 66d968cd6e691ec841d2cbdd45bbfc9631db91250ef1b26e93d6f280f58b01c63adbdbd3899762b8b3e11a8998c2b9aab0b2bfd2cf489b103be5194ebb2c4165
-  data.tar.gz: f3695b27166715d0cb32da79f4c13e1ae1b5ee7c474c211c123bb791aed6d1f39625fb45f1187fbd9c1906ac6b9062937575f5b5aec157e4dad07a602cfaf9ba
+  metadata.gz: a79e33ac6b69adc5352da7e37e37fcf9e22be023e2ea621a60d58f4fb0a970827d88d5986cc6c548854ed73dbf2ddd3687dc9d9050bc188f0487c87dbaceed8b
+  data.tar.gz: f33b1776de428e30d3b520f8ed3cd37f5d88ed22dfceb917fd3dfb052efea99f6866eaf9ff8600cdb87185bf35f35e96c90e7d4e5572459c387efa9c9e6a8d41

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.2.22
+* [enhancement] Allow OrchestrationUnit Exec property to contain list of commands
+
 # v0.2.20
 * [enhancement] Allow raw result removal from OrchestrationUnit resource
 

data/lib/jackal-cfn/resource/orchestration_unit.rb

@@ -110,36 +110,40 @@ module Jackal
         end
         if(unit[:exec])
           result = Smash.new
-          process_manager.process(unit.hash, unit[:exec]) do |process|
-            stdout = process_manager.create_io_tmp(Carnivore.uuid, 'stdout')
-            stderr = process_manager.create_io_tmp(Carnivore.uuid, 'stderr')
-            process.io.stdout = stdout
-            process.io.stderr = stderr
-            process.cwd = working_directory
-            if(unit[:env])
-              process.environment.replace(unit[:env])
-            end
-            process.leader = true
-            result[:start_time] = Time.now.to_i
-            process.start
-            begin
-              process.poll_for_exit(config.fetch(:max_execution_time, 60))
-            rescue ChildProcess::TimeoutError
-              process.stop
-              result[:timed_out] = true
-            end
-            result[:stop_time] = Time.now.to_i
-            result[:exit_code] = process.exit_code
-            stdout.rewind
-            if(stdout.size > MAX_RESULT_SIZE)
-              warn "Command result greater than allowed size: #{stdout.size} > #{MAX_RESULT_SIZE}"
-            end
-            result[:content] = stdout.readpartial(0, MAX_RESULT_SIZE)
-            if(process.exit_code != 0)
-              stderr.rewind
-              result[:error_message] = stderr.readpartial(0, MAX_RESULT_SIZE)
+          stdout = process_manager.create_io_tmp(Carnivore.uuid, 'stdout')
+          stderr = process_manager.create_io_tmp(Carnivore.uuid, 'stderr')
+          result[:start_time] = Time.now.to_i
+          [unit[:exec]].flatten.each do |exec_command|
+            process_manager.process(unit.hash, exec_command) do |process|
+              process.io.stdout = stdout
+              process.io.stderr = stderr
+              process.cwd = working_directory
+              if(unit[:env])
+                process.environment.replace(unit[:env])
+              end
+              process.leader = true
+              process.start
+              begin
+                process.poll_for_exit(config.fetch(:max_execution_time, 60))
+                result[:exit_code] = process.exit_code
+                break if result[:exit_code] != 0
+              rescue ChildProcess::TimeoutError
+                process.stop
+                result[:timed_out] = true
+                result[:exit_code] = process.exit_code
+              end
             end
           end
+          result[:stop_time] = Time.now.to_i
+          stdout.rewind
+          if(stdout.size > MAX_RESULT_SIZE)
+            warn "Command result greater than allowed size: #{stdout.size} > #{MAX_RESULT_SIZE}"
+          end
+          result[:content] = stdout.readpartial(0, MAX_RESULT_SIZE)
+          if(result[:exit_code] != 0)
+            stderr.rewind
+            result[:error_message] = stderr.readpartial(0, MAX_RESULT_SIZE)
+          end
           if(result[:exit_code] == 0)
             response['Data']['OrchestrationUnitResult'] = result[:content]
             begin

data/lib/jackal-cfn/version.rb

@@ -1,6 +1,6 @@
 module Jackal
   module Cfn
     # Current version
-    VERSION = Gem::Version.new('0.2.20')
+    VERSION = Gem::Version.new('0.2.22')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jackal-cfn
 version: !ruby/object:Gem::Version
-  version: 0.2.20
+  version: 0.2.22
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jackal