dtk-action-agent 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f72bc2bfeacdd56a05dcd6b9ca7b881b6fa20ba4
-  data.tar.gz: f943dcd2ff324eeff690445d8bac30d3f26049af
+  metadata.gz: 8ceb9bc809895890686ccd58e4783db04dd98607
+  data.tar.gz: dd303a2fe410acaaa1e1bebb2b5c37d2be231658
 SHA512:
-  metadata.gz: 778beb33c855def060cfbae12933cec49fea2e0e40e503725cf83e5c7a4c49caca7db439176ef1b7326e787af955c8944520dd1e78793c6d0c1c469f89bc19f5
-  data.tar.gz: e1957688595c4e0b340841591aa177226f6f7737fae9b778e64050ce90d19420f3e019e97a5e30299edc8ae9e26ef48f2638a084a820cc8b27b78be4a42c8119
+  metadata.gz: 8b9d0492fbb95fa778718c900bb7accc860b795a2ae53609a6aea453223a5153a7c851f5c0a1775877dc42ad2d2fd9f8d338918df0befd4dd12bd89b69962c49
+  data.tar.gz: 80e42e95161fd18359a5d0988180a6d27e405371d5835de83b2bf7f79a0b5c97c6dee84ecfca4afac784ca6cedd4ded3a3370db5c2c0d5df5d78b059f4fd1a03

data/lib/command.rb

@@ -9,19 +9,24 @@ module DTK
       attr_accessor :command_type, :command, :if_success, :if_fail, :process, :child_task
 
       ##
-      # command    - string to be run on system, e.g. ifconfig
-      # type       - type of command e.g. syscall, ruby
-      # if         - callback to be run if exit status is  = 0
-      # unless     - callback to be run if exit status is != 0
-      # child_task - if it is spawned by another main task
+      # command         - string to be run on system, e.g. ifconfig
+      # type            - type of command e.g. syscall, ruby
+      # if              - callback to be run if exit status is  = 0
+      # unless          - callback to be run if exit status is != 0
+      # stdout_redirect - redirect all output to stdout
+      # child_task      - if it is spawned by another main task
       #
+
+      STDOUT_REDIRECT = ' 2>&1'
+
       def initialize(value_hash)
-        @command_type = value_hash['type']
-        @command      = value_hash['command']
-        @if_success   = value_hash['if']
-        @if_fail      = value_hash['unless']
-        @spawned      = false
-        @child_task   = value_hash['child_task'] || false
+        @command_type    = value_hash['type']
+        @command         = value_hash['command']
+        @stdout_redirect = !!value_hash['stdout_redirect']
+        @if_success      = value_hash['if']
+        @if_fail         = value_hash['unless']
+        @spawned         = false
+        @child_task      = value_hash['child_task'] || false
 
         if @if_success && @if_fail
           Log.warn "Unexpected case, both if/unless conditions have been set for command #{@command}(#{@command_type})"
@@ -33,7 +38,7 @@ module DTK
       #
       def start_task
         begin
-          @process = POSIX::Spawn::Child.new(@command)
+          @process = POSIX::Spawn::Child.new(formulate_command)
           Log.debug("Command started: '#{self.to_s}'")
         rescue Exception => e
           @error_message = e.message
@@ -86,7 +91,16 @@ module DTK
       end
 
       def to_s
-        "#{@command} (#{command_type})"
+        "#{formulate_command} (#{command_type})"
+      end
+
+    private
+
+      #
+      # Based on stdout-redirect flag
+      #
+      def formulate_command
+        @stdout_redirect ? "#{@command} #{STDOUT_REDIRECT}" : @command
       end
 
     end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-action-agent
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn