childprocess 0.3.9 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 04d64c66d047e986bc57da09cbb13b3a4e791e28
+  data.tar.gz: ce4828aee09a5499e7f5858c93401dd42c851af9
+SHA512:
+  metadata.gz: d57f5c928a964451e325c06b60cf8680c1e0c0f3141b38ddb7d381e0914f5f4286871a8d4a1766e62375907963d7a977ff0d4f6732c4408e7eb8f7855f93894a
+  data.tar.gz: ddfcf22a34b38b47e5c7d42fab0b4a0449d0332b78dd118f191387ec72f81b8bbad9c68c94e08748c243aa7d3205f2b48edb0bd2977b0b5cc85d54905a347b35

data/.gitignore

@@ -19,5 +19,6 @@ rdoc
 pkg
 .rbx
 Gemfile.lock
+.ruby-version
 
 ## PROJECT::SPECIFIC

data/.travis.yml

@@ -1,9 +1,9 @@
 rvm:
-  - 1.8.7
   - 1.9.3
   - jruby
   - rbx
   - 2.0.0
+  - 2.1.0
   - ruby-head
 env:
   - CHILDPROCESS_POSIX_SPAWN=true
@@ -13,4 +13,4 @@ matrix:
     - rvm: jruby
       env: CHILDPROCESS_POSIX_SPAWN=true
     - rvm: rbx
-      env: CHILDPROCESS_POSIX_SPAWN=true
+    - rvm: ruby-head

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2013 Jari Bakken
+Copyright (c) 2010-2014 Jari Bakken
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -7,6 +7,9 @@ The code originated in the [selenium-webdriver](https://rubygems.org/gems/seleni
 a standalone library.
 
 [![Build Status](https://secure.travis-ci.org/jarib/childprocess.png)](http://travis-ci.org/jarib/childprocess)
+[![Gem Version](https://badge.fury.io/rb/childprocess.png)](http://badge.fury.io/rb/childprocess)
+[![Code Climate](https://codeclimate.com/github/jarib/childprocess.png)](https://codeclimate.com/github/jarib/childprocess)
+[![Coverage Status](https://coveralls.io/repos/jarib/childprocess/badge.png?branch=master)](https://coveralls.io/r/jarib/childprocess?branch=master)
 
 # Usage
 
@@ -147,4 +150,4 @@ How the process is launched and killed depends on the platform:
 
 # Copyright
 
-Copyright (c) 2010-2013 Jari Bakken. See LICENSE for details.
+Copyright (c) 2010-2014 Jari Bakken. See LICENSE for details.

data/Rakefile

@@ -9,7 +9,7 @@ include Rake::DSL if defined?(::Rake::DSL)
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.ruby_opts  = "-I lib:spec"
+  spec.ruby_opts  = "-I lib:spec -w"
   spec.pattern    = 'spec/**/*_spec.rb'
 end
 

data/childprocess.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
   s.description = %q{This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.}
 
   s.rubyforge_project = "childprocess"
+  s.license           = 'MIT'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- spec/*`.split("\n")
@@ -21,6 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", ">= 2.0.0"
   s.add_development_dependency "yard", ">= 0"
   s.add_development_dependency "rake", "~> 0.9.2"
+  s.add_development_dependency 'coveralls'
   s.add_runtime_dependency "ffi", "~> 1.0", ">= 1.0.11"
 end
 

data/lib/childprocess/jruby/process.rb

@@ -35,10 +35,14 @@ module ChildProcess
       end
 
       def wait
-        @process.waitFor
+        if exited?
+          exit_code
+        else
+          @process.waitFor
 
-        stop_pumps
-        @exit_code = @process.exitValue
+          stop_pumps
+          @exit_code = @process.exitValue
+        end
       end
 
       #

data/lib/childprocess/unix/process.rb

@@ -43,9 +43,13 @@ module ChildProcess
 
       def wait
         assert_started
-        pid, status = ::Process.waitpid2 @pid
 
-        @exit_code = status.exitstatus || status.termsig
+        if exited?
+          exit_code
+        else
+          _, status = ::Process.waitpid2 @pid
+          @exit_code = status.exitstatus || status.termsig
+        end
       end
 
       private

data/lib/childprocess/version.rb

@@ -1,3 +1,3 @@
 module ChildProcess
-  VERSION = "0.3.9"
+  VERSION = "0.4.0"
 end

data/lib/childprocess/windows/process.rb

@@ -21,11 +21,15 @@ module ChildProcess
       end
 
       def wait
-        @handle.wait
-        @exit_code = @handle.exit_code
-        @handle.close
+        if exited?
+          exit_code
+        else
+          @handle.wait
+          @exit_code = @handle.exit_code
+          @handle.close
 
-        @exit_code
+          @exit_code
+        end
       end
 
       def exited?
@@ -49,7 +53,6 @@ module ChildProcess
 
       def launch_process
         builder = ProcessBuilder.new(@args)
-        builder.inherit     = false
         builder.detach      = detach?
         builder.duplex      = duplex?
         builder.environment = @environment unless @environment.empty?

data/lib/childprocess/windows/process_builder.rb

@@ -1,13 +1,12 @@
 module ChildProcess
   module Windows
     class ProcessBuilder
-      attr_accessor :inherit, :detach, :duplex, :environment, :stdout, :stderr, :cwd
+      attr_accessor :detach, :duplex, :environment, :stdout, :stderr, :cwd
       attr_reader :stdin
 
       def initialize(args)
         @args        = args
 
-        @inherit     = false
         @detach      = false
         @duplex      = false
         @environment = nil
@@ -76,7 +75,7 @@ module ChildProcess
           @cmd_ptr,     # command line
           nil,          # process attributes
           nil,          # thread attributes
-          @inherit,     # inherit handles
+          true,         # inherit handles
           @flags,       # creation flags
           @env_ptr,     # environment
           @cwd_ptr,     # current directory
@@ -102,40 +101,35 @@ module ChildProcess
       end
 
       def setup_io
-        if @stdout || @stderr
-          startup_info[:dwFlags] ||= 0
-          startup_info[:dwFlags] |= STARTF_USESTDHANDLES
+        startup_info[:dwFlags] ||= 0
+        startup_info[:dwFlags] |= STARTF_USESTDHANDLES
 
-          @inherit = true
-
-          if @stdout
-            startup_info[:hStdOutput] = std_stream_handle_for(@stdout)
-          end
-
-          if @stderr
-            startup_info[:hStdError] = std_stream_handle_for(@stderr)
-          end
+        if @stdout
+          startup_info[:hStdOutput] = std_stream_handle_for(@stdout)
         end
 
-        setup_stdin if @duplex
-      end
+        if @stderr
+          startup_info[:hStdError] = std_stream_handle_for(@stderr)
+        end
 
-      def setup_stdin
-        read_pipe_ptr  = FFI::MemoryPointer.new(:pointer)
-        write_pipe_ptr = FFI::MemoryPointer.new(:pointer)
-        sa             = SecurityAttributes.new(:inherit => true)
+        if @duplex
+          read_pipe_ptr  = FFI::MemoryPointer.new(:pointer)
+          write_pipe_ptr = FFI::MemoryPointer.new(:pointer)
+          sa             = SecurityAttributes.new(:inherit => true)
 
-        ok = Lib.create_pipe(read_pipe_ptr, write_pipe_ptr, sa, 0)
-        Lib.check_error ok
+          ok = Lib.create_pipe(read_pipe_ptr, write_pipe_ptr, sa, 0)
+          Lib.check_error ok
 
-        @read_pipe  = read_pipe_ptr.read_pointer
-        @write_pipe = write_pipe_ptr.read_pointer
+          @read_pipe  = read_pipe_ptr.read_pointer
+          @write_pipe = write_pipe_ptr.read_pointer
 
-        @inherit = true
-        Lib.set_handle_inheritance @read_pipe, true
-        Lib.set_handle_inheritance @write_pipe, false
+          Lib.set_handle_inheritance @read_pipe, true
+          Lib.set_handle_inheritance @write_pipe, false
 
-        startup_info[:hStdInput] = @read_pipe
+          startup_info[:hStdInput] = @read_pipe
+        else
+          startup_info[:hStdInput] = std_stream_handle_for(STDIN)
+        end
       end
 
       def std_stream_handle_for(io)

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 == STDOUT
-    io.stderr.should == STDERR
+    io.stdout.should eq STDOUT
+    io.stderr.should eq STDERR
   end
 end

data/spec/childprocess_spec.rb

@@ -6,7 +6,7 @@ describe ChildProcess do
   it "returns self when started" do
     process = sleeping_ruby
 
-    process.start.should == process
+    process.start.should eq process
     process.should be_started
   end
 
@@ -48,6 +48,13 @@ describe ChildProcess do
     return_value.should == 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
+  end
+
   it "escalates if TERM is ignored" do
     process = ignored('TERM').start
     process.stop
@@ -100,8 +107,8 @@ describe ChildProcess do
         file.rewind
         child_env = eval(file.read)
 
-        child_env['INHERITED'].should == 'yes'
-        child_env['CHILD_ONLY'].should == 'yes'
+        child_env['INHERITED'].should eq 'yes'
+        child_env['CHILD_ONLY'].should eq 'yes'
       end
     end
   end
@@ -172,7 +179,7 @@ describe ChildProcess do
     path = File.expand_path('foo bar')
 
     with_executable_at(path) do |proc|
-      proc.start.should == proc
+      proc.start.should eq proc
       proc.should be_started
     end
   end

data/spec/io_spec.rb

@@ -23,8 +23,8 @@ describe ChildProcess do
       out.rewind
       err.rewind
 
-      out.read.should == "0\n"
-      err.read.should == "1\n"
+      out.read.should eq "0\n"
+      err.read.should eq "1\n"
     ensure
       out.close
       err.close
@@ -113,27 +113,26 @@ describe ChildProcess do
       process.start
 
       stdin = process.io.stdin
-      lf = ChildProcess.windows? ? "\r\n" : "\n"
 
       stdin.puts "hello"
       stdin.flush
-      wait_until { rewind_and_read(out_receiver).should == "hello#{lf}" }
+      wait_until { rewind_and_read(out_receiver).should =~ /\Ahello\r?\n\z/m }
 
       stdin.putc "n"
       stdin.flush
-      wait_until { rewind_and_read(out_receiver).should == "hello#{lf}n" }
+      wait_until { rewind_and_read(out_receiver).should =~ /\Ahello\r?\nn\z/m }
 
       stdin.print "e"
       stdin.flush
-      wait_until { rewind_and_read(out_receiver).should == "hello#{lf}ne" }
+      wait_until { rewind_and_read(out_receiver).should =~ /\Ahello\r?\nne\z/m }
 
       stdin.printf "w"
       stdin.flush
-      wait_until { rewind_and_read(out_receiver).should == "hello#{lf}new" }
+      wait_until { rewind_and_read(out_receiver).should =~ /\Ahello\r?\nnew\z/m }
 
       stdin.write "\nworld\n"
       stdin.flush
-      wait_until { rewind_and_read(out_receiver).should == "hello#{lf}new#{lf}world#{lf}" }
+      wait_until { rewind_and_read(out_receiver).should =~ /\Ahello\r?\nnew\r?\nworld\r?\n\z/m }
 
       stdin.close
       process.poll_for_exit(exit_timeout)

data/spec/spec_helper.rb

@@ -1,6 +1,11 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
+unless defined?(JRUBY_VERSION)
+  require 'coveralls'
+  Coveralls.wear!
+end
+
 require 'childprocess'
 require 'rspec'
 require 'tempfile'
@@ -175,7 +180,7 @@ module ChildProcessSpecHelper
         last_exception = ex
       end
 
-      sleep 0.05
+      sleep 0.01
     end
 
     msg = "timed out after #{timeout} seconds"
@@ -203,7 +208,7 @@ Thread.abort_on_exception = true
 RSpec.configure do |c|
   c.include(ChildProcessSpecHelper)
   c.after(:each) {
-    @process && @process.alive? && @process.stop
+    defined?(@process) && @process.alive? && @process.stop
   }
 
   if ChildProcess.jruby? && ChildProcess.new("true").instance_of?(ChildProcess::JRuby::Process)

data/spec/unix_spec.rb

@@ -9,10 +9,10 @@ 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)
+      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)
 
       process.start
       lambda { process.stop }.should_not raise_error
@@ -23,10 +23,10 @@ if ChildProcess.unix? && !ChildProcess.jruby? && !ChildProcess.posix_spawn?
     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)
+      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)
 
       process.start
       lambda { process.stop }.should_not raise_error

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: childprocess
 version: !ruby/object:Gem::Version
-  version: 0.3.9
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-02 00:00:00.000000000 Z
+date: 2014-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,31 +48,42 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.11
 description: This gem aims at being a simple and reliable solution for controlling
@@ -134,28 +139,28 @@ files:
 - spec/unix_spec.rb
 - spec/windows_spec.rb
 homepage: http://github.com/jarib/childprocess
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: childprocess
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This gem aims at being a simple and reliable solution for controlling external
   programs running in the background on any Ruby / OS combination.
 test_files: