Skip to content
This repository has been archived by the owner on Apr 14, 2021. It is now read-only.

This fixes tests on 1.9.3 #968

Merged
2 commits merged into from
Jan 21, 2011
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions lib/bundler.rb
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
1 change: 1 addition & 0 deletions lib/bundler/cli.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 6 additions & 0 deletions lib/bundler/rubygems_ext.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions lib/bundler/source.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require "uri"
require 'rubygems/user_interaction'
require "rubygems/installer"
require "rubygems/spec_fetcher"
require "rubygems/format"
Expand Down
2 changes: 2 additions & 0 deletions lib/bundler/ui.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
require 'rubygems/user_interaction'

module Bundler
class UI
def warn(message)
Expand Down
2 changes: 2 additions & 0 deletions spec/support/rubygems_ext.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
require 'rubygems/user_interaction'

module Spec
module Rubygems
def self.setup
Expand Down