diff options
author | Rick Olson <technoweenie@gmail.com> | 2008-04-08 04:21:32 +0000 |
---|---|---|
committer | Rick Olson <technoweenie@gmail.com> | 2008-04-08 04:21:32 +0000 |
commit | 0bea3f8391e985157f3aecdf50a5d61de7aa7f0c (patch) | |
tree | 30ebd0004167b45b1713c720b2d0174cf6c7a83d /railties/lib/rails | |
parent | 7e94cf7f4d4c865a84cf835349bdb51c5e71a842 (diff) | |
download | rails-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')
-rw-r--r-- | railties/lib/rails/gem_builder.rb | 1 | ||||
-rw-r--r-- | railties/lib/rails/gem_dependency.rb | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/railties/lib/rails/gem_builder.rb b/railties/lib/rails/gem_builder.rb index 629726a5c6..e7e06d0008 100644 --- a/railties/lib/rails/gem_builder.rb +++ b/railties/lib/rails/gem_builder.rb @@ -1,3 +1,4 @@ +require 'rubygems' require 'rubygems/installer' module Rails 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 |