frontkick 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93bb374c56521e783c36f3e8fb2dc6dce5e16747
-  data.tar.gz: c24802f00fe4911982148fff88d6ae7609ec21a2
+  metadata.gz: 15b843028a22925691e8f1746f64512fcc4b5e41
+  data.tar.gz: 365e8d2f64e51103895af090c1ea5ef14cd66fb9
 SHA512:
-  metadata.gz: c1dbd382e8c11c8cb220a4fe35cfb845c709aaa74b990abaf73e02d913cddca353143db60c96ac0f1c34aee3f516942b26bfbc23c8a0f58520cc67ae2966d63e
-  data.tar.gz: 807825ab7a7b3157358cd3345d5a1bdf6a0e9c7ef3d5b9e1376db1beaa50365384f1d839c02986c40ad00388f03db1cb7464c8b042b9e4bcc6687ce2b9ceaf16
+  metadata.gz: dd1f32da4df783699687b209a3475f47f07dcf4b973090784a3601dc00ae2f07893300c08eb51b88e9c0df68b69b8987468dabb34a71c310631547a07c5838ec
+  data.tar.gz: 5e870eb23d7ccaba8655134131fac61f3653f8ac98bf1f16b0b30e68558474dfec6e28bfb5d16c611cb0537695836aa8acea5ba131b19b87912dcb7655f607f8

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.5.5 (2017/03/20)
+
+Enhancements:
+
+- Add :popen2e option
+
 # 0.5.4 (2017/01/12)
 
 Enhancements:

data/README.md

@@ -70,12 +70,18 @@ ruby
 └─ echo
 ```
 
-NOTE: This interface is different with Kernel.spawn or Open3.popen3. They works with no shell if multiple arguments are given rather than an array as:
+NOTE: This interface is different with Kernel.spawn or Open3.popen3, but similar to IO.popen. Kernel.spawn or Open3.popen3 works with no shell if multiple arguments are given:
 
 ```
 spawn('echo', '*')
 ```
 
+IO.popen works with no shell if an array argument is given:
+
+```
+IO.popen(['echo', '*'])
+```
+
 ### Environment Variables
 
 You can pass environment variables as a hash for the 1st argument as [spawn](https://ruby-doc.org/core-2.4.0/Kernel.html#method-i-spawn).
@@ -133,6 +139,15 @@ Frontkick.exec(["ls /something_not_found"], :out => out, :err => err)
 
 You can also give IO objects. In this case, result.stdout, and result.stderr are the given IO objects.
 
+### Popen2e Option (Get stdout and stderr together)
+
+```ruby
+result = Frontkick.exec("echo foo; ls /something_not_found", :popen2e => true)
+puts result.output #=>
+foo
+ls: /something_not_found: No such file or directory
+```
+
 ### Popen3 Options (such as :chdir)
 
 Other options such as :chdir are treated as options of `Open3.#popen3`.

data/example/popen2e.rb

@@ -0,0 +1,4 @@
+require 'frontkick'
+
+result = Frontkick.exec(["pwd; ls /something_not_found"], :chdir => '/', :popen2e => true)
+puts result.output

data/example/redirect.rb

@@ -0,0 +1,5 @@
+require 'frontkick'
+
+$stdout.sync = true
+$stderr.sync = true
+result = Frontkick.exec(["#{__dir__}/../experiment/redirect_child.rb"], out: $stdout, err: $stderr)

data/experiment/redirect_child.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+$stdout.sync = true
+
+5.times do |i|
+  $stdout.puts 'a' * 10
+  sleep 1
+end

data/lib/frontkick/command.rb

@@ -55,32 +55,52 @@ module Frontkick
       begin
         ::Timeout.timeout(opts[:timeout], Frontkick::TimeoutLocal) do # nil is for no timeout
           duration = Benchmark.realtime do
-            stdin, stdout, stderr, wait_thr = Open3.popen3(env, *cmd_array, popen3_opts)
-            out_thr = Thread.new {
-              begin
-                while true
-                  out.write stdout.readpartial(4096)
+            if opts[:popen2e]
+              stdin, stdout, wait_thr = Open3.popen2e(env, *cmd_array, popen3_opts)
+              out_thr = Thread.new {
+                begin
+                  while true
+                    out.write stdout.readpartial(4096)
+                  end
+                rescue EOFError
                 end
-              rescue EOFError
-              end
-            }
-            err_thr = Thread.new {
-              begin
-                while true
-                  err.write stderr.readpartial(4096)
+              }
+              stdin.close
+              pid = wait_thr.pid
+
+              yield(wait_thr) if block_given?
+
+              out_thr.join
+              exit_code = wait_thr.value.exitstatus
+              process_wait(pid)
+            else
+              stdin, stdout, stderr, wait_thr = Open3.popen3(env, *cmd_array, popen3_opts)
+              out_thr = Thread.new {
+                begin
+                  while true
+                    out.write stdout.readpartial(4096)
+                  end
+                rescue EOFError
+                end
+              }
+              err_thr = Thread.new {
+                begin
+                  while true
+                    err.write stderr.readpartial(4096)
+                  end
+                rescue EOFError
                 end
-              rescue EOFError
-              end
-            }
-            stdin.close
-            pid = wait_thr.pid
-
-            yield(wait_thr) if block_given?
-
-            out_thr.join
-            err_thr.join
-            exit_code = wait_thr.value.exitstatus
-            process_wait(pid)
+              }
+              stdin.close
+              pid = wait_thr.pid
+
+              yield(wait_thr) if block_given?
+
+              out_thr.join
+              err_thr.join
+              exit_code = wait_thr.value.exitstatus
+              process_wait(pid)
+            end
           end
         end
       rescue Frontkick::TimeoutLocal => e
@@ -121,6 +141,7 @@ module Frontkick
         o.delete(:timeout)
         o.delete(:out)
         o.delete(:err)
+        o.delete(:popen2e)
       }
     end
 

data/lib/frontkick/version.rb

@@ -1,3 +1,3 @@
 module Frontkick
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frontkick
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-12 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -70,7 +70,9 @@ files:
 - example/dry_run.rb
 - example/env.rb
 - example/kill_child.rb
+- example/popen2e.rb
 - example/popen3_options.rb
+- example/redirect.rb
 - example/redirect_without_shell.rb
 - example/run.rb
 - experiment/capture3_no_deadlock.rb
@@ -78,6 +80,7 @@ files:
 - experiment/cat_64k.rb
 - experiment/popen3_deadlock.rb
 - experiment/popen3_no_deadlock.rb
+- experiment/redirect_child.rb
 - frontkick.gemspec
 - lib/frontkick.rb
 - lib/frontkick/command.rb
@@ -104,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Execute a command simply!