diff options
author | Carl Lerche <carllerche@mac.com> | 2010-01-31 17:40:34 -0800 |
---|---|---|
committer | Carl Lerche <carllerche@mac.com> | 2010-01-31 17:40:34 -0800 |
commit | 7c15c17dc4680cbb8a367eb7aa605b072cf6d3d5 (patch) | |
tree | d59e6d441a355aa4381d04135bd113aa8ac52b38 | |
parent | aa736ea9de25771111df89c01f6ee99647a30805 (diff) | |
download | bundler-7c15c17dc4680cbb8a367eb7aa605b072cf6d3d5.tar.gz |
Handle ruby warnings
-rw-r--r-- | bundler.gemspec | 2 | ||||
-rw-r--r-- | lib/bundler/environment.rb | 2 | ||||
-rw-r--r-- | lib/bundler/source.rb | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/bundler.gemspec b/bundler.gemspec index fc0d2da306..ea03049fc1 100644 --- a/bundler.gemspec +++ b/bundler.gemspec @@ -6,7 +6,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new(">= 1.3.5") if s.respond_to? :required_rubygems_version= s.authors = ["Carl Lerche", "Yehuda Katz"] - s.date = %q{2010-01-30} + s.date = %q{2010-01-31} s.default_executable = %q{bundle} s.email = ["carlhuda@engineyard.com"] s.executables = ["bundle"] diff --git a/lib/bundler/environment.rb b/lib/bundler/environment.rb index 57fddbf52d..fc2286019d 100644 --- a/lib/bundler/environment.rb +++ b/lib/bundler/environment.rb @@ -89,9 +89,11 @@ module Bundler # Disable rubygems' gem activation system ::Kernel.class_eval do if private_method_defined?(:gem_original_require) + alias rubygems_require require alias require gem_original_require end + undef gem def gem(*) # Silently ignore calls to gem end diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb index 2c152476b8..42eb6bc5bd 100644 --- a/lib/bundler/source.rb +++ b/lib/bundler/source.rb @@ -102,6 +102,7 @@ module Bundler @options = options @glob = options[:glob] || "{,*/}*.gemspec" @path = options[:path] + @default_spec = nil end def default_spec(*args) |