adding requires and default yaml parser to psych if possible

rubygems · Jan 21, 2011 · a318f91 · cris · Feb 3, 2011 · a318f91
1 parent f2ca897
commit a318f91
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,3 +1,5 @@
+require 'rubygems/user_interaction'
+
 module Spec
   module Rubygems
     def self.setup