railties 5.0.7.2 → 5.1.0.beta1

data/lib/rails/generators/actions.rb

@@ -68,7 +68,7 @@ module Rails
       #   add_source "http://gems.github.com/" do
       #     gem "rspec-rails"
       #   end
-      def add_source(source, options={}, &block)
+      def add_source(source, options = {}, &block)
         log :source, source
 
         in_root do
@@ -96,14 +96,14 @@ module Rails
       #   environment(nil, env: "development") do
       #     "config.action_controller.asset_host = 'localhost:3000'"
       #   end
-      def environment(data=nil, options={})
+      def environment(data = nil, options = {})
         sentinel = /class [a-z_:]+ < Rails::Application/i
         env_file_sentinel = /Rails\.application\.configure do/
         data = yield if !data && block_given?
 
         in_root do
           if options[:env].nil?
-            inject_into_file 'config/application.rb', "\n    #{data}", after: sentinel, verbose: false
+            inject_into_file "config/application.rb", "\n    #{data}", after: sentinel, verbose: false
           else
             Array(options[:env]).each do |env|
               inject_into_file "config/environments/#{env}.rb", "\n  #{data}", after: env_file_sentinel, verbose: false
@@ -118,7 +118,7 @@ module Rails
       #   git :init
       #   git add: "this.file that.rb"
       #   git add: "onefile.rb", rm: "badfile.cxx"
-      def git(commands={})
+      def git(commands = {})
         if commands.is_a?(Symbol)
           run "git #{commands}"
         else
@@ -137,7 +137,7 @@ module Rails
       #   end
       #
       #   vendor("foreign.rb", "# Foreign code is fun")
-      def vendor(filename, data=nil, &block)
+      def vendor(filename, data = nil, &block)
         log :vendor, filename
         create_file("vendor/#{filename}", data, verbose: false, &block)
       end
@@ -150,7 +150,7 @@ module Rails
       #   end
       #
       #   lib("foreign.rb", "# Foreign code is fun")
-      def lib(filename, data=nil, &block)
+      def lib(filename, data = nil, &block)
         log :lib, filename
         create_file("lib/#{filename}", data, verbose: false, &block)
       end
@@ -170,7 +170,7 @@ module Rails
       #   end
       #
       #   rakefile('seed.rake', 'puts "Planting seeds"')
-      def rakefile(filename, data=nil, &block)
+      def rakefile(filename, data = nil, &block)
         log :rakefile, filename
         create_file("lib/tasks/#{filename}", data, verbose: false, &block)
       end
@@ -188,7 +188,7 @@ module Rails
       #   end
       #
       #   initializer("api.rb", "API_KEY = '123456'")
-      def initializer(filename, data=nil, &block)
+      def initializer(filename, data = nil, &block)
         log :initializer, filename
         create_file("config/initializers/#{filename}", data, verbose: false, &block)
       end
@@ -210,7 +210,7 @@ module Rails
       #   rake("db:migrate")
       #   rake("db:migrate", env: "production")
       #   rake("gems:install", sudo: true)
-      def rake(command, options={})
+      def rake(command, options = {})
         execute_command :rake, command, options
       end
 
@@ -219,7 +219,7 @@ module Rails
       #   rails("db:migrate")
       #   rails("db:migrate", env: "production")
       #   rails("gems:install", sudo: true)
-      def rails_command(command, options={})
+      def rails_command(command, options = {})
         execute_command :rails, command, options
       end
 
@@ -239,7 +239,7 @@ module Rails
         sentinel = /\.routes\.draw do\s*\n/m
 
         in_root do
-          inject_into_file 'config/routes.rb', "  #{routing_code}\n", { after: sentinel, verbose: false, force: false }
+          inject_into_file "config/routes.rb", "  #{routing_code}\n", after: sentinel, verbose: false, force: false
         end
       end
 
@@ -260,33 +260,32 @@ module Rails
         @after_bundle_callbacks << block
       end
 
-      protected
+      private
 
         # Define log for backwards compatibility. If just one argument is sent,
         # invoke say, otherwise invoke say_status. Differently from say and
         # similarly to say_status, this method respects the quiet? option given.
-        def log(*args)
+        def log(*args) # :doc:
           if args.size == 1
             say args.first.to_s unless options.quiet?
           else
-            args << (self.behavior == :invoke ? :green : :red)
+            args << (behavior == :invoke ? :green : :red)
             say_status(*args)
           end
         end
 
-
         # Runs the supplied command using either "rake ..." or "rails ..."
         # based on the executor parameter provided.
-        def execute_command(executor, command, options={})
+        def execute_command(executor, command, options = {}) # :doc:
           log executor, command
-          env  = options[:env] || ENV["RAILS_ENV"] || 'development'
-          sudo = options[:sudo] && RbConfig::CONFIG['host_os'] !~ /mswin|mingw/ ? 'sudo ' : ''
+          env  = options[:env] || ENV["RAILS_ENV"] || "development"
+          sudo = options[:sudo] && !Gem.win_platform? ? "sudo " : ""
           in_root { run("#{sudo}#{extify(executor)} #{command} RAILS_ENV=#{env}", verbose: false) }
         end
 
         # Add an extension to the given name based on the platform.
-        def extify(name)
-          if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
+        def extify(name) # :doc:
+          if Gem.win_platform?
             "#{name}.bat"
           else
             name
@@ -295,7 +294,7 @@ module Rails
 
         # Surround string with single quotes if there is no quotes.
         # Otherwise fall back to double quotes
-        def quote(value)
+        def quote(value) # :doc:
           return value.inspect unless value.is_a? String
 
           if value.include?("'")

data/lib/rails/generators/actions/create_migration.rb

@@ -1,11 +1,10 @@
-require 'fileutils'
-require 'thor/actions'
+require "fileutils"
+require "thor/actions"
 
 module Rails
   module Generators
     module Actions
       class CreateMigration < Thor::Actions::CreateFile #:nodoc:
-
         def migration_dir
           File.dirname(@destination)
         end
@@ -38,32 +37,32 @@ module Rails
         end
         alias :exists? :existing_migration
 
-        protected
+        private
 
-        def on_conflict_behavior
-          options = base.options.merge(config)
-          if identical?
-            say_status :identical, :blue, relative_existing_migration
-          elsif options[:force]
-            say_status :remove, :green, relative_existing_migration
-            say_status :create, :green
-            unless pretend?
-              ::FileUtils.rm_rf(existing_migration)
-              yield
+          def on_conflict_behavior # :doc:
+            options = base.options.merge(config)
+            if identical?
+              say_status :identical, :blue, relative_existing_migration
+            elsif options[:force]
+              say_status :remove, :green, relative_existing_migration
+              say_status :create, :green
+              unless pretend?
+                ::FileUtils.rm_rf(existing_migration)
+                yield
+              end
+            elsif options[:skip]
+              say_status :skip, :yellow
+            else
+              say_status :conflict, :red
+              raise Error, "Another migration is already named #{migration_file_name}: " \
+                "#{existing_migration}. Use --force to replace this migration " \
+                "or --skip to ignore conflicted file."
             end
-          elsif options[:skip]
-            say_status :skip, :yellow
-          else
-            say_status :conflict, :red
-            raise Error, "Another migration is already named #{migration_file_name}: " +
-              "#{existing_migration}. Use --force to replace this migration " +
-              "or --skip to ignore conflicted file."
           end
-        end
 
-        def say_status(status, color, message = relative_destination)
-          base.shell.say_status(status, message, color) if config[:verbose]
-        end
+          def say_status(status, color, message = relative_destination) # :doc:
+            base.shell.say_status(status, message, color) if config[:verbose]
+          end
       end
     end
   end

data/lib/rails/generators/active_model.rb

@@ -39,13 +39,13 @@ module Rails
       # GET edit
       # PATCH/PUT update
       # DELETE destroy
-      def self.find(klass, params=nil)
+      def self.find(klass, params = nil)
         "#{klass}.find(#{params})"
       end
 
       # GET new
       # POST create
-      def self.build(klass, params=nil)
+      def self.build(klass, params = nil)
         if params
           "#{klass}.new(#{params})"
         else
@@ -59,7 +59,7 @@ module Rails
       end
 
       # PATCH/PUT update
-      def update(params=nil)
+      def update(params = nil)
         "#{name}.update(#{params})"
       end
 

data/lib/rails/generators/app_base.rb

@@ -1,16 +1,16 @@
-require 'fileutils'
-require 'digest/md5'
-require 'active_support/core_ext/string/strip'
-require 'rails/version' unless defined?(Rails::VERSION)
-require 'open-uri'
-require 'uri'
-require 'rails/generators'
-require 'active_support/core_ext/array/extract_options'
+require "fileutils"
+require "digest/md5"
+require "active_support/core_ext/string/strip"
+require "rails/version" unless defined?(Rails::VERSION)
+require "open-uri"
+require "uri"
+require "rails/generators"
+require "active_support/core_ext/array/extract_options"
 
 module Rails
   module Generators
     class AppBase < Base # :nodoc:
-      DATABASES = %w( mysql oracle postgresql sqlite3 frontbase ibm_db sqlserver )
+      DATABASES = %w( mysql postgresql sqlite3 oracle frontbase ibm_db sqlserver )
       JDBC_DATABASES = %w( jdbcmysql jdbcsqlite3 jdbcpostgresql jdbc )
       DATABASES.concat(JDBC_DATABASES)
 
@@ -24,42 +24,45 @@ module Rails
       end
 
       def self.add_shared_options_for(name)
-        class_option :template,           type: :string, aliases: '-m',
+        class_option :template,           type: :string, aliases: "-m",
                                           desc: "Path to some #{name} template (can be a filesystem path or URL)"
 
-        class_option :database,           type: :string, aliases: '-d', default: 'sqlite3',
+        class_option :database,           type: :string, aliases: "-d", default: "sqlite3",
                                           desc: "Preconfigure for selected database (options: #{DATABASES.join('/')})"
 
-        class_option :javascript,         type: :string, aliases: '-j', default: 'jquery',
-                                          desc: 'Preconfigure for selected JavaScript library'
+        class_option :javascript,         type: :string, aliases: "-j",
+                                          desc: "Preconfigure for selected JavaScript library"
+
+        class_option :webpack,            type: :string, default: nil,
+                                          desc: "Preconfigure for app-like JavaScript with Webpack"
+
+        class_option :skip_yarn,          type: :boolean, default: false,
+                                          desc: "Don't use Yarn for managing JavaScript dependencies"
 
         class_option :skip_gemfile,       type: :boolean, default: false,
                                           desc: "Don't create a Gemfile"
 
-        class_option :skip_bundle,        type: :boolean, aliases: '-B', default: false,
-                                          desc: "Don't run bundle install"
-
-        class_option :skip_git,           type: :boolean, aliases: '-G', default: false,
-                                          desc: 'Skip .gitignore file'
+        class_option :skip_git,           type: :boolean, aliases: "-G", default: false,
+                                          desc: "Skip .gitignore file"
 
         class_option :skip_keeps,         type: :boolean, default: false,
-                                          desc: 'Skip source control .keep files'
+                                          desc: "Skip source control .keep files"
 
         class_option :skip_action_mailer, type: :boolean, aliases: "-M",
                                           default: false,
                                           desc: "Skip Action Mailer files"
 
-        class_option :skip_active_record, type: :boolean, aliases: '-O', default: false,
-                                          desc: 'Skip Active Record files'
+        class_option :skip_active_record, type: :boolean, aliases: "-O", default: false,
+                                          desc: "Skip Active Record files"
 
-        class_option :skip_puma,          type: :boolean, aliases: '-P', default: false,
-                                          desc: 'Skip Puma related files'
+        class_option :skip_puma,          type: :boolean, aliases: "-P", default: false,
+                                          desc: "Skip Puma related files"
 
-        class_option :skip_action_cable,  type: :boolean, aliases: '-C', default: false,
-                                          desc: 'Skip Action Cable files'
+        class_option :skip_action_cable,  type: :boolean, aliases: "-C", default: false,
+                                          desc: "Skip Action Cable files"
 
-        class_option :skip_sprockets,     type: :boolean, aliases: '-S', default: false,
-                                          desc: 'Skip Sprockets files'
+        class_option :skip_sprockets,     type: :boolean, aliases: "-S", default: false,
+                                          desc: "Skip Sprockets files"
 
         class_option :skip_spring,        type: :boolean, default: false,
                                           desc: "Don't install Spring application preloader"
@@ -67,14 +70,20 @@ module Rails
         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'
+        class_option :skip_coffee,        type: :boolean, default: false,
+                                          desc: "Don't use CoffeeScript"
+
+        class_option :skip_javascript,    type: :boolean, aliases: "-J", default: false,
+                                          desc: "Skip JavaScript files"
 
         class_option :skip_turbolinks,    type: :boolean, default: false,
-                                          desc: 'Skip turbolinks gem'
+                                          desc: "Skip turbolinks gem"
+
+        class_option :skip_test,          type: :boolean, aliases: "-T", default: false,
+                                          desc: "Skip test files"
 
-        class_option :skip_test,          type: :boolean, aliases: '-T', default: false,
-                                          desc: 'Skip test files'
+        class_option :skip_system_test,   type: :boolean, default: false,
+                                          desc: "Skip system test files"
 
         class_option :dev,                type: :boolean, default: false,
                                           desc: "Setup the #{name} with Gemfile pointing to your Rails checkout"
@@ -86,10 +95,10 @@ module Rails
                                           desc: "Path to file containing extra configuration options for rails command"
 
         class_option :no_rc,              type: :boolean, default: false,
-                                          desc: 'Skip loading of extra configuration options from .railsrc file'
+                                          desc: "Skip loading of extra configuration options from .railsrc file"
 
-        class_option :help,               type: :boolean, aliases: '-h', group: :rails,
-                                          desc: 'Show this help message and quit'
+        class_option :help,               type: :boolean, aliases: "-h", group: :rails,
+                                          desc: "Show this help message and quit"
       end
 
       def initialize(*args)
@@ -99,9 +108,9 @@ module Rails
         convert_database_option_for_jruby
       end
 
-    protected
+    private
 
-      def gemfile_entry(name, *args)
+      def gemfile_entry(name, *args) # :doc:
         options = args.extract_options!
         version = args.first
         github = options[:github]
@@ -117,11 +126,12 @@ module Rails
         self
       end
 
-      def gemfile_entries
+      def gemfile_entries # :doc:
         [rails_gemfile_entry,
          database_gemfile_entry,
          webserver_gemfile_entry,
          assets_gemfile_entry,
+         webpacker_gemfile_entry,
          javascript_gemfile_entry,
          jbuilder_gemfile_entry,
          psych_gemfile_entry,
@@ -129,13 +139,13 @@ module Rails
          @extra_entries].flatten.find_all(&@gem_filter)
       end
 
-      def add_gem_entry_filter
+      def add_gem_entry_filter # :doc:
         @gem_filter = lambda { |next_filter, entry|
           yield(entry) && next_filter.call(entry)
         }.curry[@gem_filter]
       end
 
-      def builder
+      def builder # :doc:
         @builder ||= begin
           builder_class = get_builder_class
           builder_class.include(ActionMethods)
@@ -143,62 +153,63 @@ module Rails
         end
       end
 
-      def build(meth, *args)
+      def build(meth, *args) # :doc:
         builder.send(meth, *args) if builder.respond_to?(meth)
       end
 
-      def create_root
+      def create_root # :doc:
         valid_const?
 
-        empty_directory '.'
+        empty_directory "."
         FileUtils.cd(destination_root) unless options[:pretend]
       end
 
-      def apply_rails_template
+      def apply_rails_template # :doc:
         apply rails_template if rails_template
       rescue Thor::Error, LoadError, Errno::ENOENT => e
         raise Error, "The template [#{rails_template}] could not be loaded. Error: #{e}"
       end
 
-      def set_default_accessors!
+      def set_default_accessors! # :doc:
         self.destination_root = File.expand_path(app_path, destination_root)
-        self.rails_template = case options[:template]
+        self.rails_template = \
+          case options[:template]
           when /^https?:\/\//
             options[:template]
           when String
             File.expand_path(options[:template], Dir.pwd)
           else
             options[:template]
-        end
+          end
       end
 
-      def database_gemfile_entry
+      def database_gemfile_entry # :doc:
         return [] if options[:skip_active_record]
         gem_name, gem_version = gem_for_database
         GemfileEntry.version gem_name, gem_version,
                             "Use #{options[:database]} as the database for Active Record"
       end
 
-      def webserver_gemfile_entry
+      def webserver_gemfile_entry # :doc:
         return [] if options[:skip_puma]
-        comment = 'Use Puma as the app server'
-        GemfileEntry.new('puma', '~> 3.0', comment)
+        comment = "Use Puma as the app server"
+        GemfileEntry.new("puma", "~> 3.7", comment)
       end
 
-      def include_all_railties?
+      def include_all_railties? # :doc:
         options.values_at(:skip_active_record, :skip_action_mailer, :skip_test, :skip_sprockets, :skip_action_cable).none?
       end
 
-      def comment_if(value)
-        options[value] ? '# ' : ''
+      def comment_if(value) # :doc:
+        options[value] ? "# " : ""
       end
 
-      def keeps?
+      def keeps? # :doc:
         !options[:skip_keeps]
       end
 
-      def sqlite3?
-        !options[:skip_active_record] && options[:database] == 'sqlite3'
+      def sqlite3? # :doc:
+        !options[:skip_active_record] && options[:database] == "sqlite3"
       end
 
       class GemfileEntry < Struct.new(:name, :version, :comment, :options, :commented_out)
@@ -238,40 +249,39 @@ module Rails
         ]
         if options.dev?
           [
-            GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH)
+            GemfileEntry.path("rails", Rails::Generators::RAILS_DEV_PATH)
           ] + dev_edge_common
         elsif options.edge?
           [
-            GemfileEntry.github('rails', 'rails/rails', '5-0-stable')
+            GemfileEntry.github("rails", "rails/rails")
           ] + dev_edge_common
         else
-          [GemfileEntry.version('rails',
+          [GemfileEntry.version("rails",
                             rails_version_specifier,
                             "Bundle edge Rails instead: gem 'rails', github: 'rails/rails'")]
         end
       end
 
       def rails_version_specifier(gem_version = Rails.gem_version)
-        if gem_version.prerelease?
-          next_series = gem_version
-          next_series = next_series.bump while next_series.segments.size > 2
-
-          [">= #{gem_version}", "< #{next_series}"]
-        elsif gem_version.segments.size == 3
+        if gem_version.segments.size == 3 || gem_version.release.segments.size == 3
+          # ~> 1.2.3
+          # ~> 1.2.3.pre4
           "~> #{gem_version}"
         else
+          # ~> 1.2.3, >= 1.2.3.4
+          # ~> 1.2.3, >= 1.2.3.4.pre5
           patch = gem_version.segments[0, 3].join(".")
           ["~> #{patch}", ">= #{gem_version}"]
         end
       end
 
       def gem_for_database
-        # %w( mysql oracle postgresql sqlite3 frontbase ibm_db sqlserver jdbcmysql jdbcsqlite3 jdbcpostgresql )
+        # %w( mysql postgresql sqlite3 oracle frontbase ibm_db sqlserver jdbcmysql jdbcsqlite3 jdbcpostgresql )
         case options[:database]
+        when "mysql"          then ["mysql2", [">= 0.3.18", "< 0.5"]]
+        when "postgresql"     then ["pg", ["~> 0.18"]]
         when "oracle"         then ["ruby-oci8", nil]
-        when "postgresql"     then ["pg", [">= 0.18", "< 2.0"]]
         when "frontbase"      then ["ruby-frontbase", nil]
-        when "mysql"          then ["mysql2", [">= 0.3.18", "< 0.6.0"]]
         when "sqlserver"      then ["activerecord-sqlserver-adapter", nil]
         when "jdbcmysql"      then ["activerecord-jdbcmysql-adapter", nil]
         when "jdbcsqlite3"    then ["activerecord-jdbcsqlite3-adapter", nil]
@@ -284,9 +294,9 @@ module Rails
       def convert_database_option_for_jruby
         if defined?(JRUBY_VERSION)
           case options[:database]
-          when "oracle"     then options[:database].replace "jdbc"
           when "postgresql" then options[:database].replace "jdbcpostgresql"
           when "mysql"      then options[:database].replace "jdbcmysql"
+          when "oracle"     then options[:database].replace "jdbc"
           when "sqlite3"    then options[:database].replace "jdbcsqlite3"
           end
         end
@@ -296,32 +306,45 @@ module Rails
         return [] if options[:skip_sprockets]
 
         gems = []
-        gems << GemfileEntry.version('sass-rails', '~> 5.0',
-                                     'Use SCSS for stylesheets')
+        gems << GemfileEntry.github("sass-rails", "rails/sass-rails", nil,
+                                     "Use SCSS for stylesheets")
 
-        gems << GemfileEntry.version('uglifier',
-                                   '>= 1.3.0',
-                                   'Use Uglifier as compressor for JavaScript assets')
+        if !options[:skip_javascript]
+          gems << GemfileEntry.version("uglifier",
+                                     ">= 1.3.0",
+                                     "Use Uglifier as compressor for JavaScript assets")
+        end
 
         gems
       end
 
+      def webpacker_gemfile_entry
+        return [] unless options[:webpack]
+
+        comment = "Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker"
+        GemfileEntry.github "webpacker", "rails/webpacker", nil, comment
+      end
+
       def jbuilder_gemfile_entry
-        comment = 'Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder'
-        GemfileEntry.new 'jbuilder', '~> 2.5', comment, {}, options[:api]
+        comment = "Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder"
+        GemfileEntry.new "jbuilder", "~> 2.5", comment, {}, options[:api]
       end
 
       def coffee_gemfile_entry
-        GemfileEntry.version 'coffee-rails', '~> 4.2', 'Use CoffeeScript for .coffee assets and views'
+        GemfileEntry.version "coffee-rails", "~> 4.2", "Use CoffeeScript for .coffee assets and views"
       end
 
       def javascript_gemfile_entry
         if options[:skip_javascript] || options[:skip_sprockets]
           []
         else
-          gems = [coffee_gemfile_entry, javascript_runtime_gemfile_entry]
-          gems << GemfileEntry.version("#{options[:javascript]}-rails", nil,
-                                       "Use #{options[:javascript]} as the JavaScript library")
+          gems = [javascript_runtime_gemfile_entry]
+          gems << coffee_gemfile_entry unless options[:skip_coffee]
+
+          if options[:javascript]
+            gems << GemfileEntry.version("#{options[:javascript]}-rails", nil,
+              "Use #{options[:javascript]} as the JavaScript library")
+          end
 
           unless options[:skip_turbolinks]
             gems << GemfileEntry.version("turbolinks", "~> 5",
@@ -333,27 +356,27 @@ module Rails
       end
 
       def javascript_runtime_gemfile_entry
-        comment = 'See https://github.com/rails/execjs#readme for more supported runtimes'
+        comment = "See https://github.com/rails/execjs#readme for more supported runtimes"
         if defined?(JRUBY_VERSION)
-          GemfileEntry.version 'therubyrhino', nil, comment
+          GemfileEntry.version "therubyrhino", nil, comment
         else
-          GemfileEntry.new 'therubyracer', nil, comment, { platforms: :ruby }, true
+          GemfileEntry.new "therubyracer", nil, comment, { platforms: :ruby }, true
         end
       end
 
       def psych_gemfile_entry
         return [] unless defined?(Rubinius)
 
-        comment = 'Use Psych as the YAML engine, instead of Syck, so serialized ' \
-                  'data can be read safely from different rubies (see http://git.io/uuLVag)'
-        GemfileEntry.new('psych', '~> 2.0', comment, platforms: :rbx)
+        comment = "Use Psych as the YAML engine, instead of Syck, so serialized " \
+                  "data can be read safely from different rubies (see http://git.io/uuLVag)"
+        GemfileEntry.new("psych", "~> 2.0", comment, platforms: :rbx)
       end
 
       def cable_gemfile_entry
         return [] if options[:skip_action_cable]
-        comment = 'Use Redis adapter to run Action Cable in production'
+        comment = "Use Redis adapter to run Action Cable in production"
         gems = []
-        gems << GemfileEntry.new("redis", '~> 3.0', comment, {}, true)
+        gems << GemfileEntry.new("redis", "~> 3.0", comment, {}, true)
         gems
       end
 
@@ -368,9 +391,9 @@ module Rails
         # We unset temporary bundler variables to load proper bundler and Gemfile.
         #
         # Thanks to James Tucker for the Gem tricks involved in this call.
-        _bundle_command = Gem.bin_path('bundler', 'bundle')
+        _bundle_command = Gem.bin_path("bundler", "bundle")
 
-        require 'bundler'
+        require "bundler"
         Bundler.with_clean_env do
           full_command = %Q["#{Gem.ruby}" "#{_bundle_command}" #{command}]
           if options[:quiet]
@@ -394,11 +417,18 @@ module Rails
       end
 
       def os_supports_listen_out_of_the_box?
-        RbConfig::CONFIG['host_os'] =~ /darwin|linux/
+        RbConfig::CONFIG["host_os"] =~ /darwin|linux/
       end
 
       def run_bundle
-        bundle_command('install') if bundle_install?
+        bundle_command("install") if bundle_install?
+      end
+
+      def run_webpack
+        if !(webpack = options[:webpack]).nil?
+          rails_command "webpacker:install"
+          rails_command "webpacker:install:#{webpack}" unless webpack == "webpack"
+        end
       end
 
       def generate_spring_binstubs