Merge pull request #3682 from bundler/seg-fix-chdir

[RubyGemsIntegration] Check for chdir monitor after its been backported

2 files changed, 9 insertions, 2 deletions

diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb
index b134e06c1c..6d6f2ab9a7 100644
--- a/lib/bundler/rubygems_integration.rb
+++ b/lib/bundler/rubygems_integration.rb
@@ -614,13 +614,13 @@ module Bundler
 
         Gem::Ext::Builder.class_eval do
           if !const_defined?(:CHDIR_MONITOR)
-            const_set(:CHDIR_MONITOR, Monitor.new)
+            const_set(:CHDIR_MONITOR, EXT_LOCK)
           end
 
           if const_defined?(:CHDIR_MUTEX)
             remove_const(:CHDIR_MUTEX)
-            const_set(:CHDIR_MUTEX, const_get(:CHDIR_MONITOR))
           end
+          const_set(:CHDIR_MUTEX, const_get(:CHDIR_MONITOR))
         end
       end
 
diff --git a/spec/bundler/rubygems_integration_spec.rb b/spec/bundler/rubygems_integration_spec.rb
new file mode 100644
index 0000000000..0317bec795
--- /dev/null
+++ b/spec/bundler/rubygems_integration_spec.rb
@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe Bundler::RubygemsIntegration do
+  it "uses the same chdir lock as rubygems", :rubygems => "2.1" do
+    expect(Bundler.rubygems.ext_lock).to eq(Gem::Ext::Builder::CHDIR_MONITOR)
+  end
+end