realityforge-braid 0.9.5 → 0.9.6

data/lib/braid/operations.rb

@@ -1,14 +1,11 @@
 require 'singleton'
 require 'rubygems'
-if defined?(JRUBY_VERSION) || Gem.win_platform?
-  require'open3'
-else
-  require 'open4'
-end
-require defined?(JRUBY_VERSION) ? 'open3' : 'open4'
 require 'tempfile'
 
 module Braid
+  USE_OPEN3 = defined?(JRUBY_VERSION) || Gem.win_platform?
+  require USE_OPEN3 ? 'open3' : 'open4'
+
   module Operations
     class ShellExecutionError < BraidError
       def initialize(err = nil)
@@ -112,11 +109,11 @@ module Braid
         log(cmd)
 
         if defined?(JRUBY_VERSION) || Gem.win_platform?
-          Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
+          Open3.popen3(cmd) do |stdin, stdout, stderr|
             out = stdout.read
             err = stderr.read
-            status = wait_thr.value # Process::Status object returned.
           end
+          status = $?.exitstatus
         else
           status = Open4.popen4(cmd) do |pid, stdin, stdout, stderr|
             out = stdout.read
@@ -295,12 +292,12 @@ module Braid
         command = "git apply --index --whitespace=nowarn #{args.join(' ')} -"
 
         if defined?(JRUBY_VERSION) || Gem.win_platform?
-          Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
+          Open3.popen3(command) do |stdin, stdout, stderr|
             stdin.puts(diff)
             stdin.close
             err = stderr.read
-            status = wait_thr.value # Process::Status object returned.
           end
+          status = $?.exitstatus
         else
           status = Open4.popen4(command) do |pid, stdin, stdout, stderr|
             stdin.puts(diff)

data/lib/braid/version.rb

@@ -1,3 +1,3 @@
 module Braid
-  VERSION = '0.9.5'
+  VERSION = '0.9.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: realityforge-braid
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main