foreman_remote_execution 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a83d62de427a930126dbdac52051e2a6ca6e0cc
-  data.tar.gz: a304bc71914618eb42fa1648b4f6ce3f2f31fceb
+  metadata.gz: e5f866fe37c11fd1081d685e3715e64658354b5f
+  data.tar.gz: c5fddb603234b2930bc94226411a982039c5996e
 SHA512:
-  metadata.gz: 9afcf6f187db3707ed4842ad877d8273c3bead70b25f0fb078dacc2888d0218cbed4d41c2b2e85e874cc88522946488915ff123883e12f507638c9ef1581f9ea
-  data.tar.gz: 8a38221109dea89d1b5c91f84179727e563b2f880a948b83029adda2df3b6ffddd058dcc5e5651cb32d06bc1c6ada3bc6ddcc6b15e83fb8c3f9db71296c8d371
+  metadata.gz: 64da2786680750ada9d49b6459b63bc6a2440f1c0226de78a08c50b1b632c8b7583cd1d76c569dc1e7e1836318229cfbf1811671517f8aca0be0539188403961
+  data.tar.gz: f707c970f5b3fb9fccbe4e65d4321a449a6980b5b9f3999266ab49e4d238eb56f4644319bb12e88e691e85819570d3fc7267c62e6ec851a7f40fa58d58b6a912

data/app/lib/actions/remote_execution/helpers/live_output.rb

@@ -0,0 +1,17 @@
+module Actions
+  module RemoteExecution
+    module Helpers
+      module LiveOutput
+        def exception_to_output(context, exception, timestamp = Time.now)
+          format_output(context + ": #{exception.class} - #{exception.message}", 'debug', timestamp)
+        end
+
+        def format_output(message, type = 'debug', timestamp = Time.now)
+          { 'output_type' => type,
+            'output' => message,
+            'timestamp' => timestamp.to_f }
+        end
+      end
+    end
+  end
+end

data/app/lib/actions/remote_execution/run_host_job.rb

@@ -2,6 +2,8 @@ module Actions
   module RemoteExecution
     class RunHostJob < Actions::EntryAction
 
+      include Actions::RemoteExecution::Helpers::LiveOutput
+
       def resource_locks
         :link
       end
@@ -42,7 +44,12 @@ module Actions
       end
 
       def live_output
-        planned_actions(RunProxyCommand).first.live_output
+        proxy_command_action = planned_actions(RunProxyCommand).first
+        if proxy_command_action
+          proxy_command_action.live_output
+        else
+          execution_plan.errors.map { |e| exception_to_output(_('Failed to initialize command'), e) }
+        end
       end
 
       def humanized_name

data/app/lib/actions/remote_execution/run_proxy_command.rb

@@ -3,6 +3,7 @@ module Actions
     class RunProxyCommand < Actions::ProxyAction
 
       include ::Dynflow::Action::Cancellable
+      include Actions::RemoteExecution::Helpers::LiveOutput
 
       def plan(proxy, hostname, script, options = {})
         options = { :effective_user => nil }.merge(options)
@@ -67,8 +68,9 @@ module Actions
 
       def finalized_output
         records = []
-        if self.output[:proxy_output].present?
-          records.concat(self.output[:proxy_output].fetch(:result, []))
+
+        if proxy_result.present?
+          records.concat(proxy_result)
         else
           records << format_output(_('No output'))
         end
@@ -81,14 +83,8 @@ module Actions
         return records
       end
 
-      def exception_to_output(context, exception, timestamp = Time.now)
-        format_output(context + ": #{exception.class} - #{exception.message}", 'debug', timestamp)
-      end
-
-      def format_output(message, type = 'debug', timestamp = Time.now)
-        { 'output_type' => type,
-          'output' => message,
-          'timestamp' => timestamp.to_f }
+      def proxy_result
+        self.output.fetch(:proxy_output, {}).fetch(:result, []) || []
       end
     end
   end

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -148,6 +148,7 @@ files:
 - app/helpers/concerns/foreman_remote_execution/hosts_helper_extensions.rb
 - app/helpers/remote_execution_helper.rb
 - app/lib/actions/middleware/bind_job_invocation.rb
+- app/lib/actions/remote_execution/helpers/live_output.rb
 - app/lib/actions/remote_execution/run_host_job.rb
 - app/lib/actions/remote_execution/run_hosts_job.rb
 - app/lib/actions/remote_execution/run_proxy_command.rb