gemcutter 0.3.0 → 0.4.0.pre

data/Rakefile

@@ -5,7 +5,7 @@ task :default => [:test]
 
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
-  t.test_files = FileList['test/*_command_test.rb']
+  t.test_files = FileList['test/*_test.rb']
   t.verbose = true
 end
 
@@ -13,14 +13,15 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "gemcutter"
-    gem.version = "0.3.0"
+    gem.version = "0.4.0.pre"
     gem.summary = "Commands to interact with gemcutter.org"
     gem.description = "Adds several commands to RubyGems for managing gems and more on Gemcutter.org."
     gem.email = "nick@quaran.to"
     gem.homepage = "http://gemcutter.org"
     gem.authors = ["Nick Quaranto"]
     gem.files = FileList["lib/rubygems_plugin.rb",
-                         "lib/commands/*",
+                         "lib/gemcutter.rb",
+                         "lib/rubygems/commands/*",
                          "test/*_helper.rb",
                          "test/*_test.rb",
                          "MIT-LICENSE",
@@ -31,15 +32,15 @@ begin
     %w[rake shoulda activesupport webmock rr].each do |dep|
       gem.add_development_dependency(dep)
     end
-    gem.required_rubygems_version = Gem::Requirement.new(">= 1.3.5") if gem.respond_to? :required_rubygems_version=
+    gem.required_rubygems_version = Gem::Requirement.new(">= 1.3.6.pre.1") if gem.respond_to? :required_rubygems_version=
     gem.post_install_message = <<MESSAGE
 
 ========================================================================
 
            Thanks for installing Gemcutter! You can now run:
 
-    gem push          publish your gems for the world to use and enjoy
-    gem owner         allow/disallow others to push to your gems
+    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
 
 ========================================================================

data/lib/gemcutter.rb

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

data/lib/{commands → rubygems/commands}/migrate.rb

@@ -1,4 +1,4 @@
-class Gem::Commands::MigrateCommand < Gem::AbstractCommand
+class Gem::Commands::MigrateCommand < Gem::Command
   def description
     'Deprecate method for migrating a gem you own from Rubyforge to Gemcutter.'
   end

data/lib/{commands → rubygems/commands}/tumble.rb

@@ -1,4 +1,4 @@
-class Gem::Commands::TumbleCommand < Gem::AbstractCommand
+class Gem::Commands::TumbleCommand < Gem::Command
   def description
     "Deprecated method of upgrading to Gemcutter.org for gem downloads"
   end

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

@@ -1,4 +1,9 @@
-class Gem::Commands::WebhookCommand < Gem::AbstractCommand
+require 'rubygems/local_remote_options'
+require 'rubygems/gemcutter_utilities'
+
+class Gem::Commands::WebhookCommand < Gem::Command
+  include Gem::LocalRemoteOptions
+  include Gem::GemcutterUtilities
 
   def description
     <<-EOF
@@ -43,7 +48,7 @@ EOF
   end
 
   def execute
-    setup
+    sign_in
 
     if options[:url]
       name = options[:global] ? '*' : get_one_gem_name
@@ -60,23 +65,22 @@ EOF
 
   def remove_webhook(name, url)
     say "Removing webhook..."
-    make_webhook_request(:delete, name, url, "web_hooks/remove")
+    make_webhook_request(:delete, name, url, "api/v1/web_hooks/remove")
   end
 
   def fire_webhook(name, url)
     say "Test firing webhook..."
-    make_webhook_request(:post, name, url, "web_hooks/fire")
+    make_webhook_request(:post, name, url, "api/v1/web_hooks/fire")
   end
 
   def list_webhooks
     require 'json/pure' unless defined?(JSON::JSON_LOADED)
 
-    response = make_request(:get, "web_hooks") do |request|
-      request.add_field("Authorization", api_key)
+    resp = rubygems_api_request(:get, "api/v1/web_hooks") do |request|
+      request.add_field("Authorization", Gem.configuration.rubygems_api_key)
     end
 
-    case response
-    when Net::HTTPSuccess
+    with_response(resp) do |response|
       begin
         groups = JSON.parse(response.body)
 
@@ -101,24 +105,15 @@ EOF
         say json_error.to_s
         terminate_interaction
       end
-    else
-      say response.body
-      terminate_interaction
     end
   end
 
-  def make_webhook_request(method, name, url, api = "web_hooks")
-    response = make_request(method, api) do |request|
+  def make_webhook_request(method, name, url, api = "api/v1/web_hooks")
+    response = rubygems_api_request(method, api) do |request|
       request.set_form_data("gem_name" => name, "url" => url)
-      request.add_field("Authorization", api_key)
+      request.add_field("Authorization", Gem.configuration.rubygems_api_key)
     end
 
-    case response
-    when Net::HTTPSuccess
-      say response.body
-    else
-      say response.body
-      terminate_interaction
-    end
+    with_response(response)
   end
 end

data/lib/rubygems_plugin.rb

@@ -1,9 +1 @@
-$:.unshift File.dirname(__FILE__)     # For use/testing when no gem is installed
-
-require 'rubygems/command_manager'
-require 'commands/abstract_command'
-
-%w[migrate owner push tumble webhook].each do |command|
-  require "commands/#{command}"
-  Gem::CommandManager.instance.register_command command.to_sym
-end
+require File.join(File.dirname(__FILE__), 'gemcutter')

data/test/webhook_command_test.rb

@@ -1,10 +1,10 @@
-require 'command_helper'
+require 'helper'
 
 class WebhookCommandTest < CommandTest
   context "webhooking" do
     setup do
       @gem = "foo"
-      @api = "https://gemcutter.org/api/v1/web_hooks"
+      @api = "https://rubygems.org/api/v1/web_hooks"
       @url = "http://example.com/hook"
       @command = Gem::Commands::WebhookCommand.new
       stub(@command).say
@@ -20,7 +20,7 @@ class WebhookCommandTest < CommandTest
 
     context "adding a specific hook" do
       setup do
-        stub_config({ :rubygems_api_key => "key" })
+        stub_api_key("key")
         stub_request(:post, @api).to_return(:body => "Success!")
 
         @command.handle_options([@gem, "-a", @url])
@@ -45,7 +45,7 @@ class WebhookCommandTest < CommandTest
 
     context "adding a global hook" do
       setup do
-        stub_config({ :rubygems_api_key => "key" })
+        stub_api_key("key")
         stub_request(:post, @api).to_return(:body => "Success!")
 
         @command.handle_options(["-g", "-a", @url])
@@ -70,7 +70,7 @@ class WebhookCommandTest < CommandTest
 
     context "listing hooks with some available" do
       setup do
-        stub_config({ :rubygems_api_key => "key" })
+        stub_api_key("key")
         stub_request(:get, @api).to_return :body => <<EOF
 {
   "foo": [{"url":"http://foogemhook.com","failure_count":0}],
@@ -123,7 +123,7 @@ EOF
 
     context "listing hooks with none available" do
       setup do
-        stub_config({ :rubygems_api_key => "key" })
+        stub_api_key("key")
         stub_request(:get, @api).to_return(:body => "{}")
         @command.handle_options([])
         @command.execute
@@ -139,7 +139,7 @@ EOF
     context "listing hooks with a json error" do
       setup do
         stub(@command).terminate_interaction
-        stub_config({ :rubygems_api_key => "key" })
+        stub_api_key("key")
         stub_request(:get, @api).to_return(:body => "fubar")
         @command.handle_options([])
         @command.execute
@@ -160,7 +160,7 @@ EOF
 
     context "removing specific hooks" do
       setup do
-        stub_config({ :rubygems_api_key => "key" })
+        stub_api_key("key")
         stub_request(:delete, "#{@api}/remove").to_return(:body => "Success!")
 
         @command.handle_options([@gem, "-r", @url])
@@ -185,7 +185,7 @@ EOF
 
     context "removing global hooks" do
       setup do
-        stub_config({ :rubygems_api_key => "key" })
+        stub_api_key("key")
         stub_request(:delete, "#{@api}/remove").to_return(:body => "Success!")
 
         @command.handle_options(["-g", "-r", @url])
@@ -210,7 +210,7 @@ EOF
 
     context "test firing hooks" do
       setup do
-        stub_config({ :rubygems_api_key => "key" })
+        stub_api_key("key")
         stub_request(:post, "#{@api}/fire").to_return(:body => "Success!")
 
         @command.handle_options([@gem, "-f", @url])

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gemcutter
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  prerelease: true
+  segments: 
+  - 0
+  - 4
+  - 0
+  - pre
+  version: 0.4.0.pre
 platform: ruby
 authors: 
 - Nick Quaranto
@@ -9,69 +15,81 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-05 00:00:00 -05:00
+date: 2010-02-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: webmock
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rr
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id006
 description: Adds several commands to RubyGems for managing gems and more on Gemcutter.org.
 email: nick@quaran.to
 executables: []
@@ -83,16 +101,11 @@ extra_rdoc_files: []
 files: 
 - MIT-LICENSE
 - Rakefile
-- lib/commands/abstract_command.rb
-- lib/commands/migrate.rb
-- lib/commands/owner.rb
-- lib/commands/push.rb
-- lib/commands/tumble.rb
-- lib/commands/webhook.rb
+- lib/gemcutter.rb
+- lib/rubygems/commands/migrate.rb
+- lib/rubygems/commands/tumble.rb
+- lib/rubygems/commands/webhook.rb
 - lib/rubygems_plugin.rb
-- test/abstract_command_test.rb
-- test/command_helper.rb
-- test/push_command_test.rb
 - test/webhook_command_test.rb
 has_rdoc: true
 homepage: http://gemcutter.org
@@ -104,8 +117,8 @@ post_install_message: |+
   
              Thanks for installing Gemcutter! You can now run:
   
-      gem push          publish your gems for the world to use and enjoy
-      gem owner         allow/disallow others to push to your gems
+      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
   
   ========================================================================
@@ -118,18 +131,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.5
-  version: 
+      segments: 
+      - 1
+      - 3
+      - 6
+      - pre
+      - 1
+      version: 1.3.6.pre.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6.pre.1
 signing_key: 
 specification_version: 3
 summary: Commands to interact with gemcutter.org

data/lib/commands/abstract_command.rb

@@ -1,113 +0,0 @@
-require 'rubygems/local_remote_options'
-
-class Gem::AbstractCommand < Gem::Command
-  include Gem::LocalRemoteOptions
-
-  def gemcutter_url
-    ENV['GEMCUTTER_URL'] || 'https://gemcutter.org'
-  end
-
-  def setup
-    use_proxy! if http_proxy
-    sign_in unless api_key
-  end
-
-  def sign_in
-    say "Enter your Gemcutter credentials. Don't have an account yet? Create one at http://gemcutter.org/sign_up"
-
-    email = ask("Email: ")
-    password = ask_for_password("Password: ")
-
-    response = make_request(:get, "api_key") do |request|
-      request.basic_auth email, password
-    end
-
-    case response
-    when Net::HTTPSuccess
-      self.api_key = response.body
-      say "Signed in. Your api key has been stored in ~/.gem/credentials"
-    else
-      say response.body
-      terminate_interaction
-    end
-  end
-
-  def credentials_path
-    File.join(Gem.user_home, '.gem', 'credentials')
-  end
-
-  def api_key
-    Gem.configuration.load_file(credentials_path)[:rubygems_api_key]
-  end
-
-  def api_key=(api_key)
-    config = Gem.configuration.load_file(credentials_path).merge(:rubygems_api_key => api_key)
-
-    dirname = File.dirname(credentials_path)
-    Dir.mkdir(dirname) unless File.exists?(dirname)
-
-    File.open(credentials_path, 'w') do |f|
-      f.write config.to_yaml
-    end
-
-    @rubygems_api_key = api_key
-  end
-
-  def make_request(method, path)
-    require 'net/http'
-    require 'net/https'
-
-    url = URI.parse("#{gemcutter_url}/api/v1/#{path}")
-
-    http = proxy_class.new(url.host, url.port)
-
-    if url.scheme == 'https'
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      http.use_ssl = true
-    end
-
-    request_method =
-      case method
-      when :get
-        proxy_class::Get
-      when :post
-        proxy_class::Post
-      when :put
-        proxy_class::Put
-      when :delete
-        proxy_class::Delete
-      else
-        raise ArgumentError
-      end
-
-    request = request_method.new(url.path)
-    request.add_field "User-Agent", "Gemcutter/0.2.0"
-
-    yield request if block_given?
-    http.request(request)
-  end
-
-  def use_proxy!
-    proxy_uri = http_proxy
-    @proxy_class = Net::HTTP::Proxy(proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password)
-  end
-
-  def proxy_class
-    @proxy_class || Net::HTTP
-  end
-
-  # @return [URI, nil] the HTTP-proxy as a URI if set; +nil+ otherwise
-  def http_proxy
-    proxy = Gem.configuration[:http_proxy] || ENV['http_proxy'] || ENV['HTTP_PROXY']
-    return nil if proxy.nil? || proxy == :no_proxy
-    URI.parse(proxy)
-  end
-
-  def ask_for_password(message)
-    system "stty -echo"
-    password = ask(message)
-    system "stty echo"
-    ui.say("\n")
-    password
-  end
-end

data/lib/commands/owner.rb

@@ -1,99 +0,0 @@
-class Gem::Commands::OwnerCommand < Gem::AbstractCommand
-
-  def description
-    'Manage gem owners on Gemcutter.'
-  end
-
-  def arguments
-    "GEM_NAME       name of gem to manage owners for."
-  end
-
-  def usage
-    "#{program_name} GEM_NAME"
-  end
-
-  def initialize
-    super 'owner', description
-    defaults.merge!(:add => [], :remove => [])
-
-    add_option('-a', '--add EMAIL', 'Add an owner') do |value, options|
-      options[:add] << value
-    end
-
-    add_option('-r', '--remove EMAIL', 'Remove an owner') do |value, options|
-      options[:remove] << value
-    end
-  end
-
-  def execute
-    setup
-    name = get_one_gem_name
-
-    add_owners    name, options[:add]
-    remove_owners name, options[:remove]
-    show_owners   name
-  end
-
-  def add_owners(name, owners)
-    owners.each do |owner|
-      response = make_request(:post, "gems/#{name}/owners.json") do |request|
-        request.set_form_data("email" => owner)
-        request.add_field("Authorization", api_key)
-      end
-      
-      case response
-      when Net::HTTPSuccess
-        say "Added owner: #{owner}"
-      else
-        say "Error adding owner: #{owner}"
-      end
-    end
-  end
-
-  def remove_owners(name, owners)
-    owners.each do |owner|
-      response = make_request(:delete, "gems/#{name}/owners.json") do |request|
-        request.set_form_data(:email => owner)
-        request.add_field("Authorization", api_key)
-      end
-      
-      case response
-      when Net::HTTPSuccess
-        say "Removed owner: #{owner}"
-      else
-        say "Error removing owner: #{owner}"
-      end
-    end  end
-
-  def show_owners(name)
-    require 'json/pure' unless defined?(JSON::JSON_LOADED)
-
-    response = make_request(:get, "gems/#{name}/owners.json") do |request|
-      request.add_field("Authorization", api_key)
-    end
-
-    case response
-    when Net::HTTPSuccess
-      begin
-        owners = JSON.parse(response.body)
-
-        say "Owners for gem: #{name}"
-        owners.each do |owner|
-          say "- #{owner['email']}"
-        end
-      rescue JSON::ParserError => json_error
-        say "There was a problem parsing the data: #{json_error}"
-        terminate_interaction
-      end
-    when Net::HTTPNotFound
-      say "This gem is currently not hosted on Gemcutter."
-      terminate_interaction
-    when Net::HTTPUnauthorized
-      say "You do not have permission to manage this gem."
-      terminate_interaction
-    else
-      say "There was a problem processing your request."
-      terminate_interaction
-    end
-  end
-end

data/lib/commands/push.rb

@@ -1,38 +0,0 @@
-class Gem::Commands::PushCommand < Gem::AbstractCommand
-
-  def description
-    'Push a gem up to Gemcutter'
-  end
-
-  def arguments
-    "GEM       built gem to push up"
-  end
-
-  def usage
-    "#{program_name} GEM"
-  end
-
-  def initialize
-    super 'push', description
-    add_proxy_option
-  end
-
-  def execute
-    setup
-    send_gem
-  end
-
-  def send_gem
-    say "Pushing gem to Gemcutter..."
-
-    path = get_one_gem_name
-    response = make_request(:post, "gems") do |request|
-      request.body = Gem.read_binary(path)
-      request.add_field("Content-Length", request.body.size)
-      request.add_field("Content-Type", "application/octet-stream")
-      request.add_field("Authorization", api_key)
-    end
-
-    say response.body
-  end
-end

data/test/abstract_command_test.rb

@@ -1,135 +0,0 @@
-require 'command_helper'
-
-class Gem::Commands::FakeCommand < Gem::AbstractCommand
-  def description
-    'fake command'
-  end
-
-  def initialize
-    super 'fake', description
-  end
-
-  def execute
-  end
-end
-
-class AbstractCommandTest < CommandTest
-  context "with an fake command" do
-    setup do
-      @command = Gem::Commands::FakeCommand.new
-      stub(@command).say
-      ENV['http_proxy'] = nil
-      ENV['HTTP_PROXY'] = nil
-    end
-
-    context "parsing the proxy" do
-      should "return nil if no proxy is set" do
-        stub_config(:http_proxy => nil)
-        assert_equal nil, @command.http_proxy
-      end
-
-      should "return nil if the proxy is set to :no_proxy" do
-        stub_config(:http_proxy => :no_proxy)
-        assert_equal nil, @command.http_proxy
-      end
-
-      should "return a proxy as a URI if set" do
-        stub_config(:http_proxy => 'http://proxy.example.org:9192')
-        assert_equal 'proxy.example.org', @command.http_proxy.host
-        assert_equal 9192, @command.http_proxy.port
-      end
-
-      should "return a proxy as a URI if set by environment variable" do
-        ENV['http_proxy'] = "http://jack:duck@192.168.1.100:9092"
-        assert_equal "192.168.1.100", @command.http_proxy.host
-        assert_equal 9092, @command.http_proxy.port
-        assert_equal "jack", @command.http_proxy.user
-        assert_equal "duck", @command.http_proxy.password
-      end
-    end
-
-    should "sign in if no api key" do
-      stub(@command).api_key { nil }
-      stub(@command).sign_in
-      @command.setup
-      assert_received(@command) { |command| command.sign_in }
-    end
-
-    should "not sign in if api key exists" do
-      stub(@command).api_key { "1234567890" }
-      stub(@command).sign_in
-      @command.setup
-      assert_received(@command) { |command| command.sign_in.never }
-    end
-
-    context "using the proxy" do
-      setup do
-        stub_config(:http_proxy => "http://gilbert:sekret@proxy.example.org:8081")
-        @proxy_class = Object.new
-        mock(Net::HTTP).Proxy('proxy.example.org', 8081, 'gilbert', 'sekret') { @proxy_class }
-        @command.use_proxy!
-      end
-
-      should "replace Net::HTTP with a proxy version" do
-        assert_equal @proxy_class, @command.proxy_class
-      end
-    end
-
-    context "signing in" do
-      setup do
-        @email = "email"
-        @password = "password"
-        @key = "key"
-
-        stub(@command).say
-        stub(@command).ask { @email }
-        stub(@command).ask_for_password { @password }
-        stub_config(:rubygems_api_key => @key)
-      end
-
-      context "on a good request" do
-        setup do
-          WebMock.stub_request(:get, "https://#{@email}:#{@password}@gemcutter.org/api/v1/api_key").to_return(:body => @key)
-        end
-
-        should "ask for email and password" do
-          @command.sign_in
-          assert_received(@command) { |command| command.ask("Email: ") }
-          assert_received(@command) { |command| command.ask_for_password("Password: ") }
-        end
-
-        should "say that we signed in" do
-          @command.sign_in
-          assert_received(@command) { |command| command.say("Signed in. Your api key has been stored in ~/.gem/credentials") }
-          assert_received(@command) { |command| command.say("Enter your Gemcutter credentials. Don't have an account yet? Create one at http://gemcutter.org/sign_up") }
-        end
-      end
-
-      context "on a bad request" do
-        setup do
-          @problem = "Access Denied"
-          stub(@command).terminate_interaction
-          stub(@command).send(:api_key=)
-          WebMock.stub_request(:get, "https://#{@email}:#{@password}@gemcutter.org/api/v1/api_key").to_return(
-            :body   => @problem,
-            :status => 401)
-        end
-
-        should "let the user know there was a problem" do
-          @command.sign_in
-          assert_received(@command) { |command| command.say(@problem) }
-        end
-
-        should "kill the command" do
-          @command.sign_in
-          assert_received(@command) { |command| command.terminate_interaction }
-        end
-
-        should "not write anything to the credentials file" do
-          @command.sign_in
-          assert_received(@command) { |command| command.send(:api_key=).never }
-        end
-      end
-    end
-  end
-end

data/test/command_helper.rb

@@ -1,46 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-
-require 'shoulda'
-require 'active_support'
-require 'active_support/test_case'
-require 'webmock'
-require 'rr'
-
-begin
-  require 'redgreen'
-rescue LoadError
-end
-
-WebMock.disable_net_connect!
-
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), ".."))
-
-require "rubygems_plugin"
-
-class CommandTest < ActiveSupport::TestCase
-  include RR::Adapters::TestUnit unless include?(RR::Adapters::TestUnit)
-  include WebMock
-
-  def teardown
-    reset_webmock
-  end
-end
-
-def stub_config(config)
-  file = Gem::ConfigFile.new({})
-  config.each { |key, value| file[key] = value }
-  stub(Gem).configuration { file }
-end
-
-def assert_said(command, what)
-  assert_received(command) do |command|
-    command.say(what)
-  end
-end
-
-def assert_never_said(command, what)
-  assert_received(command) do |command|
-    command.say(what).never
-  end
-end

data/test/push_command_test.rb

@@ -1,57 +0,0 @@
-require 'command_helper'
-
-class PushCommandTest < CommandTest
-  context "pushing" do
-    setup do
-      @command = Gem::Commands::PushCommand.new
-      stub(@command).say
-    end
-
-    should "setup and send the gem" do
-      mock(@command).setup
-      mock(@command).send_gem
-      @command.execute
-      assert_received(@command) { |command| command.setup }
-      assert_received(@command) { |command| command.send_gem }
-    end
-
-    should "raise an error with no arguments" do
-      assert_raise Gem::CommandLineError do
-        @command.send_gem
-      end
-    end
-
-    context "pushing a gem" do
-      setup do
-        @url = "https://gemcutter.org/api/v1/gems"
-        @gem_path = "path/to/foo-0.0.0.gem"
-        @gem_binary = StringIO.new("gem")
-
-        stub(@command).say
-        stub(@command).options { {:args => [@gem_path]} }
-        stub(Gem).read_binary(@gem_path) { @gem_binary }
-        stub_config({ :rubygems_api_key => "key" })
-        stub_request(:post, @url).to_return(:body => "Success!")
-
-        @command.send_gem
-      end
-
-      should "say push was successful" do
-        assert_received(@command) { |command| command.say("Pushing gem to Gemcutter...") }
-        assert_received(@command) { |command| command.say("Success!") }
-      end
-
-      should "post to api" do
-        # webmock doesn't pass body params on correctly :[
-        assert_requested(:post, @url,
-                         :times => 1)
-        assert_requested(:post, @url,
-                         :headers => {'Authorization' => 'key' })
-        assert_requested(:post, @url,
-                         :headers => {'Content-Length' => @gem_binary.size})
-        assert_requested(:post, @url,
-                         :headers => {'Content-Type' => 'application/octet-stream'})
-      end
-    end
-  end
-end