railties 6.1.6 → 7.1.2

data/lib/rails/commands/credentials/credentials_command.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "pathname"
-require "shellwords"
 require "active_support"
 require "rails/command/helpers/editor"
 require "rails/command/environment_argument"
@@ -15,53 +14,43 @@ module Rails
       require_relative "credentials_command/diffing"
       include Diffing
 
-      self.environment_desc = "Uses credentials from config/credentials/:environment.yml.enc encrypted by config/credentials/:environment.key key"
-
-      no_commands do
-        def help
-          say "Usage:\n  #{self.class.banner}"
-          say ""
-          say self.class.desc
-        end
-      end
-
+      desc "edit", "Open the decrypted credentials in `$VISUAL` or `$EDITOR` for editing"
       def edit
-        extract_environment_option_from_argument(default_environment: nil)
-        require_application!
+        load_environment_config!
+        load_generators
 
-        ensure_editor_available(command: "bin/rails credentials:edit") || (return)
+        if environment_specified?
+          @content_path = "config/credentials/#{environment}.yml.enc" unless config.key?(:content_path)
+          @key_path = "config/credentials/#{environment}.key" unless config.key?(:key_path)
+        end
 
-        ensure_encryption_key_has_been_added if credentials.key.nil?
+        ensure_encryption_key_has_been_added
         ensure_credentials_have_been_added
-        ensure_rails_credentials_driver_is_set
+        ensure_diffing_driver_is_configured
 
-        catch_editing_exceptions do
-          change_credentials_in_system_editor
-        end
-
-        say "File encrypted and saved."
-      rescue ActiveSupport::MessageEncryptor::InvalidMessage
-        say "Couldn't decrypt #{content_path}. Perhaps you passed the wrong key?"
+        change_credentials_in_system_editor
       end
 
+      desc "show", "Show the decrypted credentials"
       def show
-        extract_environment_option_from_argument(default_environment: nil)
-        require_application!
+        load_environment_config!
 
         say credentials.read.presence || missing_credentials_message
       end
 
+      desc "diff", "Enroll/disenroll in decrypted diffs of credentials using git"
       option :enroll, type: :boolean, default: false,
-        desc: "Enrolls project in credential file diffing with `git diff`"
-
+        desc: "Enroll project in credentials file diffing with `git diff`"
+      option :disenroll, type: :boolean, default: false,
+        desc: "Disenroll project from credentials file diffing"
       def diff(content_path = nil)
         if @content_path = content_path
-          extract_environment_option_from_argument(default_environment: extract_environment_from_path(content_path))
-          require_application!
+          self.environment = extract_environment_from_path(content_path)
+          load_environment_config!
 
           say credentials.read.presence || credentials.content_path.read
         else
-          require_application!
+          disenroll_project_from_credentials_diffing if options[:disenroll]
           enroll_project_in_credentials_diffing if options[:enroll]
         end
       rescue ActiveSupport::MessageEncryptor::InvalidMessage
@@ -69,68 +58,77 @@ module Rails
       end
 
       private
+        def config
+          Rails.application.config.credentials
+        end
+
+        def content_path
+          @content_path ||= relative_path(config.content_path)
+        end
+
+        def key_path
+          @key_path ||= relative_path(config.key_path)
+        end
+
         def credentials
-          Rails.application.encrypted(content_path, key_path: key_path)
+          @credentials ||= Rails.application.encrypted(content_path, key_path: key_path)
         end
 
         def ensure_encryption_key_has_been_added
+          return if credentials.key?
+
+          require "rails/generators/rails/encryption_key_file/encryption_key_file_generator"
+
+          encryption_key_file_generator = Rails::Generators::EncryptionKeyFileGenerator.new
           encryption_key_file_generator.add_key_file(key_path)
           encryption_key_file_generator.ignore_key_file(key_path)
         end
 
         def ensure_credentials_have_been_added
-          if options[:environment]
-            encrypted_file_generator.add_encrypted_file_silently(content_path, key_path)
-          else
-            credentials_generator.add_credentials_file_silently
-          end
+          require "rails/generators/rails/credentials/credentials_generator"
+
+          Rails::Generators::CredentialsGenerator.new(
+            [content_path, key_path],
+            skip_secret_key_base: environment_specified? && %w[development test].include?(environment),
+            quiet: true
+          ).invoke_all
         end
 
         def change_credentials_in_system_editor
-          credentials.change do |tmp_path|
-            system("#{ENV["EDITOR"]} #{Shellwords.escape(tmp_path)}")
+          using_system_editor do
+            say "Editing #{content_path}..."
+            credentials.change { |tmp_path| system_editor(tmp_path) }
+            say "File encrypted and saved."
+            warn_if_credentials_are_invalid
           end
+        rescue ActiveSupport::EncryptedFile::MissingKeyError => error
+          say error.message
+        rescue ActiveSupport::MessageEncryptor::InvalidMessage
+          say "Couldn't decrypt #{content_path}. Perhaps you passed the wrong key?"
+        end
+
+        def warn_if_credentials_are_invalid
+          credentials.validate!
+        rescue ActiveSupport::EncryptedConfiguration::InvalidContentError => error
+          say "WARNING: #{error.message}", :red
+          say ""
+          say "Your application will not be able to load '#{content_path}' until the error has been fixed.", :red
         end
 
         def missing_credentials_message
-          if credentials.key.nil?
-            "Missing '#{key_path}' to decrypt credentials. See `bin/rails credentials:help`"
+          if !credentials.key?
+            "Missing '#{key_path}' to decrypt credentials. See `#{executable(:help)}`."
           else
-            "File '#{content_path}' does not exist. Use `bin/rails credentials:edit` to change that."
+            "File '#{content_path}' does not exist. Use `#{executable(:edit)}` to change that."
           end
         end
 
-        def content_path
-          @content_path ||= options[:environment] ? "config/credentials/#{options[:environment]}.yml.enc" : "config/credentials.yml.enc"
-        end
-
-        def key_path
-          options[:environment] ? "config/credentials/#{options[:environment]}.key" : "config/master.key"
+        def relative_path(path)
+          Rails.root.join(path).relative_path_from(Rails.root).to_s
         end
 
         def extract_environment_from_path(path)
-          available_environments.find { |env| path.include? env } if path.end_with?(".yml.enc")
-        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
-
-        def credentials_generator
-          require "rails/generators"
-          require "rails/generators/rails/credentials/credentials_generator"
-
-          Rails::Generators::CredentialsGenerator.new
+          available_environments.find { |env| path.end_with?("#{env}.yml.enc") }
         end
     end
   end

data/lib/rails/commands/db/system/change/change_command.rb

@@ -15,7 +15,8 @@ module Rails
             super
           end
 
-          def perform
+          desc "change", "Change `config/database.yml` and your database gem to the target database"
+          def perform(*)
             Rails::Generators::Db::System::ChangeGenerator.start(@argv)
           end
         end

data/lib/rails/commands/dbconsole/dbconsole_command.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "active_support/core_ext/string/filters"
-require "active_support/deprecation"
 require "rails/command/environment_argument"
 
 module Rails
@@ -12,88 +11,14 @@ module Rails
 
     def initialize(options = {})
       @options = options
+      @options[:environment] ||= Rails::Command.environment
     end
 
     def start
-      ENV["RAILS_ENV"] ||= @options[:environment] || environment
-      config = db_config.configuration_hash
-
-      case db_config.adapter
-      when /^(jdbc)?mysql/
-        args = {
-          host: "--host",
-          port: "--port",
-          socket: "--socket",
-          username: "--user",
-          encoding: "--default-character-set",
-          sslca: "--ssl-ca",
-          sslcert: "--ssl-cert",
-          sslcapath: "--ssl-capath",
-          sslcipher: "--ssl-cipher",
-          sslkey: "--ssl-key"
-        }.map { |opt, arg| "#{arg}=#{config[opt]}" if config[opt] }.compact
-
-        if config[:password] && @options[:include_password]
-          args << "--password=#{config[:password]}"
-        elsif config[:password] && !config[:password].to_s.empty?
-          args << "-p"
-        end
-
-        args << db_config.database
-
-        find_cmd_and_exec(["mysql", "mysql5"], *args)
-
-      when /^postgres|^postgis/
-        ENV["PGUSER"]     = config[:username] if config[:username]
-        ENV["PGHOST"]     = config[:host] if config[:host]
-        ENV["PGPORT"]     = config[:port].to_s if config[:port]
-        ENV["PGPASSWORD"] = config[:password].to_s if config[:password] && @options[:include_password]
-        find_cmd_and_exec("psql", db_config.database)
-
-      when "sqlite3"
-        args = []
-
-        args << "-#{@options[:mode]}" if @options[:mode]
-        args << "-header" if @options[:header]
-        args << File.expand_path(db_config.database, Rails.respond_to?(:root) ? Rails.root : nil)
-
-        find_cmd_and_exec("sqlite3", *args)
-
-      when "oracle", "oracle_enhanced"
-        logon = ""
-
-        if config[:username]
-          logon = config[:username].dup
-          logon << "/#{config[:password]}" if config[:password] && @options[:include_password]
-          logon << "@#{db_config.database}" if db_config.database
-        end
-
-        find_cmd_and_exec("sqlplus", logon)
-
-      when "sqlserver"
-        args = []
-
-        args += ["-d", "#{db_config.database}"] if db_config.database
-        args += ["-U", "#{config[:username]}"] if config[:username]
-        args += ["-P", "#{config[:password]}"] if config[:password]
-
-        if config[:host]
-          host_arg = +"tcp:#{config[:host]}"
-          host_arg << ",#{config[:port]}" if config[:port]
-          args += ["-S", host_arg]
-        end
-
-        find_cmd_and_exec("sqlcmd", *args)
-
-      else
-        abort "Unknown command-line client for #{db_config.database}."
-      end
-    end
-
-    def config
-      db_config.configuration_hash
+      adapter_class.dbconsole(db_config, @options)
+    rescue NotImplementedError
+      abort "Unknown command-line client for #{db_config.database}."
     end
-    deprecate config: "please use db_config.configuration_hash"
 
     def db_config
       return @db_config if defined?(@db_config)
@@ -101,7 +26,7 @@ module Rails
       # If the user provided a database, use that. Otherwise find
       # the first config in the database.yml
       if database
-        @db_config = configurations.configs_for(env_name: environment, name: database, include_replicas: true)
+        @db_config = configurations.configs_for(env_name: environment, name: database, include_hidden: true)
       else
         @db_config = configurations.find_db_config(environment)
       end
@@ -115,15 +40,23 @@ module Rails
       @db_config
     end
 
-    def environment
-      Rails.respond_to?(:env) ? Rails.env : Rails::Command.environment
-    end
-
     def database
       @options[:database]
     end
 
+    def environment
+      @options[:environment]
+    end
+
     private
+      def adapter_class
+        if ActiveRecord::Base.respond_to?(db_config.adapter_class_method)
+          ActiveRecord::Base.public_send(db_config.adapter_class_method)
+        else
+          ActiveRecord::ConnectionAdapters::AbstractAdapter
+        end
+      end
+
       def configurations # :doc:
         require APP_PATH
         ActiveRecord::Base.configurations = Rails.application.config.database_configuration
@@ -131,31 +64,11 @@ module Rails
       end
 
       def find_cmd_and_exec(commands, *args) # :doc:
-        commands = Array(commands)
-
-        dirs_on_path = ENV["PATH"].to_s.split(File::PATH_SEPARATOR)
-        unless (ext = RbConfig::CONFIG["EXEEXT"]).empty?
-          commands = commands.map { |cmd| "#{cmd}#{ext}" }
-        end
-
-        full_path_command = nil
-        found = commands.detect do |cmd|
-          dirs_on_path.detect do |path|
-            full_path_command = File.join(path, cmd)
-            begin
-              stat = File.stat(full_path_command)
-            rescue SystemCallError
-            else
-              stat.file? && stat.executable?
-            end
-          end
-        end
-
-        if found
-          exec full_path_command, *args
-        else
-          abort("Couldn't find database client: #{commands.join(', ')}. Check your $PATH and try again.")
-        end
+        Rails.deprecator.warn(<<~MSG.squish)
+          Rails::DBConsole#find_cmd_and_exec is deprecated and will be removed in Rails 7.2.
+          Please use find_cmd_and_exec on the connection adapter class instead.
+        MSG
+        ActiveRecord::Base.connection.find_cmd_and_exec(commands, *args)
       end
   end
 
@@ -167,20 +80,16 @@ module Rails
         desc: "Automatically provide the password from database.yml"
 
       class_option :mode, enum: %w( html list line column ), type: :string,
-        desc: "Automatically put the sqlite3 database in the specified mode (html, list, line, column)."
+        desc: "Automatically put the sqlite3 database in the specified mode"
 
       class_option :header, type: :boolean
 
       class_option :database, aliases: "--db", type: :string,
-        desc: "Specifies the database to use."
+        desc: "Specify the database to use."
 
+      desc "dbconsole", "Start a console for the database specified in config/database.yml"
       def perform
-        extract_environment_option_from_argument
-
-        # RAILS_ENV needs to be set before config/application is required.
-        ENV["RAILS_ENV"] = options[:environment]
-
-        require_application_and_environment!
+        boot_application!
         Rails::DBConsole.start(options)
       end
     end

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

@@ -7,18 +7,19 @@ module Rails
     class DestroyCommand < Base # :nodoc:
       no_commands do
         def help
-          require_application_and_environment!
+          boot_application!
           load_generators
 
           Rails::Generators.help self.class.command_name
         end
       end
 
+      desc "destroy GENERATOR", "Remove code generated by `bin/rails generate`"
       def perform(*)
         generator = args.shift
         return help unless generator
 
-        require_application_and_environment!
+        boot_application!
         load_generators
 
         Rails::Generators.invoke generator, args, behavior: :revoke, destination_root: Rails::Command.root

data/lib/rails/commands/dev/dev_command.rb

@@ -5,12 +5,7 @@ require "rails/dev_caching"
 module Rails
   module Command
     class DevCommand < Base # :nodoc:
-      no_commands do
-        def help
-          say "rails dev:cache # Toggle development mode caching on/off."
-        end
-      end
-
+      desc "cache", "Toggle development mode caching on/off"
       def cache
         Rails::DevCaching.enable_by_file
       end

data/lib/rails/commands/encrypted/USAGE

@@ -1,28 +1,23 @@
-=== Storing Encrypted Files in Source Control
+Description: 
+    The Rails `encrypted` commands provide access to encrypted files or configurations.
+    See the `Rails.application.encrypted` documentation for using them in your app.
 
-The Rails `encrypted` commands provide access to encrypted files or configurations.
-See the `Rails.application.encrypted` documentation for using them in your app.
+Encryption Keys:
+    By default, Rails looks for the encryption key in `ENV["RAILS_MASTER_KEY"]` or
+    `config/master.key`, but that lookup can be overridden with `--key`:
 
-=== Encryption Keys
+        <%= executable(:edit) %> config/encrypted_file.yml.enc --key config/encrypted_file.key
 
-By default, Rails looks for the encryption key in `config/master.key` or
-`ENV["RAILS_MASTER_KEY"]`, but that lookup can be overridden with `--key`:
+    Don't commit the key! Add it to your source control's ignore file. If you use
+    Git, Rails handles this for you.
 
-   rails encrypted:edit config/encrypted_file.yml.enc --key config/encrypted_file.key
+Examples:
+    To edit or create an encrypted file use:
 
-Don't commit the key! Add it to your source control's ignore file. If you use
-Git, Rails handles this for you.
+        <%= executable(:edit) %> config/encrypted_file.yml.enc
 
-=== Editing Files
+    This opens a temporary file in `$VISUAL` or `$EDITOR` with the decrypted contents for editing.
 
-To edit or create an encrypted file use:
+    To print the decrypted contents of an encrypted file use:
 
-   rails encrypted:edit config/encrypted_file.yml.enc
-
-This opens a temporary file in `$EDITOR` with the decrypted contents for editing.
-
-=== Viewing Files
-
-To print the decrypted contents of an encrypted file use:
-
-   rails encrypted:show config/encrypted_file.yml.enc
+        <%= executable(:show) %> config/encrypted_file.yml.enc

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

@@ -12,54 +12,65 @@ module Rails
       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 ""
-          say self.class.desc
-        end
-      end
-
-      def edit(file_path)
-        require_application!
-        encrypted = Rails.application.encrypted(file_path, key_path: options[:key])
+      desc "edit", "Open the decrypted file in `$VISUAL` or `$EDITOR` for editing"
+      def edit(*)
+        load_environment_config!
 
-        ensure_editor_available(command: "bin/rails encrypted:edit") || (return)
-        ensure_encryption_key_has_been_added(options[:key]) if encrypted.key.nil?
-        ensure_encrypted_file_has_been_added(file_path, options[:key])
+        ensure_encryption_key_has_been_added
+        ensure_encrypted_configuration_has_been_added
 
-        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?"
+        change_encrypted_configuration_in_system_editor
       end
 
-      def show(file_path)
-        require_application!
-        encrypted = Rails.application.encrypted(file_path, key_path: options[:key])
+      desc "show", "Show the decrypted contents of the file"
+      def show(*)
+        load_environment_config!
 
-        say encrypted.read.presence || missing_encrypted_message(key: encrypted.key, key_path: options[:key], file_path: file_path)
+        say encrypted_configuration.read.presence || missing_encrypted_configuration_message
       end
 
       private
-        def ensure_encryption_key_has_been_added(key_path)
+        def content_path
+          @content_path ||= args[0]
+        end
+
+        def key_path
+          options[:key]
+        end
+
+        def encrypted_configuration
+          @encrypted_configuration ||= Rails.application.encrypted(content_path, key_path: key_path)
+        end
+
+        def ensure_encryption_key_has_been_added
+          return if encrypted_configuration.key?
           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)
+        def ensure_encrypted_configuration_has_been_added
+          encrypted_file_generator.add_encrypted_file_silently(content_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}")
+        def change_encrypted_configuration_in_system_editor
+          using_system_editor do
+            encrypted_configuration.change { |tmp_path| system_editor(tmp_path) }
+            say "File encrypted and saved."
+            warn_if_encrypted_configuration_is_invalid
           end
+        rescue ActiveSupport::EncryptedFile::MissingKeyError => error
+          say error.message
+        rescue ActiveSupport::MessageEncryptor::InvalidMessage
+          say "Couldn't decrypt #{content_path}. Perhaps you passed the wrong key?"
         end
 
+        def warn_if_encrypted_configuration_is_invalid
+          encrypted_configuration.validate!
+        rescue ActiveSupport::EncryptedConfiguration::InvalidContentError => error
+          say "WARNING: #{error.message}", :red
+          say ""
+          say "Your application will not be able to load '#{content_path}' until the error has been fixed.", :red
+        end
 
         def encryption_key_file_generator
           require "rails/generators"
@@ -75,11 +86,11 @@ module Rails
           Rails::Generators::EncryptedFileGenerator.new
         end
 
-        def missing_encrypted_message(key:, key_path:, file_path:)
-          if key.nil?
-            "Missing '#{key_path}' to decrypt data. See `bin/rails encrypted:help`"
+        def missing_encrypted_configuration_message
+          if !encrypted_configuration.key?
+            "Missing '#{key_path}' to decrypt data. See `#{executable(:help)}`"
           else
-            "File '#{file_path}' does not exist. Use `bin/rails encrypted:edit #{file_path}` to change that."
+            "File '#{content_path}' does not exist. Use `#{executable(:edit)} #{content_path}` to change that."
           end
         end
     end

data/lib/rails/commands/gem_help/USAGE

@@ -0,0 +1,16 @@
+Usage:
+  rails COMMAND [options]
+
+You must specify a command:
+
+  new          Create a new Rails application. "rails new my_app" creates a
+               new application called MyApp in "./my_app"
+  plugin new   Create a new Rails railtie or engine
+
+All commands can be run with -h (or --help) for more information.
+
+Inside a Rails application directory, some common commands are:
+
+  console      Start the Rails console
+  server       Start the Rails server
+  test         Run tests except system tests

data/lib/rails/commands/gem_help/gem_help_command.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Rails
+  module Command
+    class GemHelpCommand < Base # :nodoc:
+      hide_command!
+
+      def perform
+        say self.class.class_usage
+      end
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ module Rails
     class GenerateCommand < Base # :nodoc:
       no_commands do
         def help
-          require_application_and_environment!
+          boot_application!
           load_generators
 
           Rails::Generators.help self.class.command_name
@@ -18,7 +18,7 @@ module Rails
         generator = args.shift
         return help unless generator
 
-        require_application_and_environment!
+        boot_application!
         load_generators
 
         ARGV.replace(args) # set up ARGV for third-party libraries