dtk-action-agent 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d681cedb8361d7119da4a19ac6ad046e008757fc
-  data.tar.gz: baba1defa66c1a03c3c13b2c791bced412946cdf
+  metadata.gz: f72bc2bfeacdd56a05dcd6b9ca7b881b6fa20ba4
+  data.tar.gz: f943dcd2ff324eeff690445d8bac30d3f26049af
 SHA512:
-  metadata.gz: 168e9ce7a0eb82dc1275dfcb66e752d880e1e4f19a4c732aa8c6cd84319a8fef976dc6479826dcfe529a5dd09fb5f85d9f56870212a32ea44bcff2ad1b266b96
-  data.tar.gz: f6b627f3b78ae43020c5aae52438ffd938424ab199441a6ec07140b9050b26bc8d7fe030900ea8687f80c36646cdc58ad431d01097e230d17485854a2b8b2859
+  metadata.gz: 778beb33c855def060cfbae12933cec49fea2e0e40e503725cf83e5c7a4c49caca7db439176ef1b7326e787af955c8944520dd1e78793c6d0c1c469f89bc19f5
+  data.tar.gz: e1957688595c4e0b340841591aa177226f6f7737fae9b778e64050ce90d19420f3e019e97a5e30299edc8ae9e26ef48f2638a084a820cc8b27b78be4a42c8119

data/lib/arbiter.rb

@@ -25,7 +25,7 @@ module DTK
       end
 
       def run
-        return { :results => [], :errors => Log.execution_errrors } if @execution_list.empty?
+        return { :results => [], :errors => Log.execution_errors } if @execution_list.empty?
 
         # start positioning files
         @positioner.run()
@@ -34,7 +34,7 @@ module DTK
         @commander.run()
 
         # return results
-        { :results => @commander.results(), :errors => Log.execution_errrors }
+        { :results => @commander.results(), :errors => Log.execution_errors }
       end
 
     end

data/lib/command.rb

@@ -81,6 +81,10 @@ module DTK
         self.process.err
       end
 
+      def started?
+        !!self.process
+      end
+
       def to_s
         "#{@command} (#{command_type})"
       end

data/lib/commander.rb

@@ -5,11 +5,44 @@ module DTK
   module Agent
     class Commander
 
+      PARALLEL_EXECUTION = ENV['DTK_ACTION_AGENT_PARALLEL_EXEC'] || false
+
       def initialize(execution_list)
         @command_tasks  = execution_list.collect { |command| Command.new(command) }
       end
 
       def run
+        if PARALLEL_EXECUTION
+          parallel_run()
+        else
+          sequential_run()
+        end
+      end
+
+      def sequential_run
+        @command_tasks.each do |command_task|
+          command_task.start_task
+
+          loop do
+            if command_task.exited?
+              Log.debug("Command '#{command_task}' finished, with status #{command_task.exitstatus}")
+
+              # exit if there is an error
+              return nil if (command_task.exitstatus.to_i > 0)
+
+              # if there is a callback start it
+              spawn_callback_task(command_task) if command_task.callback_pending?
+
+              break
+            end
+
+            sleep(1)
+          end
+
+        end
+      end
+
+      def parallel_run
         @command_tasks.each do |command_task|
           command_task.start_task
         end
@@ -21,17 +54,13 @@ module DTK
           # we check status of all tasks
           # (Usually is not good practice to change array/map you are iterating but this seems as cleanest solutions)
           @command_tasks.each do |command_task|
-
             # is task finished
             if command_task.exited?
               Log.debug("Command '#{command_task}' finished, with status #{command_task.exitstatus}")
 
               # if there is a callback start it
               if command_task.callback_pending?
-                new_command_task = command_task.spawn_callback_task
-                new_command_task.start_task
-                @command_tasks << new_command_task
-                Log.debug("Command '#{new_command_task}' spawned as callback")
+                spawn_callback_task(command_task, true)
                 # new task added we need to check again
                 all_finished = false
               end
@@ -45,9 +74,16 @@ module DTK
         end
       end
 
+      def spawn_callback_task(command_task, start_task = false)
+        new_command_task = command_task.spawn_callback_task
+        new_command_task.start_task if start_task
+        @command_tasks << new_command_task
+        Log.debug("Command '#{new_command_task}' spawned as callback")
+      end
+
       def results
-        @command_tasks.collect do |command_task|
-          process = command_task.process
+        res = @command_tasks.collect do |command_task|
+          next unless command_task.started?
           {
             :status      => command_task.exitstatus,
             :stdout      => command_task.out,
@@ -56,6 +92,8 @@ module DTK
             :child_task  => command_task.child_task
           }
         end
+
+        res.compact
       end
 
     private

data/lib/dtk-action-agent/version.rb

@@ -1,5 +1,5 @@
 module DTK
   module ActionAgent
-    VERSION="0.0.3"
+    VERSION="0.0.4"
   end
 end

data/lib/logger.rb

@@ -17,7 +17,7 @@ module DTK
         @error_msgs =[]
       end
 
-      def self.execution_errrors()
+      def self.execution_errors()
         self.instance.error_msgs
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-action-agent
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn
@@ -93,17 +93,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: DTK Action Agent