childprocess 0.4.1.rc1 → 0.4.1.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f15d02987e0f6fb61ee1de1d2a7a58463ed533e
-  data.tar.gz: 00bae3b277c92838151774688d3d69c691dc74f2
+  metadata.gz: e46688d94bfe27c279b73eb02843fab1e7a83db2
+  data.tar.gz: d72ef6c90fbeef9c71dc23f67686ba4f3793aba0
 SHA512:
-  metadata.gz: dccbf2db7db79bb2dcaed2726ddb1b71e9c6620bc80dd22bf4b45c6c1d9142e56731961294df701296972efada62bed9db15a12bf2af0b35073f4469fef80b47
-  data.tar.gz: ba1b3c25f5a7141b5632960054d9617af5fbf40b360dba30d0c73a34aac7f0f42cfdfe909066cc7e4408a18c6340901aaa433a5b3d729e469d465e3e6162fd23
+  metadata.gz: 8ba10a259c2cb39a937cdbb4175e6e886e958470c66970f2cf6f8e930dbae425fe46ef57a1efa0e9042dafa5c400ced65e0915352674e37d6ae6f2a0913a0d47
+  data.tar.gz: 019d24fea23a564dc961aefac8af5d0fcd168fc145965dd3fee4059a762f4c1a43fadcf6f35eabee3ca86a9b2dd103bc74bac4b297680a36626cbf260996a9d3

data/lib/childprocess/version.rb

@@ -1,3 +1,3 @@
 module ChildProcess
-  VERSION = "0.4.1.rc1"
+  VERSION = "0.4.1.rc2"
 end

data/lib/childprocess/windows/lib.rb

@@ -17,6 +17,7 @@ module ChildProcess
     CTRL_C_EVENT                          = 0
     CTRL_BREAK_EVENT                      = 1
 
+    CREATE_BREAKAWAY_FROM_JOB             = 0x01000000
     DETACHED_PROCESS                      = 0x00000008
 
     STARTF_USESTDHANDLES                  = 0x00000100

data/lib/childprocess/windows/process_builder.rb

@@ -28,7 +28,7 @@ module ChildProcess
         create_environment_pointer
         create_cwd_pointer
 
-        setup_detach
+        setup_flags
         setup_io
 
         pid = create_process
@@ -97,8 +97,9 @@ module ChildProcess
         @process_info ||= ProcessInfo.new
       end
 
-      def setup_detach
+      def setup_flags
         @flags |= DETACHED_PROCESS if @detach
+        @flags |= CREATE_BREAKAWAY_FROM_JOB
       end
 
       def setup_io

data/spec/childprocess_spec.rb

@@ -203,16 +203,16 @@ describe ChildProcess do
     }
   end
 
-  it 'kills the full process tree' do
+  it 'kills the full process tree', :process_builder => false do
     Tempfile.open('kill-process-tree') do |file|
       process = write_pid_in_sleepy_grand_child(file.path).start
 
-      pid = within(5) do
+      pid = wait_until(30) do
         Integer(rewind_and_read(file)) rescue nil
       end
 
       process.stop
-      within(3) { alive?(pid).should be_false }
+      wait_until(3) { alive?(pid).should be_false }
     end
   end
 end

data/spec/spec_helper.rb

@@ -62,7 +62,7 @@ module ChildProcessSpecHelper
 
   def write_pid_in_sleepy_grand_child(path)
     code = <<-RUBY
-      system "ruby", "-e", 'File.open(#{path.inspect}, "w") { |f| f << Process.pid }; sleep'
+      system "ruby", "-e", 'File.open(#{path.inspect}, "w") { |f| f << Process.pid; f.flush }; sleep'
     RUBY
 
     ruby_process tmp_script(code)
@@ -92,23 +92,6 @@ module ChildProcessSpecHelper
     @tf.path
   end
 
-  def within(seconds, &blk)
-    end_time   = Time.now + seconds
-    ok         = false
-    last_error = nil
-
-    until ok || Time.now >= end_time
-      begin
-        ok = yield
-      rescue RSpec::Expectations::ExpectationNotMetError => last_error
-      end
-    end
-
-    raise last_error unless ok
-
-    ok
-  end
-
   def cat
     if ChildProcess.os == :windows
       ruby(<<-CODE)
@@ -180,12 +163,13 @@ module ChildProcessSpecHelper
   end
 
   def wait_until(timeout = 10, &blk)
-    end_time = Time.now + timeout
+    end_time       = Time.now + timeout
     last_exception = nil
 
     until Time.now >= end_time
       begin
-        return if yield
+        result = yield
+        return result if result
       rescue RSpec::Expectations::ExpectationNotMetError => ex
         last_exception = ex
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: childprocess
 version: !ruby/object:Gem::Version
-  version: 0.4.1.rc1
+  version: 0.4.1.rc2
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec