lib/rubygems/commands/yank_command.rb in gemcutter-0.7.0 vs lib/rubygems/commands/yank_command.rb in gemcutter-0.7.1

@@ -14,54 +14,61 @@
   def arguments
     "GEM       name of gem"
   end
 
   def usage
-    "#{program_name} GEM -v VERSION [-p PLATFORM] [--undo]"
+    "#{program_name} GEM -v VERSION [-p PLATFORM] [--undo] [--key KEY_NAME]"
   end
-  
+
   def initialize
     super 'yank', description
     add_version_option("remove")
     add_platform_option("remove")
     add_option('--undo') do |value, options|
       options[:undo] = true
     end
+    
+    add_option('-k', '--key KEY_NAME',
+               'Use API key from your gem credentials file') do |value, options|
+      options[:key] = value
+    end
   end
 
   def execute
     sign_in
     version   = get_version_from_requirements(options[:version])
     platform  = get_platform_from_requirements(options)
-    
+    api_key   = Gem.configuration.rubygems_api_key
+    api_key   = Gem.configuration.api_keys[options[:key].to_sym] if options[:key]
+
     if !version.nil?
       if options[:undo]
-        unyank_gem(version, platform)
+        unyank_gem(version, platform, api_key)
       else
-        yank_gem(version, platform)
+        yank_gem(version, platform, api_key)
       end
     else
       say "A version argument is required: #{usage}"
       terminate_interaction
     end
   end
 
-  def yank_gem(version, platform)
+  def yank_gem(version, platform, api_key)
     say "Yanking gem from RubyGems.org..."
-    yank_api_request(:delete, version, platform, "api/v1/gems/yank")
+    yank_api_request(:delete, version, platform, "api/v1/gems/yank", api_key)
   end
-  
-  def unyank_gem(version, platform)
+
+  def unyank_gem(version, platform, api_key)
     say "Unyanking gem from RubyGems.org..."
-    yank_api_request(:put, version, platform, "api/v1/gems/unyank")
+    yank_api_request(:put, version, platform, "api/v1/gems/unyank", api_key)
   end
-  
+
   private
-    def yank_api_request(method, version, platform, api)
+    def yank_api_request(method, version, platform, api, api_key)
       name = get_one_gem_name
       response = rubygems_api_request(method, api) do |request|
-        request.add_field("Authorization", Gem.configuration.rubygems_api_key)
+        request.add_field("Authorization", api_key)
         request.set_form_data({'gem_name' => name, 'version' => version, 'platform' => platform})
       end
       say response.body
     end
 
@@ -70,10 +77,10 @@
         requirements.requirements.first[1].version
       rescue
         nil
       end
     end
-    
+
     def get_platform_from_requirements(requirements)
       Gem.platforms[1].to_s if requirements.key? :added_platform
     end
 end