octokit 1.5.0 → 1.6.0

data/.travis.yml

@@ -1,4 +1,7 @@
 language: ruby
+matrix:
+  allow_failures:
+      - rvm: ruby-head
 rvm:
   - rbx-18mode
   - rbx-19mode

data/CHANGELOG.md

@@ -1,5 +1,7 @@
 # CHANGELOG
 
+* [1.6.0 - June 14, 2012](https://github.com/pengwynn/octokit/compare/v1.5.0...v1.6.0)
+* [1.5.0 - June 14, 2012](https://github.com/pengwynn/octokit/compare/v1.4.0...v1.5.0)
 * [1.4.0 - June 3, 2012](https://github.com/pengwynn/octokit/compare/v1.3.0...v1.4.0)
 * [1.3.0 - May 17, 2012](https://github.com/pengwynn/octokit/compare/v1.2.1...v1.3.0)
 * [1.2.0 - May 17, 2012](https://github.com/pengwynn/octokit/compare/v1.1.1...v1.2.0)

data/README.md

@@ -1,5 +1,5 @@
 # Octokit [![Build Status](https://secure.travis-ci.org/pengwynn/octokit.png?branch=master)][travis] [![Dependency Status](https://gemnasium.com/pengwynn/octokit.png?travis)][gemnasium]
-Simple Ruby wrapper for the GitHub v2 & v3 API.
+Simple Ruby wrapper for the GitHub v3 API.
 
 [travis]: http://travis-ci.org/pengwynn/octokit
 [gemnasium]: https://gemnasium.com/pengwynn/octokit
@@ -26,7 +26,8 @@ Octokit.following("sferik")
 ```
 
 ### Repositories
-For convenience, methods that require a repository argument may be passed in any of the following forms:
+For convenience, methods that require a repository argument may be passed in
+any of the following forms:
 
 * `"pengwynn/octokit"`
 * `{:username => "pengwynn", :name => "octokit"}`
@@ -35,7 +36,7 @@ For convenience, methods that require a repository argument may be passed in any
 
 ```ruby
 Octokit.repo("pengwynn/octokit")
-=> <#Hashie::Rash created_at="2009/12/10 13:41:49 -0800" description="Simple Ruby wrapper for the GitHub v2 API and feeds" fork=false forks=25 has_downloads=true has_issues=true has_wiki=true homepage="http://wynnnetherland.com/projects/octokit" integrate_branch="master" language="Ruby" name="octokit" open_issues=8 owner="pengwynn" private=false pushed_at="2011/05/05 10:48:57 -0700" size=1804 url="https://github.com/pengwynn/octokit" watchers=92>
+=> <#Hashie::Rash created_at="2009/12/10 13:41:49 -0800" description="Simple Ruby wrapper for the GitHub API and feeds" fork=false forks=25 has_downloads=true has_issues=true has_wiki=true homepage="http://wynnnetherland.com/projects/octokit" integrate_branch="master" language="Ruby" name="octokit" open_issues=8 owner="pengwynn" private=false pushed_at="2011/05/05 10:48:57 -0700" size=1804 url="https://github.com/pengwynn/octokit" watchers=92>
 ```
 
 ## Authenticated Requests

data/lib/octokit/client/pub_sub_hubbub/service_hooks.rb

@@ -13,7 +13,7 @@ module Octokit
         #    client = Octokit::Client.new(:oauth_token = "token")
         #    client.subscribe_service_hook('joshk/device_imapable', 'Travis', { :token => "test", :domain => "domain", :user => "user" })
         def subscribe_service_hook(repo, service_name, service_arguments = {})
-          topic = "https://github.com/#{Repository.new(repo)}/events/push"
+          topic = "#{Octokit.web_endpoint}/#{Repository.new(repo)}/events/push"
           callback = "github://#{service_name}?#{service_arguments.collect{ |k,v| [ k,v ].join("=") }.join("&") }"
           subscribe(topic, callback)
           true
@@ -28,7 +28,7 @@ module Octokit
         #    client = Octokit::Client.new(:oauth_token = "token")
         #    client.unsubscribe_service_hook('joshk/device_imapable', 'Travis')
         def unsubscribe_service_hook(repo, service_name)
-          topic = "https://github.com/#{Repository.new(repo)}/events/push"
+          topic = "#{Octokit.web_endpoint}/#{Repository.new(repo)}/events/push"
           callback = "github://#{service_name}"
           unsubscribe(topic, callback)
           true

data/lib/octokit/configuration.rb

@@ -6,6 +6,8 @@ module Octokit
     VALID_OPTIONS_KEYS = [
       :adapter,
       :api_version,
+      :api_endpoint,
+      :web_endpoint,
       :login,
       :password,
       :proxy,
@@ -16,6 +18,8 @@ module Octokit
 
     DEFAULT_ADAPTER        = Faraday.default_adapter
     DEFAULT_API_VERSION    = 3
+    DEFAULT_API_ENDPOINT   = 'https://api.github.com'
+    DEFAULT_WEB_ENDPOINT   = 'https://github.com'
     DEFAULT_USER_AGENT     = "Octokit Ruby Gem #{Octokit::VERSION}".freeze
     DEFAULT_AUTO_TRAVERSAL = false
 
@@ -36,6 +40,8 @@ module Octokit
     def reset
       self.adapter        = DEFAULT_ADAPTER
       self.api_version    = DEFAULT_API_VERSION
+      self.api_endpoint   = DEFAULT_API_ENDPOINT
+      self.web_endpoint   = DEFAULT_WEB_ENDPOINT
       self.login          = nil
       self.password       = nil
       self.proxy          = nil

data/lib/octokit/connection.rb

@@ -8,10 +8,8 @@ module Octokit
 
     def connection(authenticate=true, raw=false, version=3, force_urlencoded=false)
       case version
-      when 2
-        url = "https://github.com"
       when 3
-        url = "https://api.github.com"
+        url = Octokit.api_endpoint
       end
 
       options = {
@@ -22,6 +20,7 @@ module Octokit
 
       options.merge!(:params => {:access_token => oauth_token}) if oauthed? && !authenticated?
 
+      # TODO: Don't build on every request
       connection = Faraday.new(options) do |builder|
         if version >= 3 && !force_urlencoded
           builder.request :json

data/lib/octokit/repository.rb

@@ -30,7 +30,7 @@ module Octokit
     end
 
     def url
-      "https://github.com/#{slug}"
+      "#{Octokit.web_endpoint}/#{slug}"
     end
 
     alias :user :username

data/lib/octokit/version.rb

@@ -1,3 +1,3 @@
 module Octokit
-  VERSION = "1.5.0" unless defined?(Octokit::VERSION)
+  VERSION = "1.6.0" unless defined?(Octokit::VERSION)
 end

data/spec/octokit/client_spec.rb

@@ -62,4 +62,23 @@ describe Octokit::Client do
 
   end
 
+  describe "api_endpoint" do
+
+    after(:each) do
+      Octokit.reset
+    end
+
+    it "should default to https://api.github.com" do
+      client = Octokit::Client.new
+      client.api_endpoint.should == 'https://api.github.com'
+    end
+
+    it "should be set " do
+      Octokit.api_endpoint = 'http://foo.dev'
+      client = Octokit::Client.new
+      client.api_endpoint.should == 'http://foo.dev'
+    end
+  end
+
+
 end

data/spec/repository_spec.rb

@@ -41,6 +41,7 @@ describe Octokit::Repository do
       repository = Octokit::Repository.new(Octokit::Repository.new('sferik/octokit'))
       repository.name.should == "octokit"
       repository.username.should == "sferik"
+      repository.url.should == 'https://github.com/sferik/octokit'
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octokit
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 Z
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70202590806140 !ruby/object:Gem::Requirement
+  requirement: &70139666166520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70202590806140
+  version_requirements: *70139666166520
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70202590804960 !ruby/object:Gem::Requirement
+  requirement: &70139666181720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70202590804960
+  version_requirements: *70139666181720
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70202590804140 !ruby/object:Gem::Requirement
+  requirement: &70139666180560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70202590804140
+  version_requirements: *70139666180560
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70202590803040 !ruby/object:Gem::Requirement
+  requirement: &70139666179420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70202590803040
+  version_requirements: *70139666179420
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70202590801880 !ruby/object:Gem::Requirement
+  requirement: &70139666178360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70202590801880
+  version_requirements: *70139666178360
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70202590801280 !ruby/object:Gem::Requirement
+  requirement: &70139666177760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202590801280
+  version_requirements: *70139666177760
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &70202590800520 !ruby/object:Gem::Requirement
+  requirement: &70139666177020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202590800520
+  version_requirements: *70139666177020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70202590799340 !ruby/object:Gem::Requirement
+  requirement: &70139666176160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202590799340
+  version_requirements: *70139666176160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70202590798640 !ruby/object:Gem::Requirement
+  requirement: &70139666175160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202590798640
+  version_requirements: *70139666175160
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70202590813800 !ruby/object:Gem::Requirement
+  requirement: &70139666190520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +122,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202590813800
+  version_requirements: *70139666190520
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70202590812220 !ruby/object:Gem::Requirement
+  requirement: &70139666188600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +133,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202590812220
+  version_requirements: *70139666188600
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70202590811620 !ruby/object:Gem::Requirement
+  requirement: &70139666187960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,7 +144,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202590811620
+  version_requirements: *70139666187960
 description: Simple wrapper for the GitHub v3 API
 email:
 - wynn.netherland@gmail.com