Fix for Ruby 1.8.7

Commit 7ac9df0a4dcff52971f5aa4c62387286e4e62410 introduced a regression.
Psych::SyntaxError is undefined, if 'psych' is not available (e.g. on
Ruby 1.8.7).

2 files changed, 7 insertions, 2 deletions

diff --git a/lib/bundler.rb b/lib/bundler.rb
index dec7dcb0b6..18e8dde44b 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -291,13 +291,12 @@ module Bundler
       # Eval the gemspec from its parent directory
       Dir.chdir(path.dirname.to_s) do
         contents = File.read(path.basename.to_s)
-
         if contents =~ /\A---/ # try YAML
           begin
             Gem::Specification.from_yaml(contents)
             # Raises ArgumentError if the file is not valid YAML (on syck)
             # Psych raises a Psych::SyntaxError
-          rescue ArgumentError, Psych::SyntaxError, Gem::EndOfYAMLException, Gem::Exception
+          rescue ArgumentError, YamlSyntaxError, Gem::EndOfYAMLException, Gem::Exception
             eval_gemspec(path, contents)
           end
         else
diff --git a/lib/bundler/psyched_yaml.rb b/lib/bundler/psyched_yaml.rb
index cdc80ca0e4..6a75eecbe1 100644
--- a/lib/bundler/psyched_yaml.rb
+++ b/lib/bundler/psyched_yaml.rb
@@ -13,3 +13,9 @@ end
 
 # Psych might NOT EXIST AT ALL
 require 'yaml'
+
+begin
+  YamlSyntaxError = Psych::SyntaxError
+rescue NameError
+  YamlSyntaxError = ArgumentError
+end