aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/commands/credentials/credentials_command.rb
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2019-08-03 23:06:47 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2019-08-03 23:06:47 +0200
commitaf2880bdda3c151b295cf0cfed691134d628e9bc (patch)
tree9dc0e4c24860190e614d6164ed32fa01471766be /railties/lib/rails/commands/credentials/credentials_command.rb
parent99650550e8dbd7a2f3248d5a0231dda92f58b111 (diff)
downloadrails-af2880bdda3c151b295cf0cfed691134d628e9bc.tar.gz
rails-af2880bdda3c151b295cf0cfed691134d628e9bc.tar.bz2
rails-af2880bdda3c151b295cf0cfed691134d628e9bc.zip
Rename to Diffing and move module into credentials command
Helpers is more for sharing between commands. Since `Diffing` is only for credentials we should just keep it only for credentials. Replaces "pretty" with diffing since the former is ambiguous, while diffing captures what it does. `opt_in` seemed clunky so it's swapped for the one-word enable.
Diffstat (limited to 'railties/lib/rails/commands/credentials/credentials_command.rb')
-rw-r--r--railties/lib/rails/commands/credentials/credentials_command.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/railties/lib/rails/commands/credentials/credentials_command.rb b/railties/lib/rails/commands/credentials/credentials_command.rb
index 772e105007..99ec0be761 100644
--- a/railties/lib/rails/commands/credentials/credentials_command.rb
+++ b/railties/lib/rails/commands/credentials/credentials_command.rb
@@ -1,18 +1,19 @@
# frozen_string_literal: true
+require "pathname"
require "active_support"
require "rails/command/helpers/editor"
-require "rails/command/helpers/pretty_credentials"
require "rails/command/environment_argument"
-require "pathname"
module Rails
module Command
class CredentialsCommand < Rails::Command::Base # :nodoc:
include Helpers::Editor
- include Helpers::PrettyCredentials
include EnvironmentArgument
+ 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
@@ -37,7 +38,7 @@ module Rails
end
say "File encrypted and saved."
- opt_in_pretty_credentials
+ enable_credentials_diffing
rescue ActiveSupport::MessageEncryptor::InvalidMessage
say "Couldn't decrypt #{content_path}. Perhaps you passed the wrong key?"
end