7 files changed, 38 insertions, 19 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index cc77d08684..8538d5fbfa 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Rails 4.0.0 (unreleased) ##
 
+*   Add dummy app Rake tasks when --skip-test-unit and --dummy-path is passed to the plugin generator.
+    Fix #8121
+
+    *Yves Senn*
+
 *   Ensure that RAILS_ENV is set when accessing Rails.env *Steve Klabnik*
 
 *   Don't eager-load app/assets and app/views *Elia Schito*
@@ -9,7 +14,7 @@
 *   New test locations `test/models`, `test/helpers`, `test/controllers`, and
     `test/mailers`. Corresponding rake tasks added as well. *Mike Moore*
 
-*   Set a different cache per environment for assets pipeline 
+*   Set a different cache per environment for assets pipeline
     through `config.assets.cache`.
 
     *Guillermo Iguaran*
diff --git a/railties/lib/rails/commands/server.rb b/railties/lib/rails/commands/server.rb
index 80fdc06cd2..0b897d736d 100644
--- a/railties/lib/rails/commands/server.rb
+++ b/railties/lib/rails/commands/server.rb
@@ -72,6 +72,7 @@ module Rails
 
         console = ActiveSupport::Logger.new($stdout)
         console.formatter = Rails.logger.formatter
+        console.level = Rails.logger.level
 
         Rails.logger.extend(ActiveSupport::Logger.broadcast(console))
       end
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 4a0bcc35a4..48ce3e86a1 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
@@ -225,7 +225,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
 
@@ -279,6 +279,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 1369140537..65a5bae712 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile
@@ -14,7 +14,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 %>
diff --git a/railties/lib/rails/rack/logger.rb b/railties/lib/rails/rack/logger.rb
index 3f59bb8733..7be2333981 100644
--- a/railties/lib/rails/rack/logger.rb
+++ b/railties/lib/rails/rack/logger.rb
@@ -24,8 +24,8 @@ module Rails
       def call_app(request, env)
         # Put some space between requests in development logs.
         if Rails.env.development?
-          Rails.logger.info ''
-          Rails.logger.info ''
+          Rails.logger.debug ''
+          Rails.logger.debug ''
         end
 
         Rails.logger.info started_request_message(request)
diff --git a/railties/railties.gemspec b/railties/railties.gemspec
index 6d28947e83..e39430560f 100644
--- a/railties/railties.gemspec
+++ b/railties/railties.gemspec
@@ -1,4 +1,4 @@
-version = File.read(File.expand_path("../../RAILS_VERSION", __FILE__)).strip
+version = File.read(File.expand_path('../../RAILS_VERSION', __FILE__)).strip
 
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
@@ -6,24 +6,27 @@ Gem::Specification.new do |s|
   s.version     = version
   s.summary     = 'Tools for creating, working with, and running Rails applications.'
   s.description = 'Rails internals: application bootup, plugins, generators, and rake tasks.'
+
   s.required_ruby_version = '>= 1.9.3'
-  s.license     = 'MIT'
 
-  s.author            = 'David Heinemeier Hansson'
-  s.email             = 'david@loudthinking.com'
-  s.homepage          = 'http://www.rubyonrails.org'
+  s.license = 'MIT'
+
+  s.author   = 'David Heinemeier Hansson'
+  s.email    = 'david@loudthinking.com'
+  s.homepage = 'http://www.rubyonrails.org'
 
-  s.files              = Dir['CHANGELOG.md', 'README.rdoc', 'bin/**/*', 'lib/**/{*,.[a-z]*}']
-  s.require_path       = 'lib'
+  s.files        = Dir['CHANGELOG.md', 'README.rdoc', 'bin/**/*', 'lib/**/{*,.[a-z]*}']
+  s.require_path = 'lib'
 
-  s.bindir             = 'bin'
-  s.executables        = ['rails']
+  s.bindir      = 'bin'
+  s.executables = ['rails']
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency('rake',          '>= 0.8.7')
-  s.add_dependency('thor',          '>= 0.15.4', '< 2.0')
-  s.add_dependency('rdoc',          '~> 3.4')
-  s.add_dependency('activesupport', version)
-  s.add_dependency('actionpack',    version)
+  s.add_dependency 'activesupport', version
+  s.add_dependency 'actionpack',    version
+
+  s.add_dependency 'rake', '>= 0.8.7'
+  s.add_dependency 'thor', '>= 0.15.4', '< 2.0'
+  s.add_dependency 'rdoc', '~> 3.4'
 end
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
index 6974db5751..ab78800a4e 100644
--- a/railties/test/generators/plugin_new_generator_test.rb
+++ b/railties/test/generators/plugin_new_generator_test.rb
@@ -66,6 +66,12 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
     assert_no_match(/APP_RAKEFILE/, File.read(File.join(destination_root, "Rakefile")))
   end
 
+  def test_generating_adds_dummy_app_rake_tasks_without_unit_test_files
+    run_generator [destination_root, "-T", "--mountable", '--dummy-path', 'my_dummy_app']
+
+    assert_match(/APP_RAKEFILE/, File.read(File.join(destination_root, "Rakefile")))
+  end
+
   def test_ensure_that_plugin_options_are_not_passed_to_app_generator
     FileUtils.cd(Rails.root)
     assert_no_match(/It works from file!.*It works_from_file/, run_generator([destination_root, "-m", "lib/template.rb"]))