octokit 1.17.0 → 1.17.1

data/CHANGELOG.md

@@ -1,5 +1,6 @@
 # CHANGELOG
 
+* [1.17.1 - October 11, 2012](https://github.com/pengwynn/octokit/compare/v1.17.0...v1.17.1)
 * [1.17.0 - October 8, 2012](https://github.com/pengwynn/octokit/compare/v1.16.0...v1.17.0)
 * [1.16.0 - September 25,2012](https://github.com/pengwynn/octokit/compare/v1.15.1...v1.16.0)
 * [1.15.1 - September 24,2012](https://github.com/pengwynn/octokit/compare/v1.15.0...v1.15.1)

data/README.md

@@ -98,6 +98,7 @@ end
 [pr]: http://help.github.com/send-pull-requests/
 
 ## Supported Ruby Versions
+
 This library aims to support and is [tested against][travis] the following Ruby
 versions:
 
@@ -116,6 +117,13 @@ 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.
 
+### JSON dependency
+
+Since JSON is included in 1.9 now, we no longer include it as a hard
+dependency. Please require it explicitly if you're running Ruby 1.8
+
+    gem 'json', '~> 1.7'
+
 ## Contributors
 
 Octokit was initially created by Wynn Netherland and [Adam

data/lib/octokit/version.rb

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

data/octokit.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'faraday', '~> 0.8'
   gem.add_dependency 'faraday_middleware', '~> 0.8'
   gem.add_dependency 'hashie', '~> 1.2'
-  gem.add_dependency 'json', '~> 1.7'
   gem.add_dependency 'multi_json', '~> 1.3'
+  gem.add_development_dependency 'json', '~> 1.7'
   gem.add_development_dependency 'maruku'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'

data/spec/faraday/response_spec.rb

@@ -25,10 +25,10 @@ describe Faraday::Response do
           to_return(:status => status)
       end
 
-      it "should raise #{exception.name} error" do
-        lambda do
+      it "raises #{exception.name} error" do
+        expect {
           @client.user('sferik')
-        end.should raise_error(exception)
+        }.to raise_error(exception)
       end
     end
   end
@@ -44,10 +44,10 @@ describe Faraday::Response do
           to_return(:status => 400, :body => body)
       end
 
-      it "should raise an error with the error message" do
-        lambda do
+      it "raises an error with the error message" do
+        expect {
           @client.user('sferik')
-        end.should raise_error(Octokit::BadRequest, /#{body.values.first}/)
+        }.to raise_error(Octokit::BadRequest, /#{body.values.first}/)
       end
     end
   end

data/spec/helper.rb

@@ -4,10 +4,17 @@ unless ENV['CI']
     add_filter "/spec"
   end
 end
+
 require 'octokit'
 require 'rspec'
 require 'webmock/rspec'
 
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end
+
 def a_delete(url)
   a_request(:delete, github_url(url))
 end

data/spec/octokit/client/authorizations_spec.rb

@@ -8,52 +8,52 @@ describe Octokit::Client::Authorizations do
   end
 
 
-  it "should list existing authorizations" do
+  it "lists existing authorizations" do
     stub_get("/authorizations").
       to_return(:body => fixture("v3/authorizations.json"))
     authorizations = @client.authorizations
-    authorizations.first.app.name.should == "Calendar About Nothing" 
+    expect(authorizations.first.app.name).to eq("Calendar About Nothing" )
   end
 
-  it "should return a single authorization" do
+  it "returns a single authorization" do
     stub_get("/authorizations/999999").
       to_return(:body => fixture("v3/authorization.json"))
     authorization = @client.authorization(999999)
-    authorization.app.name.should == "Travis" 
+    expect(authorization.app.name).to eq("Travis" )
   end
 
-  it "should create a new default authorization" do
+  it "creates a new default authorization" do
     stub_post('/authorizations').
       with(:body => {"scopes" => ""},
            :headers => {'Content-Type'=>'application/json'}).
       to_return(:body => fixture("v3/authorization.json"))
     authorization = @client.create_authorization
-    authorization.app.name.should == "Travis" 
+    expect(authorization.app.name).to eq("Travis" )
   end
 
-  it "should create a new authorization with options" do
+  it "creates a new authorization with options" do
     stub_post('/authorizations').
       with(:body => {"scopes" => ["public_repo"],"note" => "admin script", "note_url" => "https://github.com/pengwynn/octokit"},
            :headers => {'Content-Type'=>'application/json'}).
       to_return(:body => fixture("v3/authorization.json"))
     authorization = @client.create_authorization({:scopes => ["public_repo"], :note => "admin script", :note_url => "https://github.com/pengwynn/octokit"})
-    authorization.scopes.should include("public_repo")
+    expect(authorization.scopes).to include("public_repo")
   end
 
-  it "should update and existing authorization" do
+  it "updates and existing authorization" do
     stub_patch('/authorizations/999999').
       with(:body => {"scopes"=>"", "add_scopes" => ["public_repo", "gist"]},
            :headers => {'Content-Type'=>'application/json'}).
       to_return(:body => fixture("v3/authorization.json"))
     authorization = @client.update_authorization(999999, {:add_scopes => ['public_repo', 'gist']})
-    authorization.scopes.should include("public_repo")
+    expect(authorization.scopes).to include("public_repo")
   end
 
-  it "should delete an existing authorization" do
+  it "deletes an existing authorization" do
     stub_delete('/authorizations/999999').
       to_return(:status => 204)
     authorization = @client.delete_authorization(999999)
-    authorization.status.should == 204
+    expect(authorization.status).to eq(204)
   end
 
 end

data/spec/octokit/client/commits_spec.rb

@@ -9,124 +9,124 @@ describe Octokit::Client::Commits do
 
   describe ".commits" do
 
-    it "should return all commits" do
+    it "returns all commits" do
       stub_get("/repos/sferik/rails_admin/commits?per_page=35&sha=master").
         to_return(:body => fixture("v3/commits.json"))
       commits = @client.commits("sferik/rails_admin")
-      commits.first.author.login.should == "caboteria"
+      expect(commits.first.author.login).to eq("caboteria")
     end
 
   end
 
   describe ".commit" do
 
-    it "should return a commit" do
+    it "returns a commit" do
       stub_get("/repos/sferik/rails_admin/commits/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
         to_return(:body => fixture("v3/commit.json"))
       commit = @client.commit("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
-      commit.author.login.should == "caboteria"
+      expect(commit.author.login).to eq("caboteria")
     end
 
   end
 
   describe ".create_commit" do
 
-    it "should create a commit" do
+    it "creates a commit" do
       stub_post("/repos/octocat/Hello-World/git/commits").
         with(:body => { :message => "My commit message", :tree => "827efc6d56897b048c772eb4087f854f46256132", :parents => ["7d1b31e74ee336d15cbd21741bc88a537ed063a0"] },
              :headers => { "Content-Type" => "application/json" }).
         to_return(:body => fixture("v3/commit_create.json"))
       commit = @client.create_commit("octocat/Hello-World", "My commit message", "827efc6d56897b048c772eb4087f854f46256132", "7d1b31e74ee336d15cbd21741bc88a537ed063a0")
-      commit.sha.should == "7638417db6d59f3c431d3e1f261cc637155684cd"
-      commit.message.should == "My commit message"
-      commit.parents.size.should == 1
-      commit.parents.first.sha.should == "7d1b31e74ee336d15cbd21741bc88a537ed063a0"
+      expect(commit.sha).to eq("7638417db6d59f3c431d3e1f261cc637155684cd")
+      expect(commit.message).to eq("My commit message")
+      expect(commit.parents.size).to eq(1)
+      expect(commit.parents.first.sha).to eq("7d1b31e74ee336d15cbd21741bc88a537ed063a0")
     end
 
   end
 
   describe ".list_commit_comments" do
 
-    it "should return a list of all commit comments" do
+    it "returns a list of all commit comments" do
       stub_get("/repos/sferik/rails_admin/comments").
         to_return(:body => fixture("v3/list_commit_comments.json"))
       commit_comments = @client.list_commit_comments("sferik/rails_admin")
-      commit_comments.first.user.login.should == "sferik"
+      expect(commit_comments.first.user.login).to eq("sferik")
     end
 
   end
 
   describe ".commit_comments" do
 
-    it "should return a list of comments for a specific commit" do
+    it "returns a list of comments for a specific commit" do
       stub_get("/repos/sferik/rails_admin/commits/629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3/comments").
         to_return(:body => fixture("v3/commit_comments.json"))
       commit_comments = @client.commit_comments("sferik/rails_admin", "629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3")
-      commit_comments.first.user.login.should == "bbenezech"
+      expect(commit_comments.first.user.login).to eq("bbenezech")
     end
 
   end
 
   describe ".commit_comment" do
 
-    it "should return a single commit comment" do
+    it "returns a single commit comment" do
       stub_get("/repos/sferik/rails_admin/comments/861907").
         to_return(:body => fixture("v3/commit_comment.json"))
       commit = @client.commit_comment("sferik/rails_admin", "861907")
-      commit.user.login.should == "bbenezech"
+      expect(commit.user.login).to eq("bbenezech")
     end
 
   end
 
   describe ".create_commit_comment" do
 
-    it "should create a commit comment" do
+    it "creates a commit comment" do
       stub_post("/repos/sferik/rails_admin/commits/629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3/comments").
         with(:body => { :body => "Hey Eric,\r\n\r\nI think it's a terrible idea: for a number of reasons (dissections, etc.), test suite should stay deterministic IMO.\r\n", :commit_id => "629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3", :line => 1, :path => ".rspec", :position => 4 },
              :headers => { "Content-Type" => "application/json" }).
         to_return(:body => fixture("v3/commit_comment_create.json"))
       commit_comment = @client.create_commit_comment("sferik/rails_admin", "629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3", "Hey Eric,\r\n\r\nI think it's a terrible idea: for a number of reasons (dissections, etc.), test suite should stay deterministic IMO.\r\n", ".rspec", 1, 4)
-      commit_comment.body.should == "Hey Eric,\r\n\r\nI think it's a terrible idea: for a number of reasons (dissections, etc.), test suite should stay deterministic IMO.\r\n"
-      commit_comment.commit_id.should == "629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3"
-      commit_comment.path.should == ".rspec"
-      commit_comment.line.should == 1
-      commit_comment.position.should == 4
+      expect(commit_comment.body).to eq("Hey Eric,\r\n\r\nI think it's a terrible idea: for a number of reasons (dissections, etc.), test suite should stay deterministic IMO.\r\n")
+      expect(commit_comment.commit_id).to eq("629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3")
+      expect(commit_comment.path).to eq(".rspec")
+      expect(commit_comment.line).to eq(1)
+      expect(commit_comment.position).to eq(4)
     end
 
   end
 
   describe ".update_commit_comment" do
 
-    it "should update a commit comment" do
+    it "updates a commit comment" do
       stub_patch("/repos/sferik/rails_admin/comments/860296").
         with(:body => { :body => "Hey Eric,\r\n\r\nI think it's a terrible idea. The test suite should stay deterministic IMO.\r\n" },
           :headers => { "Content-Type" => "application/json" }).
         to_return(:body => fixture("v3/commit_comment_update.json"))
         commit_comment = @client.update_commit_comment("sferik/rails_admin", "860296", "Hey Eric,\r\n\r\nI think it's a terrible idea. The test suite should stay deterministic IMO.\r\n")
-        commit_comment.body.should == "Hey Eric,\r\n\r\nI think it's a terrible idea. The test suite should stay deterministic IMO.\r\n"
+        expect(commit_comment.body).to eq("Hey Eric,\r\n\r\nI think it's a terrible idea. The test suite should stay deterministic IMO.\r\n")
     end
 
   end
 
   describe ".delete_commit_comment" do
 
-    it "should delete a commit comment" do
+    it "deletes a commit comment" do
       stub_delete("/repos/sferik/rails_admin/comments/860296").
         to_return(:status => 204, :body => "")
       commit_comment = @client.delete_commit_comment("sferik/rails_admin", "860296")
-      commit_comment.should be_false
+      expect(commit_comment).to be_false
     end
 
   end
 
   describe ".compare" do
 
-    it "should return a comparison" do
+    it "returns a comparison" do
       stub_get("/repos/gvaughn/octokit/compare/0e0d7ae299514da692eb1cab741562c253d44188...b7b37f75a80b8e84061cd45b246232ad958158f5").
         to_return(:body => fixture("v3/compare.json"))
       comparison = @client.compare("gvaughn/octokit", '0e0d7ae299514da692eb1cab741562c253d44188', 'b7b37f75a80b8e84061cd45b246232ad958158f5')
-      comparison.base_commit.sha.should == '0e0d7ae299514da692eb1cab741562c253d44188'
-      comparison.merge_base_commit.sha.should == 'b7b37f75a80b8e84061cd45b246232ad958158f5'
+      expect(comparison.base_commit.sha).to eq('0e0d7ae299514da692eb1cab741562c253d44188')
+      expect(comparison.merge_base_commit.sha).to eq('b7b37f75a80b8e84061cd45b246232ad958158f5')
     end
   end
 
@@ -137,10 +137,10 @@ describe Octokit::Client::Commits do
         to_return(:body => fixture("v3/merge.json"))
     end
 
-    it "should merge a branch into another" do
+    it "merges a branch into another" do
       merge = @client.merge("pengwynn/api-sandbox", "master", "new-branch", :commit_message => "Testing the merge API")
-      merge.sha.should == '4298c8499e0a7a160975adefdecdf9d8a5437095'
-      merge.commit.message.should == 'Testing the merge API'
+      expect(merge.sha).to eq('4298c8499e0a7a160975adefdecdf9d8a5437095')
+      expect(merge.commit.message).to eq('Testing the merge API')
     end
 
   end

data/spec/octokit/client/contents_spec.rb

@@ -9,38 +9,38 @@ describe Octokit::Client::Contents do
 
   describe ".readme" do
 
-    it "should return the default readme" do
+    it "returns the default readme" do
       stub_get("/repos/pengwynn/octokit/readme").
         to_return(:body => fixture("v3/readme.json"))
       readme = @client.readme('pengwynn/octokit')
-      readme.encoding.should == "base64"
-      readme.type.should == "file"
+      expect(readme.encoding).to eq("base64")
+      expect(readme.type).to eq("file")
     end
 
   end
 
   describe ".contents" do
 
-    it "should return the contents of a file" do
+    it "returns the contents of a file" do
       stub_get("/repos/pengwynn/octokit/contents/lib/octokit.rb").
         to_return(:body => fixture("v3/contents.json"))
       contents = @client.contents('pengwynn/octokit', :path => "lib/octokit.rb")
-      contents.path.should == "lib/octokit.rb"
-      contents.name.should == "lib/octokit.rb"
-      contents.encoding.should == "base64"
-      contents.type.should == "file"
+      expect(contents.path).to eq("lib/octokit.rb")
+      expect(contents.name).to eq("lib/octokit.rb")
+      expect(contents.encoding).to eq("base64")
+      expect(contents.type).to eq("file")
     end
 
   end
 
   describe ".archive_link" do
 
-    it "should return the headers of the request" do
+    it "returns the headers of the request" do
       stub_get("/repos/pengwynn/octokit/tarball/master").
         to_return(:status => 302, :body => '', :headers =>
           { 'location' => "https://nodeload.github.com/repos/pengwynn/octokit/tarball/"})
       archive_link = @client.archive_link('pengwynn/octokit', :ref => "master")
-      archive_link == "https://nodeload.github.com/pengwynn/octokit/tarball/"
+      expect(archive_link).to eq("https://nodeload.github.com/repos/pengwynn/octokit/tarball/")
     end
 
   end

data/spec/octokit/client/downloads_spec.rb

@@ -9,23 +9,23 @@ describe Octokit::Client::Downloads do
 
   describe ".downloads" do
 
-    it "should list available downloads" do
+    it "lists available downloads" do
       stub_get("/repos/github/hubot/downloads").
         to_return(:body => fixture("v3/downloads.json"))
       downloads = @client.downloads("github/hubot")
-      downloads.first.description.should == "Robawt"
+      expect(downloads.first.description).to eq("Robawt")
     end
 
   end
 
   describe ".download" do
 
-    it "should get a single download" do
+    it "gets a single download" do
       stub_get("/repos/github/hubot/downloads/165347").
         to_return(:body => fixture("v3/download.json"))
       download = @client.download("github/hubot", 165347)
-      download.id.should == 165347
-      download.name.should == 'hubot-2.1.0.tar.gz'
+      expect(download.id).to eq(165347)
+      expect(download.name).to eq('hubot-2.1.0.tar.gz')
     end
 
   end
@@ -38,26 +38,26 @@ describe Octokit::Client::Downloads do
                        :content_type => "text/plain" }).
         to_return(:body => fixture("v3/download_create.json"))
     end
-    it "should create a download resource" do
+    it "creates a download resource" do
       resource = @client.send(:create_download_resource, "octocat/Hello-World", "download_create.json", 690, {:description => "Description of your download", :content_type => "text/plain"})
-      resource.s3_url.should == "https://github.s3.amazonaws.com/"
+      expect(resource.s3_url).to eq("https://github.s3.amazonaws.com/")
     end
 
-    it "should post to a S3 url" do
+    it "posts to an S3 url" do
       stub_post("https://github.s3.amazonaws.com/").
         to_return(:status => 201)
       file_path = File.expand_path 'spec/fixtures/v3/download_create.json'
-      @client.create_download("octocat/Hello-World", file_path, {:description => "Description of your download", :content_type => "text/plain"}).should == true
+      expect(@client.create_download("octocat/Hello-World", file_path, {:description => "Description of your download", :content_type => "text/plain"})).to eq(true)
     end
   end
 
   describe ".delete_download" do
 
-    it "should delete a download" do
+    it "deletes a download" do
       stub_request(:delete, "https://api.github.com/repos/octocat/Hellow-World/downloads/165347").
         with(:headers => {'Accept'=>'*/*'}).
         to_return(:status => 204, :body => "", :headers => {})
-      @client.delete_download('octocat/Hellow-World', 165347).status.should == 204
+      expect(@client.delete_download('octocat/Hellow-World', 165347).status).to eq(204)
     end
   end
 

data/spec/octokit/client/emojis_spec.rb

@@ -7,11 +7,11 @@ describe Octokit::Client::Emojis do
   end
 
   describe ".emojis" do
-    it "should return all github emojis" do
+    it "returns all github emojis" do
       stub_get("/emojis").
         to_return(:body => fixture("v3/emojis.json"))
       emojis = @client.emojis
-      emojis[:metal].should == 'https://a248.e.akamai.net/assets.github.com/images/icons/emoji/metal.png?v5'
+      expect(emojis[:metal]).to eq('https://a248.e.akamai.net/assets.github.com/images/icons/emoji/metal.png?v5')
     end
   end