vx-lib-shell 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac1de258197e6487b76d4b881ef6bb96050b8a02
-  data.tar.gz: bc0e35943023134797f32e80676d95e4f3bb76a9
+  metadata.gz: e2b7d6fc28b5070948dd75094444b620d57f1163
+  data.tar.gz: 5987143de05073b0b25008041dc9896994cdf87a
 SHA512:
-  metadata.gz: 7eeaa52a2799bacb5f906d6581b5adbb2842de78c768e1cb1a0bcb928681af1c24036185bd508bbe7ca21e97d14821f554b07570f8c3e53f993637a5d5dd4133
-  data.tar.gz: 57edc0a4c994578ca8dc3cc14702087ad0253848c14a5f331dd6828428d4293119f2500a752c811e46250744205df40ac0983c40bdd54c958092d2f4f32dcf6c
+  metadata.gz: fd2eca44bf45eb1a9814f8e55861b1fec627c8c28fc71fae42e6792a63d39109a5b73723c8fecc79a18989d70ca384d15fd77495e955057e299849b4919316ef
+  data.tar.gz: d249cb474a35de4a6a80ed9e5fe329c1f83dcc88bee6006da656ebc32385351b907cda5545d4672326e0a645f148a187ea3b48f16173225d1b510e9434fdd22d

data/lib/vx/lib/shell/process.rb

@@ -18,11 +18,7 @@ module Vx
           read_timeout   = Shell::ReadTimeout.new options.delete(:read_timeout)
 
           prefix = "/usr/bin/env - TERM=ansi USER=$USER HOME=#{home} SHELL=/bin/bash /bin/bash -l"
-          if command
-            command = "#{prefix} -c #{Shellwords.escape command}"
-          else
-            command = prefix
-          end
+          command = "#{prefix} -c #{Shellwords.escape command}"
 
           status = spawn_command_internal(command, options) do |r|
             read_loop r, timeout, read_timeout, select_timeout, &block
@@ -35,25 +31,20 @@ module Vx
 
           def request_pipes(options)
             m,s   = PTY.open
-            r1,w1 = IO.pipe
 
             s.raw! # disable newline conversion.
             m.sync = true
             s.sync = true
 
-            [m, s, r1, w1]
+            [m, s]
           end
 
           def spawn_command_internal(command, options)
-            r1, w1, r2, w2 = request_pipes(options)
+            r1, w1 = request_pipes(options)
 
-            pid = ::Process.spawn(command, in: r2, out: w1, err: w1)
+            pid = ::Process.spawn(command, out: w1, err: w1)
 
             begin
-              if i = options[:stdin]
-                IO.copy_stream i, w2
-              end
-              w2.close
               w1.close
 
               yield r1
@@ -64,7 +55,6 @@ module Vx
             _, status = ::Process.wait2(pid)
 
             r1.close
-            r2.close
 
             status
           end

data/lib/vx/lib/shell/ssh.rb

@@ -23,11 +23,7 @@ module Vx
           read_timeout  = Shell::ReadTimeout.new options.delete(:read_timeout)
 
           prefix = "/usr/bin/env - TERM=ansi USER=$USER HOME=#{home} SHELL=/bin/bash /bin/bash -l"
-          if command
-            command = "#{prefix} -c #{Shellwords.escape command}"
-          else
-            command = prefix
-          end
+          command = "#{prefix} -c #{Shellwords.escape command}"
 
           channel = spawn_channel command, read_timeout, options, &block
 
@@ -47,7 +43,7 @@ module Vx
         private
 
           def request_pty(channel, options)
-            channel.request_pty term: "ansi" do |_, pty_status|
+            channel.request_pty do |_, pty_status|
               raise StandardError, "could not obtain pty (ssh.channel.request_pty)" unless pty_status
               yield if block_given?
             end
@@ -87,11 +83,6 @@ module Vx
                     raise StandardError, "FAILED: couldn't execute command (ssh.channel.exec)"
                   end
 
-                  if i = options[:stdin]
-                    channel.send_data i.read
-                    channel.eof!
-                  end
-
                   channel.on_data do |_, data|
                     yield data if block_given?
                     read_timeout.reset

data/lib/vx/lib/shell/version.rb

@@ -1,7 +1,7 @@
 module Vx
   module Lib
     module Shell
-      VERSION = "0.1.2"
+      VERSION = "0.1.3"
     end
   end
 end

data/spec/lib/process_spec.rb

@@ -23,13 +23,13 @@ describe Vx::Lib::Shell::Process do
   context "timeout" do
     it 'run command with timeout' do
       expect {
-        run("echo $USER && sleep 0.5", timeout: 0.2, pty: pty)
+        run("echo $USER && sleep 0.5", timeout: 0.2)
       }.to raise_error(::Vx::Lib::Shell::TimeoutError)
       expect(subject.strip).to eq "#{user}"
     end
 
     it 'run command with timeout successfuly' do
-      code = run("echo BAR && sleep 0.1", timeout: 0.5, pty: pty)
+      code = run("echo BAR && sleep 0.1", timeout: 0.5)
       expect(subject.strip).to eq "BAR"
       expect(code).to eq 0
     end
@@ -45,43 +45,36 @@ describe Vx::Lib::Shell::Process do
 
     it 'run command with read timeout in loop' do
       expect{
-        run('sleep 0.1 ; echo $USER ; sleep 0.5', read_timeout: 0.3, pty: pty)
+        run('sleep 0.1 ; echo $USER ; sleep 0.5', read_timeout: 0.3)
       }.to raise_error(Vx::Lib::Shell::ReadTimeoutError)
       expect(collected.strip).to eq "#{user}"
     end
 
     it 'run command with read timeout successfuly' do
-      code = run('echo $USER; sleep 0.1', read_timeout: 0.5, pty: pty)
+      code = run('echo $USER; sleep 0.1', read_timeout: 0.5)
       expect(collected.strip).to eq "#{user}"
       expect(code).to eq 0
     end
 
     it 'run command with read timeout in loop successfuly' do
-      code = run('sleep 0.3 ; echo $USER; sleep 0.3 ; echo $USER', read_timeout: 0.5, pty: pty)
+      code = run('sleep 0.3 ; echo $USER; sleep 0.3 ; echo $USER', read_timeout: 0.5)
       expect(collected).to eq "#{user}\n#{user}\n"
       expect(code).to eq 0
     end
   end
 
   it 'run and kill process' do
-    code = run( "echo $USER; kill -KILL $$", pty: pty)
+    code = run( "echo $USER; kill -KILL $$")
     expect(subject).to eq "#{user}\n"
     expect(code).to eq(-9)
   end
 
   it 'run and interupt process' do
-    code = run( "echo $USER; kill -INT $$", pty: pty)
+    code = run( "echo $USER; kill -INT $$")
     expect(subject).to eq "#{user}\n"
     expect(code).to eq(-2)
   end
 
-  it "should copy stdin" do
-    io = StringIO.new("echo foo ; exit")
-    code = run(stdin: io)
-    expect(subject).to eq "foo\n"
-    expect(code).to eq 0
-  end
-
   def run(*args, &block)
     @proxy ||= ShellTest.new
     timeout do

data/spec/lib/ssh_spec.rb

@@ -87,13 +87,6 @@ describe Vx::Lib::Shell::SSH, ssh: true do
     expect(code).to eq(-4)
   end
 
-  it "should copy stdin" do
-    io = StringIO.new("echo foo ; exit\n")
-    code = run_ssh(stdin: io)
-    expect(collected).to match "foo\r\n"
-    expect(code).to eq 0
-  end
-
   def open_ssh(&block)
     described_class.open(host, user, password: pass, paranoid: false, verbose: 2, port: port, &block)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vx-lib-shell
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Dmitry Galinsky