task-orchestrator 0.0.7 → 0.0.8

data/README.md

@@ -2,7 +2,9 @@
 
 Simple task orchestration framework driven by Yaml config files
 
-![travis](https://secure.travis-ci.org/piavlo/task-orchestrator.png)
+[![Build Status](https://secure.travis-ci.org/piavlo/task-orchestrator.png)](https://travis-ci.org/piavlo/task-orchestrator)
+[![Dependency Status](https://gemnasium.com/piavlo/task-orchestrator.png)](https://gemnasium.com/piavlo/task-orchestrator)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/piavlo/task-orchestrator)
 
 ## Installation
 

data/bin/orchestrator

@@ -8,4 +8,4 @@ require 'orchestrator'
 
 options = Orchestrator::Cli.parse(ARGV)
 task = Orchestrator::Task.new(options)
-task.run
+task.run

data/examples/failure_handler

@@ -6,6 +6,8 @@ orchestrator:
     steps:
       - type: sequential
         scripts:
-          - command: exit 0
+          - command: "echo cool"
+            ok_handler: "echo OK Handler"
+            failure_handler: "echo Failure Handler"
         failure_handler: "echo Step has failed"
     failure_handler: "echo Task :::ARG.name::: has failed"

data/examples/timeouts

@@ -8,10 +8,10 @@ orchestrator:
 #        on_failure: die
         on_failure: ignore
         scripts:
-           - command: sleep 1
-             timeout: 2
            - command: sleep 5
              timeout: 2
+           - command: sleep 1
+             timeout: 2
   timeouts2:
     description: timeouts test 2
     save: true

data/lib/orchestrator/task.rb

@@ -82,10 +82,15 @@ module Orchestrator
       if command.is_a?(String)
          command = { 'command' => interpolate_command(command) }
       elsif command.is_a?(Hash)
-        invalid(error_prefix + " command is invalid") unless command.has_key?('command') && command['command'].is_a?(String)
-        command['command'] = interpolate_command(command['command'])
+        invalid(error_prefix + " is missing command attribute") unless command.has_key?('command')
+        ['command', 'ok_handler', 'failure_handler'].each do |attribute|
+          if command.has_key?(attribute)
+            invalid(error_prefix + " #{attribute} attribute is invalid") unless command[attribute].is_a?(String)
+            command[attribute] = interpolate_command(command[attribute])
+          end
+        end
       else
-        invalid(error_prefix + " is invalid")
+        invalid(error_prefix + " has invalid format")
       end
       command
     end
@@ -154,38 +159,32 @@ module Orchestrator
       ) if @options.sms and @options.sms_on_success
     end
 
-    def run_script(script)
+    def run_command(command,timeout)
       result = ""
       error = ""
 
-      timeout = script.has_key?('timeout') ? script['timeout'].to_i : @timeout
-
-      script['status'] = 'STARTED'
-      save_state
-
       #  start = Time.now
-
+      
+      status = 'STARTED'
       begin
         Timeout::timeout(timeout) do
-          status = POpen4::popen4(script['command']) do |stdout, stderr, stdin, pid|
+          status = POpen4::popen4(command) do |stdout, stderr, stdin, pid|
             result = stdout.read.strip
             error = stderr.read.strip
           end
-          script['status'] = (status.nil? or status.exitstatus != 0) ? 'FAILED' : 'OK'
+          status = (status.nil? or status.exitstatus != 0) ? 'FAILED' : 'OK'
         end
       rescue Timeout::Error
-        script['status'] = 'TIMEOUT'
+        status = 'TIMEOUT'
       end
 
-      save_state
-
       #  runtime = Time.now - start
       #  runtime = runtime > 60 ? runtime/60 : runtime
 
       @mutex.synchronize do
         output = <<-EOF
 
-Running: #{script['command']} - #{script['status']}
+Running: #{command} - #{status}
 ============ STDOUT ============
 #{result}
 ============ STDERR ============
@@ -197,7 +196,31 @@ EOF
         puts output if @options.verbose
       end
 
-      script['status'] == 'OK'
+      return status
+    end
+
+    def run_post_script_handlers(script,status)
+      handler = nil
+      if status
+        handler = 'ok_handler' if script.has_key?('ok_handler')
+      else
+        handler = 'failure_handler' if script.has_key?('failure_handler')
+      end
+      if handler
+        timeout = script.has_key?('timeout') ? script['timeout'].to_i : @timeout
+        run_command(script[handler],timeout)
+      end
+    end
+
+    def run_script(script)
+      timeout = script.has_key?('timeout') ? script['timeout'].to_i : @timeout
+
+      script['status'] = 'STARTED'
+      save_state
+      script['status'] = run_command(script['command'],timeout)
+      save_state
+    
+      return script['status'] == 'OK'
     end
 
     def thread_wrapper(i,script)
@@ -231,6 +254,7 @@ EOF
       end
 
       @threads.delete(i)
+      run_post_script_handlers(script,@statuses[i])
       fail if @on_failure == :die and not @statuses[i]
     end
 
@@ -295,6 +319,7 @@ EOF
               break if failures > @retries
               sleep @retry_delay
             end
+            run_post_script_handlers(step['scripts'][index],@statuses[index])
             fail if not @statuses[index] and @on_failure == :die
           end
           fail if @on_failure != :ignore and @statuses.find_index(false)

data/lib/orchestrator/version.rb

@@ -1,3 +1,3 @@
 module Orchestrator
-  VERSION ||= '0.0.7'
+  VERSION ||= '0.0.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: task-orchestrator
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pony
@@ -85,16 +85,16 @@ extra_rdoc_files: []
 files:
 - bin/orchestrator
 - lib/orchestrator.rb
-- lib/orchestrator/task.rb
 - lib/orchestrator/version.rb
 - lib/orchestrator/cli.rb
+- lib/orchestrator/task.rb
+- examples/timeouts
+- examples/interpolation
+- examples/dependencies
 - examples/sequential
 - examples/failure_handler
-- examples/multistep
 - examples/parallel
-- examples/interpolation
-- examples/timeouts
-- examples/dependencies
+- examples/multistep
 - task-orchestrator.gemspec
 - LICENSE
 - README.md