gemcutter 0.1.2 → 0.1.3

data/lib/commands/abstract_command.rb

@@ -3,6 +3,8 @@ require 'rubygems/local_remote_options'
 class Gem::AbstractCommand < Gem::Command
   include Gem::LocalRemoteOptions
 
+  URL = "http://gemcutter.org"
+
   def api_key
     Gem.configuration[:gemcutter_key]
   end
@@ -80,13 +82,15 @@ class Gem::AbstractCommand < Gem::Command
 
   # @return [URI, nil] the HTTP-proxy as a URI if set; +nil+ otherwise
   def http_proxy
-    proxy = Gem.configuration[: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)
-    password = ui.ask_for_password(message)
+    system "stty -echo"
+    password = ask(message)
+    system "stty echo"
     ui.say("\n")
     password
   end

data/lib/commands/migrate.rb

@@ -21,6 +21,10 @@ class Gem::Commands::MigrateCommand < Gem::AbstractCommand
     check_for_approved
   end
 
+  def project_name
+    rubygem['rubyforge_project'] || rubygem['name']
+  end
+
   def find(name)
     require 'json'
 
@@ -62,10 +66,18 @@ class Gem::Commands::MigrateCommand < Gem::AbstractCommand
     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: ")
-    password = ask_for_password("Password: ")
+    url = "#{project_name}.rubyforge.org"
+    say "Uploading the migration token to #{url}."
+
+    rf_cfg_path = "#{Gem.user_home}/.rubyforge/user-config.yml"
+
+    login, password = if File.exists?(rf_cfg_path)
+      rcfg = YAML.load_file(rf_cfg_path)
+      rcfg.values_at('username', 'password')
+    else
+      say "Please enter your RubyForge login:"
+      [ask("Login: "), ask_for_password("Password: ")]
+    end
 
     begin
       Net::SCP.start(url, login, :password => password) do |scp|
@@ -73,7 +85,7 @@ class Gem::Commands::MigrateCommand < Gem::AbstractCommand
         temp_token.chmod 0644
         temp_token.write(token)
         temp_token.close
-        scp.upload! temp_token.path, "/var/www/gforge-projects/#{rubygem['rubyforge_project']}/migrate-#{rubygem['name']}.html"
+        scp.upload! temp_token.path, "/var/www/gforge-projects/#{project_name}/migrate-#{rubygem['name']}.html"
       end
       say "Successfully uploaded your token."
     rescue Exception => e

data/lib/commands/push.rb

@@ -27,7 +27,7 @@ class Gem::Commands::PushCommand < Gem::AbstractCommand
 
     name = get_one_gem_name
     response = make_request(:post, "gems") do |request|
-      request.body = File.open(name).read
+      request.body = File.open(name, 'rb'){|io| io.read }
       request.add_field("Content-Length", request.body.size)
       request.add_field("Content-Type", "application/octet-stream")
       request.add_field("Authorization", api_key)

data/lib/rubygems_plugin.rb

@@ -7,14 +7,3 @@ require 'commands/abstract_command'
   require "commands/#{command}"
   Gem::CommandManager.instance.register_command command.to_sym
 end
-
-URL = "http://gemcutter.org" unless defined?(URL)
-
-class Gem::StreamUI
-  def ask_for_password(message)
-    system "stty -echo"
-    password = ask(message)
-    system "stty echo"
-    password
-  end
-end

data/test/command_helper.rb

@@ -10,7 +10,7 @@ require 'rr'
 
 FakeWeb.allow_net_connect = false
 
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
+$:.unshift File.expand_path(File.join(File.dirname(__FILE__), ".."))
 
 require "rubygems_plugin"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gemcutter
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Nick Quaranto
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-19 00:00:00 -04:00
+date: 2009-08-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,8 +38,8 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.textile
+extra_rdoc_files: []
+
 files: 
 - lib/commands/abstract_command.rb
 - lib/commands/migrate.rb
@@ -47,7 +47,6 @@ files:
 - lib/commands/push.rb
 - lib/commands/tumble.rb
 - lib/rubygems_plugin.rb
-- README.textile
 has_rdoc: true
 homepage: http://github.com/qrush/gemcutter
 licenses: []
@@ -55,6 +54,7 @@ licenses: []
 post_install_message: |+
   
   ========================================================================
+  
              Thanks for installing Gemcutter! You can now run:
   
       gem tumble        use Gemcutter as your primary RubyGem source
@@ -83,13 +83,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: gemcutter
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Commands to interact with gemcutter.org
 test_files: 
 - test/command_helper.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

data/README.textile

@@ -1,27 +0,0 @@
-h1. gemcutter
-
-Awesome RubyGem hosting.
-
-h2. Purpose
-
-* Provide a better API for dealing with gems
-* Create more transparent and accessible project pages
-* Enable the community to improve and enhance the site
-
-h2. Concerns
-
-These have been moved on to the "FAQ":http://gemcutter.org/pages/faq.
-
-h2. Contributions
-
-Gemcutter has a 'commit-bit' policy, much like the Rubinius project. Submit a patch that is accepted, and you'll get full commit access to the project. Please check the wiki for more information.
-
-If you're looking for things to hack on, please check GitHub Issues. If you've found bugs or have feature ideas don't be afraid to pipe up and ask the mailing list about them.
-
-h2. Testing
-
-Make sure you run @rake gemcutter:index:create@ before running the test suite, otherwise it might complain. Better solutions to this are more than welcome.
-
-h2. License
-
-Gemcutter uses the MIT license. Please check the LICENSE file for more details.

data/test/commands/abstract_command_test.rb

@@ -1,113 +0,0 @@
-require File.dirname(__FILE__) + '/../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
-    end
-
-    context "parsing the proxy" do
-      should "return nil if no proxy is set" do
-        stub(Gem).configuration { { :http_proxy => nil } }
-        assert_equal nil, @command.http_proxy
-      end
-
-      should "return nil if the proxy is set to :no_proxy" do
-        stub(Gem).configuration { { :http_proxy => :no_proxy } }
-        assert_equal nil, @command.http_proxy
-      end
-
-      should "return a proxy as a URI if set" do
-        stub(Gem).configuration { { :http_proxy => 'http://proxy.example.org:9192' } }
-        assert_equal 'proxy.example.org', @command.http_proxy.host
-        assert_equal 9192, @command.http_proxy.port
-      end
-    end
-
-    # TODO: rewrite all of this junk using spies
-    #should "use a proxy if specified" do
-    #  stub(@command).http_proxy { 'http://some.proxy' }
-    #  mock(@command).use_proxy!
-    #  mock(@command).sign_in
-    #  @command.setup
-    #end
-
-    #should "not use a proxy if unspecified" do
-    #  stub(@command).http_proxy { nil }
-    #  mock(@command).use_proxy!.never
-    #  mock(@command).sign_in
-    #  @command.setup
-    #end
-
-    should "sign in if no api key" do
-      stub(Gem).configuration { {:gemcutter_key => nil} }
-      mock(@command).sign_in
-      @command.setup
-    end
-
-    should "not sign in if api key exists" do
-      stub(Gem).configuration { {:gemcutter_key => "1234567890"} }
-      mock(@command).sign_in.never
-      @command.setup
-    end
-
-    context "using the proxy" do
-      setup do
-        stub(Gem).configuration { { :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"
-        mock(@command).say("Enter your Gemcutter credentials. Don't have an account yet? Create one at #{URL}/sign_up")
-        mock(@command).ask("Email: ") { @email }
-        mock(@command).ask_for_password("Password: ") { @password }
-        FakeWeb.register_uri :get, "https://#{@email}:#{@password}@gemcutter.heroku.com/api_key", :body => @key
-
-        @config = Object.new
-        stub(Gem).configuration { @config }
-        stub(@config)[:gemcutter_key] = @key
-        stub(@config).write
-      end
-
-      should "sign in" do
-        mock(@command).say("Signed in. Your api key has been stored in ~/.gemrc")
-        @command.sign_in
-      end
-
-      should "let the user know if there was a problem" do
-        @problem = "Access Denied"
-        mock(@command).say(@problem)
-        mock(@command).terminate_interaction
-        mock(@config).write.never
-
-        FakeWeb.register_uri :get, "https://#{@email}:#{@password}@gemcutter.heroku.com/api_key", :body => @problem, :status => 401
-        @command.sign_in
-      end
-    end
-  end
-end

data/test/commands/migrate_command_test.rb

@@ -1,141 +0,0 @@
-require File.dirname(__FILE__) + '/../command_helper'
-require 'net/scp'
-
-class MigrateCommandTest < CommandTest
-  context "executing the command" do
-    setup do
-      @command = Gem::Commands::MigrateCommand.new
-      stub(@command).setup
-      stub(@command).migrate
-    end
-
-    should "setup and send the gem" do
-      @command.execute
-      assert_received(@command) { |subject| subject.setup }
-      assert_received(@command) { |subject| subject.migrate }
-    end
-  end
-
-  context "migrating" do
-    setup do
-      @command = Gem::Commands::MigrateCommand.new
-      @token = "deadbeef"
-      stub(@command).say
-      stub(@command).find
-      stub(@command).get_token { @token }
-      stub(@command).upload_token
-      stub(@command).check_for_approved
-    end
-
-    should "raise an error with no arguments" do
-      assert_raise Gem::CommandLineError do
-        @command.migrate
-      end
-    end
-
-    should "migrate the gem" do
-      stub(@command).get_one_gem_name { "mygem" }
-      @command.migrate
-      assert_received(@command) { |subject| subject.find("mygem") }
-      assert_received(@command) { |subject| subject.get_token }
-      assert_received(@command) { |subject| subject.upload_token(@token) }
-      assert_received(@command) { |subject| subject.check_for_approved }
-    end
-  end
-
-  context "ask about the gem" do
-    setup do
-      @command = Gem::Commands::MigrateCommand.new
-      stub(@command).say
-      stub(@command).terminate_interaction
-
-      @name = "rails"
-      @json = "{\"downloads\":4,\"name\":\"rails\",\"authors\":\"David Heinemeier Hansson\",\"version\":\"2.3.3\",\"rubyforge_project\":\"rails\",\"info\":\"Rails is a framework for building web-application using CGI, FCGI, mod_ruby, or WEBrick on top of either MySQL, PostgreSQL, SQLite, DB2, SQL Server, or Oracle with eRuby- or Builder-based templates.\"}"
-    end
-
-    should "find gem info if it exists" do
-      FakeWeb.register_uri :get, "https://gemcutter.heroku.com/gems/#{@name}.json", :body => @json
-      @command.find(@name)
-      assert_equal JSON.parse(@json), @command.rubygem
-    end
-
-    should "dump out if the gem couldn't be found" do
-      FakeWeb.register_uri :get, "https://gemcutter.heroku.com/gems/#{@name}.json", :body => "Not hosted here.", :status => 404
-      @command.find(@name)
-      assert_received(@command) { |subject| subject.say(anything) }
-      assert_received(@command) { |subject| subject.terminate_interaction }
-    end
-
-    should "dump out if bad json is returned" do
-      FakeWeb.register_uri :get, "https://gemcutter.heroku.com/gems/#{@name}.json", :body => "bad data is bad"
-      @command.find(@name)
-      assert_received(@command) { |subject| subject.say(anything) }
-      assert_received(@command) { |subject| subject.terminate_interaction }
-    end
-  end
-
-  context "getting the token" do
-    setup do
-      @command = Gem::Commands::MigrateCommand.new
-      @name = "SomeGem"
-      stub(@command).say
-      stub(@command).terminate_interaction
-      stub(@command).rubygem { { "name" => @name } }
-    end
-
-    should "ask gemcutter to start the migration" do
-      token = "SECRET TOKEN"
-      FakeWeb.register_uri :post, "https://gemcutter.heroku.com/gems/#{@name}/migrate", :body => token
-      assert_equal token, @command.get_token
-    end
-
-    should "dump out if gem could not be found" do
-      FakeWeb.register_uri :post, "https://gemcutter.heroku.com/gems/#{@name}/migrate", :status => 404, :body => "not found"
-      @command.get_token
-      assert_received(@command) { |subject| subject.say("not found") }
-      assert_received(@command) { |subject| subject.terminate_interaction }
-    end
-
-    should "dump out if migration has already been completed" do
-      FakeWeb.register_uri :post, "https://gemcutter.heroku.com/gems/#{@name}/migrate", :status => 403, :body => "already migrated"
-      @command.get_token
-      assert_received(@command) { |subject| subject.say("already migrated") }
-      assert_received(@command) { |subject| subject.terminate_interaction }
-    end
-  end
-
-  context "uploading the token" do
-    setup do
-      @command = Gem::Commands::MigrateCommand.new
-      @token = "deadbeef"
-      stub(@command).say
-      stub(@command).rubygem { { "rubyforge_project" => "bostonrb" } }
-      stub(Net::SCP).start
-    end
-
-    should "connect to rubyforge and upload away" do
-      stub(@command).ask { "user" }
-      stub(@command).ask_for_password { "secret" }
-      @command.upload_token(@token)
-
-      # TODO: figure out how to test the upload! in the block
-      assert_received(Net::SCP) { |subject| subject.start("bostonrb.rubyforge.org", "user", :password => "secret") }
-    end
-  end
-
-  context "checking if the rubygem was approved" do
-    setup do
-      @command = Gem::Commands::MigrateCommand.new
-      @name = "rails"
-
-      stub(@command).say
-      stub(@command).rubygem { { "name" => @name } }
-    end
-
-    should "let the server decide the status" do
-      FakeWeb.register_uri :put, "https://gemcutter.heroku.com/gems/#{@name}/migrate", :body => "Success!", :status => 400
-      @command.check_for_approved
-      assert_received(@command) { |subject| subject.say("Success!") }
-    end
-  end
-end

data/test/commands/push_command_test.rb

@@ -1,41 +0,0 @@
-require File.dirname(__FILE__) + '/../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
-    end
-
-    should "raise an error with no arguments" do
-      assert_raise Gem::CommandLineError do
-        @command.send_gem
-      end
-    end
-
-    should "push a gem" do
-      mock(@command).say("Pushing gem to Gemcutter...")
-      @response = "success"
-      FakeWeb.register_uri :post, "https://gemcutter.heroku.com/gems", :body => @response
-
-      @gem = "test"
-      @io = "io"
-      @config = { :gemcutter_key => "key" }
-
-      stub(File).open(@gem) { @io }
-      stub(@io).read.stub!.size
-
-      stub(@command).options { {:args => [@gem]} }
-      stub(Gem).configuration { @config }
-
-      mock(@command).say(@response)
-      @command.send_gem
-    end
-  end
-end

data/test/commands/tumble_command_test.rb

@@ -1,58 +0,0 @@
-require File.dirname(__FILE__) + '/../command_helper'
-
-class TumbleCommandTest < CommandTest
-  context "with a tumbler and some sources" do
-    setup do
-      @sources = ["gems.rubyforge.org", URL]
-      stub(Gem).sources { @sources }
-      @command = Gem::Commands::TumbleCommand.new
-    end
-
-    should "show sources" do
-      mock(@command).say("Your gem sources are now:")
-      mock(@command).say("- #{@sources.first}")
-      mock(@command).say("- #{URL}")
-      @command.show_sources
-    end
-  end
-
-  context "tumbling the gem sources" do
-    setup do
-      @sources = ["http://rubyforge.org"]
-      stub(Gem).sources { @sources }
-      @config = Object.new
-      stub(Gem).configuration { @config }
-
-      @command = Gem::Commands::TumbleCommand.new
-    end
-
-    should "add gemcutter as first source" do
-      mock(@sources).unshift(URL)
-      mock(@config).write
-
-      @command.tumble
-    end
-
-    should "remove gemcutter if it's in the sources" do
-      mock(@sources).include?(URL) { true }
-      mock(@config).write
-      mock(@sources).delete(URL)
-
-      @command.tumble
-    end
-  end
-
-  context "executing the tumbler" do
-    setup do
-      @command = Gem::Commands::TumbleCommand.new
-    end
-
-    should "say thanks, tumble and show the sources" do
-      mock(@command).say(anything)
-      mock(@command).tumble
-      mock(@command).show_sources
-
-      @command.execute
-    end
-  end
-end