gemcutter 0.0.3 → 0.0.4

data/lib/commands/downgrade.rb

@@ -13,5 +13,3 @@ class Gem::Commands::DowngradeCommand < Gem::Command
     Gem.configuration.write
   end
 end
-
-Gem::CommandManager.instance.register_command :downgrade

data/lib/commands/push.rb

@@ -1,8 +1,6 @@
-require 'yaml'
 require 'net/http'
 
 class Gem::Commands::PushCommand < Gem::Command
-
   def description
     'Push a gem up to Gemcutter'
   end
@@ -20,6 +18,21 @@ class Gem::Commands::PushCommand < Gem::Command
   end
 
   def execute
+    sign_in unless api_key
+    send_gem
+  end
+
+  def ask_for_password(message)
+    password = ui.ask_for_password(message)
+    ui.say("\n")
+    password
+  end
+
+  def api_key
+    Gem.configuration[:gemcutter_key]
+  end
+
+  def send_gem
     say "Pushing gem to Gemcutter..."
 
     name = get_one_gem_name
@@ -29,11 +42,42 @@ class Gem::Commands::PushCommand < Gem::Command
     request = Net::HTTP::Post.new(url.path)
     request.body = File.open(name).read
     request.content_length = request.body.size
-    request.initialize_http_header("HTTP_AUTHORIZATION" => Gem.configuration[:gemcutter_key])
+    request.initialize_http_header("HTTP_AUTHORIZATION" => api_key)
 
     response = Net::HTTP.new(url.host, url.port).start { |http| http.request(request) }
     say response.body
   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) }
+
+    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"
+    else
+      say response.body
+      terminate_interaction
+    end
+  end
 end
 
-Gem::CommandManager.instance.register_command :push
+class Gem::StreamUI
+  def ask_for_password(message)
+    system "stty -echo"
+    password = ask(message)
+    system "stty echo"
+    password
+  end
+end

data/lib/commands/upgrade.rb

@@ -1,62 +1,19 @@
-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
     'Upgrade your gem source to Gemcutter'
   end
 
-  def ask_for_password(message)
-    ui.ask_for_password(message)
-  end
-
   def initialize
     super 'upgrade', description
   end
 
   def execute
-    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
+      say "Your primary gem source is now gemcutter.org"
     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) }
-
-    case response
-    when Net::HTTPSuccess
-      Gem.configuration[:gemcutter_key] = response.body
-      Gem.configuration.write
-    else
-      say response.body
-    end
-  end
-
 end
-
-Gem::CommandManager.instance.register_command :upgrade

data/lib/rubygems_plugin.rb

@@ -4,4 +4,8 @@ require 'commands/downgrade'
 require 'commands/push'
 require 'commands/upgrade'
 
+Gem::CommandManager.instance.register_command :downgrade
+Gem::CommandManager.instance.register_command :push
+Gem::CommandManager.instance.register_command :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.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Nick Quaranto
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-13 00:00:00 -04:00
+date: 2009-06-15 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -54,6 +54,6 @@ rubyforge_project: gemcutter
 rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
-summary: Kickass gem hosting
+summary: Awesome gem hosting
 test_files: []