aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/gem_dependency.rb
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2008-04-08 04:21:32 +0000
committerRick Olson <technoweenie@gmail.com>2008-04-08 04:21:32 +0000
commit0bea3f8391e985157f3aecdf50a5d61de7aa7f0c (patch)
tree30ebd0004167b45b1713c720b2d0174cf6c7a83d /railties/lib/rails/gem_dependency.rb
parent7e94cf7f4d4c865a84cf835349bdb51c5e71a842 (diff)
downloadrails-0bea3f8391e985157f3aecdf50a5d61de7aa7f0c.tar.gz
rails-0bea3f8391e985157f3aecdf50a5d61de7aa7f0c.tar.bz2
rails-0bea3f8391e985157f3aecdf50a5d61de7aa7f0c.zip
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
Diffstat (limited to 'railties/lib/rails/gem_dependency.rb')
-rw-r--r--railties/lib/rails/gem_dependency.rb8
1 files changed, 6 insertions, 2 deletions
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