refactor psyched_yaml

1 files changed, 13 insertions, 17 deletions

diff --git a/lib/bundler/psyched_yaml.rb b/lib/bundler/psyched_yaml.rb
index 9501d242df..fe1a701684 100644
--- a/lib/bundler/psyched_yaml.rb
+++ b/lib/bundler/psyched_yaml.rb
@@ -1,24 +1,20 @@
-# Psych could be a gem
 begin
-  gem 'psych'
-rescue Gem::LoadError
-end if defined?(Gem)
+  # Psych could be a gem, so set up the load path
+  gem 'psych' if defined?(gem)
 
-# Psych could be a stdlib
-begin
-  # it's too late if Syck is already loaded
+  # Psych could just be in the stdlib
+  # but it's too late if Syck is already loaded
   require 'psych' unless defined?(Syck)
 rescue LoadError
+  # apparently Psych wasn't available. Oh well.
+ensure
+  # at least load the YAML stdlib, whatever that may be
+  require 'yaml'
 end
 
-# Psych might NOT EXIST AT ALL
-require 'yaml'
-
-# if the file is not valid YAML:
-# * Syck raises ArgumentError
-# * Psych raises Psych::SyntaxError
-begin
-  YamlSyntaxError = Psych::SyntaxError
-rescue NameError
-  YamlSyntaxError = ArgumentError
+module Bundler
+  # On encountering invalid YAML,
+  # Psych raises Psych::SyntaxError
+  # Syck raises ArgumentError
+  YamlSyntaxError = defined?(Psych) ? Psych::SyntaxError : ArgumentError
 end