spade 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spade (0.0.1)
+    spade (0.0.2)
       eventmachine (~> 0.12.10)
       gemcutter (~> 0.6.1)
       highline (~> 1.6.1)

data/lib/spade/cli/base.rb

@@ -13,10 +13,6 @@ module Spade::CLI
       :aliases => ['-V'],
       :desc => 'Show additional debug information while running'
 
-    class_option :version, :type => :string,
-      :aliases => ['-v'],
-      :desc => 'Package version'
-
     class_option :require, :type => :array, :required => false,
       :aliases => ['-r'],
       :desc => "optional JS files to require before invoking main command"
@@ -204,11 +200,17 @@ module Spade::CLI
     end
 
     desc "yank", "Remove a specific package version release from SproutCutter"
+    method_option :version, :type => :string,  :default => nil,   :aliases => ['-v'],    :desc => 'Specify a version to yank'
+    method_option :undo,    :type => :boolean, :default => false,                        :desc => 'Unyank package'
     def yank(package)
       if options[:version]
         remote = Spade::Remote.new
         if remote.logged_in?
-          say remote.yank(package, options[:version])
+          if options[:undo]
+            say remote.unyank(package, options[:version])
+          else
+            say remote.yank(package, options[:version])
+          end
         else
           say LOGIN_MESSAGE
         end

data/lib/spade/remote.rb

@@ -39,6 +39,13 @@ module Spade
       end
     end
 
+    def unyank(package, version)
+      request :put, "api/v1/gems/unyank" do |req|
+        req.set_form_data 'gem_name' => package, 'version' => version
+        req.add_field "Authorization", creds.api_key
+      end
+    end
+
     def add_owner(package, email)
       request :post, "api/v1/gems/#{package}/owners" do |req|
         req.set_form_data 'email' => email

data/lib/spade/version.rb

@@ -1,3 +1,3 @@
 module Spade
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/cli/unyank_spec.rb

@@ -0,0 +1,74 @@
+require "spec_helper"
+
+describe "spade unyank" do
+  let(:api_key) { "deadbeef" }
+  let(:creds)   { spade_dir("credentials") }
+
+  before do
+    cd(home)
+    env["HOME"] = home.to_s
+    env["RUBYGEMS_HOST"] = "http://localhost:9292"
+    start_fake(FakeGemcutter.new(api_key))
+  end
+
+  context "with a good api key" do
+    before do
+      write_api_key(api_key)
+    end
+
+    it "unyanks a gem when sent with the right api key" do
+      spade "yank", "core-test", "--undo", "-v", "1.4.3"
+
+      stdout.read.should include("Successfully unyanked gem: core-test (1.4.3)")
+    end
+
+    it "must unyank a valid gem" do
+      spade "yank", "blahblah", "--undo", "-v", "0.0.1"
+
+      stdout.read.should include("This gem could not be found")
+    end
+
+    it "does not unyank and indexed gem" do
+      spade "yank", "core-test", "--undo", "-v", "2.4.3"
+
+      stdout.read.should include("The version 2.4.3 is already indexed.")
+    end
+  end
+
+  it "shows rejection message if wrong api key is supplied" do
+    write_api_key("beefbeef")
+
+    spade "yank", "core-test", "--undo", "-v", "1.4.3"
+
+    stdout.read.should include("One cannot simply walk into Mordor!")
+  end
+end
+
+describe "spade unyank with invalid api key" do
+  before do
+    cd(home)
+    env["HOME"] = home.to_s
+    env["RUBYGEMS_HOST"] = "http://localhost:9292"
+    write_api_key("beefbeef")
+  end
+
+  it "must require a version" do
+    spade "yank", "core-test", "--undo"
+
+    stdout.read.should include("Version required")
+  end
+end
+
+describe "spade unyank without api key" do
+  before do
+    cd(home)
+    env["HOME"] = home.to_s
+    env["RUBYGEMS_HOST"] = "http://localhost:9292"
+  end
+
+  it "asks for login first if api key does not exist" do
+    spade "yank", "core-test", "-v", "1.4.3", "--undo"
+
+    stdout.read.should include("Please login first with `spade login`")
+  end
+end

data/spec/cli/yank_spec.rb

@@ -27,6 +27,12 @@ describe "spade yank" do
 
       stdout.read.should include("This gem could not be found")
     end
+
+    it "does not yank a yanked gem" do
+      spade "yank", "core-test", "-v", "2.4.3"
+
+      stdout.read.should include("The version 2.4.3 has already been yanked.")
+    end
   end
 
   it "shows rejection message if wrong api key is supplied" do

data/spec/support/fake_gemcutter.rb

@@ -15,10 +15,22 @@ class FakeGemcutter
     elsif request.path == "/api/v1/gems" && request.post?
       respond 200, "Successfully registered rake (0.8.7)"
     elsif request.path == "/api/v1/gems/yank" && request.delete?
-      if request.params["version"].to_i > 0
+      version = request.params["version"].to_i
+      if version < 1
+        respond 404, "This gem could not be found"
+      elsif version < 2
         respond 200, "Successfully yanked gem: #{request.params["gem_name"]} (#{request.params["version"]})"
       else
+        respond 500, "The version #{request.params["version"]} has already been yanked."
+      end
+    elsif request.path == "/api/v1/gems/unyank" && request.put?
+      version = request.params["version"].to_i
+      if version < 1
         respond 404, "This gem could not be found"
+      elsif version < 2
+        respond 200, "Successfully unyanked gem: #{request.params["gem_name"]} (#{request.params["version"]})"
+      else
+        respond 500, "The version #{request.params["version"]} is already indexed."
       end
     elsif request.path == "/api/v1/gems/rake/owners"
       if request.post?

metadata

@@ -2,7 +2,7 @@
 name: spade
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Charles Jolley
@@ -429,6 +429,7 @@ files:
 - spec/cli/push_spec.rb
 - spec/cli/uninstall_spec.rb
 - spec/cli/unpack_spec.rb
+- spec/cli/unyank_spec.rb
 - spec/cli/yank_spec.rb
 - spec/credentials_spec.rb
 - spec/fixtures/badrake-0.8.7.gem
@@ -514,6 +515,7 @@ test_files:
 - spec/cli/push_spec.rb
 - spec/cli/uninstall_spec.rb
 - spec/cli/unpack_spec.rb
+- spec/cli/unyank_spec.rb
 - spec/cli/yank_spec.rb
 - spec/credentials_spec.rb
 - spec/fixtures/badrake-0.8.7.gem