railties 5.0.0.beta2 → 5.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83e9a8d14879b7cd28fc9fd57f76b5e2f280c609
-  data.tar.gz: ac950ac53f6b98b0797920ed8d93fd96e875b74e
+  metadata.gz: b4fea73157abd641e818793971d61f9ba1c982cb
+  data.tar.gz: 9356d423706a1cb8c934ca166661c0bd9a018f5d
 SHA512:
-  metadata.gz: 99c2414aba749e7dd0bb5fb7fb473387ded69a813dae0a40e4d4b2925318575bfed83ae59b46b28234590a7606aa5e82ef1237d97b9435da4504be22c9712e53
-  data.tar.gz: 0b1c83b2b97aa12caf646777cc37313eb25f46111b9359b4b648507698840678e1f2a12af058fd6ea288a8c35e267adaa5718e6529922340d581d7766bc67b40
+  metadata.gz: 93728268e600949966dcb493db8738e8b601d973d09bff191808f473e5015862a8a533268e0354136e42b27e4ed73cfe70e8cbe6e34556ff39eeb292acddaea7
+  data.tar.gz: 941025bde174d4fc8645f143148dc26addbd7eb60df50d31c500fa9258105aa5d363b4270b7223ac3f90a280e35d4aa8e5c58a6ebab2c46716751e2b365c646b

data/CHANGELOG.md

@@ -1,3 +1,37 @@
+## Rails 5.0.0.beta3 (February 24, 2016) ##
+
+*   Alias `rake` with `rails_command` in the Rails Application Templates API
+    following Rails 5 convention of preferring "rails" to "rake" to run tasks.
+
+    *claudiob*
+
+*   Generate applications with an option to log to STDOUT in production
+    using the environment variable `RAILS_LOG_TO_STDOUT`.
+
+    *Richard Schneeman*
+
+*   Change fail fast of `bin/rails test` interrupts run on error.
+
+    *Yuji Yaginuma*
+
+*   The application generator supports `--skip-listen` to opt-out of features
+    that depend on the listen gem. As of this writing they are the evented file
+    system monitor and the async plugin for spring.
+
+*   The Gemfiles of new applications include spring-watcher-listen on Linux and
+    Mac OS X (unless --skip-spring).
+
+    *Xavier Noria*
+
+*   New applications are generated with the evented file system monitor enabled
+    on Linux and Mac OS X.
+
+    *Xavier Noria*
+
+*   Add dummy files for apple-touch-icon.png and apple-touch-icon.png. GH#23427
+
+    *Alexey Zabelin*
+
 ## Rails 5.0.0.beta2 (February 01, 2016) ##
 
 *   Add `after_bundle` callbacks in Rails plugin templates.  Useful for allowing

data/RDOC_MAIN.rdoc

@@ -51,7 +51,7 @@ can read more about Action Pack in its {README}[link:files/actionpack/README_rdo
 
 4. Go to http://localhost:3000 and you'll see:
 
-    "Welcome aboard: You're riding Ruby on Rails!"
+    "Yay! You’re on Rails!"
 
 5. Follow the guidelines to start developing your application. You may find the following resources handy:
 

data/lib/rails/application.rb

@@ -214,7 +214,7 @@ module Rails
     #       url: http://localhost:3001
     #       namespace: my_app_development
     #
-    #     # config/production.rb
+    #     # config/environments/production.rb
     #     Rails.application.configure do
     #       config.middleware.use ExceptionNotifier, config_for(:exception_notification)
     #     end

data/lib/rails/application/finisher.rb

@@ -22,10 +22,10 @@ module Rails
       initializer :add_builtin_route do |app|
         if Rails.env.development?
           app.routes.append do
-            get '/rails/info/properties' => "rails/info#properties"
-            get '/rails/info/routes'     => "rails/info#routes"
-            get '/rails/info'            => "rails/info#index"
-            get '/'                      => "rails/welcome#index"
+            get '/rails/info/properties' => "rails/info#properties", internal: true
+            get '/rails/info/routes'     => "rails/info#routes", internal: true
+            get '/rails/info'            => "rails/info#index", internal: true
+            get '/'                      => "rails/welcome#index", internal: true
           end
         end
       end

data/lib/rails/code_statistics.rb

@@ -9,6 +9,8 @@ class CodeStatistics #:nodoc:
                 'Job tests',
                 'Integration tests']
 
+  HEADERS = {lines: ' Lines', code_lines: '   LOC', classes: 'Classes', methods: 'Methods'}
+
   def initialize(*pairs)
     @pairs      = pairs
     @statistics = calculate_statistics
@@ -67,27 +69,37 @@ class CodeStatistics #:nodoc:
       test_loc
     end
 
+    def width_for(label)
+      [@statistics.values.sum {|s| s.send(label) }.to_s.size, HEADERS[label].length].max
+    end
+
     def print_header
       print_splitter
-      puts "| Name                 |  Lines |   LOC  | Classes | Methods | M/C | LOC/M |"
+      print '| Name                '
+      HEADERS.each do |k, v|
+        print " | #{v.rjust(width_for(k))}"
+      end
+      puts ' | M/C | LOC/M |'
       print_splitter
     end
 
     def print_splitter
-      puts "+----------------------+--------+--------+---------+---------+-----+-------+"
+      print '+----------------------'
+      HEADERS.each_key do |k|
+        print "+#{'-' * (width_for(k) + 2)}"
+      end
+      puts '+-----+-------+'
     end
 
     def print_line(name, statistics)
       m_over_c   = (statistics.methods / statistics.classes) rescue m_over_c = 0
       loc_over_m = (statistics.code_lines / statistics.methods) - 2 rescue loc_over_m = 0
 
-      puts "| #{name.ljust(20)} " \
-           "| #{statistics.lines.to_s.rjust(6)} " \
-           "| #{statistics.code_lines.to_s.rjust(6)} " \
-           "| #{statistics.classes.to_s.rjust(7)} " \
-           "| #{statistics.methods.to_s.rjust(7)} " \
-           "| #{m_over_c.to_s.rjust(3)} " \
-           "| #{loc_over_m.to_s.rjust(5)} |"
+      print "| #{name.ljust(20)} "
+      HEADERS.each_key do |k|
+        print "| #{statistics.send(k).to_s.rjust(width_for(k))} "
+      end
+      puts "| #{m_over_c.to_s.rjust(3)} | #{loc_over_m.to_s.rjust(5)} |"
     end
 
     def print_code_test_stats

data/lib/rails/commands.rb

@@ -14,6 +14,5 @@ command = ARGV.shift
 command = aliases[command] || command
 
 require 'rails/command'
-require 'rails/commands/dev_cache'
 
 Rails::Command.run(command, ARGV)

data/lib/rails/commands/runner.rb

@@ -59,8 +59,8 @@ elsif File.exist?(code_or_file)
   Kernel.load code_or_file
 else
   begin
-    eval(code_or_file, binding, __FILE__, __LINE__) 
-  rescue SyntaxError,NameError => err
+    eval(code_or_file, binding, __FILE__, __LINE__)
+  rescue SyntaxError, NameError
     $stderr.puts "Please specify a valid ruby command or the path of a script to run."
     $stderr.puts "Run '#{$0} -h' for help."
     exit 1

data/lib/rails/engine/configuration.rb

@@ -39,6 +39,7 @@ module Rails
           paths.add "app",                 eager_load: true, glob: "{*,*/concerns}"
           paths.add "app/assets",          glob: "*"
           paths.add "app/controllers",     eager_load: true
+          paths.add "app/channels",        eager_load: true, glob: "**/*_channel.rb"
           paths.add "app/helpers",         eager_load: true
           paths.add "app/models",          eager_load: true
           paths.add "app/mailers",         eager_load: true

data/lib/rails/gem_version.rb

@@ -8,7 +8,7 @@ module Rails
     MAJOR = 5
     MINOR = 0
     TINY  = 0
-    PRE   = "beta2"
+    PRE   = "beta3"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/rails/generators.rb

@@ -105,7 +105,7 @@ module Rails
 
     # Configure generators for API only applications. It basically hides
     # everything that is usually browser related, such as assets and session
-    # migration generators, and completely disable views, helpers and assets
+    # migration generators, and completely disable helpers and assets
     # so generators such as scaffold won't create them.
     def self.api_only!
       hide_namespaces "assets", "helper", "css", "js"
@@ -116,6 +116,10 @@ module Rails
         helper: false,
         template_engine: nil
       )
+
+      if ARGV.first == 'mailer'
+        options[:rails].merge!(template_engine: :erb)
+      end
     end
 
     # Remove the color from output.

data/lib/rails/generators/actions.rb

@@ -216,8 +216,9 @@ module Rails
         log :rake, command
         env  = options[:env] || ENV["RAILS_ENV"] || 'development'
         sudo = options[:sudo] && RbConfig::CONFIG['host_os'] !~ /mswin|mingw/ ? 'sudo ' : ''
-        in_root { run("#{sudo}#{extify(:rake)} #{command} RAILS_ENV=#{env}", verbose: false) }
+        in_root { run("#{sudo}#{extify(:rails)} #{command} RAILS_ENV=#{env}", verbose: false) }
       end
+      alias :rails_command :rake
 
       # Just run the capify command in root
       #

data/lib/rails/generators/app_base.rb

@@ -63,6 +63,9 @@ module Rails
         class_option :skip_spring,        type: :boolean, default: false,
                                           desc: "Don't install Spring application preloader"
 
+        class_option :skip_listen,        type: :boolean, default: false,
+                                          desc: "Don't generate configuration that depends on the listen gem"
+
         class_option :skip_javascript,    type: :boolean, aliases: '-J', default: false,
                                           desc: 'Skip JavaScript files'
 
@@ -308,16 +311,11 @@ module Rails
       end
 
       def coffee_gemfile_entry
-        comment = 'Use CoffeeScript for .coffee assets and views'
-        if options.dev? || options.edge?
-          GemfileEntry.github 'coffee-rails', 'rails/coffee-rails', nil, comment
-        else
-          GemfileEntry.version 'coffee-rails', '~> 4.1.0', comment
-        end
+        GemfileEntry.version 'coffee-rails', '~> 4.1.0', 'Use CoffeeScript for .coffee assets and views'
       end
 
       def javascript_gemfile_entry
-        if options[:skip_javascript]
+        if options[:skip_javascript] || options[:skip_sprockets]
           []
         else
           gems = [coffee_gemfile_entry, javascript_runtime_gemfile_entry]
@@ -325,8 +323,8 @@ module Rails
                                        "Use #{options[:javascript]} as the JavaScript library")
 
           unless options[:skip_turbolinks]
-            gems << GemfileEntry.version("turbolinks", nil,
-             "Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks")
+            gems << GemfileEntry.version("turbolinks", "~> 5.x",
+             "Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks")
           end
 
           gems
@@ -352,9 +350,9 @@ module Rails
 
       def cable_gemfile_entry
         return [] if options[:skip_action_cable]
-        comment = 'Action Cable dependencies for the Redis adapter'
+        comment = 'Use Redis adapter to run Action Cable in production'
         gems = []
-        gems << GemfileEntry.new("redis", '~> 3.0', comment)
+        gems << GemfileEntry.new("redis", '~> 3.0', comment, {}, true)
         gems
       end
 
@@ -390,6 +388,14 @@ module Rails
         !options[:skip_spring] && !options.dev? && Process.respond_to?(:fork) && !RUBY_PLATFORM.include?("cygwin")
       end
 
+      def depend_on_listen?
+        !options[:skip_listen] && os_supports_listen_out_of_the_box?
+      end
+
+      def os_supports_listen_out_of_the_box?
+        RbConfig::CONFIG['host_os'] =~ /darwin|linux/
+      end
+
       def run_bundle
         bundle_command('install') if bundle_install?
       end

data/lib/rails/generators/rails/app/app_generator.rb

@@ -91,6 +91,7 @@ module Rails
       cookie_serializer_config_exist = File.exist?('config/initializers/cookies_serializer.rb')
       callback_terminator_config_exist = File.exist?('config/initializers/callback_terminator.rb')
       active_record_belongs_to_required_by_default_config_exist = File.exist?('config/initializers/active_record_belongs_to_required_by_default.rb')
+      action_cable_config_exist = File.exist?('config/cable.yml')
 
       config
 
@@ -105,6 +106,10 @@ module Rails
       unless active_record_belongs_to_required_by_default_config_exist
         remove_file 'config/initializers/active_record_belongs_to_required_by_default.rb'
       end
+
+      unless action_cable_config_exist
+        template 'config/cable.yml'
+      end
     end
 
     def database_yml
@@ -276,9 +281,9 @@ module Rails
         end
       end
 
-      def delete_app_views_if_api_option
+      def delete_application_layout_file_if_api_option
         if options[:api]
-          remove_dir 'app/views'
+          remove_file 'app/views/layouts/application.html.erb'
         end
       end
 

data/lib/rails/generators/rails/app/templates/Gemfile

@@ -38,9 +38,15 @@ group :development do
   gem 'web-console', '~> 3.0'
   <%- end -%>
 <%- end -%>
+<% if depend_on_listen? -%>
+  gem 'listen', '~> 3.0.5'
+<% end -%>
 <% if spring_install? -%>
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
+<% if depend_on_listen? -%>
+  gem 'spring-watcher-listen', '~> 2.0.0'
+<% end -%>
 <% end -%>
 end
 <% end -%>

data/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt

@@ -11,8 +11,8 @@
     <%%= stylesheet_link_tag    'application', media: 'all' %>
     <%- else -%>
       <%- if gemfile_entries.any? { |m| m.name == 'turbolinks' } -%>
-    <%%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
-    <%%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+    <%%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => 'reload' %>
+    <%%= javascript_include_tag 'application', 'data-turbolinks-track' => 'reload' %>
       <%- else -%>
     <%%= stylesheet_link_tag    'application', media: 'all' %>
     <%%= javascript_include_tag 'application' %>

data/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml

@@ -1,4 +1,4 @@
-# MySQL.  Versions 4.1 and 5.0 are recommended.
+# MySQL. Versions 5.0 and up are supported.
 #
 # Install the MySQL driver:
 #   gem install activerecord-jdbcmysql-adapter

data/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml

@@ -1,4 +1,4 @@
-# PostgreSQL. Versions 8.2 and up are supported.
+# PostgreSQL. Versions 9.1 and up are supported.
 #
 # Configure Using Gemfile
 # gem 'activerecord-jdbcpostgresql-adapter'

data/lib/rails/generators/rails/app/templates/config/databases/mysql.yml

@@ -1,4 +1,4 @@
-# MySQL.  Versions 5.0+ are recommended.
+# MySQL. Versions 5.0 and up are supported.
 #
 # Install the MySQL driver
 #   gem install mysql2

data/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml

@@ -1,4 +1,4 @@
-# PostgreSQL. Versions 8.2 and up are supported.
+# PostgreSQL. Versions 9.1 and up are supported.
 #
 # Install the pg driver:
 #   gem install pg
@@ -19,7 +19,7 @@ default: &default
   encoding: unicode
   # For details on connection pooling, see rails configuration guide
   # http://guides.rubyonrails.org/configuring.html#database-pooling
-  pool: 5
+  pool: <%%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
 
 development:
   <<: *default

data/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt

@@ -15,12 +15,22 @@ Rails.application.configure do
   # Enable/disable caching. By default caching is disabled.
   if Rails.root.join('tmp/caching-dev.txt').exist?
     config.action_controller.perform_caching = true
+
+    <%- unless options.skip_action_mailer? -%>
+    config.action_mailer.perform_caching = false
+    <%- end -%>
+
     config.cache_store = :memory_store
     config.public_file_server.headers = {
       'Cache-Control' => 'public, max-age=172800'
     }
   else
     config.action_controller.perform_caching = false
+
+    <%- unless options.skip_action_mailer? -%>
+    config.action_mailer.perform_caching = false
+    <%- end -%>
+
     config.cache_store = :null_store
   end
   <%- unless options.skip_action_mailer? -%>
@@ -58,5 +68,5 @@ Rails.application.configure do
 
   # Use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc. This feature depends on the listen gem.
-  # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+  <%= '# ' unless depend_on_listen? %>config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 end

data/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

@@ -60,6 +60,10 @@ Rails.application.configure do
   # require 'syslog/logger'
   # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')
 
+  if ENV["RAILS_LOG_TO_STDOUT"].present?
+    config.logger = ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
+  end
+
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
@@ -67,6 +71,7 @@ Rails.application.configure do
   # config.active_job.queue_adapter     = :resque
   # config.active_job.queue_name_prefix = "<%= app_name %>_#{Rails.env}"
   <%- unless options.skip_action_mailer? -%>
+  config.action_mailer.perform_caching = false
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.

data/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt

@@ -28,6 +28,7 @@ Rails.application.configure do
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
   <%- unless options.skip_action_mailer? -%>
+  config.action_mailer.perform_caching = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
@@ -35,9 +36,6 @@ Rails.application.configure do
   config.action_mailer.delivery_method = :test
   <%- end -%>
 
-  # Randomize the order test cases are executed.
-  config.active_support.test_order = :random
-
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 

data/lib/rails/generators/rails/app/templates/config/puma.rb

@@ -42,3 +42,6 @@ environment ENV.fetch("RAILS_ENV") { "development" }
 # on_worker_boot do
 #   ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
 # end
+
+# Allow puma to be restarted by `rails restart` command.
+plugin :tmp_restart

data/lib/rails/generators/rails/plugin/plugin_generator.rb

@@ -90,6 +90,7 @@ task default: :test
       opts[:force] = force
       opts[:skip_bundle] = true
       opts[:api] = options.api?
+      opts[:skip_listen] = true
 
       invoke Rails::Generators::AppGenerator,
         [ File.expand_path(dummy_path, destination_root) ], opts
@@ -287,10 +288,6 @@ task default: :test
 
     protected
 
-      def app_templates_dir
-        "../../app/templates"
-      end
-
       def create_dummy_app(path = nil)
         dummy_path(path) if path
 

data/lib/rails/generators/rails/plugin/templates/app/controllers/%namespaced_name%/application_controller.rb.tt

@@ -1,5 +1,6 @@
 <%= wrap_in_modules <<-rb.strip_heredoc
   class ApplicationController < ActionController::#{api? ? "API" : "Base"}
+    #{ api? ? '# ' : '' }protect_from_forgery with: :exception
   end
 rb
 %>

data/lib/rails/generators/test_unit/model/templates/fixtures.yml

@@ -6,7 +6,7 @@
   <%- if attribute.password_digest? -%>
   password_digest: <%%= BCrypt::Password.create('secret') %>
   <%- elsif attribute.reference? -%>
-  <%= yaml_key_value(attribute.column_name.sub(/_id$/, ''), attribute.default) %>
+  <%= yaml_key_value(attribute.column_name.sub(/_id$/, ''), attribute.default || name) %>
   <%- else -%>
   <%= yaml_key_value(attribute.column_name, attribute.default) %>
   <%- end -%>

data/lib/rails/rack/logger.rb

@@ -72,10 +72,6 @@ module Rails
         instrumenter.finish 'request.action_dispatch', request: request
       end
 
-      def development?
-        Rails.env.development?
-      end
-
       def logger
         Rails.logger
       end

data/lib/rails/railtie.rb

@@ -183,7 +183,7 @@ module Rails
       end
 
       protected
-        def generate_railtie_name(string)
+        def generate_railtie_name(string) #:nodoc:
           ActiveSupport::Inflector.underscore(string).tr("/", "_")
         end
 
@@ -200,21 +200,24 @@ module Rails
 
     delegate :railtie_name, to: :class
 
-    def initialize
+    def initialize #:nodoc:
       if self.class.abstract_railtie?
         raise "#{self.class.name} is abstract, you cannot instantiate it directly."
       end
     end
 
-    def configure(&block)
+    def configure(&block) #:nodoc:
       instance_eval(&block)
     end
 
+    # This is used to create the <tt>config</tt> object on Railties, an instance of
+    # Railtie::Configuration, that is used by Railties and Application to store
+    # related configuration.
     def config
       @config ||= Railtie::Configuration.new
     end
 
-    def railtie_namespace
+    def railtie_namespace #:nodoc:
       @railtie_namespace ||= self.class.parents.detect { |n| n.respond_to?(:railtie_namespace) }
     end
 

data/lib/rails/tasks.rb

@@ -3,6 +3,7 @@ require 'rake'
 # Load Rails Rakefile extensions
 %w(
   annotations
+  dev
   framework
   initializers
   log

data/lib/rails/tasks/dev.rake

@@ -0,0 +1,14 @@
+namespace :dev do
+  desc 'Toggle development mode caching on/off'
+  task :cache do
+    if File.exist? 'tmp/caching-dev.txt'
+      File.delete 'tmp/caching-dev.txt'
+      puts 'Development mode is no longer being cached.'
+    else
+      FileUtils.touch 'tmp/caching-dev.txt'
+      puts 'Development mode is now being cached.'
+    end
+
+    FileUtils.touch 'tmp/restart.txt'
+  end
+end

data/lib/rails/tasks/framework.rake

@@ -45,7 +45,7 @@ namespace :rails do
         @app_generator ||= begin
           require 'rails/generators'
           require 'rails/generators/rails/app/app_generator'
-          gen = Rails::Generators::AppGenerator.new ["rails"], { with_dispatchers: true },
+          gen = Rails::Generators::AppGenerator.new ["rails"], { with_dispatchers: true, api: !!Rails.application.config.api_only },
             destination_root: Rails.root
           File.exist?(Rails.root.join("config", "application.rb")) ?
             gen.send(:app_const) : gen.send(:valid_const?)

data/lib/rails/tasks/routes.rake

@@ -2,15 +2,15 @@ require 'active_support/deprecation'
 require 'active_support/core_ext/string/strip' # for strip_heredoc
 require 'optparse'
 
-desc 'Print out all defined routes in match order, with names. Target specific controller with --controller option - or its -c shorthand.'
+desc 'Print out all defined routes in match order, with names. Target specific controller with -c option, or grep routes using -g option'
 task routes: :environment do
   all_routes = Rails.application.routes.routes
   require 'action_dispatch/routing/inspector'
   inspector = ActionDispatch::Routing::RoutesInspector.new(all_routes)
   if ARGV.any?{ |argv| argv.start_with? 'CONTROLLER' }
     puts <<-eow.strip_heredoc
-      Passing `CONTROLLER` to `bin/rake routes` is deprecated and will be removed in Rails 5.1.
-      Please use `bin/rake routes -c controller_name` instead.
+      Passing `CONTROLLER` to `bin/rails routes` is deprecated and will be removed in Rails 5.1.
+      Please use `bin/rails routes -c controller_name` instead.
     eow
   end
 
@@ -18,12 +18,12 @@ task routes: :environment do
   routes_filter = { controller: ENV['CONTROLLER'] } if ENV['CONTROLLER']
 
   OptionParser.new do |opts|
-    opts.banner = "Usage: rake routes [options]"
-    opts.on("-c", "--controller [CONTROLLER]") do |controller|
+    opts.banner = "Usage: rails routes [options]"
+    opts.on("-c CONTROLLER") do |controller|
       routes_filter = { controller: controller }
     end
 
-    opts.on("-g", "--grep [PATTERN]") do |pattern|
+    opts.on("-g PATTERN") do |pattern|
       routes_filter = pattern
     end
 

data/lib/rails/test_unit/line_filtering.rb

@@ -13,9 +13,12 @@ module Rails
   end
 
   class CompositeFilter # :nodoc:
+    attr_reader :named_filter
+
     def initialize(runnable, filter, patterns)
       @runnable = runnable
-      @filters = [ derive_regexp(filter), *derive_line_filters(patterns) ].compact
+      @named_filter = derive_named_filter(filter)
+      @filters = [ @named_filter, *derive_line_filters(patterns) ].compact
     end
 
     # Minitest uses === to find matching filters.
@@ -24,9 +27,14 @@ module Rails
     end
 
     private
-      def derive_regexp(filter)
-        # Regexp filtering copied from Minitest.
-        filter =~ %r%/(.*)/% ? Regexp.new($1) : filter
+      def derive_named_filter(filter)
+        if filter.respond_to?(:named_filter)
+          filter.named_filter
+        elsif filter =~ %r%/(.*)/% # Regexp filtering copied from Minitest.
+          Regexp.new $1
+        elsif filter.is_a?(String)
+          filter
+        end
       end
 
       def derive_line_filters(patterns)

data/lib/rails/test_unit/minitest_plugin.rb

@@ -1,6 +1,7 @@
 require "active_support/core_ext/module/attribute_accessors"
 require "rails/test_unit/reporter"
 require "rails/test_unit/test_requirer"
+require 'shellwords'
 
 module Minitest
   class SuppressedSummaryReporter < SummaryReporter
@@ -42,7 +43,7 @@ module Minitest
     end
 
     opts.on("-f", "--fail-fast",
-            "Abort test run on first failure") do
+            "Abort test run on first failure or error") do
       options[:fail_fast] = true
     end
 
@@ -60,11 +61,13 @@ module Minitest
   # as the patterns would also contain the other Rake tasks.
   def self.rake_run(patterns) # :nodoc:
     @rake_patterns = patterns
-    passed = run
+    passed = run(Shellwords.split(ENV['TESTOPTS'] || ''))
     exit passed unless passed
     passed
   end
 
+  # Owes great inspiration to test runner trailblazers like RSpec,
+  # minitest-reporters, maxitest and others.
   def self.plugin_rails_init(options)
     self.run_with_rails_extension = true
 

data/lib/rails/test_unit/reporter.rb

@@ -18,13 +18,13 @@ module Rails
       if output_inline? && result.failure && (!result.skipped? || options[:verbose])
         io.puts
         io.puts
-        io.puts format_failures(result).map { |line| color_output(line, by: result) }
+        io.puts color_output(result, by: result)
         io.puts
         io.puts format_rerun_snippet(result)
         io.puts
       end
 
-      if fail_fast? && result.failure && !result.error? && !result.skipped?
+      if fail_fast? && result.failure && !result.skipped?
         raise Interrupt
       end
     end
@@ -66,21 +66,9 @@ module Rails
         "%s#%s = %.2f s = %s" % [result.class, result.name, result.time, result.result_code]
       end
 
-      def format_failures(result)
-        result.failures.map do |failure|
-          "#{failure.result_label}:\n#{result.class}##{result.name}:\n#{failure.message}\n"
-        end
-      end
-
       def format_rerun_snippet(result)
-        # Try to extract path to assertion from backtrace.
-        if result.location =~ /\[(.*)\]\z/
-          assertion_path = $1
-        else
-          assertion_path = result.method(result.name).source_location.join(':')
-        end
-
-        "#{self.executable} #{relative_path_for(assertion_path)}"
+        location, line = result.method(result.name).source_location
+        "#{self.executable} #{relative_path_for(location)}:#{line}"
       end
 
       def app_root

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta2
+  version: 5.0.0.beta3
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta2
+        version: 5.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta2
+        version: 5.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta2
+        version: 5.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta2
+        version: 5.0.0.beta3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta2
+        version: 5.0.0.beta3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta2
+        version: 5.0.0.beta3
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -135,7 +135,6 @@ files:
 - lib/rails/commands/console_helper.rb
 - lib/rails/commands/dbconsole.rb
 - lib/rails/commands/destroy.rb
-- lib/rails/commands/dev_cache.rb
 - lib/rails/commands/generate.rb
 - lib/rails/commands/plugin.rb
 - lib/rails/commands/rake_proxy.rb
@@ -244,6 +243,8 @@ files:
 - lib/rails/generators/rails/app/templates/public/404.html
 - lib/rails/generators/rails/app/templates/public/422.html
 - lib/rails/generators/rails/app/templates/public/500.html
+- lib/rails/generators/rails/app/templates/public/apple-touch-icon-precomposed.png
+- lib/rails/generators/rails/app/templates/public/apple-touch-icon.png
 - lib/rails/generators/rails/app/templates/public/favicon.ico
 - lib/rails/generators/rails/app/templates/public/robots.txt
 - lib/rails/generators/rails/app/templates/test/test_helper.rb
@@ -354,6 +355,7 @@ files:
 - lib/rails/source_annotation_extractor.rb
 - lib/rails/tasks.rb
 - lib/rails/tasks/annotations.rake
+- lib/rails/tasks/dev.rake
 - lib/rails/tasks/engine.rake
 - lib/rails/tasks/framework.rake
 - lib/rails/tasks/initializers.rake
@@ -402,9 +404,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Tools for creating, working with, and running Rails applications.
 test_files: []
-has_rdoc: 

data/lib/rails/commands/dev_cache.rb

@@ -1,21 +0,0 @@
-require 'rails/command'
-
-module Rails
-  module Commands
-    # This is a wrapper around the Rails dev:cache command
-    class DevCache < Command
-      set_banner :dev_cache, 'Toggle development mode caching on/off'
-      def dev_cache
-        if File.exist? 'tmp/caching-dev.txt'
-          File.delete 'tmp/caching-dev.txt'
-          puts 'Development mode is no longer being cached.'
-        else
-          FileUtils.touch 'tmp/caching-dev.txt'
-          puts 'Development mode is now being cached.'
-        end
-
-        FileUtils.touch 'tmp/restart.txt'
-      end
-    end
-  end
-end