Permalink
Browse files

Merge pull request #968 from tenderlove/bundler

---

Rubygems 1.5.0 doesnt require all files that it did in previous versions.  This branch adds the proper require statements to bundler.  This branch also fixes warnings emitted by psych when dumping YAML.
  • Loading branch information...
2 parents f2ca897 + ac9c3c9 commit 4dbbc4a051f702a81768545c9ccca2db2bcc0115 @indirect indirect committed Jan 21, 2011
Showing with 18 additions and 0 deletions.
  1. +6 −0 lib/bundler.rb
  2. +1 −0 lib/bundler/cli.rb
  3. +6 −0 lib/bundler/rubygems_ext.rb
  4. +1 −0 lib/bundler/source.rb
  5. +2 −0 lib/bundler/ui.rb
  6. +2 −0 spec/support/rubygems_ext.rb
View
@@ -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'
View
@@ -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
@@ -105,6 +105,12 @@ class Dependency
alias eql? ==
+ def encode_with(coder)
+ to_yaml_properties.each do |ivar|
+ coder[ivar.to_s.sub(/^@/, '')] = instance_variable_get(ivar)
+ end
+ end
+
def to_yaml_properties
instance_variables.reject { |p| ["@source", "@groups"].include?(p.to_s) }
end
View
@@ -1,4 +1,5 @@
require "uri"
+require 'rubygems/user_interaction'
require "rubygems/installer"
require "rubygems/spec_fetcher"
require "rubygems/format"
View
@@ -1,3 +1,5 @@
+require 'rubygems/user_interaction'
+
module Bundler
class UI
def warn(message)
@@ -1,3 +1,5 @@
+require 'rubygems/user_interaction'
+
module Spec
module Rubygems
def self.setup

0 comments on commit 4dbbc4a

Please sign in to comment.