voltos 0.3.0.rc10 → 0.3.0.rc11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: badb07b7a5602fde134ef7d34a57c97b1da3f59f
-  data.tar.gz: 76f47e84b81337f3057aee325c76867f695c89bf
+  metadata.gz: 95927f2e70936a2a34eba426842f51affd050a7e
+  data.tar.gz: b13eb1e0e9e464dcb1938e2f2a9de3eac6a10438
 SHA512:
-  metadata.gz: 35cf12382c288f86ce1925e8e3970c2e037ed086bb8293e0004aab379cede0aee3094f75ea7a5b81d4c5c559a346d9971eaf4ebf94f95c4fd751504bbace18bd
-  data.tar.gz: 0694506e6e01712aea92ebc77e1d73e119c61f3b16d1e1e2a642cd1557d029dee751ca53ce392703d55ba3a9019b3d2bdb4f08a6cc8183e7253aed9d53cad169
+  metadata.gz: 154886e9b986bde9d457da7eb0f2929779796a98b9a11c1520c84c68806fedde3d84d5d3e7deb77880fca3dad8757398960bbe7813473b2445f96cc687152bcf
+  data.tar.gz: acebddbec308e50d4f11b0b44a25d20a87133a1dacb396bee50a5ef905a5284c8a64950e9e65e5436db231bcb1c4992edd5928f488e74cce00ffa6e59d5bc37d

data/exe/voltos

@@ -1,36 +1,58 @@
 #!/usr/bin/env ruby
 require 'pty'
+require 'open3'
 require 'readline'
 STDOUT.sync = true
 bin = "#{Gem.bin_path('voltos', 'voltos')}-cli"
-status = PTY.spawn(bin, *ARGV) do |stdout, stdin, pid|
-  stdout.sync = true
-  Thread.new do
-    loop do
-      STDOUT.print stdout.getc
+if STDIN.tty?
+  status = PTY.spawn(bin, *ARGV) do |stdout, stdin, pid|
+    stdout.sync = true
+    Thread.new do
+      loop do
+        STDOUT.print stdout.getc
+      end
     end
-  end
-  Thread.new do
-    loop do
-      input = Readline.readline("", true)
-      if input.nil?
-        stdout.flush
-        stdout.close
-        stdin.close
+    Thread.new do
+      loop do
+        input = Readline.readline("", true)
+        if input.nil?
+          stdout.flush
+          stdout.close
+          stdin.close
+        end
+        stdin.puts input.strip
+      end
+    end
+    begin
+      Process::waitpid(pid) rescue nil
+      while out = stdout.getc do
+        STDOUT.print out
       end
-      stdin.puts input.strip
+    rescue SystemExit, Interrupt
+      Process.kill('INT', pid)
+      retry
+    rescue EOFError
+      puts "Ctrl-D"
+    rescue IOError
     end
   end
-  begin
-    Process::waitpid(pid) rescue nil
-    while out = stdout.getc do
-      STDOUT.print out
+else
+  Open3.popen3(bin, *ARGV) do |stdin, stdout, stderr, thread|
+    errThread = Thread.new do
+      while !stderr.eof?  do
+        putc stderr.readchar
+      end
+    end
+    outThread = Thread.new do
+      while !stdout.eof?  do
+        putc stdout.readchar
+      end
     end
-  rescue SystemExit, Interrupt
-    Process.kill('INT', pid)
-    retry
-  rescue EOFError
-    puts "Ctrl-D"
+    Process::waitpid(thread.pid) rescue nil
+    errThread.join
+    outThread.join
+    process = thread.value
+    status = process.exitstatus.to_i if !process.nil?
   end
 end
 exit(status.to_i)

data/lib/voltos/version.rb

@@ -1,3 +1,3 @@
 module Voltos
-  VERSION = "0.3.0.rc10"
+  VERSION = "0.3.0.rc11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: voltos
 version: !ruby/object:Gem::Version
-  version: 0.3.0.rc10
+  version: 0.3.0.rc11
 platform: ruby
 authors:
 - Daniel May
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler