childprocess 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c4f97dba977d63da875a3d6db8f5587f7b22461
-  data.tar.gz: ee29a0a23a7b3e157ccb40b7ec1a5b052cfe8260
+  metadata.gz: 77e7009c5202bfecb17e331b56d15c79b92d33b0
+  data.tar.gz: 343d119d1130d05fe395d5ee2631aeb1a50866a0
 SHA512:
-  metadata.gz: f8c08e7184c5395508087fabf42f0dd8b96b289e563c70123a59704017fcf57f7bffdfbe02a55d188a7688a0bb6e2710143f79532df4e3d8dc9bab3666d1bd19
-  data.tar.gz: b29cfe1b27fd74a17ffc04a1d3c3e43b80265dd94a1dd0750940cc970475164d0f52318e663c7b8240d65ab6cc66272ba5f0f2b98f514bd99fb79aadd4ce54d6
+  metadata.gz: f84deda774210ec0d133c08095389c212770ed6afa58b37bddef82a7ca0513e76fcdcd3aaeb0ea4ca0e878329c160a7d9ba4770f19faceb472d9dbe9333cc45a
+  data.tar.gz: 7ded6c7fa7364c4c5fe423c7a06e671dce947e6290e62fb3d4be7d62554be1339e0e706159ee9fc4350c0a3a1fc4f5f608122c2c281780485793523d42dcfb5f

data/.travis.yml

@@ -6,8 +6,8 @@ rvm:
   - 2.1.0
   - ruby-head
 env:
-  - CHILDPROCESS_POSIX_SPAWN=true
-  - CHILDPROCESS_POSIX_SPAWN=false
+  - CHILDPROCESS_POSIX_SPAWN=true CHILDPROCESS_UNSET=should-be-unset
+  - CHILDPROCESS_POSIX_SPAWN=false CHILDPROCESS_UNSET=should-be-unset
 matrix:
   allow_failures:
     - rvm: rbx

data/README.md

@@ -142,6 +142,17 @@ process.detach = true
 process.start
 ```
 
+#### Invoking a shell
+
+As opposed to `Kernel#system`, `Kernel#exec` et al., ChildProcess will not automatically execute your command in a shell (like `/bin/sh` or `cmd.exe`) depending on the arguments.
+This means that if you try to execute e.g. gem executables (like `bundle` or `gem`) or Windows executables (with `.com` or `.bat` extensions) you may see a `ChildProcess::LaunchError`.
+You can work around this by being explicit about what interpreter to invoke:
+
+```ruby
+ChildProcess.build("cmd.exe", "/c", "bundle")
+ChildProcess.build("ruby", "-S", "bundle")
+```
+
 # Implementation
 
 How the process is launched and killed depends on the platform:

data/childprocess.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rspec", ">= 2.0.0"
+  s.add_development_dependency "rspec", "~> 3.0.0"
   s.add_development_dependency "yard", ">= 0"
   s.add_development_dependency "rake", "~> 0.9.2"
   s.add_development_dependency 'coveralls'

data/lib/childprocess/jruby/process.rb

@@ -21,7 +21,8 @@ module ChildProcess
         stop_pumps
 
         true
-      rescue java.lang.IllegalThreadStateException
+      rescue java.lang.IllegalThreadStateException => ex
+        log(ex.class => ex.message)
         false
       ensure
         log(:exit_code => @exit_code)
@@ -113,7 +114,11 @@ module ChildProcess
 
       def set_env(env)
         ENV.to_hash.merge(@environment).each do |k,v|
-          env.put(k.to_s, v.to_s) if v
+          if v
+            env.put(k.to_s, v.to_s)
+          else
+            env.remove(k.to_s) if env.key?(k.to_s)
+          end
         end
       end
 

data/lib/childprocess/version.rb

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

data/spec/abstract_io_spec.rb

@@ -6,7 +6,7 @@ describe ChildProcess::AbstractIO do
   it "inherits the parent's IO streams" do
     io.inherit!
 
-    io.stdout.should eq STDOUT
-    io.stderr.should eq STDERR
+    expect(io.stdout).to eq STDOUT
+    expect(io.stderr).to eq STDERR
   end
 end

data/spec/childprocess_spec.rb

@@ -6,8 +6,8 @@ describe ChildProcess do
   it "returns self when started" do
     process = sleeping_ruby
 
-    process.start.should eq process
-    process.should be_started
+    expect(process.start).to eq process
+    expect(process).to be_alive
   end
 
   # We can't detect failure to execve() when using posix_spawn() on Linux
@@ -30,35 +30,35 @@ describe ChildProcess do
     process = exit_with(1).start
     process.wait
 
-    process.should be_crashed
+    expect(process).to be_crashed
   end
 
   it "knows if the process didn't crash" do
     process = exit_with(0).start
     process.wait
 
-    process.should_not be_crashed
+    expect(process).to_not be_crashed
   end
 
   it "can wait for a process to finish" do
     process = exit_with(0).start
     return_value = process.wait
 
-    process.should_not be_alive
-    return_value.should == 0
+    expect(process).to_not be_alive
+    expect(return_value).to eq 0
   end
 
   it 'ignores #wait if process already finished' do
     process = exit_with(0).start
     sleep 0.01 until process.exited?
 
-    process.wait.should == 0
+    expect(process.wait).to eql 0
   end
 
   it "escalates if TERM is ignored" do
     process = ignored('TERM').start
     process.stop
-    process.should be_exited
+    expect(process).to be_exited
   end
 
   it "accepts a timeout argument to #stop" do
@@ -74,7 +74,7 @@ describe ChildProcess do
       end
 
       child_env = eval rewind_and_read(file)
-      child_env['INHERITED'].should == 'yes'
+      expect(child_env['INHERITED']).to eql 'yes'
     end
   end
 
@@ -84,12 +84,12 @@ describe ChildProcess do
       process.environment['CHILD_ONLY'] = '1'
       process.start
 
-      ENV['CHILD_ONLY'].should be_nil
+      expect(ENV['CHILD_ONLY']).to be_nil
 
       process.wait
 
       child_env = eval rewind_and_read(file)
-      child_env['CHILD_ONLY'].should == '1'
+      expect(child_env['CHILD_ONLY']).to eql '1'
     end
   end
 
@@ -104,8 +104,8 @@ describe ChildProcess do
 
         child_env = eval rewind_and_read(file)
 
-        child_env['INHERITED'].should eq 'yes'
-        child_env['CHILD_ONLY'].should eq 'yes'
+        expect(child_env['INHERITED']).to eq 'yes'
+        expect(child_env['CHILD_ONLY']).to eq 'yes'
       end
     end
   end
@@ -120,7 +120,7 @@ describe ChildProcess do
       process.wait
 
       child_env = eval rewind_and_read(file)
-      child_env.should_not have_key('CHILDPROCESS_UNSET')
+      expect(child_env).to_not have_key('CHILDPROCESS_UNSET')
     end
   end
 
@@ -132,12 +132,13 @@ describe ChildProcess do
       process = write_argv(file.path, *args).start
       process.wait
 
-      rewind_and_read(file).should == args.inspect
+      expect(rewind_and_read(file)).to eql args.inspect
     end
   end
 
   it "lets a detached child live on" do
     pending "how do we spec this?"
+    fail
   end
 
   it "preserves Dir.pwd in the child" do
@@ -153,7 +154,7 @@ describe ChildProcess do
 
       process.wait
 
-      rewind_and_read(file).should == expected_dir
+      expect(rewind_and_read(file)).to eq expected_dir
     end
   end
 
@@ -164,7 +165,7 @@ describe ChildProcess do
       process = write_argv(file.path, *args).start
       process.wait
 
-      rewind_and_read(file).should == args.inspect
+      expect(rewind_and_read(file)).to eq args.inspect
     end
   end
 
@@ -172,14 +173,14 @@ describe ChildProcess do
     path = File.expand_path('foo bar')
 
     with_executable_at(path) do |proc|
-      proc.start.should eq proc
-      proc.should be_started
+      expect(proc.start).to eq proc
+      expect(proc).to be_alive
     end
   end
 
   it "times out when polling for exit" do
     process = sleeping_ruby.start
-    lambda { process.poll_for_exit(0.1) }.should raise_error(ChildProcess::TimeoutError)
+    expect { process.poll_for_exit(0.1) }.to raise_error(ChildProcess::TimeoutError)
   end
 
   it "can change working directory" do
@@ -196,10 +197,10 @@ describe ChildProcess do
         process.start
         process.wait
 
-        rewind_and_read(file).should == dir
+        expect(rewind_and_read(file)).to eq dir
       end
 
-      Dir.pwd.should == orig_pwd
+      expect(Dir.pwd).to eq orig_pwd
     }
   end
 
@@ -214,7 +215,7 @@ describe ChildProcess do
       end
 
       process.stop
-      wait_until(3) { alive?(pid).should be_false }
+      wait_until(3) { expect(alive?(pid)).to eql(false) }
     end
   end
 
@@ -223,7 +224,7 @@ describe ChildProcess do
     threads = []
 
     threads << Thread.new { sleeping_ruby(1).start.wait }
-    threads << Thread.new(time) { (Time.now - time).should < 0.5 }
+    threads << Thread.new(time) { expect(Time.now - time).to be < 0.5 }
 
     threads.each { |t| t.join }
   end

data/spec/io_spec.rb

@@ -17,11 +17,11 @@ describe ChildProcess do
       process.io.stderr = err
 
       process.start
-      process.io.stdin.should be_nil
+      expect(process.io.stdin).to be_nil
       process.wait
 
-      rewind_and_read(out).should eq "0\n"
-      rewind_and_read(err).should eq "1\n"
+      expect(rewind_and_read(out)).to eq "0\n"
+      expect(rewind_and_read(err)).to eq "1\n"
     ensure
       out.close
       err.close
@@ -44,7 +44,7 @@ describe ChildProcess do
       process.start
       process.wait
 
-      rewind_and_read(out).should == "0\n"
+      expect(rewind_and_read(out)).to eq "0\n"
     ensure
       out.close
     end
@@ -61,7 +61,7 @@ describe ChildProcess do
       process.start
       process.wait
 
-      rewind_and_read(out).should == "hello\n"
+      expect(rewind_and_read(out)).to eq "hello\n"
     ensure
       out.close
     end
@@ -84,7 +84,7 @@ describe ChildProcess do
 
       process.poll_for_exit(exit_timeout)
 
-      rewind_and_read(out).should == "hello world\n"
+      expect(rewind_and_read(out)).to eq "hello world\n"
     ensure
       out.close
     end
@@ -108,23 +108,23 @@ describe ChildProcess do
 
       stdin.puts "hello"
       stdin.flush
-      wait_until { rewind_and_read(out_receiver).should =~ /\Ahello\r?\n\z/m }
+      wait_until { expect(rewind_and_read(out_receiver)).to match(/\Ahello\r?\n\z/m) }
 
       stdin.putc "n"
       stdin.flush
-      wait_until { rewind_and_read(out_receiver).should =~ /\Ahello\r?\nn\z/m }
+      wait_until { expect(rewind_and_read(out_receiver)).to match(/\Ahello\r?\nn\z/m) }
 
       stdin.print "e"
       stdin.flush
-      wait_until { rewind_and_read(out_receiver).should =~ /\Ahello\r?\nne\z/m }
+      wait_until { expect(rewind_and_read(out_receiver)).to match(/\Ahello\r?\nne\z/m) }
 
       stdin.printf "w"
       stdin.flush
-      wait_until { rewind_and_read(out_receiver).should =~ /\Ahello\r?\nnew\z/m }
+      wait_until { expect(rewind_and_read(out_receiver)).to match(/\Ahello\r?\nnew\z/m) }
 
       stdin.write "\nworld\n"
       stdin.flush
-      wait_until { rewind_and_read(out_receiver).should =~ /\Ahello\r?\nnew\r?\nworld\r?\n\z/m }
+      wait_until { expect(rewind_and_read(out_receiver)).to match(/\Ahello\r?\nnew\r?\nworld\r?\n\z/m) }
 
       stdin.close
       process.poll_for_exit(exit_timeout)
@@ -168,7 +168,7 @@ describe ChildProcess do
     out = stdout.read
     err = stderr.read
 
-    [out, err].should == %w[stdout stderr]
+    expect([out, err]).to eq %w[stdout stderr]
   end
 
   it "can set close-on-exec when IO is inherited" do
@@ -199,7 +199,7 @@ describe ChildProcess do
       process.start
       process.wait
 
-      rewind_and_read(out).size.should == 3000
+      expect(rewind_and_read(out).size).to eq 3000
     ensure
       out.close
     end

data/spec/jruby_spec.rb

@@ -6,7 +6,7 @@ if ChildProcess.jruby? && !ChildProcess.windows?
     let(:io) { ChildProcess::JRuby::IO.new }
 
     it "raises an ArgumentError if given IO does not respond to :to_outputstream" do
-      lambda { io.stdout = nil }.should raise_error(ArgumentError)
+      expect { io.stdout = nil }.to raise_error(ArgumentError)
     end
   end
 
@@ -17,7 +17,7 @@ if ChildProcess.jruby? && !ChildProcess.windows?
       it "raises an error when trying to access the child's pid" do
         process = exit_with(0)
         process.start
-        lambda { process.pid }.should raise_error(NotImplementedError)
+        expect { process.pid }.to raise_error(NotImplementedError)
       end
     end
   end

data/spec/pid_behavior.rb

@@ -6,7 +6,7 @@ shared_examples_for "a platform that provides the child's pid" do
       process = write_pid(file.path).start
       process.wait
 
-      process.pid.should == rewind_and_read(file).chomp.to_i
+      expect(process.pid).to eq rewind_and_read(file).chomp.to_i
     end
   end
 end

data/spec/spec_helper.rb

@@ -128,9 +128,9 @@ module ChildProcessSpecHelper
   def with_executable_at(path, &blk)
     if ChildProcess.os == :windows
       path << ".cmd"
-      content = "@echo foo"
+      content = "#{RUBY} -e 'sleep 10' \n @echo foo"
     else
-      content = "#!/bin/sh\necho foo"
+      content = "#!/bin/sh\nsleep 10\necho foo"
     end
 
     File.open(path, 'w', 0744) { |io| io << content }

data/spec/unix_spec.rb

@@ -9,29 +9,29 @@ if ChildProcess.unix? && !ChildProcess.jruby? && !ChildProcess.posix_spawn?
     it "handles ECHILD race condition where process dies between timeout and KILL" do
       process = sleeping_ruby
 
-      process.stub(:fork).and_return('fakepid')
-      process.stub(:send_term)
-      process.stub(:poll_for_exit).and_raise(ChildProcess::TimeoutError)
-      process.stub(:send_kill).and_raise(Errno::ECHILD.new)
+      allow(process).to receive(:fork).and_return('fakepid')
+      allow(process).to receive(:send_term)
+      allow(process).to receive(:poll_for_exit).and_raise(ChildProcess::TimeoutError)
+      allow(process).to receive(:send_kill).and_raise(Errno::ECHILD.new)
 
       process.start
-      lambda { process.stop }.should_not raise_error
+      expect { process.stop }.not_to raise_error
 
-      process.stub(:alive?).and_return(false)
+      allow(process).to receive(:alive?).and_return(false)
     end
 
     it "handles ESRCH race condition where process dies between timeout and KILL" do
       process = sleeping_ruby
 
-      process.stub(:fork).and_return('fakepid')
-      process.stub(:send_term)
-      process.stub(:poll_for_exit).and_raise(ChildProcess::TimeoutError)
-      process.stub(:send_kill).and_raise(Errno::ESRCH.new)
+      allow(process).to receive(:fork).and_return('fakepid')
+      allow(process).to receive(:send_term)
+      allow(process).to receive(:poll_for_exit).and_raise(ChildProcess::TimeoutError)
+      allow(process).to receive(:send_kill).and_raise(Errno::ESRCH.new)
 
       process.start
-      lambda { process.stop }.should_not raise_error
+      expect { process.stop }.not_to raise_error
 
-      process.stub(:alive?).and_return(false)
+      allow(process).to receive(:alive?).and_return(false)
     end
   end
 
@@ -39,14 +39,14 @@ if ChildProcess.unix? && !ChildProcess.jruby? && !ChildProcess.posix_spawn?
     let(:io) { ChildProcess::Unix::IO.new }
 
     it "raises an ArgumentError if given IO does not respond to :to_io" do
-      lambda { io.stdout = nil }.should raise_error(ArgumentError, /to respond to :to_io/)
+      expect { io.stdout = nil }.to raise_error(ArgumentError, /to respond to :to_io/)
     end
 
     it "raises a TypeError if #to_io does not return an IO" do
       fake_io = Object.new
       def fake_io.to_io() StringIO.new end
 
-      lambda { io.stdout = fake_io }.should raise_error(TypeError, /expected IO, got/)
+      expect { io.stdout = fake_io }.to raise_error(TypeError, /expected IO, got/)
     end
   end
 

data/spec/windows_spec.rb

@@ -10,14 +10,14 @@ if ChildProcess.windows?
     let(:io) { ChildProcess::Windows::IO.new }
 
     it "raises an ArgumentError if given IO does not respond to :fileno" do
-      lambda { io.stdout = nil }.should raise_error(ArgumentError, /must have :fileno or :to_io/)
+      expect { io.stdout = nil }.to raise_error(ArgumentError, /must have :fileno or :to_io/)
     end
 
     it "raises an ArgumentError if the #to_io does not return an IO " do
       fake_io = Object.new
       def fake_io.to_io() StringIO.new end
 
-      lambda { io.stdout = fake_io }.should raise_error(ArgumentError, /must have :fileno or :to_io/)
+      expect { io.stdout = fake_io }.to raise_error(ArgumentError, /must have :fileno or :to_io/)
     end
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: childprocess
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement