railties 5.1.7 → 5.2.0.beta1

data/lib/rails/commands/destroy/destroy_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators"
 
 module Rails

data/lib/rails/commands/encrypted/encrypted_command.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require "pathname"
+require "active_support"
+require "rails/command/helpers/editor"
+
+module Rails
+  module Command
+    class EncryptedCommand < Rails::Command::Base # :nodoc:
+      include Helpers::Editor
+
+      class_option :key, aliases: "-k", type: :string,
+        default: "config/master.key", desc: "The Rails.root relative path to the encryption key"
+
+      no_commands do
+        def help
+          say "Usage:\n  #{self.class.banner}"
+          say ""
+        end
+      end
+
+      def edit(file_path)
+        require_application_and_environment!
+
+        ensure_editor_available(command: "bin/rails encrypted:edit") || (return)
+        ensure_encryption_key_has_been_added(options[:key])
+        ensure_encrypted_file_has_been_added(file_path, options[:key])
+
+        catch_editing_exceptions do
+          change_encrypted_file_in_system_editor(file_path, options[:key])
+        end
+
+        say "File encrypted and saved."
+      rescue ActiveSupport::MessageEncryptor::InvalidMessage
+        say "Couldn't decrypt #{file_path}. Perhaps you passed the wrong key?"
+      end
+
+      def show(file_path)
+        require_application_and_environment!
+
+        say Rails.application.encrypted(file_path, key_path: options[:key]).read.presence ||
+          "File '#{file_path}' does not exist. Use bin/rails encrypted:edit #{file_path} to change that."
+      end
+
+      private
+        def ensure_encryption_key_has_been_added(key_path)
+          encryption_key_file_generator.add_key_file(key_path)
+          encryption_key_file_generator.ignore_key_file(key_path)
+        end
+
+        def ensure_encrypted_file_has_been_added(file_path, key_path)
+          encrypted_file_generator.add_encrypted_file_silently(file_path, key_path)
+        end
+
+        def change_encrypted_file_in_system_editor(file_path, key_path)
+          Rails.application.encrypted(file_path, key_path: key_path).change do |tmp_path|
+            system("#{ENV["EDITOR"]} #{tmp_path}")
+          end
+        end
+
+
+        def encryption_key_file_generator
+          require "rails/generators"
+          require "rails/generators/rails/encryption_key_file/encryption_key_file_generator"
+
+          Rails::Generators::EncryptionKeyFileGenerator.new
+        end
+
+        def encrypted_file_generator
+          require "rails/generators"
+          require "rails/generators/rails/encrypted_file/encrypted_file_generator"
+
+          Rails::Generators::EncryptedFileGenerator.new
+        end
+    end
+  end
+end

data/lib/rails/commands/generate/generate_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators"
 
 module Rails

data/lib/rails/commands/help/help_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rails
   module Command
     class HelpCommand < Base # :nodoc:

data/lib/rails/commands/new/new_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rails
   module Command
     class NewCommand < Base # :nodoc:

data/lib/rails/commands/plugin/plugin_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rails
   module Command
     class PluginCommand < Base # :nodoc:

data/lib/rails/commands/rake/rake_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rails
   module Command
     class RakeCommand < Base # :nodoc:

data/lib/rails/commands/runner/USAGE

@@ -8,6 +8,9 @@ Run the Ruby file located at `path/to/filename.rb` after loading the app:
 
   <%= executable %> path/to/filename.rb
 
+Run the Ruby script read from stdin after loading the app:
+  <%= executable %> -
+
 <% unless Gem.win_platform? %>
 You can also use the runner command as a shebang line for your executables:
 

data/lib/rails/commands/runner/runner_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rails
   module Command
     class RunnerCommand < Base # :nodoc:
@@ -13,7 +15,7 @@ module Rails
       end
 
       def self.banner(*)
-        "#{super} [<'Some.ruby(code)'> | <filename.rb>]"
+        "#{super} [<'Some.ruby(code)'> | <filename.rb> | -]"
       end
 
       def perform(code_or_file = nil, *command_argv)
@@ -29,12 +31,14 @@ module Rails
 
         ARGV.replace(command_argv)
 
-        if File.exist?(code_or_file)
+        if code_or_file == "-"
+          eval($stdin.read, TOPLEVEL_BINDING, "stdin")
+        elsif File.exist?(code_or_file)
           $0 = code_or_file
           Kernel.load code_or_file
         else
           begin
-            eval(code_or_file, binding, __FILE__, __LINE__)
+            eval(code_or_file, TOPLEVEL_BINDING, __FILE__, __LINE__)
           rescue SyntaxError, NameError => error
             $stderr.puts "Please specify a valid ruby command or the path of a script to run."
             $stderr.puts "Run '#{self.class.executable} -h' for help."

data/lib/rails/commands/secrets/secrets_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support"
 require "rails/secrets"
 
@@ -13,7 +15,7 @@ module Rails
       end
 
       def setup
-        generator.start
+        deprecate_in_favor_of_credentials_and_exit
       end
 
       def edit
@@ -40,20 +42,23 @@ module Rails
       rescue Rails::Secrets::MissingKeyError => error
         say error.message
       rescue Errno::ENOENT => error
-        raise unless error.message =~ /secrets\.yml\.enc/
-
-        Rails::Secrets.read_template_for_editing do |tmp_path|
-          system("#{ENV["EDITOR"]} #{tmp_path}")
-          generator.skip_secrets_file { setup }
+        if error.message =~ /secrets\.yml\.enc/
+          deprecate_in_favor_of_credentials_and_exit
+        else
+          raise
         end
       end
 
+      def show
+        say Rails::Secrets.read
+      end
+
       private
-        def generator
-          require "rails/generators"
-          require "rails/generators/rails/encrypted_secrets/encrypted_secrets_generator"
+        def deprecate_in_favor_of_credentials_and_exit
+          say "Encrypted secrets is deprecated in favor of credentials. Run:"
+          say "bin/rails credentials --help"
 
-          Rails::Generators::EncryptedSecretsGenerator
+          exit 1
         end
     end
   end

data/lib/rails/commands/server/server_command.rb

@@ -1,7 +1,11 @@
+# frozen_string_literal: true
+
 require "fileutils"
 require "optparse"
 require "action_dispatch"
 require "rails"
+require "active_support/deprecation"
+require "active_support/core_ext/string/filters"
 require "rails/dev_caching"
 
 module Rails
@@ -18,10 +22,15 @@ module Rails
       set_environment
     end
 
-    # TODO: this is no longer required but we keep it for the moment to support older config.ru files.
     def app
       @app ||= begin
         app = super
+        if app.is_a?(Class)
+          ActiveSupport::Deprecation.warn(<<-MSG.squish)
+            Use `Rails::Application` subclass to start the server is deprecated and will be removed in Rails 6.0.
+            Please change `run #{app}` to `run Rails.application` in config.ru.
+          MSG
+        end
         app.respond_to?(:to_app) ? app.to_app : app
       end
     end
@@ -117,6 +126,8 @@ module Rails
         desc: "Specifies the PID file."
       class_option "dev-caching", aliases: "-C", type: :boolean, default: nil,
         desc: "Specifies whether to perform caching in development."
+      class_option "restart", type: :boolean, default: nil, hide: true
+      class_option "early_hints", type: :boolean, default: nil, desc: "Enables HTTP/2 early hints."
 
       def initialize(args = [], local_options = {}, config = {})
         @original_options = local_options
@@ -127,6 +138,7 @@ module Rails
 
       def perform
         set_application_directory!
+        prepare_restart
         Rails::Server.new(server_options).tap do |server|
           # Require application after server sets environment to propagate
           # the --environment option.
@@ -150,7 +162,8 @@ module Rails
             daemonize:             options[:daemon],
             pid:                   pid,
             caching:               options["dev-caching"],
-            restart_cmd:           restart_command
+            restart_cmd:           restart_command,
+            early_hints:           early_hints
           }
         end
       end
@@ -213,7 +226,11 @@ module Rails
         end
 
         def restart_command
-          "bin/rails server #{@server} #{@original_options.join(" ")}"
+          "bin/rails server #{@server} #{@original_options.join(" ")} --restart"
+        end
+
+        def early_hints
+          options[:early_hints]
         end
 
         def pid
@@ -223,6 +240,10 @@ module Rails
         def self.banner(*)
           "rails server [puma, thin etc] [options]"
         end
+
+        def prepare_restart
+          FileUtils.rm_f(options[:pid]) if options[:restart]
+        end
     end
   end
 end

data/lib/rails/commands/test/test_command.rb

@@ -1,33 +1,28 @@
-require_relative "../../command"
-require_relative "../../test_unit/runner"
+# frozen_string_literal: true
+
+require "rails/command"
+require "rails/test_unit/runner"
+require "rails/test_unit/reporter"
 
 module Rails
   module Command
     class TestCommand < Base # :nodoc:
       no_commands do
         def help
-          require "optparse"
-          require "minitest/rails_plugin"
-
-          opts = OptionParser.new
-          opts.banner = "Usage: #{Rails::TestUnitReporter.executable} [options] [files or directories]"
-          opts.separator ""
-          opts.separator "You can run a single test by appending a line number to a filename:"
-          opts.separator ""
-          opts.separator "    #{Rails::TestUnitReporter.executable} test/models/user_test.rb:27"
-          opts.separator ""
-          opts.separator "You can run multiple files and directories at the same time:"
-          opts.separator ""
-          opts.separator "    #{Rails::TestUnitReporter.executable} test/controllers test/integration/login_test.rb"
-          opts.separator ""
-          opts.separator "By default test failures and errors are reported inline during a run."
-          opts.separator ""
-
-          opts.separator "Rails options:"
-          Rails::TestUnit::Runner.options(opts)
-          Minitest.plugin_rails_options(opts, {})
+          say "Usage: #{Rails::TestUnitReporter.executable} [options] [files or directories]"
+          say ""
+          say "You can run a single test by appending a line number to a filename:"
+          say ""
+          say "    #{Rails::TestUnitReporter.executable} test/models/user_test.rb:27"
+          say ""
+          say "You can run multiple files and directories at the same time:"
+          say ""
+          say "    #{Rails::TestUnitReporter.executable} test/controllers test/integration/login_test.rb"
+          say ""
+          say "By default test failures and errors are reported inline during a run."
+          say ""
 
-          say opts
+          Minitest.run(%w(--help))
         end
       end
 

data/lib/rails/commands/version/version_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rails
   module Command
     class VersionCommand < Base # :nodoc:

data/lib/rails/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/ordered_options"
 require "active_support/core_ext/object"
 require "rails/paths"

data/lib/rails/console/app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/all"
 require "action_controller"
 

data/lib/rails/console/helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rails
   module ConsoleMethods
     # Gets the helper methods available to the controller.

data/lib/rails/dev_caching.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "fileutils"
 
 module Rails
@@ -17,7 +19,6 @@ module Rails
         end
 
         FileUtils.touch "tmp/restart.txt"
-        FileUtils.rm_f("tmp/pids/server.pid")
       end
 
       def enable_by_argument(caching)

data/lib/rails/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/railtie"
 require "rails/engine/railties"
 require "active_support/core_ext/module/delegation"
@@ -40,7 +42,7 @@ module Rails
   #
   #   class MyEngine < Rails::Engine
   #     # Add a load path for this specific Engine
-  #     config.autoload_paths << File.expand_path("../lib/some/path", __FILE__)
+  #     config.autoload_paths << File.expand_path("lib/some/path", __dir__)
   #
   #     initializer "my_engine.add_middleware" do |app|
   #       app.middleware.use MyEngine::Middleware

data/lib/rails/engine/commands.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 unless defined?(APP_PATH)
   if File.exist?(File.expand_path("test/dummy/config/application.rb", ENGINE_ROOT))
     APP_PATH = File.expand_path("test/dummy/config/application", ENGINE_ROOT)

data/lib/rails/engine/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/railtie/configuration"
 
 module Rails

data/lib/rails/engine/railties.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rails
   class Engine < Railtie
     class Railties

data/lib/rails/engine/updater.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rails/generators"
 require "rails/generators/rails/plugin/plugin_generator"
 
@@ -7,7 +9,7 @@ module Rails
       class << self
         def generator
           @generator ||= Rails::Generators::PluginGenerator.new ["plugin"],
-            { engine: true }, destination_root: ENGINE_ROOT
+            { engine: true }, { destination_root: ENGINE_ROOT }
         end
 
         def run(action)

data/lib/rails/gem_version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rails
   # Returns the version of the currently loaded Rails as a <tt>Gem::Version</tt>
   def self.gem_version
@@ -6,9 +8,9 @@ module Rails
 
   module VERSION
     MAJOR = 5
-    MINOR = 1
-    TINY  = 7
-    PRE   = nil
+    MINOR = 2
+    TINY  = 0
+    PRE   = "beta1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end