gemcutter 0.6.1 → 0.7.0

data/Rakefile

@@ -8,44 +8,3 @@ Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/*_test.rb']
   t.verbose = true
 end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "gemcutter"
-    gem.version = "0.6.1"
-    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/rubygems/commands/*",
-                         "test/helper.rb",
-                         "test/*_test.rb",
-                         "MIT-LICENSE",
-                         "Rakefile"]
-    gem.test_files = []
-    gem.executables = []
-    %w[rake shoulda activesupport webmock rr].each do |dep|
-      gem.add_development_dependency(dep)
-    end
-    gem.post_install_message = <<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 yank        remove a specific version of a gem from RubyGems.org
-
-========================================================================
-
-MESSAGE
-  end
-  Jeweler::RubyforgeTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end

data/lib/rubygems/commands/yank_command.rb

@@ -16,12 +16,13 @@ class Gem::Commands::YankCommand < Gem::Command
   end
 
   def usage
-    "#{program_name} GEM -v VERSION [--undo]"
+    "#{program_name} GEM -v VERSION [-p PLATFORM] [--undo]"
   end
   
   def initialize
     super 'yank', description
     add_version_option("remove")
+    add_platform_option("remove")
     add_option('--undo') do |value, options|
       options[:undo] = true
     end
@@ -29,12 +30,14 @@ class Gem::Commands::YankCommand < Gem::Command
 
   def execute
     sign_in
-    version = get_version_from_requirements(options[:version])
+    version   = get_version_from_requirements(options[:version])
+    platform  = get_platform_from_requirements(options)
+    
     if !version.nil?
       if options[:undo]
-        unyank_gem(version)
+        unyank_gem(version, platform)
       else
-        yank_gem(version)
+        yank_gem(version, platform)
       end
     else
       say "A version argument is required: #{usage}"
@@ -42,22 +45,22 @@ class Gem::Commands::YankCommand < Gem::Command
     end
   end
 
-  def yank_gem(version)
+  def yank_gem(version, platform)
     say "Yanking gem from RubyGems.org..."
-    yank_api_request(:delete, version, "api/v1/gems/yank")
+    yank_api_request(:delete, version, platform, "api/v1/gems/yank")
   end
   
-  def unyank_gem(version)
+  def unyank_gem(version, platform)
     say "Unyanking gem from RubyGems.org..."
-    yank_api_request(:put, version, "api/v1/gems/unyank")
+    yank_api_request(:put, version, platform, "api/v1/gems/unyank")
   end
   
   private
-    def yank_api_request(method, version, api)
+    def yank_api_request(method, version, platform, 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})
+        request.set_form_data({'gem_name' => name, 'version' => version, 'platform' => platform})
       end
       say response.body
     end
@@ -69,4 +72,8 @@ class Gem::Commands::YankCommand < Gem::Command
         nil
       end
     end
+    
+    def get_platform_from_requirements(requirements)
+      Gem.platforms[1].to_s if requirements.key? :added_platform
+    end
 end

data/test/helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'rubygems/command'
 require 'test/unit'
 
 require 'shoulda'
@@ -16,10 +17,10 @@ WebMock.disable_net_connect!
 
 class CommandTest < ActiveSupport::TestCase
   include RR::Adapters::TestUnit unless include?(RR::Adapters::TestUnit)
-  include WebMock
+  include WebMock::API
 
   def teardown
-    reset_webmock
+    WebMock.reset!
   end
 end
 

data/test/yank_command_test.rb

@@ -4,13 +4,14 @@ 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
+      @gem      = "MyGem"
+      @version  = '0.1.0'
+      @platform = nil
+      @command  = Gem::Commands::YankCommand.new
       stub(@command).say
     end
 
-    %w[-v --version].each do |option|
+    %w[-v --version -p --platform].each do |option|
       should "raise an error with no version with #{option}" do
         assert_raise OptionParser::MissingArgument do
           @command.handle_options([@gem, option])
@@ -35,10 +36,10 @@ class YankCommandTest < CommandTest
       end
       
       should 'invoke yank_gem' do
-        stub(@command).yank_gem(@version)
+        stub(@command).yank_gem(@version, @platform)
         @command.execute
         assert_received(@command) do |command|
-          command.yank_gem(@version)
+          command.yank_gem(@version, @platform)
         end
       end
 
@@ -49,6 +50,33 @@ class YankCommandTest < CommandTest
         assert_requested(:delete, @api,
                          :headers => { 'Authorization' => 'key' })
       end
+      
+      context 'with a platform specified' do
+        setup do
+          stub_api_key("key")
+          @api = "https://rubygems.org/api/v1/gems/yank"
+          @platform = "x86-darwin-10"
+          stub_request(:delete, @api).to_return(:body => "Successfully yanked")
+          @command.handle_options([@gem, "-v", @version, "-p", @platform])
+        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, @platform)
+          @command.execute
+          assert_received(@command) do |command|
+            command.yank_gem(@version, @platform)
+          end
+        end
+      end
+      
     end
     
     context 'unyanking a gem' do
@@ -68,10 +96,10 @@ class YankCommandTest < CommandTest
       end
 
       should 'invoke unyank_gem' do
-        stub(@command).unyank_gem(@version)
+        stub(@command).unyank_gem(@version, @platform)
         @command.execute
         assert_received(@command) do |command|
-          command.unyank_gem(@version)
+          command.unyank_gem(@version, @platform)
         end
       end
       
@@ -81,5 +109,34 @@ class YankCommandTest < CommandTest
         assert_requested(:put, @api, :headers => { 'Authorization' => 'key' })
       end
     end
+    
+    
+    context 'with a platform specified' do
+      setup do
+        stub_api_key("key")
+        @api = "https://rubygems.org/api/v1/gems/unyank"
+        @platform = "x86-darwin-10"
+        stub_request(:put, @api).to_return(:body => "Successfully unyanked")
+        @command.handle_options([@gem, "-v", @version, "-p", @platform, "--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, @platform)
+        @command.execute
+        assert_received(@command) do |command|
+          command.unyank_gem(@version, @platform)
+        end
+      end
+    end
+    
   end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gemcutter
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
   - 0
-  - 6
-  - 1
-  version: 0.6.1
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Nick Quaranto
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-17 00:00:00 -05:00
+date: 2011-02-26 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -124,8 +124,8 @@ post_install_message: |+
   
   ========================================================================
   
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Commands to interact with RubyGems.org