gemcutter 0.7.0 → 0.7.1

data/Gemfile

@@ -0,0 +1,7 @@
+source 'http://rubygems.org'
+
+platforms :jruby do
+  gem 'jruby-openssl', '~> 0.7'
+end
+
+gemspec

data/README.md

@@ -0,0 +1,99 @@
+# gemcutter
+
+This repository now contains only the `gemcutter` gem, which provides `gem
+yank` and `gem webhook`. The Rails app has moved to
+[rubygems/rubygems.org][rubygems]. Please update your links and remotes!
+
+[rubygems]: https://github.com/rubygems/rubygems.org
+
+## <a name="installation"></a>Installation
+    gem install gemcutter
+
+## <a name="ci"></a>Build Status
+[![Build Status](https://secure.travis-ci.org/rubygems/gemcutter.png)][ci]
+
+[ci]: http://travis-ci.org/rubygems/gemcutter
+
+## <a name="dependencies"></a>Dependency Status
+[![Dependency Status](https://gemnasium.com/rubygems/gemcutter.png)][gemnasium]
+
+[gemnasium]: https://gemnasium.com/rubygems/gemcutter
+
+## <a name="contributing"></a>Contributing
+In the spirit of [free software][free-sw], **everyone** is encouraged to help improve
+this project.
+
+[free-sw]: http://www.fsf.org/licensing/essays/free-sw.html
+
+Here are some ways *you* can contribute:
+
+* by using alpha, beta, and prerelease versions
+* by reporting bugs
+* by suggesting new features
+* by writing or editing documentation
+* by writing specifications
+* by writing code (**no patch is too small**: fix typos, add comments, clean up inconsistent whitespace)
+* by refactoring code
+* by closing [issues][]
+* by reviewing patches
+
+[issues]: https://github.com/rubygems/gemcutter/issues
+
+## <a name="issues"></a>Submitting an Issue
+We use the [GitHub issue tracker][issues] to track bugs and features. Before
+submitting a bug report or feature request, check to make sure it hasn't
+already been submitted. You can indicate support for an existing issue by
+voting it up. When submitting a bug report, please include a [gist][] that
+includes a stack trace and any details that may be necessary to reproduce the
+bug, including your gem version, Ruby version, and operating system. Ideally, a
+bug report should include a pull request with failing specs.
+
+[gist]: https://gist.github.com/
+
+## <a name="pulls"></a>Submitting a Pull Request
+1. Fork the project.
+2. Create a topic branch.
+3. Implement your feature or bug fix.
+4. Add tests for your feature or bug fix.
+5. Run `bundle exec rake test`. If your changes are not 100% covered, go back
+   to step 4.
+6. Commit and push your changes.
+7. Submit a pull request. Please do not include changes to the gemspec or
+   version. (If you want to create your own version for some reason, please do
+   so in a separate commit.)
+
+## <a name="versions"></a>Supported Ruby Versions
+This library aims to support and is [tested against][ci] the following Ruby
+implementations:
+
+* Ruby 1.8.7
+* Ruby 1.9.2
+* Ruby 1.9.3
+* [JRuby][]
+* [Rubinius][]
+* [Ruby Enterprise Edition][ree]
+
+[jruby]: http://www.jruby.org/
+[rubinius]: http://rubini.us/
+[ree]: http://www.rubyenterpriseedition.com/
+
+If something doesn't work on one of these interpreters, it should be considered
+a bug.
+
+This library may inadvertently work (or seem to work) on other Ruby
+implementations, however support will only be provided for the versions listed
+above.
+
+If you would like this library to support another Ruby version, you may
+volunteer to be a maintainer. Being a maintainer entails making sure all tests
+run and pass on that implementation. When something breaks on your
+implementation, you will be personally responsible for providing patches in a
+timely fashion. If critical issues for a particular implementation exist at the
+time of a major release, support for that Ruby version may be dropped.
+
+## <a name="license"></a>License
+
+Gemcutter is released under the MIT license. Please check the [LICENSE][] file
+for more details.
+
+[license]: https://github.com/rubygems/gemcutter/blob/master/MIT-LICENSE

data/Rakefile

@@ -1,8 +1,11 @@
-require 'rake'
-require 'rake/testtask'
+#!/usr/bin/env rake
+
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-task :default => [:test]
+task :default => :test
 
+require 'rake/testtask'
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.test_files = FileList['test/*_test.rb']

data/lib/gemcutter/version.rb

@@ -0,0 +1,3 @@
+module Gemcutter
+  VERSION = '0.7.1'.freeze unless defined? ::Gemcutter::VERSION
+end

data/lib/rubygems/commands/yank_command.rb

@@ -16,9 +16,9 @@ class Gem::Commands::YankCommand < Gem::Command
   end
 
   def usage
-    "#{program_name} GEM -v VERSION [-p PLATFORM] [--undo]"
+    "#{program_name} GEM -v VERSION [-p PLATFORM] [--undo] [--key KEY_NAME]"
   end
-  
+
   def initialize
     super 'yank', description
     add_version_option("remove")
@@ -26,18 +26,25 @@ class Gem::Commands::YankCommand < Gem::Command
     add_option('--undo') do |value, options|
       options[:undo] = true
     end
+    
+    add_option('-k', '--key KEY_NAME',
+               'Use API key from your gem credentials file') do |value, options|
+      options[:key] = value
+    end
   end
 
   def execute
     sign_in
     version   = get_version_from_requirements(options[:version])
     platform  = get_platform_from_requirements(options)
-    
+    api_key   = Gem.configuration.rubygems_api_key
+    api_key   = Gem.configuration.api_keys[options[:key].to_sym] if options[:key]
+
     if !version.nil?
       if options[:undo]
-        unyank_gem(version, platform)
+        unyank_gem(version, platform, api_key)
       else
-        yank_gem(version, platform)
+        yank_gem(version, platform, api_key)
       end
     else
       say "A version argument is required: #{usage}"
@@ -45,21 +52,21 @@ class Gem::Commands::YankCommand < Gem::Command
     end
   end
 
-  def yank_gem(version, platform)
+  def yank_gem(version, platform, api_key)
     say "Yanking gem from RubyGems.org..."
-    yank_api_request(:delete, version, platform, "api/v1/gems/yank")
+    yank_api_request(:delete, version, platform, "api/v1/gems/yank", api_key)
   end
-  
-  def unyank_gem(version, platform)
+
+  def unyank_gem(version, platform, api_key)
     say "Unyanking gem from RubyGems.org..."
-    yank_api_request(:put, version, platform, "api/v1/gems/unyank")
+    yank_api_request(:put, version, platform, "api/v1/gems/unyank", api_key)
   end
-  
+
   private
-    def yank_api_request(method, version, platform, api)
+    def yank_api_request(method, version, platform, api, api_key)
       name = get_one_gem_name
       response = rubygems_api_request(method, api) do |request|
-        request.add_field("Authorization", Gem.configuration.rubygems_api_key)
+        request.add_field("Authorization", api_key)
         request.set_form_data({'gem_name' => name, 'version' => version, 'platform' => platform})
       end
       say response.body
@@ -72,7 +79,7 @@ class Gem::Commands::YankCommand < Gem::Command
         nil
       end
     end
-    
+
     def get_platform_from_requirements(requirements)
       Gem.platforms[1].to_s if requirements.key? :added_platform
     end

data/test/helper.rb

@@ -1,18 +1,15 @@
+$:.unshift File.expand_path('..', __FILE__)
+$:.unshift File.expand_path('../../lib', __FILE__)
 require 'rubygems'
-require 'rubygems/command'
+require 'rubygems/commands/webhook_command'
+require 'rubygems/commands/yank_command'
 require 'test/unit'
-
 require 'shoulda'
 require 'active_support'
 require 'active_support/test_case'
 require 'webmock'
 require 'rr'
 
-begin
-  require 'redgreen'
-rescue LoadError
-end
-
 WebMock.disable_net_connect!
 
 class CommandTest < ActiveSupport::TestCase
@@ -27,6 +24,7 @@ end
 def stub_api_key(api_key)
   file = Gem::ConfigFile.new({})
   stub(file).rubygems_api_key { api_key }
+  yield file if block_given?
   stub(Gem).configuration { file }
 end
 

data/test/webhook_command_test.rb

@@ -1,5 +1,4 @@
 require 'helper'
-require 'lib/rubygems/commands/webhook_command'
 
 class WebhookCommandTest < CommandTest
   context "webhooking" do

data/test/yank_command_test.rb

@@ -1,5 +1,4 @@
 require 'helper'
-require 'lib/rubygems/commands/yank_command'
 
 class YankCommandTest < CommandTest
   context "yanking" do
@@ -21,7 +20,8 @@ class YankCommandTest < CommandTest
 
     context 'yanking a gem' do
       setup do
-        stub_api_key("key")
+        @api_key = "key"
+        stub_api_key(@api_key)
         @api = "https://rubygems.org/api/v1/gems/yank"
         stub_request(:delete, @api).to_return(:body => "Successfully yanked")
         @command.handle_options([@gem, "-v", @version])
@@ -34,12 +34,12 @@ class YankCommandTest < CommandTest
           command.say("Successfully yanked")
         end
       end
-      
+
       should 'invoke yank_gem' do
-        stub(@command).yank_gem(@version, @platform)
+        stub(@command).yank_gem(@version, @platform, @api_key)
         @command.execute
         assert_received(@command) do |command|
-          command.yank_gem(@version, @platform)
+          command.yank_gem(@version, @platform, @api_key)
         end
       end
 
@@ -50,7 +50,20 @@ class YankCommandTest < CommandTest
         assert_requested(:delete, @api,
                          :headers => { 'Authorization' => 'key' })
       end
-      
+
+      should 'use given API key' do
+        other_key = 'another_key'
+
+        stub_api_key('key') {|config| stub(config).api_keys {{:another_name => other_key}}}
+
+        @command.handle_options([@gem, "-v", @version, "-k", "another_name"])
+        @command.execute
+        assert_requested(:delete, @api,
+                         :times => 1)
+        assert_requested(:delete, @api,
+                         :headers => { 'Authorization' => other_key })
+      end
+
       context 'with a platform specified' do
         setup do
           stub_api_key("key")
@@ -59,7 +72,7 @@ class YankCommandTest < CommandTest
           stub_request(:delete, @api).to_return(:body => "Successfully yanked")
           @command.handle_options([@gem, "-v", @version, "-p", @platform])
         end
-        
+
         should 'say gem was yanked' do
           @command.execute
           assert_received(@command) do |command|
@@ -67,26 +80,27 @@ class YankCommandTest < CommandTest
             command.say("Successfully yanked")
           end
         end
-        
+
         should 'invoke yank_gem' do
-          stub(@command).yank_gem(@version, @platform)
+          stub(@command).yank_gem(@version, @platform, @api_key)
           @command.execute
           assert_received(@command) do |command|
-            command.yank_gem(@version, @platform)
+            command.yank_gem(@version, @platform, @api_key)
           end
         end
       end
-      
+
     end
-    
+
     context 'unyanking a gem' do
       setup do
-        stub_api_key("key")
+        @api_key = "key"
+        stub_api_key(@api_key)
         @api = "https://rubygems.org/api/v1/gems/unyank"
         stub_request(:put, @api).to_return(:body => "Successfully unyanked")
         @command.handle_options([@gem, "-v", @version, "--undo"])
       end
-      
+
       should 'say gem was unyanked' do
         @command.execute
         assert_received(@command) do |command|
@@ -96,30 +110,31 @@ class YankCommandTest < CommandTest
       end
 
       should 'invoke unyank_gem' do
-        stub(@command).unyank_gem(@version, @platform)
+        stub(@command).unyank_gem(@version, @platform, @api_key)
         @command.execute
         assert_received(@command) do |command|
-          command.unyank_gem(@version, @platform)
+          command.unyank_gem(@version, @platform, @api_key)
         end
       end
-      
+
       should 'put to api' do
         @command.execute
         assert_requested(:put, @api, :times => 1)
         assert_requested(:put, @api, :headers => { 'Authorization' => 'key' })
       end
     end
-    
-    
+
+
     context 'with a platform specified' do
       setup do
-        stub_api_key("key")
+        @api_key = 'key'
+        stub_api_key(@api_key)
         @api = "https://rubygems.org/api/v1/gems/unyank"
         @platform = "x86-darwin-10"
         stub_request(:put, @api).to_return(:body => "Successfully unyanked")
         @command.handle_options([@gem, "-v", @version, "-p", @platform, "--undo"])
       end
-      
+
       should 'say gem was unyanked' do
         @command.execute
         assert_received(@command) do |command|
@@ -127,16 +142,16 @@ class YankCommandTest < CommandTest
           command.say("Successfully unyanked")
         end
       end
-      
+
       should 'invoke unyank_gem' do
-        stub(@command).unyank_gem(@version, @platform)
+        stub(@command).unyank_gem(@version, @platform, @api_key)
         @command.execute
         assert_received(@command) do |command|
-          command.unyank_gem(@version, @platform)
+          command.unyank_gem(@version, @platform, @api_key)
         end
       end
     end
-    
+
   end
 
 end

metadata

@@ -1,104 +1,94 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gemcutter
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 0.7.1
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 0
-  version: 0.7.0
 platform: ruby
-authors: 
+authors:
 - Nick Quaranto
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-26 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rake
+date: 2011-12-02 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70304807834260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *70304807834260
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &70304807833340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70304807833340
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70304807832320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70304807832320
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: &70304807830600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70304807830600
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &70304807829460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70304807829460
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70304807827760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-description: Adds several commands to RubyGems for managing gems and more on RubyGems.org.
-email: nick@quaran.to
+  prerelease: false
+  version_requirements: *70304807827760
+description: Provides the `gem yank` and `gem webhook` commands to RubyGems.
+email:
+- nick@quaran.to
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- Gemfile
 - MIT-LICENSE
+- README.md
 - Rakefile
+- lib/gemcutter/version.rb
 - lib/rubygems/commands/migrate_command.rb
 - lib/rubygems/commands/tumble_command.rb
 - lib/rubygems/commands/webhook_command.rb
@@ -107,51 +97,36 @@ files:
 - test/helper.rb
 - test/webhook_command_test.rb
 - test/yank_command_test.rb
-has_rdoc: true
 homepage: http://rubygems.org
 licenses: []
-
-post_install_message: |+
-  
-  ========================================================================
-  
-             Thanks for installing Gemcutter! You can now run:
-  
-    gem push        merged into RubyGems 1.3.6
-    gem owner       merged into RubyGems 1.3.6
-    gem webhook     register urls to be pinged when gems are pushed
-    gem yank        remove a specific version of a gem from RubyGems.org
-  
-  ========================================================================
-  
+post_install_message: ! "********************************************************************************\n\n
+  \          Thanks for installing Gemcutter! You can now run:\n\n  gem push        merged
+  into RubyGems 1.3.6\n  gem owner       merged into RubyGems 1.3.6\n  gem webhook
+  \    register urls to be pinged when gems are pushed\n  gem yank        remove a
+  specific version of a gem from RubyGemgem.org\n\n********************************************************************************\n"
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Commands to interact with RubyGems.org
-test_files: []
-
+summary: Provides additional commands to interact with RubyGems.org
+test_files:
+- test/helper.rb
+- test/webhook_command_test.rb
+- test/yank_command_test.rb
+has_rdoc: