gems 0.1.0 → 0.2.0

data/.gitignore

@@ -1,4 +1,3 @@
-*.gem
 *.rbc
 .DS_Store
 .bundle

data/README.md

@@ -76,6 +76,9 @@ Usage Examples
     # Test fire a webhook.
     Gems.fire_web_hook 'rails', 'http://example.com'
 
+    # Submit a gem to RubyGems.org.
+    Gems.push File.new 'gemcutter-0.2.1.gem'
+
     # Remove a gem from RubyGems.org's index.
     # Defaults to the latest version if no version is specified.
     Gems.yank 'bills', '0.0.1'

data/gems.gemspec

@@ -11,7 +11,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'yard', '~> 0.7'
   gem.add_runtime_dependency 'faraday', '~> 0.6.1'
   gem.add_runtime_dependency 'faraday_middleware', '~> 0.6.5'
-  gem.add_runtime_dependency 'hashie', '~> 1.0.0'
   gem.add_runtime_dependency 'multi_json', '~> 1.0.3'
   gem.add_runtime_dependency 'multi_xml', '~> 0.2.2'
 

data/lib/gems/client.rb

@@ -58,7 +58,7 @@ module Gems
     # @example
     #   Gems.downloads 'coulda', '0.6.3', Date.today - 30, Date.today
     def downloads(gem_name, gem_version=nil, from=nil, to=Date.today)
-      gem_version ||= info(gem_name).version
+      gem_version ||= info(gem_name)['version']
       if from
         get("/api/v1/versions/#{gem_name}-#{gem_version}/downloads/search", {:from => from.to_s, :to => to.to_s}, :json)
       else
@@ -173,6 +173,16 @@ module Gems
       post("/api/v1/web_hooks/fire", {:gem_name => gem_name, :url => url}, :raw)
     end
 
+    # Submit a gem to RubyGems.org
+    #
+    # @param gem [File] A built gem.
+    # @return [String]
+    # @example
+    #   Gems.push(File.new("pkg/gemcutter-0.2.1.gem"))
+    def push(gem)
+      post("/api/v1/gems", gem.read, :raw, 'application/octet-stream')
+    end
+
     # Remove a gem from RubyGems.org's index
     #
     # @param gem_name [String] The name of a gem.
@@ -183,7 +193,7 @@ module Gems
     # @example
     #   Gems.yank("gemcutter", "0.2.1", {:platform => "x86-darwin-10"})
     def yank(gem_name, gem_version=nil, options={})
-      gem_version ||= info(gem_name).version
+      gem_version ||= info(gem_name)['version']
       delete("/api/v1/gems/yank", options.merge(:gem_name => gem_name, :version => gem_version), :raw)
     end
 
@@ -197,7 +207,7 @@ module Gems
     # @example
     #   Gems.unyank("gemcutter", "0.2.1", {:platform => "x86-darwin-10"})
     def unyank(gem_name, gem_version=nil, options={})
-      gem_version ||= info(gem_name).version
+      gem_version ||= info(gem_name)['version']
       put("/api/v1/gems/unyank", options.merge(:gem_name => gem_name, :version => gem_version), :raw)
     end
   end

data/lib/gems/configuration.rb

@@ -7,6 +7,7 @@ module Gems
     # An array of valid keys in the options hash when configuring a {Gems::Client}
     VALID_OPTIONS_KEYS = [
       :format,
+      :host,
       :key,
       :password,
       :user_agent,
@@ -16,12 +17,15 @@ module Gems
     # Set the default response format appended to the path
     #
     # @note JSON is preferred over XML because it is more concise and faster to parse.
-    DEFAULT_FORMAT = :json
+    DEFAULT_FORMAT = :json.freeze
+
+    # Set the default API endpoint
+    DEFAULT_HOST = ENV['RUBYGEMS_HOST'] ? ENV['RUBYGEMS_HOST'].freeze : 'https://rubygems.org'.freeze
 
     # Set the default credentials
-    DEFAULT_KEY = Gem.configuration.rubygems_api_key
+    DEFAULT_KEY = Gem.configuration.rubygems_api_key.freeze
 
-    # Set the default value sent in the 'User-Agent' header
+    # Set the default 'User-Agent' HTTP header
     DEFAULT_USER_AGENT = "Gems #{Gems::VERSION}".freeze
 
     attr_accessor *VALID_OPTIONS_KEYS
@@ -46,6 +50,7 @@ module Gems
     # Reset all configuration options to defaults
     def reset
       self.format     = DEFAULT_FORMAT
+      self.host       = DEFAULT_HOST
       self.key        = DEFAULT_KEY
       self.password   = nil
       self.user_agent = DEFAULT_USER_AGENT

data/lib/gems/connection.rb

@@ -2,20 +2,21 @@ require 'faraday_middleware'
 
 module Gems
   module Connection
-    def connection(format=format)
+    def connection(content_length=nil, content_type=nil, format=foramt)
       options = {
         :headers => {
           :user_agent => user_agent,
         },
         :ssl => {:verify => false},
-        :url => 'https://rubygems.org',
+        :url => host,
       }
 
+      options[:headers].merge!({:content_length => content_length}) if content_length
+      options[:headers].merge!({:content_type => content_type}) if content_type
       options[:headers].merge!({:authorization => key}) if key
 
       connection = Faraday.new(options) do |connection|
-        connection.use Faraday::Request::UrlEncoded
-        connection.use Faraday::Response::Mashify
+        connection.use Faraday::Request::UrlEncoded unless content_type
         case format.to_s.downcase
         when 'json'
           connection.use Faraday::Response::ParseJson

data/lib/gems/request.rb

@@ -1,31 +1,37 @@
+require 'rubygems'
+
 module Gems
   module Request
-    def delete(path, options={}, format=format)
-      request(:delete, path, options, format)
+    def delete(path, options={}, format=format, content_type=nil)
+      request(:delete, path, options, format, content_type)
     end
 
-    def get(path, options={}, format=format)
-      request(:get, path, options, format)
+    def get(path, options={}, format=format, content_type=nil)
+      request(:get, path, options, format, content_type)
     end
 
-    def post(path, options={}, format=format)
-      request(:post, path, options, format)
+    def post(path, options={}, format=format, content_type=nil)
+      request(:post, path, options, format, content_type)
     end
 
-    def put(path, options={}, format=format)
-      request(:put, path, options, format)
+    def put(path, options={}, format=format, content_type=nil)
+      request(:put, path, options, format, content_type)
     end
 
     private
 
-    def request(method, path, options, format)
-      response = connection(format).send(method) do |request|
+    def request(method, path, options, format, content_type)
+      content_length = case content_type
+      when 'application/octet-stream'
+        options.size
+      end
+      response = connection(content_length, content_type, format).send(method) do |request|
         case method
         when :delete, :get
           request.url(formatted_path(path, format), options)
         when :post, :put
           request.path = formatted_path(path, format)
-          request.body = options unless options.empty?
+          request.body = options unless options == {}
         end
       end
       response.body

data/lib/gems/version.rb

@@ -1,3 +1,3 @@
 module Gems
-  VERSION = "0.1.0" unless defined? ::Gems::VERSION
+  VERSION = "0.2.0" unless defined? ::Gems::VERSION
 end

data/spec/fixtures/push

@@ -0,0 +1 @@
+Successfully registered gem: gems (0.0.8)

data/spec/gems/client_spec.rb

@@ -2,14 +2,6 @@ require 'helper'
 
 describe Gems::Client do
   before do
-    Gems.configure do |config|
-      config.key      = '701243f217cdf23b1370c7b66b65ca97'
-      config.username = 'nick@gemcutter.org'
-      config.password = 'schwwwwing'
-    end
-  end
-
-  after do
     Gems.reset
   end
 
@@ -26,7 +18,7 @@ describe Gems::Client do
           info = Gems.info 'rails'
           a_get("/api/v1/gems/rails.#{format}").
             should have_been_made
-          info.name.should == 'rails'
+          info['name'].should == 'rails'
         end
       end
     end
@@ -47,7 +39,7 @@ describe Gems::Client do
           a_get("/api/v1/search.#{format}").
             with(:query => {"query" => "cucumber"}).
             should have_been_made
-          search.first.name.should == 'cucumber'
+          search.first['name'].should == 'cucumber'
         end
       end
     end
@@ -63,7 +55,7 @@ describe Gems::Client do
       versions = Gems.versions 'coulda'
       a_get("/api/v1/versions/coulda.json").
         should have_been_made
-      versions.first.number.should == '0.6.3'
+      versions.first['number'].should == '0.6.3'
     end
   end
 
@@ -80,7 +72,7 @@ describe Gems::Client do
         downloads = Gems.downloads 'coulda'
         a_get("/api/v1/versions/coulda-3.0.9/downloads.json").
           should have_been_made
-        downloads["2011-06-22"].should == 8
+        downloads['2011-06-22'].should == 8
       end
     end
 
@@ -94,7 +86,7 @@ describe Gems::Client do
         downloads = Gems.downloads 'coulda', '0.6.3'
         a_get("/api/v1/versions/coulda-0.6.3/downloads.json").
           should have_been_made
-        downloads["2011-06-22"].should == 8
+        downloads['2011-06-22'].should == 8
       end
     end
 
@@ -110,7 +102,7 @@ describe Gems::Client do
         a_get("/api/v1/versions/coulda-0.6.3/downloads/search.json").
           with(:query => {"from" => "2011-01-01", "to" => Date.today.to_s}).
           should have_been_made
-        downloads["2011-06-22"].should == 8
+        downloads['2011-06-22'].should == 8
       end
     end
 
@@ -126,7 +118,7 @@ describe Gems::Client do
         a_get("/api/v1/versions/coulda-0.6.3/downloads/search.json").
           with(:query => {"from" => "2011-01-01", "to" => "2011-06-28"}).
           should have_been_made
-        downloads["2011-06-22"].should == 8
+        downloads['2011-06-22'].should == 8
       end
     end
   end
@@ -143,19 +135,23 @@ describe Gems::Client do
       a_get("/api/v1/dependencies").
         with(:query => {"gems" => "rails,thor"}).
         should have_been_made
-      dependencies.first.number.should == "3.0.9"
+      dependencies.first[:number].should == "3.0.9"
     end
   end
 
   describe ".api_key" do
     before do
-      stub_get("/api/v1/api_key").
+      Gems.configure do |config|
+        config.username = 'nick@gemcutter.org'
+        config.password = 'schwwwwing'
+      end
+      stub_get("https://nick%40gemcutter.org:schwwwwing@rubygems.org/api/v1/api_key").
         to_return(:body => fixture("api_key"))
     end
 
     it "should retrieve an API key" do
       api_key = Gems.api_key
-      a_get("/api/v1/api_key").
+      a_get("https://nick%40gemcutter.org:schwwwwing@rubygems.org/api/v1/api_key").
         should have_been_made
       api_key.should == "701243f217cdf23b1370c7b66b65ca97"
     end
@@ -174,7 +170,7 @@ describe Gems::Client do
           gems = Gems.gems
           a_get("/api/v1/gems.#{format}").
             should have_been_made
-          gems.first.name.should == "congress"
+          gems.first['name'].should == "congress"
         end
       end
     end
@@ -193,7 +189,7 @@ describe Gems::Client do
           owners = Gems.owners("gems")
           a_get("/api/v1/gems/gems/owners.#{format}").
             should have_been_made
-          owners.first.email.should == "sferik@gmail.com"
+          owners.first['email'].should == "sferik@gmail.com"
         end
       end
     end
@@ -241,7 +237,7 @@ describe Gems::Client do
       web_hooks = Gems.web_hooks
       a_get("/api/v1/web_hooks.json").
         should have_been_made
-      web_hooks.rails.first.url.should == "http://example.com"
+      web_hooks['rails'].first['url'].should == "http://example.com"
     end
   end
 
@@ -293,6 +289,20 @@ describe Gems::Client do
     end
   end
 
+  describe ".push" do
+    before do
+      stub_post("/api/v1/gems").
+        to_return(:body => fixture("push"))
+    end
+
+    it "should submit a gem to RubyGems.org" do
+      push = Gems.push(File.new(File.expand_path("../../fixtures/gems-0.0.8.gem", __FILE__), "rb"))
+      a_post("/api/v1/gems").
+        should have_been_made
+      push.should == "Successfully registered gem: gems (0.0.8)"
+    end
+  end
+
   describe ".yank" do
     context "with no version specified" do
       before do

data/spec/gems_spec.rb

@@ -3,14 +3,8 @@ require 'helper'
 describe Gems do
   context "when delegating to a client" do
     before do
-      Gems.configure do |config|
-        config.username = 'nick@gemcutter.org'
-        config.password = 'schwwwwing'
-      end
-      stub_get("/api/v1/gems/rails.json").to_return(:body => fixture("rails.json"))
-    end
-
-    after do
+      stub_get("/api/v1/gems/rails.json").
+        to_return(:body => fixture("rails.json"))
       Gems.reset
     end
 

data/spec/helper.rb

@@ -6,36 +6,40 @@ require 'gems'
 require 'rspec'
 require 'webmock/rspec'
 
-def a_delete(path)
-  a_request(:delete, 'https://nick%40gemcutter.org:schwwwwing@rubygems.org' + path)
+def rubygems_url(url)
+  url =~ /^http/ ? url : 'https://rubygems.org' + url
 end
 
-def a_get(path)
-  a_request(:get, 'https://nick%40gemcutter.org:schwwwwing@rubygems.org' + path)
+def a_delete(url)
+  a_request(:delete, rubygems_url(url))
 end
 
-def a_post(path)
-  a_request(:post, 'https://nick%40gemcutter.org:schwwwwing@rubygems.org' + path)
+def a_get(url)
+  a_request(:get, rubygems_url(url))
 end
 
-def a_put(path)
-  a_request(:put, 'https://nick%40gemcutter.org:schwwwwing@rubygems.org' + path)
+def a_post(url)
+  a_request(:post, rubygems_url(url))
 end
 
-def stub_delete(path)
-  stub_request(:delete, 'https://nick%40gemcutter.org:schwwwwing@rubygems.org' + path)
+def a_put(url)
+  a_request(:put, rubygems_url(url))
 end
 
-def stub_get(path)
-  stub_request(:get, 'https://nick%40gemcutter.org:schwwwwing@rubygems.org' + path)
+def stub_delete(url)
+  stub_request(:delete, rubygems_url(url))
 end
 
-def stub_post(path)
-  stub_request(:post, 'https://nick%40gemcutter.org:schwwwwing@rubygems.org' + path)
+def stub_get(url)
+  stub_request(:get, rubygems_url(url))
 end
 
-def stub_put(path)
-  stub_request(:put, 'https://nick%40gemcutter.org:schwwwwing@rubygems.org' + path)
+def stub_post(url)
+  stub_request(:post, rubygems_url(url))
+end
+
+def stub_put(url)
+  stub_request(:put, rubygems_url(url))
 end
 
 def fixture_path

metadata

@@ -2,7 +2,7 @@
 name: gems
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
   - Erik Michaels-Ober
@@ -112,39 +112,28 @@ dependencies:
             version: 0.6.5
     type: :runtime
     version_requirements: *id009
-  - !ruby/object:Gem::Dependency 
-    name: hashie
-    prerelease: false
-    requirement: &id010 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ~>
-          - !ruby/object:Gem::Version 
-            version: 1.0.0
-    type: :runtime
-    version_requirements: *id010
   - !ruby/object:Gem::Dependency 
     name: multi_json
     prerelease: false
-    requirement: &id011 !ruby/object:Gem::Requirement 
+    requirement: &id010 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: 1.0.3
     type: :runtime
-    version_requirements: *id011
+    version_requirements: *id010
   - !ruby/object:Gem::Dependency 
     name: multi_xml
     prerelease: false
-    requirement: &id012 !ruby/object:Gem::Requirement 
+    requirement: &id011 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: 0.2.2
     type: :runtime
-    version_requirements: *id012
+    version_requirements: *id011
 description: Ruby wrapper for the RubyGems.org API
 email: 
   - sferik@gmail.com
@@ -178,10 +167,12 @@ files:
   - spec/fixtures/dependencies
   - spec/fixtures/downloads.json
   - spec/fixtures/fire_web_hook
+  - spec/fixtures/gems-0.0.8.gem
   - spec/fixtures/gems.json
   - spec/fixtures/gems.xml
   - spec/fixtures/owners.json
   - spec/fixtures/owners.yaml
+  - spec/fixtures/push
   - spec/fixtures/rails.json
   - spec/fixtures/rails.xml
   - spec/fixtures/remove_owner.json
@@ -230,10 +221,12 @@ test_files:
   - spec/fixtures/dependencies
   - spec/fixtures/downloads.json
   - spec/fixtures/fire_web_hook
+  - spec/fixtures/gems-0.0.8.gem
   - spec/fixtures/gems.json
   - spec/fixtures/gems.xml
   - spec/fixtures/owners.json
   - spec/fixtures/owners.yaml
+  - spec/fixtures/push
   - spec/fixtures/rails.json
   - spec/fixtures/rails.xml
   - spec/fixtures/remove_owner.json