frontkick 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bb5e819a8afaf32b404b81f3b4d0792aa90f7b9
-  data.tar.gz: 9a35e8fafa3cfecde913653eaf4611a9ace3b70a
+  metadata.gz: 93bb374c56521e783c36f3e8fb2dc6dce5e16747
+  data.tar.gz: c24802f00fe4911982148fff88d6ae7609ec21a2
 SHA512:
-  metadata.gz: 628155e7ae55b811fee9f9727f429b5a6e8b50bf28d722618583b8d82627ce60640ac2263dda02d4c43d75ad03a9ac474483a5c0a170586b27c55e656321bfe8
-  data.tar.gz: 5baf25776ba2790a21c4f9156fdc78fe960fff48dee5357ad6b7e8e655b24549baff06f48c9be1ce66048ac7f0e6087f0e98dbc9aca9463b911480baf21f53dd
+  metadata.gz: c1dbd382e8c11c8cb220a4fe35cfb845c709aaa74b990abaf73e02d913cddca353143db60c96ac0f1c34aee3f516942b26bfbc23c8a0f58520cc67ae2966d63e
+  data.tar.gz: 807825ab7a7b3157358cd3345d5a1bdf6a0e9c7ef3d5b9e1376db1beaa50365384f1d839c02986c40ad00388f03db1cb7464c8b042b9e4bcc6687ce2b9ceaf16

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.5.4 (2017/01/12)
+
+Enhancements:
+
+- Support env argument
+
 # 0.5.3 (2017/01/12)
 
 Fixes:

data/README.md

@@ -70,6 +70,20 @@ 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:
+
+```
+spawn('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).
+
+```ruby
+result = Frontkick.exec({"FOO"=>"BAR"}, ["echo", "*"])
+```
+
 ### Dry Run Option
 
 ```ruby

data/example/env.rb

@@ -0,0 +1,7 @@
+require 'frontkick'
+
+result = Frontkick.exec({'FOO'=>'foo'}, 'env | grep FOO')
+puts result.stdout
+
+result = Frontkick.exec({'FOO'=>'foo'}, 'env | grep FOO', {dry_run: true})
+puts result.stdout

data/lib/frontkick.rb

@@ -5,8 +5,8 @@ require 'frontkick/command'
 require 'frontkick/result'
 
 module Frontkick
-  def self.exec(cmd, opts = {}, &block)
-    ::Frontkick::Command.exec(cmd, opts, &block)
+  def self.exec(*env_cmd, **opts, &block)
+    ::Frontkick::Command.exec(*env_cmd, opts, &block)
   end
 
   def self.process_wait(pid)

data/lib/frontkick/command.rb

@@ -4,7 +4,18 @@ require 'shellwords'
 
 module Frontkick
   class Command
-    def self.exec(cmd, opts = {}, &block)
+    def self.exec(*env_cmd, **opts, &block)
+      env, cmd = env_cmd.size >= 2 ? env_cmd : [{}, env_cmd.first]
+      # With this conversion,
+      #
+      #   popen3(env, *cmd_array, opts)
+      #
+      # works for both interface of:
+      #
+      #   popen3(env, command, opts)
+      #   popen3(env, program, *args, opts)
+      cmd_array = cmd.is_a?(Array) ? cmd : [cmd]
+
       opts[:timeout_kill] = true unless opts.has_key?(:timeout_kill) # default: true
 
       exit_code, duration = nil
@@ -32,11 +43,10 @@ module Frontkick
         err = StringIO.new
       end
 
-      cmd_array = cmd.kind_of?(Array) ? cmd : [cmd]
-      command = "#{cmd_array.first} #{Shellwords.shelljoin(cmd_array[1..-1])}"
-
       if opts[:dry_run]
-        return Result.new(:stdout => command, :stderr => '', :exit_code => 0, :duration => 0)
+        stdout = env.map {|k,v| "#{k}=#{v} " }.join('')
+        stdout << "#{cmd_array.first} #{Shellwords.shelljoin(cmd_array[1..-1])}"
+        return Result.new(:stdout => stdout, :stderr => '', :exit_code => 0, :duration => 0)
       end
 
       popen3_opts = self.popen3_opts(opts)
@@ -45,7 +55,7 @@ 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(*cmd_array, popen3_opts)
+            stdin, stdout, stderr, wait_thr = Open3.popen3(env, *cmd_array, popen3_opts)
             out_thr = Thread.new {
               begin
                 while true

data/lib/frontkick/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frontkick
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Naotoshi Seo
@@ -68,6 +68,7 @@ files:
 - README.md
 - Rakefile
 - example/dry_run.rb
+- example/env.rb
 - example/kill_child.rb
 - example/popen3_options.rb
 - example/redirect_without_shell.rb