don't require yaml until we need to write settings

we don't require yaml when we need to read the settings by using our own ghetto 
YAML parser that only applies to Bundler config files. specs still pass. :P

2 files changed, 4 insertions, 3 deletions

diff --git a/lib/bundler.rb b/lib/bundler.rb
index 18e8dde44b..6f33e3274c 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -2,7 +2,6 @@ require 'rbconfig'
 require 'fileutils'
 require 'pathname'
 require 'bundler/gem_path_manipulation'
-require 'bundler/psyched_yaml'
 require 'bundler/rubygems_ext'
 require 'bundler/rubygems_integration'
 require 'bundler/version'
diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
index adf018505c..31b88dd648 100644
--- a/lib/bundler/settings.rb
+++ b/lib/bundler/settings.rb
@@ -111,6 +111,7 @@ module Bundler
         hash[key] = value
         hash.delete(key) if value.nil?
         FileUtils.mkdir_p(file.dirname)
+        require 'bundler/psyched_yaml'
         File.open(file, "w") { |f| f.puts hash.to_yaml }
       end
       value
@@ -127,9 +128,10 @@ module Bundler
 
     def load_config(config_file)
       if config_file.exist? && !config_file.size.zero?
-        yaml = YAML.load_file(config_file)
+        Hash[config_file.read.scan(/^(BUNDLE_.+): '?(.+?)'?$/)]
+      else
+        {}
       end
-      yaml || {}
     end
 
   end