rspec-bash-x 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74cf305ed10730b811f278b17e84579525ca2f75
-  data.tar.gz: 69fafdc217a018885b31b568ac0a7f95c0752bdb
+  metadata.gz: 3143908ceef94f9985ca5a4234aa841fb2eb5ea1
+  data.tar.gz: 2af3b25aad667a9405d148e6b119ed85296a73e3
 SHA512:
-  metadata.gz: 335ba43a3659066d595d1dd6e085c6ba6f1503e5d24730adf808764c1a0a0394ccebf4d31d07185517b15cf05b577e265019f3b968f1b04252a08ed8143c87b5
-  data.tar.gz: 39decb1ca2a1193e0c7eb4046d572e8454dd9e8b289f1bff4db8efbf53bf9bfca8c2492b8b5d2bd8acf0eeaf346aad8d3580e09a39ce9c539e5d70ac620762bf
+  metadata.gz: e448146c650e50bd0a29deb61b4a1b0a3d549fbc9cbc6ab0d466f65ca89051a401fd09571222814dc3f923188171d2fabe5748617b0221bfc12f0231cc1fb8b3
+  data.tar.gz: 341db330bcd0436793bc122af9eff45c6d87b0e6c32750fa29e988635ab9611c5721c23a8e8b706d914ab600d5e934ee60b9fc7f2640adc38ae4d541cce95fea

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 1.2.0
+
+- ScriptEvaluator#run_script now accepts `env:` hash after command arguments

data/lib/rspec/bash/open3.rb

@@ -9,7 +9,7 @@ module RSpec
       # the descriptors are available as 62 (child read) and 63 (child write)
       #
       # @param [Array<String>] cmd
-      def self.popen3X(cmd, read_fd: 62, write_fd: 63, &block)
+      def self.popen3X(cmd, read_fd: 62, write_fd: 63, env: {}, &block)
         in_r, in_w = IO.pipe
         out_r, out_w = IO.pipe
         err_r, err_w = IO.pipe
@@ -23,13 +23,13 @@ module RSpec
         opts[read_fd] = r2b_r
         opts[write_fd] = b2r_w
 
-        env = {
+        combined_env = env.merge({
           "BASHIT_R_FD" => "#{read_fd}",
           "BASHIT_W_FD" => "#{write_fd}"
-        }
+        })
 
         ::Open3.send(:popen_run,
-          [env] + cmd,
+          [combined_env] + cmd,
           opts,
           [in_r, out_w, err_w, r2b_r, b2r_w], # child_io
           [in_w, out_r, err_r, r2b_w, b2r_r], # parent_io

data/lib/rspec/bash/script_evaluator.rb

@@ -25,7 +25,7 @@ module RSpec
       # @param [Number?] options.write_fd
       # @param [Number?] options.throttle
       def eval(script, args = [], **opts)
-        file = Tempfile.new('rspec_bash')
+        file = opts.fetch(:file, Tempfile.new('rspec_bash'))
         file.write(script.to_s)
         file.close
         verbose = opts.fetch(:verbose, Bash.configuration.verbose)
@@ -35,7 +35,8 @@ module RSpec
 
         Bash::Open3.popen3X([ '/usr/bin/env', 'bash', file.path ].concat(args), {
           read_fd: opts.fetch(:read_fd, Bash.configuration.read_fd),
-          write_fd: opts.fetch(:write_fd, Bash.configuration.write_fd)
+          write_fd: opts.fetch(:write_fd, Bash.configuration.write_fd),
+          env: opts.fetch(:env, {})
         }) do |input, stdout, stderr, r2b, b2r, wait_thr|
           workers = []
 
@@ -83,7 +84,7 @@ module RSpec
           try_hard "shut off workers" do workers.map(&:join) end
           try_hard "kill them all" do workers.map(&:kill) end
           try_hard "clean up temp bus file" do bus_file.unlink end
-          try_hard "clean up source file" do file.unlink end
+          try_hard "clean up source file" do file.unlink unless opts.key?(:file) end
 
           script.track_exit_code wait_thr.value.exitstatus
 

data/lib/rspec/bash/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Bash
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-bash-x
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ahmad Amireh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support