task-orchestrator 0.0.8 → 0.0.9

data/examples/interpolation

@@ -3,13 +3,26 @@ orchestrator:
   interpolation:
     description: command interpolation test
     save: true
+    defaults:
+      args:
+        arg1: zopa
+        arg2: popa
+        arg3:
+        cmd: ":::EXEC.date:::"
+      envs:
+        DNS: google.com
+        DHCP:
+        CMD: ":::EXEC.date:::"
     steps:
       - type: sequential
         scripts:
-          - command: "echo :::ARG.name:::"
-          - command: "echo :::ARG.arg1:::"
-          - command: "echo :::ARG.arg2:::"
-          - command: "echo :::ENV.DNS:::"
-          - command: "echo :::EXEC.date:::"
-          - command: "echo :::EXEC./bin/date +%s:::"
-#          - command: "echo :::EXEC./dasdfsd:::"
+          - command: "echo name is  :::ARG.name:::"
+          - command: "echo arg1 is :::ARG.arg1:::"
+          - command: "echo arg2 is :::ARG.arg2:::"
+          - command: "echo arg3 is :::ARG.arg3:::"
+          - command: "echo arg3 is :::ARG.cmd:::"
+          - command: "echo DNS is :::ENV.DNS:::"
+          - command: "echo DHCP is :::ENV.DHCP:::"
+          - command: "echo DATE is :::ENV.CMD:::"
+          - command: "echo DATE is :::EXEC.date:::"
+          - command: "echo UNIX_TIMESTAMP is :::EXEC./bin/date +%s:::"

data/lib/orchestrator/task.rb

@@ -16,6 +16,10 @@ module Orchestrator
 
       @options = options
 
+      @defaults = {}
+      @defaults[:envs] = Object.new
+      @defaults[:args] = Object.new
+
       invalid("config file #{config} does not exists") unless File.exist?(@options.config)
 
       @settings = YAML.load_file(@options.config)
@@ -50,18 +54,20 @@ module Orchestrator
       end
     end
 
-    def interpolate_command(command)
+    def interpolate_command(command,pattern=/^(ENV|ARG|EXEC)\./)
       command.gsub(/:::([^:]*):::/) do
         match = $1
+        invalid("interpolation type is not valid in this context - :::#{match}:::") if match !~ pattern and match =~ /^(ENV|ARG|EXEC)\./
+
         case match
         when /^ENV\./
           env = match["ENV.".length..-1]
-          invalid("command interpolation failed no such env variable - #{env}") unless ENV[env]
-          ENV[env]
+          invalid("command interpolation failed no such env variable - #{env}") if !ENV[env] and !@defaults[:envs].instance_variable_defined?("@#{env}")
+          ENV[env] ? ENV[env] : @defaults[:envs].instance_variable_get("@#{env}")
         when /^ARG\./
           arg = match["ARG.".length..-1]
-          invalid("command interpolation failed no such arg - #{arg}") unless @options.args.instance_variable_defined?("@#{arg}".to_sym)
-          @options.args.instance_variable_get("@#{arg}".to_sym)
+          invalid("command interpolation failed no such arg - #{arg}") if !@options.args.instance_variable_defined?("@#{arg}") and !@defaults[:args].instance_variable_defined?("@#{arg}")
+          @options.args.instance_variable_defined?("@#{arg}") ? @options.args.instance_variable_get("@#{arg}") : @defaults[:args].instance_variable_get("@#{arg}")
         when /^EXEC\./
           exec = match["EXEC.".length..-1]
           result = nil
@@ -105,6 +111,19 @@ module Orchestrator
         invalid("task sms recipients is missing") unless @state['sms'].has_key?('recipients') && @state['sms']['recipients'].is_a?(String) || @state['sms']['recipients'].is_a?(Array)
         invalid("task sms from is missing") unless @state['sms'].has_key?('from') && @state['sms']['from'].is_a?(String)
       end
+      if @state.has_key?('defaults')
+        invalid("defaults must be hash") unless @state['defaults'].is_a?(Hash)
+        [:envs, :args].each do |type|
+          if @state['defaults'].has_key?(type.to_s)
+            invalid("default envs must be hash") unless @state['defaults'][type.to_s].is_a?(Hash)
+            @state['defaults'][type.to_s].each do|key,value|
+              value = '' unless value
+              invalid("default value for #{type} #{key} is invalid") unless value.is_a?(String)
+              @defaults[type].instance_variable_set("@#{key}",interpolate_command(value,/^EXEC\./))
+            end
+          end
+        end
+      end
       invalid("task description is missing or invalid") unless @state.has_key?('description') && @state['description'].is_a?(String)
       invalid("task save must be boolean") if @state.has_key?('save') && !!@state['save'] != @state['save']
       @state['save'] = false unless @state.has_key?('save')

data/lib/orchestrator/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: task-orchestrator
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-03-11 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/parallel
 - examples/multistep
+- examples/parallel
+- examples/interpolation
+- examples/timeouts
+- examples/dependencies
 - task-orchestrator.gemspec
 - LICENSE
 - README.md