keycutter 0.1.1 → 0.2.0

data/features/add.feature

@@ -1,5 +1,3 @@
-@fakeweb
-
 Feature: Adding keys
   As a developer
   I want to add an API key
@@ -10,9 +8,9 @@ Feature: Adding keys
     When I run "gem keys <command> <key>" interactively
     And I type "josh@vitamin-j.com"
     And I type "12345"
-    Then the output should contain "Added <key> rubygems API key"
-    And I should have a "<key>" rubygems key
-    And the "<key>" rubygems key should be the response body
+    Then the output should contain "Added <key> API key"
+    And I should have a "<key>" api key
+    And the "<key>" api key should be the response body
 
     Examples:
       |command|key     |
@@ -25,4 +23,14 @@ Feature: Adding keys
     And I type "josh@vitamin-j.com"
     And I type "12345"
     Then the output should contain "Access denied"
-    And I should not have a "bogus" rubygems key
+    And I should not have a "bogus" api key
+
+  @1.4
+  Scenario: Adding a key from a compatible host
+    Given a gemcutter host at "https://nubygems.org"
+    And a valid gemcutter account
+    When I run "gem keys --add personal --host https://nubygems.org" interactively
+    And I type "josh@vitamin-j.com"
+    And I type "12345"
+    Then the output should contain "Enter your nubygems.org credentials"
+    And the "personal" api key should be the response body

data/features/default.feature

@@ -1,47 +1,29 @@
-Feature: Default commands
-  As a new user
-  I want to find out what my options are
-  So I can put keycutter to best use
+Feature: Using gem keys
+  As an open source developer
+  I want to switch between rubygems API keys
+  In order to push all of my sweet gems
 
-  Scenario: Installing the gem
-    When I run "gem q"
-    Then the output should contain "keycutter"
-
-  Scenario: Calling the plugin with no options
-    Given I have the following rubygems keys:
+  Background:
+    Given I have the following api keys:
       |name    |key                             |
       |personal|11111111111111111111111111111111|
       |work    |22222222222222222222222222222222|
-      |oss_1   |33333333333333333333333333333333|
-      |oss_2   |44444444444444444444444444444444|
-    And my current rubygems key is "personal"
-    When I run "gem keys"
-    Then the output should contain:
-    """
-    *** CURRENT KEYS ***
 
-       oss_1
-       oss_2
-     * personal
-       work
-    """
-
-  Scenario Outline: Using the list option
-    Given I have the following rubygems keys:
-      |name    |key                             |
-      |personal|11111111111111111111111111111111|
-      |work    |22222222222222222222222222222222|
-    And my current rubygems key is "work"
-    When I run "gem keys <option>"
-    Then the output should contain:
-    """
-    *** CURRENT KEYS ***
-
-       personal
-     * work
-    """
+  Scenario Outline: Using a different key
+    Given my current rubygems key is "work"
+    When I run "gem keys <command> <key>"
+    Then the output should contain "Now using <key> API key"
+    And my current rubygems key should be "<key>"
 
     Examples:
-      |option |
-      |-l     |
-      |--list |
+      |command|key     |
+      |-d     |personal|
+      |--default  |personal|
+      |-d     |work    |
+
+  Scenario: Using a bogus key
+    Given my current rubygems key is "personal"
+    When I run "gem keys -d bogus"
+    Then the output should contain "No such API key. You can add it with: gem keys -a bogus"
+    And the exit status should be 1
+    And my current rubygems key should be "personal"

data/features/list.feature

@@ -0,0 +1,47 @@
+Feature: Default commands
+  As a new user
+  I want to find out what my options are
+  So I can put keycutter to best use
+
+  Scenario: Installing the gem
+    When I run "gem q"
+    Then the output should contain "keycutter"
+
+  Scenario: Calling the plugin with no options
+    Given I have the following api keys:
+      |name    |key                             |
+      |rubygems|11111111111111111111111111111111|
+      |work    |22222222222222222222222222222222|
+      |oss_1   |33333333333333333333333333333333|
+      |oss_2   |44444444444444444444444444444444|
+    And my current rubygems key is "rubygems"
+    When I run "gem keys"
+    Then the output should contain:
+    """
+    *** CURRENT KEYS ***
+
+       oss_1
+       oss_2
+     * rubygems
+       work
+    """
+
+  Scenario Outline: Using the list option
+    Given I have the following api keys:
+      |name    |key                             |
+      |rubygems|11111111111111111111111111111111|
+      |work    |22222222222222222222222222222222|
+    And my current rubygems key is "work"
+    When I run "gem keys <option>"
+    Then the output should contain:
+    """
+    *** CURRENT KEYS ***
+
+       rubygems
+     * work
+    """
+
+    Examples:
+      |option |
+      |-l     |
+      |--list |

data/features/remove.feature

@@ -4,15 +4,15 @@ Feature: Remove API keys
   So I can get rid of cruft
 
   Background:
-    Given I have the following rubygems keys:
+    Given I have the following api keys:
       |name    |key                             |
       |personal|11111111111111111111111111111111|
       |work    |22222222222222222222222222222222|
 
   Scenario Outline:
     When I run "gem keys <command> <key>"
-    Then the output should contain "Removed <key> rubygems API key"
-    And I should not have a "<key>" rubygems key
+    Then the output should contain "Removed <key> API key"
+    And I should not have a "<key>" api key
 
     Examples:
       |command |key     |
@@ -21,5 +21,4 @@ Feature: Remove API keys
 
   Scenario: Removing a bogus key
     When I run "gem keys -r bogus"
-    Then the output should contain "No such rubygems API key"
-    And the exit status should be 1
+    Then the output should contain "No such API key"

data/features/step_definitions/keycutter_steps.rb

@@ -1,41 +1,48 @@
-Given /^I have the following rubygems keys:$/ do |table|
-  accounts = table.hashes.inject({}) do |hash,row|
-    hash[row[:name]] = row[:key]
+Given /^I have the following api keys:$/ do |table|
+  keys = table.hashes.inject({}) do |hash,row|
+    hash[row[:name].to_sym] = row[:key]
     hash
   end
-  Gem.configuration.rubygems_accounts = accounts
+  Gem.configuration.api_keys = keys
 end
 
 Given /^my current rubygems key is "([^"]*)"$/ do |key|
-  Gem.configuration.rubygems_api_key = Gem.configuration.rubygems_accounts[key]
+  Gem.configuration.rubygems_api_key = Gem.configuration.api_keys[key.to_sym]
 end
 
 Given /^a valid gemcutter account$/ do
-  @response = {:body => '3'*32}
-  DRb.start_service "druby://localhost:3333", [:get, "https://rubygems.org/api/v1/api_key", @response]
+  set_env 'FAKEWEB_BODY', '3'*32
+  set_env 'FAKEWEB_STATUS', '200'
+  set_env 'FAKEWEB_MESSAGE', 'OK'
 end
 
 Given /^an invalid gemcutter account$/ do
-  @response = {:body => "HTTP Basic: Access denied", :status => ["401", "Not Authorized"]}
-  DRb.start_service "druby://localhost:3333", [:get, "https://rubygems.org/api/v1/api_key", @response]
+  set_env 'FAKEWEB_BODY', 'HTTP Basic: Access denied.'
+  set_env 'FAKEWEB_STATUS', '401'
+  set_env 'FAKEWEB_MESSAGE', 'Unauthorized'
 end
 
+Given /^a gemcutter host at "([^"]*)"$/ do |host|
+  set_env 'FAKEWEB_HOST', host
+end
+
+
 Then /^my current rubygems key should be "([^"]*)"$/ do |key|
   Gem.configuration.load_rubygems_api_key
-  Gem.configuration.rubygems_api_key.should == Gem.configuration.rubygems_accounts[key]
+  Gem.configuration.rubygems_api_key.should == Gem.configuration.api_keys[key.to_sym]
 end
 
-Then /^I should have a "([^"]*)" rubygems key$/ do |key|
-  Gem.configuration.load_rubygems_accounts
-  Gem.configuration.rubygems_accounts.should have_key(key)
+Then /^I should have a "([^"]*)" api key$/ do |key|
+  Gem.configuration.load_api_keys
+  Gem.configuration.api_keys.should have_key(key.to_sym)
 end
 
-Then /^I should not have a "([^"]*)" rubygems key$/ do |key|
-  Gem.configuration.load_rubygems_accounts
-  Gem.configuration.rubygems_accounts.should_not have_key(key)
+Then /^I should not have a "([^"]*)" api key$/ do |key|
+  Gem.configuration.load_api_keys
+  Gem.configuration.api_keys.should_not have_key(key.to_sym)
 end
 
-Then /^the "([^"]*)" rubygems key should be the response body$/ do |key|
-  Gem.configuration.load_rubygems_accounts
-  Gem.configuration.rubygems_accounts[key].should == @response[:body]
+Then /^the "([^"]*)" api key should be the response body$/ do |key|
+  Gem.configuration.load_api_keys
+  Gem.configuration.api_keys[key.to_sym].should == ENV['FAKEWEB_BODY']
 end

data/features/support/hooks.rb

@@ -5,12 +5,12 @@ end
 
 Before do
   @original_api_key  = Gem.configuration.rubygems_api_key
-  @original_accounts = Gem.configuration.rubygems_accounts
+  @original_accounts = Gem.configuration.api_keys
 end
 
 After do
   Gem.configuration.rubygems_api_key  = @original_api_key
-  Gem.configuration.rubygems_accounts = @original_accounts
+  Gem.configuration.api_keys = @original_accounts
 end
 
 at_exit do

data/lib/keycutter.rb

@@ -1,6 +1,6 @@
 require 'keycutter/version'
 require 'keycutter/configuration'
-require 'keycutter/testing' if ENV['FAKEWEB']
+require 'keycutter/testing' if ENV['FAKEWEB_BODY'] && ENV['FAKEWEB_STATUS'] && ENV['FAKEWEB_MESSAGE']
 
 module Keycutter
 

data/lib/keycutter/configuration.rb

@@ -1,12 +1,12 @@
 require 'rubygems/config_file'
 
 class Gem::ConfigFile
-  def rubygems_accounts
-    @rubygems_accounts || load_rubygems_accounts
+  def api_keys
+    @api_keys || load_api_keys
   end
 
-  def rubygems_accounts=(accounts)
-    config = load_file(credentials_path).merge(:rubygems_accounts => accounts)
+  def api_keys=(keys)
+    keys.merge!(:rubygems_api_key => @rubygems_api_key) if defined? @rubygems_api_key
 
     dirname = File.dirname(credentials_path)
     Dir.mkdir(dirname) unless File.exists?(dirname)
@@ -14,14 +14,18 @@ class Gem::ConfigFile
     require 'yaml'
 
     File.open(credentials_path, 'w') do |f|
-      f.write config.to_yaml
+      f.write keys.to_yaml
     end
 
-    @rubygems_accounts = accounts
+    @api_keys = keys
   end
 
-  def load_rubygems_accounts
-    credentials_hash = File.exists?(credentials_path) ? load_file(credentials_path) : @hash
-    @rubygems_accounts = credentials_hash[:rubygems_accounts] || {}
+  def load_api_keys
+    @api_keys = File.exists?(credentials_path) ? load_file(credentials_path) : @hash
+    if @api_keys.key?(:rubygems_api_key)
+      rubygems_api_key = @api_keys.delete(:rubygems_api_key)
+      @api_keys[:rubygems] = rubygems_api_key unless @api_keys.key?(:rubygems)
+    end
+    @api_keys
   end
 end

data/lib/keycutter/testing.rb

@@ -1,8 +1,8 @@
-require 'drb'
 require 'fakeweb'
 
-DRb.start_service
-remote = DRbObject.new(nil, "druby://localhost:3333")
-
 FakeWeb.allow_net_connect = false
-FakeWeb.register_uri *remote
+fakeweb_host = ENV['FAKEWEB_HOST'] || 'https://rubygems.org'
+FakeWeb.register_uri :get, "#{fakeweb_host}/api/v1/api_key", {
+                     :body => ENV['FAKEWEB_BODY'],
+                     :status => [ENV['FAKEWEB_STATUS'], ENV['FAKEWEB_MESSAGE']]
+                     }

data/lib/keycutter/version.rb

@@ -1,3 +1,3 @@
 module Keycutter
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/rubygems/commands/keys_command.rb

@@ -3,6 +3,10 @@ require 'rubygems/gemcutter_utilities'
 class Gem::Commands::KeysCommand < Gem::Command
   include Gem::GemcutterUtilities
 
+  OptionParser.accept Symbol do |value|
+    value.to_sym
+  end
+
   def initialize
     super 'keys', "Adds management for multiple gemcutter accounts"
 
@@ -10,17 +14,23 @@ class Gem::Commands::KeysCommand < Gem::Command
       options[:list] = value
     end
 
-    add_option '-u', '--use KEYNAME', 'Use the given API key' do |value,options|
-      options[:use] = value
+    add_option '-d', '--default KEYNAME', Symbol, 'Set the default API key' do |value,options|
+      options[:default] = value
     end
 
-    add_option '-r', '--remove KEYNAME', 'Remove the given API key' do |value,options|
+    add_option '-r', '--remove KEYNAME', Symbol, 'Remove the given API key' do |value,options|
       options[:remove] = value
     end
 
-    add_option '-a', '--add KEYNAME', 'Add an API key with the given name' do |value,options|
+    add_option '-a', '--add KEYNAME', Symbol, 'Add an API key with the given name' do |value,options|
       options[:add] = value
     end
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.4.0')
+      add_option '--host HOST', 'Use another gemcutter-compatible host' do |value,options|
+        options[:host] = value
+      end
+    end
   end
 
   def arguments
@@ -38,45 +48,53 @@ class Gem::Commands::KeysCommand < Gem::Command
   def execute
     require 'keycutter'
 
-    options[:list] = !(options[:use] || options[:remove] || options[:add])
+    options[:list] = !(options[:default] || options[:remove] || options[:add])
 
     if options[:add] then
-      say "Enter your RubyGems.org credentials."
+      if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.4.0')
+        gem_host = URI.parse(options[:host] || Gem.host).host
+      else
+        gem_host = 'Rubygems.org'
+      end
+
+      say "Enter your #{gem_host} credentials."
       say "Don't have an account yet? Create one at http://rubygems.org/sign_up"
 
       email    =              ask "   Email: "
       password = ask_for_password "Password: "
       say
 
-      response = rubygems_api_request :get, "api/v1/api_key" do |request|
+      args = [:get, 'api/v1/api_key']
+      args << options[:host] if options[:host]
+
+      response = rubygems_api_request(*args) do |request|
         request.basic_auth email, password
       end
 
       with_response response do |resp|
-        accounts = Gem.configuration.rubygems_accounts.merge(options[:add] => resp.body)
-        Gem.configuration.rubygems_accounts = accounts
-        say "Added #{options[:add]} rubygems API key"
+        accounts = Gem.configuration.api_keys.merge(options[:add] => resp.body)
+        Gem.configuration.api_keys = accounts
+        say "Added #{options[:add]} API key"
       end
     end
 
     if options[:remove] then
-      accounts = Gem.configuration.rubygems_accounts
+      accounts = Gem.configuration.api_keys
       if accounts.has_key? options[:remove]
         accounts.delete(options[:remove])
-        Gem.configuration.rubygems_accounts = accounts
-        say "Removed #{options[:remove]} rubygems API key"
+        Gem.configuration.api_keys = accounts
+        say "Removed #{options[:remove]} API key"
       else
-        say "No such rubygems API key"
-        terminate_interaction 1
+        say "No such API key"
       end
     end
 
-    if options[:use] then
-      if Gem.configuration.rubygems_accounts.has_key? options[:use]
-        Gem.configuration.rubygems_api_key = Gem.configuration.rubygems_accounts[options[:use]]
-        say "Now using #{options[:use]} rubygems API key"
+    if options[:default] then
+      if Gem.configuration.api_keys.has_key? options[:default]
+        Gem.configuration.rubygems_api_key = Gem.configuration.api_keys[options[:default]]
+        say "Now using #{options[:default]} API key"
       else
-        say "No such rubygems API key. You can add it with: gem keys -a #{options[:use]}"
+        say "No such API key. You can add it with: gem keys -a #{options[:default]}"
         terminate_interaction 1
       end
     end
@@ -84,10 +102,10 @@ class Gem::Commands::KeysCommand < Gem::Command
     if options[:list] then
       say "*** CURRENT KEYS ***"
       say
-      accounts = Gem.configuration.rubygems_accounts.sort
-      accounts.each do |account|
-        name, key = account
-        say "%2s %s" % [Gem.configuration.rubygems_api_key[key] && '*', name]
+      api_keys = Gem.configuration.api_keys.sort_by {|k,v| k.to_s}
+      api_keys.each do |api_key|
+        name, key = api_key
+        say " #{Gem.configuration.rubygems_api_key == key ? '*' : ' '} #{name}"
       end
     end
   end

data/spec/configuration_spec.rb

@@ -7,29 +7,32 @@ describe Gem::ConfigFile do
     @config.stub(:credentials_path) { @credentials }
   end
 
-  describe "#rubygems_accounts" do
+  describe "#api_keys" do
     it "should load from credentials file" do
-      credentials = {:rubygems_accounts => {'personal' => '1'*32, 'work' => '2'*32}}
+      credentials = {:personal => '1'*32, :work => '2'*32}
       File.open(@credentials, 'w') { |f| f.write credentials.to_yaml }
-      @config.rubygems_accounts.should == credentials[:rubygems_accounts] 
+      @config.api_keys.should == credentials
+    end
+
+    it "should add existing rubygems key to the hash" do
+      credentials = {:rubygems_api_key => '0'*32}
+      File.open(@credentials, 'w') { |f| f.write credentials.to_yaml }
+      @config.api_keys.should == {:rubygems => '0'*32}
     end
   end
 
-  describe "#rubygems_accounts=" do
+  describe "#api_keys=" do
     it "should write to credentials file" do
       File.open(@credentials, 'w') { |f| f.write '' }
-      accounts = {'personal' => '1'*32, 'work' => '2'*32}
-      @config.rubygems_accounts = accounts
+      accounts = {:personal => '1'*32, :work => '2'*32}
+      @config.api_keys = accounts
 
-      File.read(@credentials).should == {:rubygems_accounts => accounts}.to_yaml
+      File.read(@credentials).should == accounts.to_yaml
     end
 
     it "should preserve existing credentials" do
-      api_key = {:rubygems_api_key => '0'*32}
-      File.open(@credentials, 'w') { |f| f.write api_key.to_yaml }
-
-      accounts = {'personal' => '1'*32, 'work' => '2'*32}
-      @config.rubygems_accounts = accounts
+      @config.rubygems_api_key = '0'*32
+      @config.api_keys = {:personal => '1'*32, :work => '2'*32}
 
       credentials = YAML.load_file(@credentials)
       credentials[:rubygems_api_key].should == '0'*32

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: keycutter
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Josh French
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-19 00:00:00 -05:00
+date: 2011-01-04 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -38,12 +37,11 @@ files:
 - Rakefile
 - features/add.feature
 - features/default.feature
+- features/list.feature
 - features/remove.feature
 - features/step_definitions/keycutter_steps.rb
 - features/support/env.rb
-- features/support/fakeweb.rb
 - features/support/hooks.rb
-- features/use.feature
 - keycutter.gemspec
 - lib/keycutter.rb
 - lib/keycutter/configuration.rb
@@ -63,38 +61,33 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: keycutter
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Gemcutter key management
 test_files: 
 - features/add.feature
 - features/default.feature
+- features/list.feature
 - features/remove.feature
 - features/step_definitions/keycutter_steps.rb
 - features/support/env.rb
-- features/support/fakeweb.rb
 - features/support/hooks.rb
-- features/use.feature
 - spec/configuration_spec.rb
 - spec/spec_helper.rb

data/features/support/fakeweb.rb

@@ -1,8 +0,0 @@
-Before '@fakeweb' do
-  require 'drb'
-  set_env 'FAKEWEB', 'test'
-end
-
-After '@fakeweb' do
-  DRb.stop_service
-end

data/features/use.feature

@@ -1,29 +0,0 @@
-Feature: Using gem keys
-  As an open source developer
-  I want to switch between rubygems API keys
-  In order to push all of my sweet gems
-
-  Background:
-    Given I have the following rubygems keys:
-      |name    |key                             |
-      |personal|11111111111111111111111111111111|
-      |work    |22222222222222222222222222222222|
-
-  Scenario Outline: Using a different key
-    Given my current rubygems key is "work"
-    When I run "gem keys <command> <key>"
-    Then the output should contain "Now using <key> rubygems API key"
-    And my current rubygems key should be "<key>"
-
-    Examples:
-      |command|key     |
-      |-u     |personal|
-      |--use  |personal|
-      |-u     |work    |
-
-  Scenario: Using a bogus key
-    Given my current rubygems key is "personal"
-    When I run "gem keys -u bogus"
-    Then the output should contain "No such rubygems API key. You can add it with: gem keys -a bogus"
-    And the exit status should be 1
-    And my current rubygems key should be "personal"