Deprecate --key #23

grant-olson · Mar 23, 2013 · 6cc3a74 · 6cc3a74
1 parent cfe66b8
commit 6cc3a74
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+* Add deprecation warning for --key option.  Users should use
+  --gpg-local-user instead.  --key will be removed in 1.0.
+
 * Allow forwarding of select gpg options with commands like
 --gpg-homedir.  run `gem verify --help` to see a list of all options.
 

diff --git a/lib/rubygems/commands/sign_command.rb b/lib/rubygems/commands/sign_command.rb
@@ -19,6 +19,7 @@ def initialize # :nodoc:
     add_version_option
 
     add_option('--key KEY', "Specify key id if you don't want to use your default gpg key") do |key, options|
+      warn("--key deprecated.  Use --gpg-local-user instead")
       options[:key] = key
     end
   end

diff --git a/lib/rubygems/openpgp/sign_plugins.rb b/lib/rubygems/openpgp/sign_plugins.rb
@@ -10,6 +10,7 @@
 end
 
 b.add_option('--key KEY', "Specify key id if you don't want to use your default gpg key") do |key, options|
+  warn("--key deprecated.  Use --gpg-local-user instead")
   Gem::OpenPGP.options[:key] = key
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ @@
     end
     b.add_option('--key KEY', "Specify key id if you don't want to use your default gpg key") do |key, options|
+      warn("--key deprecated.  Use --gpg-local-user instead")
       Gem::OpenPGP.options[:key] = key
     end
@@ Expand Down @@