photocopier 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    photocopier (0.0.4)
+    photocopier (0.0.5)
       activesupport
       escape
       i18n
@@ -12,18 +12,18 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.9)
+    activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     diff-lcs (1.1.3)
     escape (0.0.4)
-    i18n (0.6.1)
-    multi_json (1.4.0)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-ssh (2.6.2)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
+    i18n (0.6.4)
+    multi_json (1.7.0)
+    net-scp (1.1.0)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.6)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)

data/README.md

@@ -48,8 +48,8 @@ ssh.get_directory('remote_dir', './local_dir')
 # and viceversa
 ssh.put_directory('./local_dir', 'remote_dir')
 
-# execs a command and waits for the result, returns output and exit code
-ssh.exec!('pwd') # => [ "/home/128423/users/.home\n", 0 ]
+# execs a command and waits for the result, returns stdout, stderr and exit code
+ssh.exec!('pwd') # => [ "/home/128423/users/.home\n", "", 0 ]
 ```
 The very same commands are valid for the `Photocopier::FTP` adapter.
 

data/lib/photocopier/ssh.rb

@@ -51,15 +51,24 @@ module Photocopier
     end
 
     def exec!(cmd)
-      result = ""
+      stdout = ""
+      stderr = ""
       exit_code = nil
-      session.exec!(cmd) do |ch, type, data|
-        result << data
-        ch.on_request("exit-status") do |ch, data|
-          exit_code = data.read_long
+      session.open_channel do |channel|
+        channel.exec(cmd) do |ch, success|
+          channel.on_data do |ch, data|
+            stdout << data
+          end
+          channel.on_extended_data do |ch, type, data|
+            stderr << data
+          end
+          channel.on_request("exit-status") do |ch, data|
+            exit_code = data.read_long
+          end
         end
       end
-      [ result, exit_code ]
+      session.loop
+      [ stdout, stderr, exit_code ]
     end
 
     private

data/lib/photocopier/version.rb

@@ -1,3 +1,3 @@
 module Photocopier
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: photocopier
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors: