evrone-common-spawn 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ba5ac5008b3ed08ab6ab11244721aa25b5cf1de
-  data.tar.gz: fa1a01ee4855ba9a26c2384eef00fa5e7a5e2645
+  metadata.gz: 72883bae873f531ba9e9ce5ee18c03f28807b12b
+  data.tar.gz: 32639657615dd8156849cdd1a53b0c8c9007bb6b
 SHA512:
-  metadata.gz: 2bf4150280e499ca33df726d41d13a0d992d6067fb3530ec32756319c27a3123d93fd180af85430a15afb1ac15fe5c1cac5a562c8cadae72811ad201f2467ea7
-  data.tar.gz: c803c1f155e42c91d92fe1dce23ea1a7da6cc755a418197a2573a5eb2b5111af0837ba2fe61085ba02ddb45b68a8db60baa98b305b069eb7141f3c3bccdb300d
+  metadata.gz: c1a7f84c8110e41e836a365d4b39dc692fa1bde96a903c2394be257f111d62ba48d000e5a8d2209bfa977e6324c11b9eb44b42e1b3228e8a1a7ff419ebd02c82
+  data.tar.gz: dc18782286c1295e04902be3ad1888bfcfecd762bc8ae1d7f7c1557d69aad2710d8011cf5f24364bc6c646bce3ccc99cc932c05e035983aa9c898ff4e0bd42f8

data/lib/evrone/common/spawn/ssh.rb

@@ -45,6 +45,10 @@ module Evrone
 
         private
 
+          def normalize_nl(str)
+            str.gsub(/\r\n?/, "\n")
+          end
+
           def build_command(env, command, options)
             cmd = command
             unless env.empty?
@@ -80,30 +84,28 @@ module Evrone
           end
 
           def spawn_channel(command, read_timeout, &block)
-
             @connection.open_channel do |channel|
-              read_timeout.reset
 
-              #env.each do |k, v|
-              #  channel.env k, v do |_, success|
-              #    yield "FAILED: couldn't execute command (ssh.channel.env)\n" if block_given?
-              #  end
-              #end
+              channel.request_pty do |_, pty_status|
+                raise StandardError, "could not obtain pty" unless pty_status
 
-              channel.exec command do |_, success|
+                read_timeout.reset
 
-                unless success
-                  yield "FAILED: couldn't execute command (ssh.channel.exec)\n" if block_given?
-                end
+                channel.exec command do |_, success|
 
-                channel.on_data do |_, data|
-                  yield data if block_given?
-                  read_timeout.reset
-                end
+                  unless success
+                    yield "FAILED: couldn't execute command (ssh.channel.exec)\n" if block_given?
+                  end
+
+                  channel.on_data do |_, data|
+                    yield normalize_nl(data) if block_given?
+                    read_timeout.reset
+                  end
 
-                channel.on_extended_data do |_, _, data|
-                  yield data if block_given?
-                  read_timeout.reset
+                  channel.on_extended_data do |_, _, data|
+                    yield normalize_nl(data) if block_given?
+                    read_timeout.reset
+                  end
                 end
               end
             end

data/lib/evrone/common/spawn/version.rb

@@ -1,7 +1,7 @@
 module Evrone
   module Common
     module Spawn
-      VERSION = "0.0.4"
+      VERSION = "0.0.5"
     end
   end
 end

data/spec/lib/spawn/ssh_spec.rb

@@ -51,7 +51,7 @@ describe Evrone::Common::Spawn::SSH, ssh: true do
     end
 
     it 'run command with timeout successfuly' do
-      code = run_ssh('echo $USER; sleep 0.2', timeout: 0.5)
+      code = run_ssh('echo $USER; sleep 0.2', timeout: 1)
       expect(collected).to eq "#{user}\n"
       expect(code).to eq 0
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evrone-common-spawn
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-27 00:00:00.000000000 Z
+date: 2013-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh