gemcutter 0.0.7 → 0.0.8

data/lib/commands/abstract_command.rb

@@ -1,4 +1,8 @@
+require 'rubygems/local_remote_options'
+
 class Gem::AbstractCommand < Gem::Command
+  include Gem::LocalRemoteOptions
+
   def api_key
     Gem.configuration[:gemcutter_key]
   end
@@ -22,14 +26,9 @@ class Gem::AbstractCommand < Gem::Command
     email = ask("Email: ")
     password = ask_for_password("Password: ")
 
-    url = URI.parse("#{gemcutter_url}/api_key")
-
-    http = Net::HTTP.new(url.host, url.port)
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    http.use_ssl = (url.scheme == 'https')
-    request = Net::HTTP::Get.new(url.path)
-    request.basic_auth email, password
-    response = http.request(request)
+    response = make_request(:get, "api_key") do |request|
+      request.basic_auth email, password
+    end
 
     case response
     when Net::HTTPSuccess
@@ -42,6 +41,36 @@ class Gem::AbstractCommand < Gem::Command
     end
   end
 
+  def make_request(method, path)
+    require 'net/http'
+    require 'net/https'
+
+    url = URI.parse("#{gemcutter_url}/#{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
+      else
+        raise ArgumentError
+      end
+
+    request = request_method.new(url.path)
+    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)

data/lib/commands/migrate.rb

@@ -1,8 +1,3 @@
-require 'open-uri'
-require 'net/scp'
-require 'json'
-require 'tempfile'
-
 class Gem::Commands::MigrateCommand < Gem::AbstractCommand
   attr_reader :rubygem
 
@@ -27,30 +22,31 @@ class Gem::Commands::MigrateCommand < Gem::AbstractCommand
   end
 
   def find(name)
-    begin
-      data = open("#{gemcutter_url}/gems/#{name}.json")
-      @rubygem = JSON.parse(data.string)
-    rescue OpenURI::HTTPError
+    require 'json'
+
+    response = make_request(:get, "gems/#{name}.json")
+
+    case response
+    when Net::HTTPSuccess
+      begin
+        @rubygem = JSON.parse(response.body)
+      rescue JSON::ParserError => json_error
+        say "There was a problem parsing the data: #{json_error}"
+        terminate_interaction
+      end
+    else
       say "This gem is currently not hosted on Gemcutter."
       terminate_interaction
-    rescue JSON::ParserError => json_error
-      say "There was a problem parsing the data: #{json_error}"
-      terminate_interaction
     end
   end
 
   def get_token
     say "Starting migration of #{rubygem["name"]} from RubyForge..."
 
-    url = URI.parse("#{gemcutter_url}/gems/#{rubygem["slug"]}/migrate")
-
-    http = proxy_class.new(url.host, url.port)
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    http.use_ssl = (url.scheme == 'https')
-    request = proxy_class::Post.new(url.path)
-    request.add_field("Content-Length", 0)
-    request.add_field("Authorization", api_key)
-    response = http.request(request)
+    response = make_request(:post, "gems/#{rubygem["slug"]}/migrate") do |request|
+      request.add_field("Content-Length", 0)
+      request.add_field("Authorization", api_key)
+    end
 
     case response
     when Net::HTTPSuccess
@@ -63,6 +59,9 @@ class Gem::Commands::MigrateCommand < Gem::AbstractCommand
   end
 
   def upload_token(token)
+    require 'tempfile'
+    require 'net/scp'
+
     url = "#{self.rubygem['rubyforge_project']}.rubyforge.org"
     say "Uploading the migration token to #{url}. Please enter your RubyForge login:"
     login = ask("Login: ")
@@ -84,15 +83,11 @@ class Gem::Commands::MigrateCommand < Gem::AbstractCommand
 
   def check_for_approved
     say "Asking Gemcutter to verify the upload..."
-    url = URI.parse("#{gemcutter_url}/gems/#{rubygem["slug"]}/migrate")
-
-    http = proxy_class.new(url.host, url.port)
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    http.use_ssl = (url.scheme == 'https')
-    request = proxy_class::Put.new(url.path)
-    request.add_field("Content-Length", 0)
-    request.add_field("Authorization", api_key)
-    response = http.request(request)
+
+    response = make_request(:put, "gems/#{rubygem["slug"]}/migrate") do |request|
+      request.add_field("Content-Length", 0)
+      request.add_field("Authorization", api_key)
+    end
 
     say response.body
   end

data/lib/commands/push.rb

@@ -1,11 +1,5 @@
-require 'net/http'
-require 'net/https'
-require 'rubygems/local_remote_options'
-
 class Gem::Commands::PushCommand < Gem::AbstractCommand
 
-  include Gem::LocalRemoteOptions
-
   def description
     'Push a gem up to Gemcutter'
   end
@@ -32,17 +26,11 @@ class Gem::Commands::PushCommand < Gem::AbstractCommand
     say "Pushing gem to Gemcutter..."
 
     name = get_one_gem_name
-    url = URI.parse("#{gemcutter_url}/gems")
-
-    http = proxy_class.new(url.host, url.port)
-    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    http.use_ssl = (url.scheme == 'https')
-    request = proxy_class::Post.new(url.path)
-    request.body = File.open(name).read
-    request.add_field("Content-Length", request.body.size)
-    request.add_field("Authorization", api_key)
-
-    response = http.request(request)
+    response = make_request(:post, "gems") do |request|
+      request.body = File.open(name).read
+      request.add_field("Content-Length", request.body.size)
+      request.add_field("Authorization", api_key)
+    end
 
     say response.body
   end

data/test/{unit/commands → commands}/abstract_command_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../command_helper'
+require File.dirname(__FILE__) + '/../command_helper'
 
 class Gem::Commands::FakeCommand < Gem::AbstractCommand
   def description

data/test/{unit/commands → commands}/migrate_command_test.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/../../command_helper'
+require File.dirname(__FILE__) + '/../command_helper'
+require 'net/scp'
 
 class MigrateCommandTest < CommandTest
   context "executing the command" do

data/test/{unit/commands → commands}/push_command_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../command_helper'
+require File.dirname(__FILE__) + '/../command_helper'
 
 class PushCommandTest < CommandTest
   context "pushing" do

data/test/{unit/commands → commands}/tumble_command_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../command_helper'
+require File.dirname(__FILE__) + '/../command_helper'
 
 class TumbleCommandTest < CommandTest
   context "with a tumbler and some sources" do
@@ -9,9 +9,9 @@ class TumbleCommandTest < CommandTest
     end
 
     should "show sources" do
-      mock(@command).puts("Your gem sources are now:")
-      mock(@command).puts("- #{@sources.first}")
-      mock(@command).puts("- #{URL}")
+      mock(@command).say("Your gem sources are now:")
+      mock(@command).say("- #{@sources.first}")
+      mock(@command).say("- #{URL}")
       @command.show_sources
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gemcutter
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Nick Quaranto
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-10 00:00:00 -04:00
+date: 2009-08-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: net-scp
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: nick@quaran.to
 executables: []
@@ -77,7 +87,7 @@ specification_version: 3
 summary: Awesome gem hosting
 test_files: 
 - test/command_helper.rb
-- test/unit/commands/migrate_command_test.rb
-- test/unit/commands/tumble_command_test.rb
-- test/unit/commands/push_command_test.rb
-- test/unit/commands/abstract_command_test.rb
+- test/commands/migrate_command_test.rb
+- test/commands/tumble_command_test.rb
+- test/commands/push_command_test.rb
+- test/commands/abstract_command_test.rb