keycutter 0.2.0 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2e7d571fe04c0cb4876f243c393e46adb6dc1d77
+  data.tar.gz: 1ca75d895460d33d14bb9d84b4efb98ecb32825a
+SHA512:
+  metadata.gz: 650f97d0bf40797017af5cb62ea91a7f8d523653334b893c3022a6b32e84476096b789f72a01c934d577fa25e465fdd4a93b5e8f8837234a78aaca70ef0ca5d6
+  data.tar.gz: f3d4e02875759d791c1403342c38f628b092a84895f7b9396446f5c0a2c82f14768ce67c046387677e008377d406feaea36ccb4ec8e7cfee1f7d113de09f1a5f

data/.ruby-gemset

@@ -0,0 +1 @@
+keycutter

data/.ruby-version

@@ -0,0 +1 @@
+2.3.3

data/CHANGELOG.md

@@ -0,0 +1,29 @@
+## Change Log
+
+### 1.0.0
+
+#### Fixed
+
+* the default key will now correctly be reported in all scenarios.
+
+* adding a new key when there is no ~/.gem/credentials file will now no
+longer erroneously put the contents of the ~/.gemrc in the newly created
+credentials file.
+
+* adding a new key when there is no ~/.gem/credentials file will now create
+the credentials file with 0600 permissions.
+
+#### Changed
+
+* api keys will no longer default to being pulled from the ~/.gemrc when the
+~/.gem/credentials file does not exist. This behavior was previously not
+explicitly dealt with in this library, but removing support could potentially
+be a breaking change for some people so the major version is being bumped.
+
+### 0.1.1
+
+* Lazy load Keycutter after the command has been invoked
+
+### 0.1.0
+
+* Initial release

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec
 

data/README.md

@@ -13,35 +13,45 @@ Installation
 Usage
 -----
 
-Start by adding your current API key. You can name it whatever you want:
+Use the `gem keys` command to manage multiple API keys. Upon installation,
+keycutter will only know about your existing rubygems key:
 
-    $ gem keys --add personal
+    $ gem keys --list
+
+    *** CURRENT KEYS ***
+
+     * rubygems
+
+If you manage gems for your company or an open-source organization, you can add
+additional keys:
+
+    $ gem keys --add work
        Email:
     Password:
 
-You'll be prompted for your Rubygems.org email and password. If you manage gems
-for your company or an open-source organization, add those too:
+You'll be prompted for your Rubygems.org email and password.
 
-    $ gem keys --add company
-    $ gem keys --add project
+If you're using RubyGems 1.4.1 or higher, you can pass the `--host` option to
+use a gemcutter-compatible host when adding a key:
 
-You can view your current keys:
+    $ gem keys --add internal --host http://gems.mycompany.com
 
-    $ gem keys --list
-    
-    *** CURRENT KEYS ***
+By default, your existing rubygems.org key is used whenever communicating with
+gemcutter. To switch the default key used to manage remote gems:
 
-       company
-     * personal
-       project
+    $ gem keys --default work
 
-Your currently active key is marked.
+Your default key is always marked with a *:
 
-To switch to a different account before pushing a gem:
+    $ gem keys --list
 
-    $ gem keys --use company
+    *** CURRENT KEYS ***
 
-You can also remove a key:
+       internal
+       rubygems
+     * work
+     
+You can also remove keys:
 
     $ gem keys --remove project
 
@@ -49,10 +59,3 @@ Help is available from the command line:
 
     $ gem keys --help
 
-TODO
-----
-
- * Add auto-detection of existing API key and create a default key name
- * Rubygems 1.3.7 doesn't support gemcutter-compatible hosts, although this has
-   been added to edge. Update `keys --add` to take a `--host` option when the next
-   version of rubygems is released.

data/features/add.feature

@@ -5,7 +5,7 @@ Feature: Adding keys
 
   Scenario Outline: Adding a new key
     Given a valid gemcutter account
-    When I run "gem keys <command> <key>" interactively
+    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> API key"
@@ -19,7 +19,7 @@ Feature: Adding keys
 
   Scenario: Adding a key with bad credentials
     Given an invalid gemcutter account
-    When I run "gem keys -a bogus" interactively
+    When I run `gem keys -a bogus` interactively
     And I type "josh@vitamin-j.com"
     And I type "12345"
     Then the output should contain "Access denied"
@@ -29,7 +29,7 @@ Feature: Adding keys
   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
+    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"

data/features/default.feature

@@ -11,7 +11,7 @@ Feature: Using gem keys
 
   Scenario Outline: Using a different key
     Given my current rubygems key is "work"
-    When I run "gem keys <command> <key>"
+    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>"
 
@@ -23,7 +23,7 @@ Feature: Using gem keys
 
   Scenario: Using a bogus key
     Given my current rubygems key is "personal"
-    When I run "gem keys -d bogus"
+    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

@@ -4,7 +4,7 @@ Feature: Default commands
   So I can put keycutter to best use
 
   Scenario: Installing the gem
-    When I run "gem q"
+    When I run `gem q`
     Then the output should contain "keycutter"
 
   Scenario: Calling the plugin with no options
@@ -15,7 +15,7 @@ Feature: Default commands
       |oss_1   |33333333333333333333333333333333|
       |oss_2   |44444444444444444444444444444444|
     And my current rubygems key is "rubygems"
-    When I run "gem keys"
+    When I run `gem keys`
     Then the output should contain:
     """
     *** CURRENT KEYS ***
@@ -32,7 +32,7 @@ Feature: Default commands
       |rubygems|11111111111111111111111111111111|
       |work    |22222222222222222222222222222222|
     And my current rubygems key is "work"
-    When I run "gem keys <option>"
+    When I run `gem keys <option>`
     Then the output should contain:
     """
     *** CURRENT KEYS ***

data/features/remove.feature

@@ -10,7 +10,7 @@ Feature: Remove API keys
       |work    |22222222222222222222222222222222|
 
   Scenario Outline:
-    When I run "gem keys <command> <key>"
+    When I run `gem keys <command> <key>`
     Then the output should contain "Removed <key> API key"
     And I should not have a "<key>" api key
 
@@ -20,5 +20,5 @@ Feature: Remove API keys
       |--remove|work    |
 
   Scenario: Removing a bogus key
-    When I run "gem keys -r bogus"
+    When I run `gem keys -r bogus`
     Then the output should contain "No such API key"

data/features/step_definitions/keycutter_steps.rb

@@ -26,23 +26,22 @@ 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.api_keys[key.to_sym]
+  Gem.configuration.load_api_keys
+  expect(Gem.configuration.rubygems_api_key).to eq(Gem.configuration.api_keys[key.to_sym])
 end
 
 Then /^I should have a "([^"]*)" api key$/ do |key|
   Gem.configuration.load_api_keys
-  Gem.configuration.api_keys.should have_key(key.to_sym)
+  expect(Gem.configuration.api_keys).to have_key(key.to_sym)
 end
 
 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)
+  expect(Gem.configuration.api_keys).not_to have_key(key.to_sym)
 end
 
 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']
+  expect(Gem.configuration.api_keys[key.to_sym]).to eq(ENV['FAKEWEB_BODY'])
 end

data/keycutter.gemspec

@@ -6,6 +6,7 @@ Gem::Specification.new do |s|
   s.name        = "keycutter"
   s.version     = Keycutter::VERSION
   s.platform    = Gem::Platform::RUBY
+  s.licenses    = ['MIT']
   s.authors     = ["Josh French"]
   s.email       = ["josh@vitamin-j.com"]
   s.homepage    = "http://github.com/joshfrench/keycutter"

data/lib/keycutter/configuration.rb

@@ -13,7 +13,7 @@ class Gem::ConfigFile
 
     require 'yaml'
 
-    File.open(credentials_path, 'w') do |f|
+    File.open(credentials_path, 'w', 0600) do |f|
       f.write keys.to_yaml
     end
 
@@ -21,10 +21,10 @@ class Gem::ConfigFile
   end
 
   def load_api_keys
-    @api_keys = File.exists?(credentials_path) ? load_file(credentials_path) : @hash
+    @api_keys = File.exists?(credentials_path) ? load_file(credentials_path) : {}
     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)
+      @rubygems_api_key = @api_keys.delete(:rubygems_api_key)
+      @api_keys[:rubygems] = @rubygems_api_key unless @api_keys.key?(:rubygems)
     end
     @api_keys
   end

data/lib/keycutter/version.rb

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

data/spec/configuration_spec.rb

@@ -4,20 +4,20 @@ describe Gem::ConfigFile do
   before do
     @credentials = File.dirname(__FILE__) + '/../test_credentials'
     @config = Gem::ConfigFile.new([])
-    @config.stub(:credentials_path) { @credentials }
+    allow(@config).to receive(:credentials_path) { @credentials }
   end
 
   describe "#api_keys" do
     it "should load from credentials file" do
       credentials = {:personal => '1'*32, :work => '2'*32}
       File.open(@credentials, 'w') { |f| f.write credentials.to_yaml }
-      @config.api_keys.should == credentials
+      expect(@config.api_keys).to eq(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}
+      expect(@config.api_keys).to eq({:rubygems => '0'*32})
     end
   end
 
@@ -27,7 +27,7 @@ describe Gem::ConfigFile do
       accounts = {:personal => '1'*32, :work => '2'*32}
       @config.api_keys = accounts
 
-      File.read(@credentials).should == accounts.to_yaml
+      expect(File.read(@credentials)).to eq(accounts.to_yaml)
     end
 
     it "should preserve existing credentials" do
@@ -35,7 +35,7 @@ describe Gem::ConfigFile do
       @config.api_keys = {:personal => '1'*32, :work => '2'*32}
 
       credentials = YAML.load_file(@credentials)
-      credentials[:rubygems_api_key].should == '0'*32
+      expect(credentials[:rubygems_api_key]).to eq('0'*32)
     end
   end
 end

data/spec/spec_helper.rb

@@ -2,3 +2,7 @@ $:.unshift(File.dirname(__FILE__) + '/../../lib')
 
 require 'rspec/mocks'
 require 'keycutter'
+
+# Set permissions to what rubygems wants,
+# so it doesn't throw a permissions error
+File.chmod(0600, 'test_credentials')

metadata

@@ -1,36 +1,26 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: keycutter
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+version: !ruby/object:Gem::Version
+  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Josh French
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-04 00:00:00 -05:00
-default_executable: 
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies: []
-
 description: Multiple gemcutter accounts? Manage your keys with ease.
-email: 
+email:
 - josh@vitamin-j.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .rvmrc
-- CHANGELOG
+files:
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
+- CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -51,37 +41,31 @@ files:
 - lib/rubygems_plugin.rb
 - spec/configuration_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/joshfrench/keycutter
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: keycutter
-rubygems_version: 1.3.6
+rubygems_version: 2.5.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Gemcutter key management
-test_files: 
+test_files:
 - features/add.feature
 - features/default.feature
 - features/list.feature

data/.rvmrc

@@ -1 +0,0 @@
-rvm gemset use keycutter

data/CHANGELOG

@@ -1,7 +0,0 @@
-== Changelog
-
-=== 0.1.1
-* Lazy load Keycutter after the command has been invoked
-
-=== 0.1.0
-* Initial release