aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
diff options
context:
space:
mode:
authorDavid Padilla <david@crowdint.com>2012-05-10 15:56:13 -0500
committerYves Senn <yves.senn@gmail.com>2012-11-15 18:28:17 +0100
commit00fbee5bbf7896d38ccf3a26d4b6f36f9a63f358 (patch)
tree43284259f9301e993ef0fd69dc55f1299ed18f5a /railties/lib/rails/generators
parent492c8de43338ae4a282f37930fc348b6fcc2ffdf (diff)
downloadrails-00fbee5bbf7896d38ccf3a26d4b6f36f9a63f358.tar.gz
rails-00fbee5bbf7896d38ccf3a26d4b6f36f9a63f358.tar.bz2
rails-00fbee5bbf7896d38ccf3a26d4b6f36f9a63f358.zip
Fixes issue #6251
Plugin generator crashes when using the --dummy-path option Code was assuming the application name in `config/application.rb` was module Dummy.
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r--railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb2
1 files changed, 1 insertions, 1 deletions
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 cd7d51e628..918fa5bd3b 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
@@ -282,7 +282,7 @@ task :default => :test
dummy_application_path = File.expand_path("#{dummy_path}/config/application.rb", destination_root)
unless options[:pretend] || !File.exists?(dummy_application_path)
contents = File.read(dummy_application_path)
- contents[(contents.index("module Dummy"))..-1]
+ contents[(contents.index(/module ([\w]+)\n(.*)class Application/m))..-1]
end
end
end