From 00fbee5bbf7896d38ccf3a26d4b6f36f9a63f358 Mon Sep 17 00:00:00 2001 From: David Padilla Date: Thu, 10 May 2012 15:56:13 -0500 Subject: 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. --- railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/lib/rails') 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 -- cgit v1.2.3 From e69058c15389b7f88771a95c1637b2f306d0c02f Mon Sep 17 00:00:00 2001 From: Yves Senn Date: Thu, 15 Nov 2012 18:45:37 +0100 Subject: =?UTF-8?q?backport=20#8139,=20`plugin=20new`=20adds=20dummy=20app?= =?UTF-8?q?=20tasks=20when=20necessary.=20=E2=80=A6=20The=20`plugin=20new`?= =?UTF-8?q?=20generator=20always=20adds=20the=20dummy=20app=20rake=20tasks?= =?UTF-8?q?,=20when=20a=20dummy=20app=20was=20created.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #8224 Conflicts: railties/CHANGELOG.md --- .../lib/rails/generators/rails/plugin_new/plugin_new_generator.rb | 6 +++++- railties/lib/rails/generators/rails/plugin_new/templates/Rakefile | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'railties/lib/rails') 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 918fa5bd3b..6c53d8bebb 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 @@ -204,7 +204,7 @@ task :default => :test end def create_test_dummy_files - return if options[:skip_test_unit] && options[:dummy_path] == 'test/dummy' + return unless with_dummy_app? create_dummy_app end @@ -242,6 +242,10 @@ task :default => :test options[:mountable] end + def with_dummy_app? + options[:skip_test_unit].blank? || options[:dummy_path] != 'test/dummy' + end + def self.banner "rails plugin new #{self.arguments.map(&:usage).join(' ')} [options]" end diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile b/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile index 564fda3c49..9b3b8cc03f 100755 --- a/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile +++ b/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile @@ -20,7 +20,7 @@ RDoc::Task.new(:rdoc) do |rdoc| rdoc.rdoc_files.include('lib/**/*.rb') end -<% if full? && !options[:skip_active_record] && !options[:skip_test_unit] -%> +<% if full? && !options[:skip_active_record] && with_dummy_app? -%> APP_RAKEFILE = File.expand_path("../<%= dummy_path -%>/Rakefile", __FILE__) load 'rails/tasks/engine.rake' <% end %> -- cgit v1.2.3