From 0bea3f8391e985157f3aecdf50a5d61de7aa7f0c Mon Sep 17 00:00:00 2001 From: Rick Olson Date: Tue, 8 Apr 2008 04:21:32 +0000 Subject: Don't require rails/gem_builder during rails initialization, it's only needed for the gems:build task. [rick] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9240 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- railties/lib/rails/gem_dependency.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'railties/lib/rails/gem_dependency.rb') diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb index 8d6a748e4c..0b2e6eb93d 100644 --- a/railties/lib/rails/gem_dependency.rb +++ b/railties/lib/rails/gem_dependency.rb @@ -14,8 +14,7 @@ module Rails end @lib = options[:lib] @source = options[:source] - @loaded = false - @load_paths_added = false + @loaded = @frozen = @load_paths_added = false @unpack_directory = nil end @@ -28,6 +27,7 @@ module Rails gem *args else $LOAD_PATH << File.join(unpacked_paths.first, 'lib') + @frozen = true end @load_paths_added = true rescue Gem::LoadError @@ -47,6 +47,10 @@ module Rails $!.backtrace.each { |b| puts b } end + def frozen? + @frozen + end + def loaded? @loaded end -- cgit v1.2.3