From 5384ba3081745ea44481750e6471e4dcaa8d1a93 Mon Sep 17 00:00:00 2001 From: Pratik Naik Date: Fri, 17 Oct 2008 22:58:37 +0200 Subject: Don't create test/performance/test_helper.rb. Just require the needed files from test directly. [#1135 state:resolved] --- .../lib/rails_generator/generators/applications/app/app_generator.rb | 1 - .../components/performance_test/templates/performance_test.rb | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'railties/lib') diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb index acd3dc8c8c..32c320385d 100644 --- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb +++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb @@ -50,7 +50,6 @@ class AppGenerator < Rails::Generator::Base m.template "helpers/application.rb", "app/controllers/application.rb", :assigns => { :app_name => @app_name, :app_secret => md5.hexdigest } m.template "helpers/application_helper.rb", "app/helpers/application_helper.rb" m.template "helpers/test_helper.rb", "test/test_helper.rb" - m.template "helpers/performance_test_helper.rb", "test/performance/test_helper.rb" m.template "helpers/performance_test.rb", "test/performance/browsing_test.rb" # database.yml and routes.rb diff --git a/railties/lib/rails_generator/generators/components/performance_test/templates/performance_test.rb b/railties/lib/rails_generator/generators/components/performance_test/templates/performance_test.rb index 352ff48054..27c91b0fca 100644 --- a/railties/lib/rails_generator/generators/components/performance_test/templates/performance_test.rb +++ b/railties/lib/rails_generator/generators/components/performance_test/templates/performance_test.rb @@ -1,4 +1,5 @@ -require 'performance/test_helper' +require 'test_helper' +require 'performance_test_help' class <%= class_name %>Test < ActionController::PerformanceTest # Replace this with your real tests. -- cgit v1.2.3 From 6d1d48de6a16b0ff4e4533cccf00c0ec747feefb Mon Sep 17 00:00:00 2001 From: Michael Koziarski Date: Sun, 19 Oct 2008 13:23:27 +0200 Subject: Memoize the require and construction of the StringInquirer --- railties/lib/initializer.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'railties/lib') diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index 0aec97dece..6500b2d309 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -49,8 +49,10 @@ module Rails end def env - require 'active_support/string_inquirer' - ActiveSupport::StringInquirer.new(RAILS_ENV) + @_env ||= begin + require 'active_support/string_inquirer' + ActiveSupport::StringInquirer.new(RAILS_ENV) + end end def cache -- cgit v1.2.3 From 326030a1e843245ae493fbdfb1b5eb72d1e59f26 Mon Sep 17 00:00:00 2001 From: Matt Jones Date: Mon, 20 Oct 2008 15:02:23 -0400 Subject: config.gem: Fix typo in unpack, skip dependencies on unloaded gems, and silence spec warnings on refresh. [#1128] Signed-off-by: Pratik Naik --- railties/lib/rails/gem_dependency.rb | 2 +- railties/lib/tasks/gems.rake | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'railties/lib') diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb index 80481859e1..46d5fd3a47 100644 --- a/railties/lib/rails/gem_dependency.rb +++ b/railties/lib/rails/gem_dependency.rb @@ -151,7 +151,7 @@ module Rails end # Gem.activate changes the spec - get the original - real_spec = Gem::Specification.load(spec.loaded_from) + real_spec = Gem::Specification.load(specification.loaded_from) write_spec(directory, real_spec) end diff --git a/railties/lib/tasks/gems.rake b/railties/lib/tasks/gems.rake index c65dfc7dd4..e2cb4b9577 100644 --- a/railties/lib/tasks/gems.rake +++ b/railties/lib/tasks/gems.rake @@ -11,7 +11,7 @@ end def print_gem_status(gem, indent=1) code = gem.loaded? ? (gem.frozen? ? "F" : "I") : " " puts " "*(indent-1)+" - [#{code}] #{gem.name} #{gem.requirement.to_s}" - gem.dependencies.each { |g| print_gem_status(g, indent+1)} + gem.dependencies.each { |g| print_gem_status(g, indent+1)} if gem.loaded? end namespace :gems do @@ -70,6 +70,7 @@ namespace :gems do task :refresh_specs => :base do require 'rubygems' require 'rubygems/gem_runner' + Rails::VendorGemSourceIndex.silence_spec_warnings = true Rails.configuration.gems.each do |gem| next unless gem.frozen? && (ENV['GEM'].blank? || ENV['GEM'] == gem.name) gem.refresh_spec(Rails::GemDependency.unpacked_path) if gem.loaded? -- cgit v1.2.3 From 326036de46b0a89d8f23eabfde8b772bd31a7ad6 Mon Sep 17 00:00:00 2001 From: Pratik Naik Date: Tue, 21 Oct 2008 01:47:27 +0100 Subject: Fix script/generate warning --- railties/lib/rails_generator/lookup.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'railties/lib') diff --git a/railties/lib/rails_generator/lookup.rb b/railties/lib/rails_generator/lookup.rb index 0526d526ad..a3525364a2 100644 --- a/railties/lib/rails_generator/lookup.rb +++ b/railties/lib/rails_generator/lookup.rb @@ -208,7 +208,8 @@ module Rails class GemGeneratorSource < AbstractGemSource # Yield latest versions of generator gems. def each - Gem::cache.search(/_generator$/).inject({}) { |latest, gem| + dependency = Gem::Dependency.new(/_generator$/, Gem::Requirement.default) + Gem::cache.search(dependency).inject({}) { |latest, gem| hem = latest[gem.name] latest[gem.name] = gem if hem.nil? or gem.version > hem.version latest -- cgit v1.2.3