tty-command 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3d696d9fa5255f95622561988eddfcb26650824
-  data.tar.gz: cf0fe3027e2e2958b55a1c99ce1f9769ccbd717a
+  metadata.gz: fb721a5620ec91bddc77643358783a38fb76631f
+  data.tar.gz: b0f3485e21f80e9172d1651eb661360fb3972d6f
 SHA512:
-  metadata.gz: 06bdcfbea782615ef663e866bc11862f7cc9046a98ce6748418d83c4d539597e93f6d31bd928477b91a08370c9db9cef33094252110e08439a06cc02bac7b60d
-  data.tar.gz: 94da004a191721e5d45e26f62587d5bfadb767fc083af00fa3eeac4d7e5520b7ec354578597b6c563bfb423adcb6d018e41d9215e8cf592099f79475dedf1e2c
+  metadata.gz: 3184987586dff4f957bbeee34cf0811f60c10db0f533fe48e957f171a3a1b22485f1e4970a7b4867466deb73ad95e9b3ae30c4194753724471756aece30446de
+  data.tar.gz: 1500b854c1a69a788e49226d28403f92ee28258b608939596e1da92296ff815623ef70885e0c54751e3a8769539fc5f6c8dfd973f69c43c87f112cbf575707ce

data/.travis.yml

@@ -2,13 +2,14 @@
 language: ruby
 sudo: false
 cache: bundler
+before_install: "gem update bundler"
 script: "bundle exec rake ci"
 rvm:
   - 2.0.0
   - 2.1.10
-  - 2.2.6
-  - 2.3.3
-  - 2.4.1
+  - 2.2.8
+  - 2.3.5
+  - 2.4.2
   - ruby-head
   - jruby-9.1.1.0
   - jruby-head

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Change log
 
+## [v0.7.0] - 2017-11-19
+
+### Added
+* Add :binmode option to allow configuring input & ouput as binary
+* Add :pty option to allow runnig commands in PTY(pseudo terminal)
+
+### Changed
+* Change Command to remove threads synchronization to leave it up to client to handle
+* Change Cmd to allow updating options
+* Change Command to accept options for all commands such as :timeout, :binmode etc...
+* Change Execute to ChildProcess module
+* Change ChildProcess to skip spawn redirect close options on Windows platform
+* Change to enforce UTF-8 encoding for process pipes to be cross platform
+* Change ProcessRunner to stop rescuing runtime failures
+* Change to stop mutating String instances
+
+### Fixed
+* Fix ProcessRunner threads deadlocking on exclusive mutex
+* Fix :timeout option to raise TimeoutExceeded error
+* Fix test suite to work on Windows
+* Fix Cmd arguments escaping
+
 ## [v0.6.0] - 2017-07-22
 
 ### Added
@@ -74,6 +96,9 @@
 
 * Initial implementation and release
 
+[v0.7.0]: https://github.com/piotrmurach/tty-command/compare/v0.6.0...v0.7.0
+[v0.6.0]: https://github.com/piotrmurach/tty-command/compare/v0.5.0...v0.6.0
+[v0.5.0]: https://github.com/piotrmurach/tty-command/compare/v0.4.0...v0.5.0
 [v0.4.0]: https://github.com/piotrmurach/tty-command/compare/v0.3.3...v0.4.0
 [v0.3.3]: https://github.com/piotrmurach/tty-command/compare/v0.3.2...v0.3.3
 [v0.3.2]: https://github.com/piotrmurach/tty-command/compare/v0.3.1...v0.3.2

data/Gemfile

@@ -6,3 +6,9 @@ group :test do
   gem 'simplecov', '~> 0.12.0'
   gem 'coveralls', '~> 0.8.17'
 end
+
+if RUBY_VERSION > '2.1.0'
+  group :perf do
+    gem 'memory_profiler', '~> 0.9.8'
+  end
+end

data/README.md

@@ -1,6 +1,8 @@
 # TTY::Command [![Gitter](https://badges.gitter.im/Join%20Chat.svg)][gitter]
+
 [![Gem Version](https://badge.fury.io/rb/tty-command.svg)][gem]
 [![Build Status](https://secure.travis-ci.org/piotrmurach/tty-command.svg?branch=master)][travis]
+[![Build status](https://ci.appveyor.com/api/projects/status/0150ync7bdkfhmsv?svg=true)][appveyor]
 [![Code Climate](https://codeclimate.com/github/piotrmurach/tty-command/badges/gpa.svg)][codeclimate]
 [![Coverage Status](https://coveralls.io/repos/github/piotrmurach/tty-command/badge.svg)][coverage]
 [![Inline docs](http://inch-ci.org/github/piotrmurach/tty-command.svg?branch=master)][inchpages]
@@ -8,6 +10,7 @@
 [gitter]: https://gitter.im/piotrmurach/tty
 [gem]: http://badge.fury.io/rb/tty-command
 [travis]: http://travis-ci.org/piotrmurach/tty-command
+[appveyor]: https://ci.appveyor.com/project/piotrmurach/tty-command
 [codeclimate]: https://codeclimate.com/github/piotrmurach/tty-command
 [coverage]: https://coveralls.io/github/piotrmurach/tty-command
 [inchpages]: http://inch-ci.org/github/piotrmurach/tty-command
@@ -56,14 +59,16 @@ Or install it yourself as:
 * [3. Advanced Interface](#3-advanced-interface)
   * [3.1. Environment variables](#31-environment-variables)
   * [3.2. Options](#32-options)
-    * [3.2.1. Current directory](#321-current-directory)
-    * [3.2.2. Redirection](#322-redirection)
-    * [3.2.3. Handling input](#323-handling-input)
-    * [3.2.4. Timeout](#324-timeout)
+    * [3.2.1. Redirection](#321-redirection)
+    * [3.2.2. Handling input](#322-handling-input)
+    * [3.2.3. Timeout](#323-timeout)
+    * [3.2.4. Binary mode](#324-binary-mode)
     * [3.2.5. Signal](#325-signal)
-    * [3.2.6. User](#326-user)
-    * [3.2.7. Group](#327-group)
-    * [3.2.8. Umask](#328-umask)
+    * [3.2.6. PTY(pseudo-terminal)](#326-ptypseudo-terminal)
+    * [3.2.7. Current directory](#327-current-directory)
+    * [3.2.8. User](#328-user)
+    * [3.2.9. Group](#329-group)
+    * [3.2.10. Umask](#3210-umask)
   * [3.3. Result](#33-result)
     * [3.3.1. success?](#331-success)
     * [3.3.2. failure?](#332-failure)
@@ -266,15 +271,7 @@ cmd.run(:echo, 'hello', env: {foo: 'bar', baz: nil})
 
 When a hash is given in the last argument (options), it allows to specify a current directory, umask, user, group and and zero or more fd redirects for the child process.
 
-#### 3.2.1 Current directory
-
-To change directory in which the command is run pass the `:chidir` option:
-
-```ruby
-cmd.run(:echo, 'hello', chdir: '/var/tmp')
-```
-
-#### 3.2.2 Redirection
+#### 3.2.1 Redirection
 
 There are few ways you can redirect commands output.
 
@@ -328,7 +325,7 @@ You can, for example, read data from one source and output to another:
 cmd.run("cat", :in => "Gemfile", :out => 'gemfile.log')
 ```
 
-#### 3.2.3 Handling Input
+#### 3.2.2 Handling Input
 
 You can provide input to stdin stream using the `:input` key. For instance, given the following executable called `cli` that expects name from `stdin`:
 
@@ -357,7 +354,7 @@ in_stream.rewind
 cmd.run("my_cli_program", "login", in: in_stream).out
 ```
 
-#### 3.2.4 Timeout
+#### 3.2.3 Timeout
 
 You can timeout command execuation by providing the `:timeout` option in seconds:
 
@@ -365,8 +362,28 @@ You can timeout command execuation by providing the `:timeout` option in seconds
 cmd.run("while test 1; sleep 1; done", timeout: 5)
 ```
 
+And to set it for all commands do:
+
+```ruby
+cmd = TTY::Command.new(timeout: 5)
+```
+
 Please run `examples/timeout.rb` to see timeout in action.
 
+#### 3.2.4 Binary mode
+
+By default the standard input, output and error are non-binary. However, you can change to read and write in binary mode by using the `:binmode` option like so:
+
+```ruby
+cmd.run("echo 'hello'", binmode: true)
+```
+
+To set all commands to be run in binary mode do:
+
+```ruby
+cmd = TTY::Command.new(binmode: true)
+```
+
 #### 3.2.5 Signal
 
 You can specify process termination signal other than the defaut `SIGTERM`:
@@ -375,7 +392,47 @@ You can specify process termination signal other than the defaut `SIGTERM`:
 cmd.run("whilte test1; sleep1; done", timeout: 5, signal: :KILL)
 ```
 
-#### 3.2.6 User
+#### 3.2.6 PTY(pseudo terminal)
+
+The `:pty` configuration option causes the command to be executed in subprocess where each stream is a pseudo terminal. By default this options is set to `false`. However, some comamnds may require a terminal like device to work correctly. For example, a command may emit colored output only if it is running via terminal.
+
+In order to run command in pseudo terminal, either set the flag globally for all commands:
+
+```ruby
+cmd = TTY::Command.new(pty: true)
+```
+
+or for each executed command individually:
+
+```ruby
+cmd.run("echo 'hello'", pty: true)
+```
+
+Please note though, that setting `:pty` to `true` may change how the command behaves. For instance, on unix like systems the line feed character `\n` in output will be prefixed with carriage return `\r`:
+
+```ruby
+out, _ = cmd.run("echo 'hello'")
+out # => "hello\n"
+```
+
+and with `:pty` option:
+
+```ruby
+out, _ = cmd.run("echo 'hello'", pty: true)
+out # => "hello\r\n"
+```
+
+In addition, any input to command may be echoed to the standard output.
+
+#### 3.2.7 Current directory
+
+To change directory in which the command is run pass the `:chdir` option:
+
+```ruby
+cmd.run(:echo, 'hello', chdir: '/var/tmp')
+```
+
+#### 3.2.8 User
 
 To run command as a given user do:
 
@@ -383,7 +440,7 @@ To run command as a given user do:
 cmd.run(:echo, 'hello', user: 'piotr')
 ```
 
-#### 3.2.7 Group
+#### 3.2.9 Group
 
 To run command as part of group do:
 
@@ -391,7 +448,7 @@ To run command as part of group do:
 cmd.run(:echo, 'hello', group: 'devs')
 ```
 
-#### 3.2.8 Umask
+#### 3.2.10 Umask
 
 To run command with umask do:
 

data/appveyor.yml

@@ -0,0 +1,24 @@
+---
+install:
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - ruby --version
+  - gem --version
+  - bundle install
+build: off
+test_script:
+  - bundle exec rake ci
+environment:
+  matrix:
+    - ruby_version: "200"
+    - ruby_version: "200-x64"
+    - ruby_version: "21"
+    - ruby_version: "21-x64"
+    - ruby_version: "22"
+    - ruby_version: "22-x64"
+    - ruby_version: "23"
+    - ruby_version: "23-x64"
+    - ruby_version: "24"
+    - ruby_version: "24-x64"
+matrix:
+  allow_failures:
+    - ruby_version: "193"

data/benchmarks/memory.rb

@@ -0,0 +1,11 @@
+# encoding: utf-8
+#
+require 'memory_profiler'
+require 'tty-command'
+
+report = MemoryProfiler.report do
+  cmd = TTY::Command.new(color: false)
+  cmd.run("echo 'hello world!'")
+end
+
+report.pretty_print(to_file: 'memory_report.txt')

data/examples/pty.rb

@@ -0,0 +1,7 @@
+require 'tty-command'
+
+cmd = TTY::Command.new
+
+path = File.expand_path("../spec/fixtures/color", __dir__)
+
+cmd.run(path, pty: true)

data/examples/threaded.rb

@@ -0,0 +1,12 @@
+require 'tty-command'
+
+cmd = TTY::Command.new
+
+threads = []
+3.times do |i|
+  th = Thread.new do
+    10.times { cmd.run("echo th#{i}; sleep 0.1") }
+  end
+  threads << th
+end
+threads.each(&:join)

data/lib/tty/command.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
 require 'rbconfig'
@@ -25,6 +24,8 @@ module TTY
       RbConfig::CONFIG['ruby_install_name'] + RbConfig::CONFIG['EXEEXT']
     )
 
+    WIN_PLATFORMS = /cygwin|mswin|mingw|bccwin|wince|emx/.freeze
+
     def self.record_separator
       @record_separator ||= $/
     end
@@ -33,6 +34,10 @@ module TTY
       @record_separator = sep
     end
 
+    def self.windows?
+      !!(RbConfig::CONFIG['host_os'] =~ WIN_PLATFORMS)
+    end
+
     attr_reader :printer
 
     # Initialize a Command object
@@ -46,13 +51,17 @@ module TTY
     #   the mode for executing command
     #
     # @api public
-    def initialize(options = {})
+    def initialize(**options)
       @output = options.fetch(:output) { $stdout }
       @color   = options.fetch(:color) { true }
       @uuid    = options.fetch(:uuid) { true }
       @printer_name = options.fetch(:printer) { :pretty }
       @dry_run = options.fetch(:dry_run) { false }
       @printer = use_printer(@printer_name, color: @color, uuid: @uuid)
+      @cmd_options = {}
+      @cmd_options[:pty] = true if options[:pty]
+      @cmd_options[:binmode] = true if options[:binmode]
+      @cmd_options[:timeout] = options[:timeout] if options[:timeout]
     end
 
     # Start external executable in a child process
@@ -163,15 +172,16 @@ module TTY
 
     # @api private
     def command(*args)
-      Cmd.new(*args)
+      cmd = Cmd.new(*args)
+      cmd.update(@cmd_options)
+      cmd
     end
 
     # @api private
     def execute_command(cmd, &block)
-      mutex = Mutex.new
       dry_run = @dry_run || cmd.options[:dry_run] || false
-      @runner = select_runner(dry_run).new(cmd, @printer)
-      mutex.synchronize { @runner.run!(&block) }
+      @runner = select_runner(dry_run).new(cmd, @printer, &block)
+      @runner.run!
     end
 
     # @api private

data/lib/tty/command/{execute.rb → child_process.rb}

@@ -3,10 +3,11 @@
 
 require 'tempfile'
 require 'securerandom'
+require 'io/console'
 
 module TTY
   class Command
-    module Execute
+    module ChildProcess
       # Execute command in a child process with all IO streams piped
       # in and out. The interface is similar to Process.spawn
       #
@@ -22,19 +23,45 @@ module TTY
       # @api public
       def spawn(cmd)
         process_opts = normalize_redirect_options(cmd.options)
+        binmode = cmd.options[:binmode] || false
+        pty     = cmd.options[:pty] || false
+
+        pty = try_loading_pty if pty
+        require('pty') if pty # load within this scope
 
         # Create pipes
-        in_rd,  in_wr  = IO.pipe # reading
-        out_rd, out_wr = IO.pipe # writing
-        err_rd, err_wr = IO.pipe # error
+        in_rd,  in_wr  = pty ? PTY.open : IO.pipe('utf-8') # reading
+        out_rd, out_wr = pty ? PTY.open : IO.pipe('utf-8') # writing
+        err_rd, err_wr = pty ? PTY.open : IO.pipe('utf-8') # error
         in_wr.sync = true
 
+        if binmode
+          in_wr.binmode
+          out_rd.binmode
+          err_rd.binmode
+        end
+
+        if pty
+          in_wr.raw!
+          out_wr.raw!
+          err_wr.raw!
+        end
+
         # redirect fds
         opts = {
-          :in  => in_rd,  in_wr  => :close,
-          :out => out_wr, out_rd => :close,
-          :err => err_wr, err_rd => :close
-        }.merge(process_opts)
+          in: in_rd,
+          out: out_wr,
+          err: err_wr
+        }
+        unless TTY::Command.windows?
+          close_child_fds = {
+            in_wr  => :close,
+            out_rd => :close,
+            err_rd => :close
+          }
+          opts.merge!(close_child_fds)
+        end
+        opts.merge!(process_opts)
 
         pid = Process.spawn(cmd.to_command, opts)
 
@@ -47,14 +74,28 @@ module TTY
           begin
             return yield(*tuple)
           ensure
+            # ensure parent pipes are closed
             [in_wr, out_rd, err_rd].each { |fd| fd.close if fd && !fd.closed? }
           end
         else
           tuple
         end
       end
+      module_function :spawn
 
-      private
+      # Try loading pty module
+      #
+      # @return [Boolean]
+      #
+      # @api private
+      def try_loading_pty
+        require 'pty'
+        true
+      rescue LoadError
+        warn("Requested PTY device but the system doesn't support it.")
+        false
+      end
+      module_function :try_loading_pty
 
       # Normalize spawn fd into :in, :out, :err keys.
       #
@@ -75,6 +116,7 @@ module TTY
           opts
         end
       end
+      module_function :normalize_redirect_options
 
       # Convert option pari to recognized spawn option pair
       #
@@ -93,6 +135,7 @@ module TTY
         end
         [key, value]
       end
+      module_function :convert
 
       # Determine if object is a fd
       #
@@ -110,6 +153,7 @@ module TTY
           respond_to?(:to_i) && !object.to_io.nil?
         end
       end
+      module_function :fd?
 
       # Convert fd to name :in, :out, :err
       #
@@ -132,6 +176,7 @@ module TTY
           raise ExecuteError, "Wrong execute redirect: #{object.inspect}"
         end
       end
+      module_function :fd_to_process_key
 
       # Convert file name to file handle
       #
@@ -149,6 +194,7 @@ module TTY
         tmp.rewind
         tmp
       end
+      module_function :convert_to_fd
 
       # Attempts to read object content
       #
@@ -162,6 +208,7 @@ module TTY
           object
         end
       end
-    end # Execute
+      module_function :try_reading
+    end # ChildProcess
   end # Command
 end # TTY

data/lib/tty/command/cmd.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'securerandom'
+require 'shellwords'
 
 module TTY
   class Command
@@ -46,7 +47,7 @@ module TTY
           else
             @command = sanitize(command)
           end
-          @argv = args.map { |i| shell_escape(i) }
+          @argv = args.map { |i| Shellwords.escape(i) }
         end
         @env ||= {}
         @options = opts
@@ -55,6 +56,13 @@ module TTY
         freeze
       end
 
+      # Extend command options if keys don't already exist
+      #
+      # @api public
+      def update(**options)
+        @options.update(options.update(@options))
+      end
+
       # The shell environment variables
       #
       # @api public
@@ -131,20 +139,6 @@ module TTY
       def sanitize(value)
         value.to_s.dup
       end
-
-      # Enclose argument in quotes if it contains
-      # characters that require escaping
-      #
-      # @param [String] arg
-      #   the argument to escape
-      #
-      # @api private
-      def shell_escape(arg)
-        str = arg.to_s.dup
-        return str if str =~ /^[0-9A-Za-z+,.\/:=@_-]+$/
-        str.gsub!("'", "'\\''")
-        "'#{str}'"
-      end
     end # Cmd
   end # Command
 end # TTY

data/lib/tty/command/printers/null.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
-require 'tty/command/printers/abstract'
+require_relative 'abstract'
 
 module TTY
   class Command

data/lib/tty/command/printers/pretty.rb

@@ -1,16 +1,20 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require 'pastel'
-require 'tty/command/printers/abstract'
+
+require_relative 'abstract'
 
 module TTY
   class Command
     module Printers
       class Pretty < Abstract
+        TIME_FORMAT = "%5.3f %s".freeze
+
         def print_command_start(cmd, *args)
-          message = "Running #{decorate(cmd.to_command, :yellow, :bold)}"
+          message = ["Running #{decorate(cmd.to_command, :yellow, :bold)}"]
           message << args.map(&:chomp).join(' ') unless args.empty?
-          write(message, cmd.uuid)
+          write(message.join, cmd.uuid)
         end
 
         def print_command_out_data(cmd, *args)
@@ -24,11 +28,11 @@ module TTY
         end
 
         def print_command_exit(cmd, status, runtime, *args)
-          runtime = "%5.3f %s" % [runtime, pluralize(runtime, 'second')]
-          message = "Finished in #{runtime}"
+          runtime = TIME_FORMAT % [runtime, pluralize(runtime, 'second')]
+          message = ["Finished in #{runtime}"]
           message << " with exit status #{status}" if status
           message << " (#{success_or_failure(status)})"
-          write(message, cmd.uuid)
+          write(message.join, cmd.uuid)
         end
 
         # Write message out to output
@@ -36,12 +40,12 @@ module TTY
         # @api private
         def write(message, uuid = nil)
           uuid_needed = options.fetch(:uuid) { true }
-          out = ''
+          out = []
           if uuid_needed
             out << "[#{decorate(uuid, :green)}] " unless uuid.nil?
           end
           out << "#{message}\n"
-          output << out
+          output << out.join
         end
 
         private

data/lib/tty/command/printers/progress.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require 'pastel'
-require 'tty/command/printers/abstract'
+require_relative 'abstract'
 
 module TTY
   class Command

data/lib/tty/command/printers/quiet.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'tty/command/printers/abstract'
+require_relative 'abstract'
 
 module TTY
   class Command

data/lib/tty/command/process_runner.rb

@@ -3,15 +3,13 @@
 
 require 'thread'
 
-require_relative 'execute'
+require_relative 'child_process'
 require_relative 'result'
 require_relative 'truncator'
 
 module TTY
   class Command
     class ProcessRunner
-      include Execute
-
       # the command to be spawned
       attr_reader :cmd
 
@@ -21,28 +19,45 @@ module TTY
       #   the printer to use for logging
       #
       # @api private
-      def initialize(cmd, printer)
+      def initialize(cmd, printer, &block)
         @cmd     = cmd
         @timeout = cmd.options[:timeout]
         @input   = cmd.options[:input]
         @signal  = cmd.options[:signal] || :TERM
         @printer = printer
-        @threads = []
-        @lock    = Mutex.new
+        @block   = block
       end
 
       # Execute child process
+      #
+      # Write the input if provided to the child's stdin and read
+      # the contents of both the stdout and stderr.
+      #
+      # If a block is provided then yield the stdout and stderr content
+      # as its being read.
+      #
       # @api public
-      def run!(&block)
+      def run!
         @printer.print_command_start(cmd)
         start = Time.now
         runtime = 0.0
 
-        pid, stdin, stdout, stderr = spawn(cmd)
+        pid, stdin, stdout, stderr = ChildProcess.spawn(cmd)
+
+        # no input to write, close child's stdin pipe
+        stdin.close if (@input.nil? || @input.empty?) && !stdin.nil?
 
-        # write and read streams
-        write_stream(stdin)
-        stdout_data, stderr_data = read_streams(stdout, stderr, &block)
+        readers = [stdout, stderr]
+        writers = [@input && stdin].compact
+
+        while writers.any?
+          ready_readers, ready_writers = IO.select(readers, writers, [], @timeout)
+          raise TimeoutExceeded if ready_readers.nil? || ready_writers.nil?
+
+          write_stream(ready_writers, writers)
+        end
+
+        stdout_data, stderr_data = read_streams(stdout, stderr)
 
         status = waitpid(pid)
         runtime = Time.now - start
@@ -50,9 +65,6 @@ module TTY
         @printer.print_command_exit(cmd, status, runtime)
 
         Result.new(status, stdout_data, stderr_data, runtime)
-      rescue
-        terminate(pid)
-        Result.new(-1, stdout_data, stderr_data)
       ensure
         [stdin, stdout, stderr].each { |fd| fd.close if fd && !fd.closed? }
       end
@@ -76,32 +88,31 @@ module TTY
         raise TimeoutExceeded if t < 0.0
       end
 
+      # Write the input to the process stdin
+      #
       # @api private
-      def write_stream(stdin)
-        return unless @input
-        writers = [stdin]
+      def write_stream(ready_writers, writers)
         start = Time.now
-
-        # wait when ready for writing to pipe
-        _, writable = IO.select(nil, writers, writers, @timeout)
-        raise TimeoutExceeded if writable.nil?
-
-        while writers.any?
-          writable.each do |fd|
-            begin
-              err   = nil
-              size  = fd.write(@input)
-              @input = @input.byteslice(size..-1)
-            rescue Errno::EPIPE => err
-            end
-            if err || @input.bytesize == 0
-              writers.delete(stdin)
-            end
-
-            # control total time spent writing
-            runtime = Time.now - start
-            handle_timeout(runtime)
+        ready_writers.each do |fd|
+          begin
+            err   = nil
+            size  = fd.write(@input)
+            @input = @input.byteslice(size..-1)
+          rescue IO::WaitWritable
+          rescue Errno::EPIPE => err
+            # The pipe closed before all input written
+            # Probably process exited prematurely
+            fd.close
+            writers.delete(fd)
+          end
+          if err || @input.bytesize == 0
+            fd.close
+            writers.delete(fd)
           end
+
+          # control total time spent writing
+          runtime = Time.now - start
+          handle_timeout(runtime)
         end
       end
 
@@ -111,45 +122,45 @@ module TTY
       # @param [IO] stderr
       #
       # @api private
-      def read_streams(stdout, stderr, &block)
+      def read_streams(stdout, stderr)
         stdout_data = []
         stderr_data = Truncator.new
 
-        print_out = -> (cmd, line) { @printer.print_command_out_data(cmd, line) }
-        print_err = -> (cmd, line) { @printer.print_command_err_data(cmd, line) }
+        out_buffer = -> (line) {
+          stdout_data << line
+          @printer.print_command_out_data(cmd, line)
+          @block.(line, nil) if @block
+        }
 
-        stdout_yield = -> (line) { block.(line, nil) if block }
-        stderr_yield = -> (line) { block.(nil, line) if block }
+        err_buffer = -> (line) {
+          stderr_data << line
+          @printer.print_command_err_data(cmd, line)
+          @block.(nil, line) if @block
+        }
 
-        @threads << read_stream(stdout, stdout_data, print_out, stdout_yield)
-        @threads << read_stream(stderr, stderr_data, print_err, stderr_yield)
+        stdout_thread = read_stream(stdout, out_buffer)
+        stderr_thread = read_stream(stderr, err_buffer)
 
-        @threads.each do |th|
-          result = th.join(@timeout)
-          if result.nil?
-            @threads[0].raise
-            @threads[1].raise
-          end
-        end
+        stdout_thread.join
+        stderr_thread.join
 
         [stdout_data.join, stderr_data.read]
       end
 
-      def read_stream(stream, data, print_callback, callback)
+      def read_stream(stream, buffer)
         Thread.new do
           Thread.current[:cmd_start] = Time.now
           begin
             while (line = stream.gets)
-              @lock.synchronize do
-                data << line
-                callback.(line)
-                print_callback.(cmd, line)
-              end
+              buffer.(line)
 
               # control total time spent reading
               runtime = Time.now - Thread.current[:cmd_start]
               handle_timeout(runtime)
             end
+          rescue Errno::EIO
+            # GNU/Linux `gets` raises when PTY slave is closed
+            nil
           rescue => err
             raise err
           ensure

data/lib/tty/command/version.rb

@@ -2,6 +2,6 @@
 
 module TTY
   class Command
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
   end # Command
 end # TTY

data/tasks/console.rake

@@ -4,7 +4,8 @@ desc 'Load gem inside irb console'
 task :console do
   require 'irb'
   require 'irb/completion'
-  require File.join(__FILE__, '../../lib/tty-command')
+  require_relative '../lib/tty-command'
   ARGV.clear
   IRB.start
 end
+task :c => :console

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tty-command
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-22 00:00:00.000000000 Z
+date: 2017-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pastel
@@ -90,6 +90,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- appveyor.yml
+- benchmarks/memory.rb
 - bin/console
 - bin/setup
 - examples/bash.rb
@@ -98,17 +100,19 @@ files:
 - examples/env.rb
 - examples/logger.rb
 - examples/output.rb
+- examples/pty.rb
 - examples/redirect_stderr.rb
 - examples/redirect_stdin.rb
 - examples/redirect_stdout.rb
 - examples/stdin_input.rb
+- examples/threaded.rb
 - examples/timeout.rb
 - examples/wait.rb
 - lib/tty-command.rb
 - lib/tty/command.rb
+- lib/tty/command/child_process.rb
 - lib/tty/command/cmd.rb
 - lib/tty/command/dry_runner.rb
-- lib/tty/command/execute.rb
 - lib/tty/command/exit_error.rb
 - lib/tty/command/printers/abstract.rb
 - lib/tty/command/printers/null.rb