Use Dir.pwd instead of Pathname.pwd

Author: hsbt

bundler/lib/bundler/cli/gem.rb

@@ -24,7 +24,7 @@ def initialize(options, gem_name, thor)
       thor.destination_root = nil
 
       @name = @gem_name
-      @target = SharedHelpers.pwd.join(gem_name)
+      @target = Pathname.new(SharedHelpers.pwd).join(gem_name)
 
       @extension = options[:ext]
 
@@ -276,7 +276,7 @@ def run
     private
 
     def resolve_name(name)
-      SharedHelpers.pwd.join(name).basename.to_s
+      Pathname.new(SharedHelpers.pwd).join(name).basename.to_s
     end
 
     def ask_and_set(key, prompt, explanation)

bundler/lib/bundler/shared_helpers.rb

@@ -55,7 +55,7 @@ def chdir(dir, &blk)
 
     def pwd
       Bundler.rubygems.ext_lock.synchronize do
-        Pathname.pwd
+        Dir.pwd
       end
     end
 

bundler/lib/bundler/source/path.rb

@@ -24,7 +24,7 @@ def initialize(options)
           @path = Pathname.new(options["path"])
           expanded_path = expand(@path)
           @path = if @path.relative?
-            expanded_path.relative_path_from(root_path.expand_path)
+            expanded_path.relative_path_from(File.expand_path(root_path))
           else
             expanded_path
           end

bundler/spec/bundler/shared_helpers_spec.rb

@@ -159,7 +159,7 @@
     let(:pwd_stub) { nil }
 
     it "returns the current absolute path" do
-      expect(subject.pwd).to eq(source_root)
+      expect(subject.pwd).to eq(source_root.to_s)
     end
   end