factor-connector-ssh 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03df7c841e47c23e72420dcc09f91295f03b8754
-  data.tar.gz: 28425cd7c2e60cb7a36fbc51421a9dba8d633211
+  metadata.gz: 626d8267471771788e813eb9266923489db3d4e8
+  data.tar.gz: 98ed1bbf9142689203d38d9c93c07c268cc91849
 SHA512:
-  metadata.gz: d176236d1004d233055e50f62c76f0987feaa1202ed103ab1062dab6db061cfea3a7b3b4375e1a3de90c153a49b3002930cf3e1200fbb793a5286d8580e0455b
-  data.tar.gz: 6bd5c88e3d6f62b2ac42042d7b5233317f1b5e1b21c4d21ee38aa45a1c26e5b6731fd627d89f30bb043758bec6f787e565a03c77469043bb0ac219bb1088308f
+  metadata.gz: cf44969ec87c27d08add881431a20b29c7fa93bf6468441f3efd84477915e251cc3647d4c23d809017274bedcd0016efbe79577187cab7d243d4b06721971e03
+  data.tar.gz: 4791f30d29e654059e3cff063a78e48688347d16442403f94c5fedff7b8663dac02bbf9cc7356d619fc864aeeb08b33ad24a3599cafb3bc12437f49b596a046b

data/lib/factor/connector/ssh.rb

@@ -5,6 +5,46 @@ require 'tempfile'
 require 'securerandom'
 require 'uri'
 
+class Net::SSH::Connection::Session
+  class CommandExecutionFailed < StandardError
+  end
+
+  def exec_sc!(command)
+    stdout_data,stderr_data = "",""
+    exit_code,exit_signal = nil,nil
+    self.open_channel do |channel|
+      channel.exec(command) do |_, success|
+        raise CommandExecutionFailed, "Command \"#{command}\" was unable to execute" unless success
+
+        channel.on_data do |_,data|
+          stdout_data += data
+        end
+
+        channel.on_extended_data do |_,_,data|
+          stderr_data += data
+        end
+
+        channel.on_request("exit-status") do |_,data|
+          exit_code = data.read_long
+        end
+
+        channel.on_request("exit-signal") do |_, data|
+          exit_signal = data.read_long
+        end
+      end
+    end
+    self.loop
+
+    {
+      stdout:stdout_data,
+      stderr:stderr_data,
+      exit_code:exit_code,
+      exit_signal:exit_signal
+    }
+  end
+end
+
+
 Factor::Connector.service 'ssh' do
   action 'execute' do |params|
     host_param  = params['host']
@@ -43,21 +83,22 @@ Factor::Connector.service 'ssh' do
     fail 'Host variable must specific host address' unless host
 
     begin
+      return_info = []
       Net::SSH.start(host, user, ssh_settings) do |ssh|
         commands.each do |command|
           info "Executing '#{command}'"
-          output_lines = ssh.exec!(command)
+          output = ssh.exec_sc!(command)
           encode_settings = {
             invalid: :replace,
             undef: :replace,
             replace: '?'
           }
-          output_lines = output_lines.to_s.encode('UTF-8', encode_settings)
-          output << output_lines
-          command_lines << {
-            lines: output_lines.split("\n"),
-            all: output_lines
-          }
+
+          output[:stdout] = output[:stdout].to_s.encode('UTF-8', encode_settings).split("\n")
+          output[:stderr] = output[:stderr].to_s.encode('UTF-8', encode_settings).split("\n")
+          output[:command] = command
+          return_info << output
+          
         end
       end
     rescue Net::SSH::AuthenticationFailed
@@ -72,11 +113,6 @@ Factor::Connector.service 'ssh' do
     rescue
       warn 'Failed to clean up, but no worries, work will go on.'
     end
-    return_info = {
-      line: output.split("\n"),
-      all: output,
-      command: command_lines
-    }
     action_callback return_info
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factor-connector-ssh
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Maciej Skierkowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh