Handle gems without extensions, too ¬_¬

2 files changed, 8 insertions, 6 deletions

diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb
index afeee2b077..3d84df45cd 100644
--- a/lib/bundler/source/rubygems.rb
+++ b/lib/bundler/source/rubygems.rb
@@ -102,11 +102,11 @@ module Bundler
           Bundler.rubygems.repository_subdirectories.each do |name|
             src = File.join(install_path, name, "*")
             dst = File.join(Bundler.rubygems.gem_dir, name)
-            if name == "extensions"
+            if name == "extensions" && Dir.glob(src).any?
               src = File.join(src, "*/*")
-              ext_src = Dir.glob(src).first.gsub(src[0..-6], '')
-              ext_dst = File.join(dst, ext_src)
-              dst = File.dirname(ext_dst)
+              ext_src = Dir.glob(src).first
+              ext_src.gsub!(src[0..-6], '')
+              dst = File.dirname(File.join(dst, ext_src))
             end
             Bundler.mkdir_p dst
             Bundler.sudo "cp -R #{src} #{dst}" if Dir[src].any?
diff --git a/spec/install/gems/sudo_spec.rb b/spec/install/gems/sudo_spec.rb
index 2fccfc0871..60a48ab1e8 100644
--- a/spec/install/gems/sudo_spec.rb
+++ b/spec/install/gems/sudo_spec.rb
@@ -89,8 +89,10 @@ describe "when using sudo", :sudo => true do
         gem "very_simple_binary"
       G
 
-      binary = Dir.glob(system_gem_path("extensions/*/*/very_simple_binary-1.0/very_simple_binary_c.bundle")).first
-      expect(File.exist?(binary)).to be
+      binary_glob = system_gem_path("extensions/*/*/very_simple_binary-1.0/very_simple_binary_c.bundle")
+      binary = Dir.glob(binary_glob).first
+      expect(binary).to be
+      expect(Pathname.new(binary)).to exist
     end
   end