Merge remote-tracking branch 'upstream/master' into issue-2000

1 files changed, 25 insertions, 17 deletions

diff --git a/lib/bundler.rb b/lib/bundler.rb
index 7497e03d..6091a6e0 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -24,6 +24,7 @@ module Bundler
   autoload :Graph,                 'bundler/graph'
   autoload :Index,                 'bundler/index'
   autoload :Installer,             'bundler/installer'
+  autoload :Injector,              'bundler/injector'
   autoload :LazySpecification,     'bundler/lazy_specification'
   autoload :LockfileParser,        'bundler/lockfile_parser'
   autoload :MatchPlatform,         'bundler/match_platform'
@@ -261,7 +262,7 @@ module Bundler
     def which(executable)
       if File.executable?(executable)
         executable
-      else
+      elsif ENV['PATH']
         path = ENV['PATH'].split(File::PATH_SEPARATOR).find do |p|
           File.executable?(File.join(p, executable))
         end
@@ -291,24 +292,16 @@ module Bundler
       # Eval the gemspec from its parent directory
       Dir.chdir(path.dirname.to_s) do
         contents = File.read(path.basename.to_s)
-        begin
-          Gem::Specification.from_yaml(contents)
-          # Raises ArgumentError if the file is not valid YAML
-        rescue ArgumentError, SyntaxError, Gem::EndOfYAMLException, Gem::Exception
+        if contents =~ /\A---/ # try YAML
           begin
-            eval(contents, TOPLEVEL_BINDING, path.expand_path.to_s)
-          rescue LoadError, SyntaxError => e
-            original_line = e.backtrace.find { |line| line.include?(path.to_s) }
-            msg  = "There was a #{e.class} while evaluating #{path.basename}: \n#{e.message}"
-            msg << " from\n  #{original_line}" if original_line
-            msg << "\n"
-
-            if e.is_a?(LoadError) && RUBY_VERSION >= "1.9"
-              msg << "\nDoes it try to require a relative path? That's been removed in Ruby 1.9."
-            end
-
-            raise GemspecError, msg
+            Gem::Specification.from_yaml(contents)
+            # Raises ArgumentError if the file is not valid YAML (on syck)
+            # Psych raises a Psych::SyntaxError
+          rescue ArgumentError, YamlSyntaxError, Gem::EndOfYAMLException, Gem::Exception
+            eval_gemspec(path, contents)
           end
+        else
+          eval_gemspec(path, contents)
         end
       end
     end
@@ -319,6 +312,21 @@ module Bundler
 
   private
 
+    def eval_gemspec(path, contents)
+      eval(contents, TOPLEVEL_BINDING, path.expand_path.to_s)
+    rescue LoadError, SyntaxError => e
+      original_line = e.backtrace.find { |line| line.include?(path.to_s) }
+      msg  = "There was a #{e.class} while evaluating #{path.basename}: \n#{e.message}"
+      msg << " from\n  #{original_line}" if original_line
+      msg << "\n"
+
+      if e.is_a?(LoadError) && RUBY_VERSION >= "1.9"
+        msg << "\nDoes it try to require a relative path? That's been removed in Ruby 1.9."
+      end
+
+      raise GemspecError, msg
+    end
+
     def configure_gem_home_and_path
       blank_home = ENV['GEM_HOME'].nil? || ENV['GEM_HOME'].empty?