adding requires and default yaml parser to psych if possible

5 files changed, 12 insertions, 0 deletions

diff --git a/lib/bundler.rb b/lib/bundler.rb
index dd1ad009b0..10425f8419 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -1,6 +1,12 @@
 require 'rbconfig'
 require 'fileutils'
 require 'pathname'
+
+begin
+  require 'psych'
+rescue LoadError
+end
+
 require 'yaml'
 require 'bundler/rubygems_ext'
 require 'bundler/version'
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index 68751ce606..5c03a97263 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -1,6 +1,7 @@
 $:.unshift File.expand_path('../vendor', __FILE__)
 require 'thor'
 require 'thor/actions'
+require 'rubygems/user_interaction'
 require 'rubygems/config_file'
 
 # Work around a RubyGems bug
diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb
index 934743f991..b374fdd89e 100644
--- a/lib/bundler/source.rb
+++ b/lib/bundler/source.rb
@@ -1,4 +1,5 @@
 require "uri"
+require 'rubygems/user_interaction'
 require "rubygems/installer"
 require "rubygems/spec_fetcher"
 require "rubygems/format"
diff --git a/lib/bundler/ui.rb b/lib/bundler/ui.rb
index e6331921aa..10d5df9eb1 100644
--- a/lib/bundler/ui.rb
+++ b/lib/bundler/ui.rb
@@ -1,3 +1,5 @@
+require 'rubygems/user_interaction'
+
 module Bundler
   class UI
     def warn(message)
diff --git a/spec/support/rubygems_ext.rb b/spec/support/rubygems_ext.rb
index 9e1aa7fa8c..7f312e9547 100644
--- a/spec/support/rubygems_ext.rb
+++ b/spec/support/rubygems_ext.rb
@@ -1,3 +1,5 @@
+require 'rubygems/user_interaction'
+
 module Spec
   module Rubygems
     def self.setup