gemcutter 0.0.1 → 0.0.2

data/lib/commands/downgrade.rb

@@ -1,18 +1,15 @@
 class Gem::Commands::DowngradeCommand < Gem::Command
-  DESCRIPTION = 'Return to using RubyForge as your primary gem source'
-
   def description
-    DESCRIPTION
+    'Return to using RubyForge as your primary gem source'
   end
 
   def initialize
-    super 'downgrade', DESCRIPTION
+    super 'downgrade', description
   end
 
   def execute
     say "Your primary gem source is now gems.rubyforge.org"
-    Gem.sources.delete "http://gemcutter.org"
-    Gem.sources << "http://gems.rubyforge.org"
+    Gem.sources.delete URL
     Gem.configuration.write
   end
 end

data/lib/commands/push.rb

@@ -2,10 +2,9 @@ require 'yaml'
 require 'net/http'
 
 class Gem::Commands::PushCommand < Gem::Command
-  DESCRIPTION = 'Push a gem up to Gemcutter'
 
   def description
-    DESCRIPTION
+    'Push a gem up to Gemcutter'
   end
 
   def arguments
@@ -17,21 +16,20 @@ class Gem::Commands::PushCommand < Gem::Command
   end
 
   def initialize
-    super 'push', DESCRIPTION
+    super 'push', description
   end
 
   def execute
     say "Pushing gem to Gemcutter..."
 
     name = get_one_gem_name
-    config = YAML.load_file(File.expand_path("~/.gemrc"))
     site = ENV['TEST'] ? "local" : "org"
     url = URI.parse("http://gemcutter.#{site}/gems")
 
     request = Net::HTTP::Post.new(url.path)
     request.body = File.open(name).read
     request.content_length = request.body.size
-    request.basic_auth config[:gemcutter_email], config[:gemcutter_password]
+    request.initialize_http_header("HTTP_AUTHORIZATION" => Gem.configuration[:gemcutter_key])
 
     response = Net::HTTP.new(url.host, url.port).start { |http| http.request(request) }
     say response.body

data/lib/commands/upgrade.rb

@@ -1,20 +1,57 @@
-class Gem::Commands::UpgradeCommand < Gem::Command
-  DESCRIPTION = 'Upgrade your gem source to Gemcutter'
+class Gem::StreamUI
+  def ask_for_password(message)
+    system "stty -echo"
+    password = ask(message)
+    system "stty echo"
+    password
+  end
+end
 
+class Gem::Commands::UpgradeCommand < Gem::Command
   def description
-    DESCRIPTION
+    'Upgrade your gem source to Gemcutter'
+  end
+
+  def ask_for_password(message)
+    ui.ask_for_password(message)
   end
 
   def initialize
-    super 'upgrade', DESCRIPTION
+    super 'upgrade', description
   end
 
   def execute
-    say "Upgrading your primary gem source to gems.gemcutter.org"
-    Gem.sources.delete "http://gems.rubyforge.org"
-    Gem.sources << "http://gemcutter.org"
+    add_source
+    sign_in
+  end
+
+  def add_source
+    if Gem.sources.include?(URL)
+      say "Gemcutter is already your primary gem source. Please use `gem downgrade` if you wish to no longer use Gemcutter."
+    else
+      say "Upgrading your primary gem source to gemcutter.org"
+      Gem.sources.unshift URL
+      Gem.configuration.write
+    end
+  end
+
+  def sign_in
+    say "Enter your Gemcutter credentials. Don't have an account yet? Create one at #{URL}/sign_up"
+
+    email = ask("Email: ")
+    password = ask_for_password("Password: ")
+
+    site = ENV['TEST'] ? "local" : "org"
+    url = URI.parse("http://gemcutter.#{site}/api_key")
+
+    request = Net::HTTP::Get.new(url.path)
+    request.basic_auth email, password
+    response = Net::HTTP.new(url.host, url.port).start { |http| http.request(request) }
+
+    Gem.configuration[:gemcutter_key] = response.body
     Gem.configuration.write
   end
+
 end
 
 Gem::CommandManager.instance.register_command :upgrade

data/lib/rubygems_plugin.rb

@@ -3,3 +3,5 @@ require 'rubygems/command_manager'
 require 'commands/downgrade'
 require 'commands/push'
 require 'commands/upgrade'
+
+URL = "http://gemcutter.org" unless defined?(URL)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gemcutter
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Nick Quaranto
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-02 00:00:00 -04:00
+date: 2009-06-09 00:00:00 -04:00
 default_executable: 
 dependencies: []