From c0c79f779c990f9e53c9b600291801fdf0bbe56b Mon Sep 17 00:00:00 2001 From: Aaron Quint Date: Sat, 27 Dec 2008 23:29:48 -0500 Subject: Use SimpleLogger for Rails::TemplateRunner outside of the Generator context [#1618 state:resolved] Signed-off-by: Pratik Naik --- .../generators/applications/app/template_runner.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'railties') diff --git a/railties/lib/rails_generator/generators/applications/app/template_runner.rb b/railties/lib/rails_generator/generators/applications/app/template_runner.rb index 4af85762aa..7f2e086271 100644 --- a/railties/lib/rails_generator/generators/applications/app/template_runner.rb +++ b/railties/lib/rails_generator/generators/applications/app/template_runner.rb @@ -355,5 +355,15 @@ module Rails def logger @logger ||= Rails::Generator::Base.logger end + + def logger + @logger ||= if defined?(Rails::Generator::Base) + Rails::Generator::Base.logger + else + require 'rails_generator/simple_logger' + Rails::Generator::SimpleLogger.new(STDOUT) + end + end + end end \ No newline at end of file -- cgit v1.2.3 From 1fb275541a58e6a2100261c6117e96e6c014cc6c Mon Sep 17 00:00:00 2001 From: Mike Gunderloy Date: Sun, 28 Dec 2008 10:57:37 -0600 Subject: Ensure template runner tests don't depend on hash ordering [#1654 state:resolved] Signed-off-by: Pratik Naik --- .../lib/rails_generator/generators/applications/app/template_runner.rb | 2 +- railties/test/generators/rails_template_runner_test.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'railties') diff --git a/railties/lib/rails_generator/generators/applications/app/template_runner.rb b/railties/lib/rails_generator/generators/applications/app/template_runner.rb index 7f2e086271..bb7bd0e6f4 100644 --- a/railties/lib/rails_generator/generators/applications/app/template_runner.rb +++ b/railties/lib/rails_generator/generators/applications/app/template_runner.rb @@ -89,7 +89,7 @@ module Rails gems_code = "config.gem '#{name}'" if options.any? - opts = options.inject([]) {|result, h| result << [":#{h[0]} => '#{h[1]}'"] }.join(", ") + opts = options.inject([]) {|result, h| result << [":#{h[0]} => '#{h[1]}'"] }.sort.join(", ") gems_code << ", #{opts}" end diff --git a/railties/test/generators/rails_template_runner_test.rb b/railties/test/generators/rails_template_runner_test.rb index 07507a16c4..fcc020603d 100644 --- a/railties/test/generators/rails_template_runner_test.rb +++ b/railties/test/generators/rails_template_runner_test.rb @@ -79,7 +79,7 @@ class RailsTemplateRunnerTest < GeneratorTestCase def test_gem_with_options_should_include_options_in_gem_dependency_in_environment run_template_method(:gem, 'mislav-will-paginate', :lib => 'will-paginate', :source => 'http://gems.github.com') - assert_rails_initializer_includes("config.gem 'mislav-will-paginate', :source => 'http://gems.github.com', :lib => 'will-paginate'") + assert_rails_initializer_includes("config.gem 'mislav-will-paginate', :lib => 'will-paginate', :source => 'http://gems.github.com'") end def test_environment_should_include_data_in_environment_initializer_block -- cgit v1.2.3