voltos 0.3.0.rc11 → 0.3.0.rc12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95927f2e70936a2a34eba426842f51affd050a7e
-  data.tar.gz: b13eb1e0e9e464dcb1938e2f2a9de3eac6a10438
+  metadata.gz: 6108fdaecd4dee14499bcae26dd4f5a92c819cfe
+  data.tar.gz: 91d77ea706f913b4158982679621c685da45250d
 SHA512:
-  metadata.gz: 154886e9b986bde9d457da7eb0f2929779796a98b9a11c1520c84c68806fedde3d84d5d3e7deb77880fca3dad8757398960bbe7813473b2445f96cc687152bcf
-  data.tar.gz: acebddbec308e50d4f11b0b44a25d20a87133a1dacb396bee50a5ef905a5284c8a64950e9e65e5436db231bcb1c4992edd5928f488e74cce00ffa6e59d5bc37d
+  metadata.gz: fe7e57721b997651e8af022d97640a5a2fbd1fb33c0946aae5922f1362f8a8eef57b535cd0f80c91d4566326c032c164063f7e3c361a19a7e75072f522ee5c65
+  data.tar.gz: 9baf412dbb50c35f7f781a66b2a82b1cb294ef0484199ae57e5a6dceeb993e81ab1a973c9bc067c3d09285f1fd1c155021904771b9c5c32d1fd1887df5c98034

data/exe/voltos

@@ -2,10 +2,10 @@
 require 'pty'
 require 'open3'
 require 'readline'
-STDOUT.sync = true
-bin = "#{Gem.bin_path('voltos', 'voltos')}-cli"
-if STDIN.tty?
-  status = PTY.spawn(bin, *ARGV) do |stdout, stdin, pid|
+
+def run_as_tty(bin, args)
+  STDOUT.sync = true
+  status = PTY.spawn(bin, *args) do |stdout, stdin, pid|
     stdout.sync = true
     Thread.new do
       loop do
@@ -25,34 +25,54 @@ if STDIN.tty?
     end
     begin
       Process::waitpid(pid) rescue nil
-      while out = stdout.getc do
-        STDOUT.print out
-      end
     rescue SystemExit, Interrupt
       Process.kill('INT', pid)
       retry
     rescue EOFError
-      puts "Ctrl-D"
-    rescue IOError
+    rescue IOError, Errno::EIO
     end
   end
-else
+  status
+end
+
+def run_as_daemon(bin, args)
+  process = nil
   Open3.popen3(bin, *ARGV) do |stdin, stdout, stderr, thread|
+    Thread.new do
+      while !stdin.closed? do
+        input = Readline.readline("", true).strip
+        stdin.puts input
+      end
+    end
+
     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
-    Process::waitpid(thread.pid) rescue nil
-    errThread.join
-    outThread.join
-    process = thread.value
-    status = process.exitstatus.to_i if !process.nil?
+
+    begin
+      Process::waitpid(thread.pid) rescue nil
+      errThread.join
+      outThread.join
+      process = thread.value
+    rescue SystemExit, Interrupt
+      retry
+    end
   end
+  return process.exitstatus if process
+end
+
+bin = "#{Gem.bin_path('voltos', 'voltos')}-cli"
+if STDIN.tty?
+  status = run_as_tty(bin, ARGV)
+else
+  status = run_as_daemon(bin, ARGV)
 end
 exit(status.to_i)

data/lib/voltos/version.rb

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

metadata

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