gemcutter 0.4.1 → 0.6.0

data/Rakefile

@@ -13,14 +13,13 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "gemcutter"
-    gem.version = "0.4.1"
+    gem.version = "0.6.0"
     gem.summary = "Commands to interact with RubyGems.org"
     gem.description = "Adds several commands to RubyGems for managing gems and more on RubyGems.org."
     gem.email = "nick@quaran.to"
     gem.homepage = "http://rubygems.org"
     gem.authors = ["Nick Quaranto"]
     gem.files = FileList["lib/rubygems_plugin.rb",
-                         "lib/gemcutter.rb",
                          "lib/rubygems/commands/*",
                          "test/*_helper.rb",
                          "test/*_test.rb",
@@ -28,7 +27,6 @@ begin
                          "Rakefile"]
     gem.test_files = []
     gem.executables = []
-    gem.add_runtime_dependency('json_pure')
     %w[rake shoulda activesupport webmock rr].each do |dep|
       gem.add_development_dependency(dep)
     end
@@ -38,9 +36,10 @@ begin
 
            Thanks for installing Gemcutter! You can now run:
 
-    gem push          merged into RubyGems 1.3.6
-    gem owner         merged into RubyGems 1.3.6
-    gem webhook       register urls to be pinged when gems are pushed
+  gem push        merged into RubyGems 1.3.6
+  gem owner       merged into RubyGems 1.3.6
+  gem webhook     register urls to be pinged when gems are pushed
+  gem yank        remove a specific version of a gem from RubyGems.org
 
 ========================================================================
 

data/lib/rubygems/commands/{webhook.rb → webhook_command.rb}

@@ -74,15 +74,13 @@ EOF
   end
 
   def list_webhooks
-    require 'json/pure' unless defined?(JSON::JSON_LOADED)
-
-    resp = rubygems_api_request(:get, "api/v1/web_hooks") do |request|
+    resp = rubygems_api_request(:get, "api/v1/web_hooks.yaml") do |request|
       request.add_field("Authorization", Gem.configuration.rubygems_api_key)
     end
 
     with_response(resp) do |response|
       begin
-        groups = JSON.parse(response.body)
+        groups = YAML.load(response.body)
 
         if groups.size.zero?
           say "You haven't added any webhooks yet."
@@ -100,9 +98,9 @@ EOF
             end
           end
         end
-      rescue JSON::ParserError => json_error
+      rescue Exception => error
         say "There was a problem parsing the data:"
-        say json_error.to_s
+        say error.to_s
         terminate_interaction
       end
     end

data/lib/rubygems/commands/yank_command.rb

@@ -0,0 +1,72 @@
+require 'rubygems/local_remote_options'
+require 'rubygems/version_option'
+require 'rubygems/gemcutter_utilities'
+
+class Gem::Commands::YankCommand < Gem::Command
+  include Gem::LocalRemoteOptions
+  include Gem::VersionOption
+  include Gem::GemcutterUtilities
+
+  def description
+    'Remove a specific gem version release from RubyGems.org'
+  end
+
+  def arguments
+    "GEM       name of gem"
+  end
+
+  def usage
+    "#{program_name} GEM -v VERSION [--undo]"
+  end
+  
+  def initialize
+    super 'yank', description
+    add_version_option("remove")
+    add_option('--undo') do |value, options|
+      options[:undo] = true
+    end
+  end
+
+  def execute
+    sign_in
+    version = get_version_from_requirements(options[:version])
+    if !version.nil?
+      if options[:undo]
+        unyank_gem(version)
+      else
+        yank_gem(version)
+      end
+    else
+      say "A version argument is required: #{usage}"
+      terminate_interaction
+    end
+  end
+
+  def yank_gem(version)
+    say "Yanking gem from RubyGems.org..."
+    yank_api_request(:delete, version, "api/v1/gems/yank")
+  end
+  
+  def unyank_gem(version)
+    say "Unyanking gem from RubyGems.org..."
+    yank_api_request(:put, version, "api/v1/gems/unyank")
+  end
+  
+  private
+    def yank_api_request(method, version, api)
+      name = get_one_gem_name
+      response = rubygems_api_request(method, api) do |request|
+        request.add_field("Authorization", Gem.configuration.rubygems_api_key)
+        request.set_form_data({'gem_name' => name, 'version' => version})
+      end
+      say response.body
+    end
+
+    def get_version_from_requirements(requirements)
+      begin
+        requirements.requirements.first[1].version
+      rescue
+        nil
+      end
+    end
+end

data/lib/rubygems_plugin.rb

@@ -1 +1,7 @@
-require File.join(File.dirname(__FILE__), 'gemcutter') if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.3.6')
+require 'rubygems/command_manager'
+
+if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.3.6')
+  %w[migrate tumble webhook yank].each do |command|
+    Gem::CommandManager.instance.register_command command.to_sym
+  end
+end

data/test/webhook_command_test.rb

@@ -1,4 +1,5 @@
 require 'helper'
+require 'lib/rubygems/commands/webhook_command'
 
 class WebhookCommandTest < CommandTest
   context "webhooking" do
@@ -71,11 +72,15 @@ class WebhookCommandTest < CommandTest
     context "listing hooks with some available" do
       setup do
         stub_api_key("key")
-        stub_request(:get, @api).to_return :body => <<EOF
-{
-  "foo": [{"url":"http://foogemhook.com","failure_count":0}],
-  "all gems":[{"url":"http://allgemshook.com","failure_count":0}]
-}
+        stub_request(:get, "#{@api}.yaml").to_return :body => <<EOF
+---
+foo:
+- url: http://foogemhook.com
+  failure_count: 0
+all gems:
+- url: http://allgemshook.com
+  failure_count: 0
+
 EOF
       end
 
@@ -114,9 +119,9 @@ EOF
         @command.execute
 
         # webmock doesn't pass body params on correctly :[
-        assert_requested(:get, @api,
+        assert_requested(:get, "#{@api}.yaml",
                          :times => 1)
-        assert_requested(:get, @api,
+        assert_requested(:get, "#{@api}.yaml",
                          :headers => { 'Authorization' => 'key' })
       end
     end
@@ -124,7 +129,7 @@ EOF
     context "listing hooks with none available" do
       setup do
         stub_api_key("key")
-        stub_request(:get, @api).to_return(:body => "{}")
+        stub_request(:get, "#{@api}.yaml").to_return(:body => "{}")
         @command.handle_options([])
         @command.execute
       end
@@ -140,7 +145,7 @@ EOF
       setup do
         stub(@command).terminate_interaction
         stub_api_key("key")
-        stub_request(:get, @api).to_return(:body => "fubar")
+        stub_request(:get, "#{@api}.yaml").to_return(:body => "fubar")
         @command.handle_options([])
         @command.execute
       end

data/test/yank_command_test.rb

@@ -0,0 +1,85 @@
+require 'helper'
+require 'lib/rubygems/commands/yank_command'
+
+class YankCommandTest < CommandTest
+  context "yanking" do
+    setup do
+      @gem = "MyGem"
+      @version = '0.1.0'
+      @command = Gem::Commands::YankCommand.new
+      stub(@command).say
+    end
+
+    %w[-v --version].each do |option|
+      should "raise an error with no version with #{option}" do
+        assert_raise OptionParser::MissingArgument do
+          @command.handle_options([@gem, option])
+        end
+      end
+    end
+
+    context 'yanking a gem' do
+      setup do
+        stub_api_key("key")
+        @api = "https://rubygems.org/api/v1/gems/yank"
+        stub_request(:delete, @api).to_return(:body => "Successfully yanked")
+        @command.handle_options([@gem, "-v", @version])
+      end
+
+      should 'say gem was yanked' do
+        @command.execute
+        assert_received(@command) do |command|
+          command.say("Yanking gem from Gemcutter...")
+          command.say("Successfully yanked")
+        end
+      end
+      
+      should 'invoke yank_gem' do
+        stub(@command).yank_gem(@version)
+        @command.execute
+        assert_received(@command) do |command|
+          command.yank_gem(@version)
+        end
+      end
+
+      should 'delete to api' do
+        @command.execute
+        assert_requested(:delete, @api,
+                         :times => 1)
+        assert_requested(:delete, @api,
+                         :headers => { 'Authorization' => 'key' })
+      end
+    end
+    
+    context 'unyanking a gem' do
+      setup do
+        stub_api_key("key")
+        @api = "https://rubygems.org/api/v1/gems/unyank"
+        stub_request(:put, @api).to_return(:body => "Successfully unyanked")
+        @command.handle_options([@gem, "-v", @version, "--undo"])
+      end
+      
+      should 'say gem was unyanked' do
+        @command.execute
+        assert_received(@command) do |command|
+          command.say("Re-indexing gem")
+          command.say("Successfully unyanked")
+        end
+      end
+
+      should 'invoke unyank_gem' do
+        stub(@command).unyank_gem(@version)
+        @command.execute
+        assert_received(@command) do |command|
+          command.unyank_gem(@version)
+        end
+      end
+      
+      should 'put to api' do
+        @command.execute
+        assert_requested(:put, @api, :times => 1)
+        assert_requested(:put, @api, :headers => { 'Authorization' => 'key' })
+      end
+    end
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gemcutter
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Nick Quaranto
@@ -14,81 +15,79 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-22 00:00:00 -05:00
+date: 2010-07-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: json_pure
+  name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: shoulda
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: activesupport
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: webmock
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: webmock
+  name: rr
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rr
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id006
 description: Adds several commands to RubyGems for managing gems and more on RubyGems.org.
 email: nick@quaran.to
 executables: []
@@ -100,12 +99,13 @@ extra_rdoc_files: []
 files: 
 - MIT-LICENSE
 - Rakefile
-- lib/gemcutter.rb
-- lib/rubygems/commands/migrate.rb
-- lib/rubygems/commands/tumble.rb
-- lib/rubygems/commands/webhook.rb
+- lib/rubygems/commands/migrate_command.rb
+- lib/rubygems/commands/tumble_command.rb
+- lib/rubygems/commands/webhook_command.rb
+- lib/rubygems/commands/yank_command.rb
 - lib/rubygems_plugin.rb
 - test/webhook_command_test.rb
+- test/yank_command_test.rb
 has_rdoc: true
 homepage: http://rubygems.org
 licenses: []
@@ -116,9 +116,10 @@ post_install_message: |+
   
              Thanks for installing Gemcutter! You can now run:
   
-      gem push          merged into RubyGems 1.3.6
-      gem owner         merged into RubyGems 1.3.6
-      gem webhook       register urls to be pinged when gems are pushed
+    gem push        merged into RubyGems 1.3.6
+    gem owner       merged into RubyGems 1.3.6
+    gem webhook     register urls to be pinged when gems are pushed
+    gem yank        remove a specific version of a gem from RubyGems.org
   
   ========================================================================
   
@@ -127,23 +128,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Commands to interact with RubyGems.org

data/lib/gemcutter.rb

@@ -1,6 +0,0 @@
-require 'rubygems/command_manager'
-
-%w[migrate tumble webhook].each do |command|
-  require "rubygems/commands/#{command}"
-  Gem::CommandManager.instance.register_command command.to_sym
-end