gemcutter 0.1.8 → 0.2.0

data/lib/commands/abstract_command.rb

@@ -5,10 +5,6 @@ class Gem::AbstractCommand < Gem::Command
 
   URL = "http://gemcutter.org"
 
-  def api_key
-    Gem.configuration[:gemcutter_key]
-  end
-
   def gemcutter_url
     ENV['GEMCUTTER_URL'] || 'https://gemcutter.org'
   end
@@ -30,20 +26,40 @@ class Gem::AbstractCommand < Gem::Command
 
     case response
     when Net::HTTPSuccess
-      Gem.configuration[:gemcutter_key] = response.body
-      Gem.configuration.write
-      say "Signed in. Your api key has been stored in ~/.gemrc"
+      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}/#{path}")
+    url = URI.parse("#{gemcutter_url}/api/v1/#{path}")
 
     http = proxy_class.new(url.host, url.port)
 
@@ -67,6 +83,8 @@ class Gem::AbstractCommand < Gem::Command
       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

data/lib/commands/tumble.rb

@@ -1,6 +1,6 @@
 class Gem::Commands::TumbleCommand < Gem::AbstractCommand
   def description
-    'Enable or disable Gemcutter as your primary gem source.'
+    "Deprecated method of upgrading to Gemcutter.org for gem downloads"
   end
 
   def initialize
@@ -8,25 +8,6 @@ class Gem::Commands::TumbleCommand < Gem::AbstractCommand
   end
 
   def execute
-    say "Thanks for using Gemcutter!"
-    tumble
-    show_sources
-  end
-
-  def tumble
-    if Gem.sources.include?(URL)
-      Gem.sources.delete URL
-      Gem.configuration.write
-    else
-      Gem.sources.unshift URL
-      Gem.configuration.write
-    end
-  end
-
-  def show_sources
-    say "Your gem sources are now:"
-    Gem.sources.each do |source|
-      say "- #{source}"
-    end
+    say "This command is deprecated, Gemcutter.org is the primary source for gems."
   end
 end

data/test/command_helper.rb

@@ -22,3 +22,9 @@ require "rubygems_plugin"
 class CommandTest < ActiveSupport::TestCase
   include RR::Adapters::TestUnit unless include?(RR::Adapters::TestUnit)
 end
+
+def stub_config(config)
+  file = Gem::ConfigFile.new({})
+  config.each { |key, value| file[key] = value }
+  stub(Gem).configuration { file }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gemcutter
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors: 
 - Nick Quaranto
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-22 00:00:00 -08:00
+date: 2009-12-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,7 +57,6 @@ post_install_message: |+
   
              Thanks for installing Gemcutter! You can now run:
   
-      gem tumble        use Gemcutter as your primary RubyGem source
       gem push          publish your gems for the world to use and enjoy
       gem migrate       take over your gem from RubyForge on Gemcutter
       gem owner         allow/disallow others to push to your gems