aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile2
-rw-r--r--railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb16
-rw-r--r--railties/test/generators/plugin_new_generator_test.rb4
3 files changed, 19 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 202a84ced4..a23d482703 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,6 +6,8 @@ else
gem "arel", :git => "git://github.com/rails/arel.git"
end
+gem "thor", :git => "git://github.com/wycats/thor.git"
+
gem "rack", :git => "git://github.com/rack/rack.git"
gem "rails", :path => File.dirname(__FILE__)
diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
index e464279af6..7b202344ee 100644
--- a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
@@ -146,16 +146,22 @@ end
def create_test_dummy_files
say_status :vendor_app, dummy_path
- build(:generate_test_dummy)
+ mute do
+ build(:generate_test_dummy)
+ end
end
def change_config_files
store_application_definition!
- build(:test_dummy_config)
+ mute do
+ build(:test_dummy_config)
+ end
end
def remove_uneeded_rails_files
- build(:test_dummy_clean)
+ mute do
+ build(:test_dummy_clean)
+ end
end
def finish_template
@@ -219,6 +225,10 @@ end
builder.send(name) if builder.respond_to?(name)
end
end
+
+ def mute(&block)
+ shell.mute(&block)
+ end
end
end
end
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
index 53e1dd6708..985ef088e5 100644
--- a/railties/test/generators/plugin_new_generator_test.rb
+++ b/railties/test/generators/plugin_new_generator_test.rb
@@ -103,6 +103,10 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
assert_file "lib/bukkits.rb", /require "bukkits\/engine"/
end
+ def test_being_quiet_while_creating_dummy_application
+ assert_no_match /create\s+config\/application.rb/, run_generator
+ end
+
protected
def action(*args, &block)