smart_proxy_remote_execution_ssh 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTEyZjNlZjgzOGU2ODkzNmYyMGM1NTgwNWZjM2VjZmU2NDljZmEwMw==
+    ZmFjY2VkY2YyMTZhNmM4MTQ1ZGI5NTA3ZTRjMDIzYTZiNzFmNzU5Mg==
   data.tar.gz: !binary |-
-    YjVmNmNiNDdiNTA5ZTU1YjNiNzNkMzcxOTkxZDY3YTgwN2QxYjBhNQ==
+    MWRkNzJjZDdjNWMyNTI4NTA2NDI0NDAyZWI4ZmY5MjVkM2E5Njk5Yw==
 SHA512:
   metadata.gz: !binary |-
-    NmJmOTc3Njg3MmE5Yzk0NWQ0MjI3MmMwYjM0Mjk3Mzg3NWYxZDY2ZWI0YzNi
-    MjE1MDBkMjMwYTc0N2FlYjUyY2Q1MzgwZTQ0NzA5YzIwYmUyNTBlNzQ0NzI1
-    OTZhOGU5MWMyZGU5MzE1YjI4MzhmMWIwYjg5YzNmNTkzNGVkMjM=
+    Y2IwYTA4OTgwYTcxMjEzODg4NDRjYWQwODE0NWEwM2QxN2ZlZDlkYmI0MDEz
+    OGZkOGM0Y2M2NjZlNjg1ODJkNmFmYmJmMjU2MWE4NjllOWNkZDVkY2U3YWZi
+    NWZkNTBlM2I5ZDgwNDU5YWU2YTVkMGQ0MTM0YzJlYzA5MjE2MWE=
   data.tar.gz: !binary |-
-    NWRjNDU2YzgzNzAxM2NlMDliYTY3MTE5MDM3OTRkN2NiMzVmNmVlNTgxNTE4
-    YTcyMjY5YTJlZmE0NTkxYTJlOGNhM2ZmODEzZDE4ZWIwOTU4NDIyN2U2ZjFj
-    MWZhNTMzNDNkN2Y5ZDU4ZDFhNmU0ZTA4NWRlNGI1YjRhODU3NjE=
+    M2IzMGY4ZDI2NjA5ZGEyMTk3YWM5NGEyODNkMjFlYjk2ZWUwOTkwMzAyNTc5
+    YTJlODIyMmM4N2JhODIwY2M5NzE4YzA5NWI2ZWEwZjFlNDAwYTY3NzRkNDli
+    MGU0OTBhMzQ0ZDU4ZDA1MzcwYmI3Y2IxZjA2YzBkN2JlMDNiNTM=

data/lib/smart_proxy_remote_execution_ssh/command_action.rb

@@ -17,13 +17,7 @@ module Proxy::RemoteExecution::Ssh
       when nil
         init_run
       when CommandUpdate
-        update = event
-        output[:result].concat(update.buffer_to_hash)
-        if update.exit_status
-          finish_run(update)
-        else
-          suspend
-        end
+        process_update(event)
       when Dynflow::Action::Cancellable::Cancel
         kill_run
       when Dynflow::Action::Skip
@@ -32,9 +26,8 @@ module Proxy::RemoteExecution::Ssh
         raise "Unexpected event #{event.inspect}"
       end
     rescue => e
-      action_logger.error e
-      output[:result] << Connector::DebugData.new("#{e.class}: #{e.message}").to_hash
-      output[:exit_status] = "PROXY_ERROR"
+      action_logger.error(e)
+      process_update(CommandUpdate.new(CommandUpdate.encode_exception("Proxy error", e)))
     end
 
     def finalize
@@ -72,6 +65,15 @@ module Proxy::RemoteExecution::Ssh
       output[:exit_status] = update.exit_status
     end
 
+    def process_update(update)
+      output[:result].concat(update.buffer_to_hash)
+      if update.exit_status
+        finish_run(update)
+      else
+        suspend
+      end
+    end
+
     def failed_run?
       output[:exit_status] != 0
     end

data/lib/smart_proxy_remote_execution_ssh/connector.rb

@@ -22,9 +22,9 @@ module Proxy::RemoteExecution::Ssh
     def async_run(command)
       started = false
       session.open_channel do |channel|
-        channel.on_data { |ch, data| yield CommandUpdate::StdoutData.new(data) }
+        channel.on_data { |ch, data| yield CommandUpdate::StdoutData.new(handle_encoding(data)) }
 
-        channel.on_extended_data { |ch, type, data| yield CommandUpdate::StderrData.new(data) }
+        channel.on_extended_data { |ch, type, data| yield CommandUpdate::StderrData.new(handle_encoding(data)) }
 
         # standard exit of the command
         channel.on_request("exit-status") { |ch, data| yield CommandUpdate::StatusData.new(data.read_long) }
@@ -120,6 +120,14 @@ module Proxy::RemoteExecution::Ssh
 
     private
 
+    def handle_encoding(data)
+      if data.is_a? String
+        data.force_encoding('UTF-8')
+      else
+        data
+      end
+    end
+
     def session
       @session ||= begin
                      @logger.debug("opening session to #{@user}@#{@host}")

data/lib/smart_proxy_remote_execution_ssh/session.rb

@@ -30,7 +30,14 @@ module Proxy::RemoteExecution::Ssh
       end
       output_path = File.join(File.dirname(remote_script), 'output')
 
-      @connector.async_run("#{su_prefix}#{remote_script} | /usr/bin/tee #{output_path}") do |data|
+      # pipe the output to tee while capturing the exit code
+      script = <<-SCRIPT
+        exec 4>&1
+        exit_code=`((#{su_prefix}#{remote_script}; echo $?>&3 ) | /usr/bin/tee #{output_path} ) 3>&1 >&4`
+        exec 4>&-
+        exit $exit_code
+      SCRIPT
+      @connector.async_run(script) do |data|
         @command_buffer << data
       end
     rescue => e

data/lib/smart_proxy_remote_execution_ssh/version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module RemoteExecution
     module Ssh
-      VERSION = '0.0.4'
+      VERSION = '0.0.5'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_remote_execution_ssh
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler