realityforge-braid 0.9.6 → 0.9.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c009c76db25682b5b8188e31e96ee1ea36b208c9
+  data.tar.gz: c3190ab5f44db8c7c4f0630b7e42083ac6247f55
+SHA512:
+  metadata.gz: a28aa73685116294d8897483beb9f224086cdda864cb3be5faa19d408f5baa3a6d5e36035744c1eb47c6e8f3a5c74836e83d46f53807b7f5d424412dd1aeb3a0
+  data.tar.gz: 19abc0fe85eed2959c820e82dde08f6f224ac749f0f44f610d47a41b471eb31a9150cf8640e455c159716bb502b4e0fa8cd255a2dc083d28631757951dc488fa

data/.gitignore

@@ -12,3 +12,4 @@ rdoc
 /*.iml
 /*.ipr
 /*.iws
+/Gemfile.lock

data/.travis.yml

@@ -2,3 +2,4 @@ language: ruby
 rvm:
   - 1.9.3
   - jruby-19mode
+  - jruby-18mode

data/lib/braid/operations.rb

@@ -108,12 +108,17 @@ module Braid
         status, pid = 0
         log(cmd)
 
-        if defined?(JRUBY_VERSION) || Gem.win_platform?
-          Open3.popen3(cmd) do |stdin, stdout, stderr|
+        if USE_OPEN3
+          status = nil
+          Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thread|
+            stdin.close
             out = stdout.read
             err = stderr.read
+            # Under earlier jrubies this is not correctly passed so add in check
+            status = wait_thread.value if wait_thread # Process::Status object returned.
           end
-          status = $?.exitstatus
+          # Handle earlier jrubies such as 1.6.7.2
+          status = $?.exitstatus if status.nil?
         else
           status = Open4.popen4(cmd) do |pid, stdin, stdout, stderr|
             out = stdout.read
@@ -291,13 +296,16 @@ module Braid
 
         command = "git apply --index --whitespace=nowarn #{args.join(' ')} -"
 
-        if defined?(JRUBY_VERSION) || Gem.win_platform?
-          Open3.popen3(command) do |stdin, stdout, stderr|
+        if USE_OPEN3
+          Open3.popen3(command) do |stdin, stdout, stderr, wait_thread|
             stdin.puts(diff)
             stdin.close
             err = stderr.read
+            # Under earlier jrubies this is not correctly passed so add in check
+            status = wait_thread.value if wait_thread # Process::Status object returned.
           end
-          status = $?.exitstatus
+          # Handle earlier jrubies such as 1.6.7.2
+          status = $?.exitstatus if status.nil?
         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.6'
+  VERSION = '0.9.7'
 end

metadata

@@ -1,81 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: realityforge-braid
 version: !ruby/object:Gem::Version
-  version: 0.9.6
-  prerelease: 
+  version: 0.9.7
 platform: ruby
 authors:
 - Cristi Balan
 - Norbert Crombach
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2014-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 4.7.3
-  type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.7.3
-- !ruby/object:Gem::Dependency
-  name: open4
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :runtime
+        version: 4.7.3
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.12.0
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.11
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.11
+  prerelease: false
+  type: :development
 description: A simple tool for tracking vendor branches in git.
 email: evil@che.lu
 executables:
@@ -120,7 +97,8 @@ files:
 - spec/test_helper.rb
 homepage: http://evil.che.lu/projects/braid
 licenses: []
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options:
 - --line-numbers
 - --inline-source
@@ -130,21 +108,19 @@ 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: braid
-rubygems_version: 1.8.23
-signing_key: 
-specification_version: 3
+rubygems_version: 2.1.5
+signing_key:
+specification_version: 4
 summary: A simple tool for tracking vendor branches in git.
 test_files: []