octokit 1.7.0 → 1.8.0

data/CHANGELOG.md

@@ -1,5 +1,6 @@
 # CHANGELOG
 
+* [1.8.0 - June 18, 2012](https://github.com/pengwynn/octokit/compare/v1.7.0...v1.8.0)
 * [1.7.0 - June 18, 2012](https://github.com/pengwynn/octokit/compare/v1.6.1...v1.7.0)
 * [1.6.1 - June 14, 2012](https://github.com/pengwynn/octokit/compare/v1.6.0...v1.6.1)
 * [1.6.0 - June 14, 2012](https://github.com/pengwynn/octokit/compare/v1.5.0...v1.6.0)

data/README.md

@@ -103,6 +103,16 @@ 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.
 
+## Contributors
+
+Octokit was initially created by Wynn Netherland and [Adam
+Stacoviak](http://twitter.com/adamstac) but has
+turned into a true community effort. Special thanks to the following core
+contributors:
+
+* [Erik Michaels-Ober](http://github.com/sferik)
+* [Clint Shryock](http://github.com/ctshryock)
+
 ## Inspiration
 Octokit was inspired by [Octopi][] and aims to be a lightweight,
 less-ActiveResourcey alternative.

data/lib/octokit/client.rb

@@ -20,6 +20,7 @@ require 'octokit/client/users'
 require 'octokit/client/events'
 require 'octokit/client/authorizations'
 require 'octokit/client/refs'
+require 'octokit/client/contents'
 
 module Octokit
   class Client
@@ -52,5 +53,6 @@ module Octokit
     include Octokit::Client::Events
     include Octokit::Client::Authorizations
     include Octokit::Client::Refs
+    include Octokit::Client::Contents
   end
 end

data/lib/octokit/client/contents.rb

@@ -0,0 +1,51 @@
+module Octokit
+	class Client
+		module Contents
+
+	# Receive the default Readme for a repository
+	#
+	# @param repo [String, Repository, Hash] A GitHub repository
+	# @param ref [String] The String name of the Commit/Branch/Tag. Defaults to “master”.
+	# @option options [String] :ref name of the Commit/Branch/Tag. Defaults to “master”.
+	# @return [Hash] The detail of the readme
+	# @see http://developer.github.com/v3/repos/contents/
+	# @example Get the readme file for a repo
+	#   Octokit.readme("pengwynn/octokit")
+			def readme(repo, options={})
+				get("/repos/#{Repository.new repo}/readme", options, 3)
+			end
+
+	# Receive a listing of a repository folder or the contents of a file
+	#
+	# @param repo [String, Repository, Hash] A GitHub repository
+	# @option options [String] :path A folder or file path
+	# @option options [String] :ref name of the Commit/Branch/Tag. Defaults to “master”.
+	# @return [Hash] The contents of a file or list of the files in the folder
+	# @see http://developer.github.com/v3/repos/contents/
+	# @example List the contents of lib/octokit.rb
+	#   Octokit.contents("pengwynn/octokit", :path => 'lib/octokit.rb')
+			def contents(repo, options={})
+				repo_path = options.delete :path
+				url = "/repos/#{Repository.new repo}/contents/#{repo_path}"
+				get(url, options, 3)
+			end
+			
+	# This method will provide a URL to download a tarball or zipball archive for a repository. 
+	#
+	# @param repo [String, Repository, Hash] A GitHub repository.
+	# @option options format [String] Either tarball (default) or zipball.
+	# @option options [String] :ref Optional valid Git reference, defaults to master.
+	# @return [String] Location of the download
+	# @see http://developer.github.com/v3/repos/contents/
+	# @example Get archive link for pengwynn/octokit
+	#   Octokit.archive_link("pengwynn/octokit")
+			def archive_link(repo, options={})
+				repo_ref = options.delete :ref
+				format = (options.delete :format) || 'tarball'
+				url = "/repos/#{Repository.new repo}/#{format}/#{repo_ref}"
+			  headers = get(url, options, 3, false, true).headers
+			  return headers['location']
+		  end
+	end
+end
+end

data/lib/octokit/client/downloads.rb

@@ -26,7 +26,16 @@ module Octokit
         get("repos/#{Repository.new(repo)}/downloads/#{id}", options, 3)
       end
 
-
+      # Create a download in a repository
+      #
+      # @param repo [String, Repository, Hash] A GitHub repository
+      # @param name [String, Repository, Hash] A display name for the download
+      # @option options [String] :description The download description
+      # @option options [String] :content_type The content type. Defaults to 'text/plain'
+      # @return [Download] A single download from the repository
+      # @see http://developer.github.com/v3/repos/downloads/#create-a-new-download-part-1-create-the-resource
+      # @example Create the "Robawt" download on Github/Hubot
+      #   Octokit.create_download("github/hubot", 'Robawt')
       def create_download(repo, name, options={})
         options[:content_type] ||= 'text/plain'
         file = Faraday::UploadIO.new(name, options[:content_type])

data/lib/octokit/client/organizations.rb

@@ -84,6 +84,13 @@ module Octokit
       end
       alias :remove_team_repo :remove_team_repository
 
+      def remove_organization_member(org, user, options={})
+        # this is a synonym for: for team in org.teams: remove_team_member(team.id, user)
+        # provided in the GH API v3
+        delete("orgs/#{org}/members/#{user}", options, 3, true, raw=true).status == 204
+      end
+      alias :remove_org_member :remove_organization_member
+
       def publicize_membership(org, user, options={})
         put("orgs/#{org}/public_members/#{user}", options, 3, true, raw=true).status == 204
       end

data/lib/octokit/client/repositories.rb

@@ -60,10 +60,12 @@ module Octokit
       alias :delete_repo :delete_repository
 
       def set_private(repo, options={})
+        # GitHub Api for setting private updated to use private attr, rather than public
         update_repository repo, options.merge({ :private => true })
       end
 
       def set_public(repo, options={})
+        # GitHub Api for setting private updated to use private attr, rather than public
         update_repository repo, options.merge({ :private => false })
       end
 
@@ -127,6 +129,19 @@ module Octokit
         get "/repos/#{Repository.new repo}/branches", options, 3
       end
 
+      # Get a single branch from a repository
+      #
+      # @param repo [String, Repository, Hash] A GitHub repository
+      # @param branch [String] Branch name 
+      # @return [Branch] The branch requested, if it exists
+      # @see http://developer.github.com/v3/repos/#get-branch
+      # @example Get branch 'master` from pengwynn/octokit
+      #   Octokit.issue("pengwynn/octokit", "master")
+      def branch(repo, branch, options={})
+        get "/repos/#{Repository.new repo}/branches/#{branch}", options, 3
+      end
+      alias :get_branch :branch 
+
       def hooks(repo, options={})
         get "/repos/#{Repository.new repo}/hooks", options, 3
       end

data/lib/octokit/version.rb

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

data/octokit.gemspec

@@ -14,9 +14,9 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'webmock'
   gem.add_development_dependency 'yard'
-  gem.authors = ["Wynn Netherland", "Adam Stacoviak", "Erik Michaels-Ober"]
+  gem.authors = ["Wynn Netherland", "Erik Michaels-Ober", "Clint Shryock"]
   gem.description = %q{Simple wrapper for the GitHub v3 API}
-  gem.email = ['wynn.netherland@gmail.com', 'adam@stacoviak.com', 'sferik@gmail.com']
+  gem.email = ['wynn.netherland@gmail.com', 'sferik@gmail.com', 'clint@ctshryock.com']
   gem.files = `git ls-files`.split("\n")
   gem.homepage = 'https://github.com/pengwynn/octokit'
   gem.name = 'octokit'

data/spec/fixtures/v3/contents.json

@@ -0,0 +1,14 @@
+{
+  "type": "file",
+  "content": "cmVxdWlyZSAnb2N0b2tpdC9jb25maWd1cmF0aW9uJwpyZXF1aXJlICdvY3Rv\na2l0L2NsaWVudCcKcmVxdWlyZSAnb2N0b2tpdC9lcnJvcicKCm1vZHVsZSBP\nY3Rva2l0CiAgZXh0ZW5kIENvbmZpZ3VyYXRpb24KICBjbGFzcyA8PCBzZWxm\nCiAgICAjIEFsaWFzIGZvciBPY3Rva2l0OjpDbGllbnQubmV3CiAgICAjCiAg\nICAjIEByZXR1cm4gW09jdG9raXQ6OkNsaWVudF0KICAgIGRlZiBuZXcob3B0\naW9ucz17fSkKICAgICAgT2N0b2tpdDo6Q2xpZW50Lm5ldyhvcHRpb25zKQog\nICAgZW5kCgogICAgIyBEZWxlZ2F0ZSB0byBPY3Rva2l0OjpDbGllbnQubmV3\nCiAgICBkZWYgbWV0aG9kX21pc3NpbmcobWV0aG9kLCAqYXJncywgJmJsb2Nr\nKQogICAgICByZXR1cm4gc3VwZXIgdW5sZXNzIG5ldy5yZXNwb25kX3RvPyht\nZXRob2QpCiAgICAgIG5ldy5zZW5kKG1ldGhvZCwgKmFyZ3MsICZibG9jaykK\nICAgIGVuZAoKICAgIGRlZiByZXNwb25kX3RvPyhtZXRob2QsIGluY2x1ZGVf\ncHJpdmF0ZT1mYWxzZSkKICAgICAgbmV3LnJlc3BvbmRfdG8/KG1ldGhvZCwg\naW5jbHVkZV9wcml2YXRlKSB8fCBzdXBlcihtZXRob2QsIGluY2x1ZGVfcHJp\ndmF0ZSkKICAgIGVuZAogIGVuZAplbmQK\n",
+  "sha": "21787fb105676aad095f575bd00f9d18ddcb5a42",
+  "encoding": "base64",
+  "size": 609,
+  "_links": {
+    "html": "https://github.com/pengwynn/octokit/blob/master/lib/octokit.rb",
+    "self": "https://api.github.com/repos/pengwynn/octokit/contents/lib/octokit.rb",
+    "git": "https://api.github.com/repos/pengwynn/octokit/git/blobs/21787fb105676aad095f575bd00f9d18ddcb5a42"
+  },
+  "name": "lib/octokit.rb",
+  "path": "lib/octokit.rb"
+}

data/spec/fixtures/v3/readme.json

@@ -0,0 +1,14 @@
+{
+  "_links": {
+    "html": "https://github.com/pengwynn/octokit/blob/master/README.md",
+    "self": "https://api.github.com/repos/pengwynn/octokit/contents/README.md",
+    "git": "https://api.github.com/repos/pengwynn/octokit/git/blobs/f8be7910362f4576d2eb3ba721f9c4cd6ee06569"
+  },
+  "type": "file",
+  "content": "IyBPY3Rva2l0IFshW0J1aWxkIFN0YXR1c10oaHR0cHM6Ly9zZWN1cmUudHJh\ndmlzLWNpLm9yZy9wZW5nd3lubi9vY3Rva2l0LnBuZz9icmFuY2g9bWFzdGVy\nKV1bdHJhdmlzXSBbIVtEZXBlbmRlbmN5IFN0YXR1c10oaHR0cHM6Ly9nZW1u\nYXNpdW0uY29tL3Blbmd3eW5uL29jdG9raXQucG5nP3RyYXZpcyldW2dlbW5h\nc2l1bV0KU2ltcGxlIFJ1Ynkgd3JhcHBlciBmb3IgdGhlIEdpdEh1YiB2MyBB\nUEkuCgpbdHJhdmlzXTogaHR0cDovL3RyYXZpcy1jaS5vcmcvcGVuZ3d5bm4v\nb2N0b2tpdApbZ2VtbmFzaXVtXTogaHR0cHM6Ly9nZW1uYXNpdW0uY29tL3Bl\nbmd3eW5uL29jdG9raXQKCiMjIEluc3RhbGxhdGlvbgogICAgZ2VtIGluc3Rh\nbGwgb2N0b2tpdAoKIyMgRG9jdW1lbnRhdGlvbgpbaHR0cDovL3Jkb2MuaW5m\nby9nZW1zL29jdG9raXRdW2RvY3VtZW50YXRpb25dCgpbZG9jdW1lbnRhdGlv\nbl06IGh0dHA6Ly9yZG9jLmluZm8vZ2Vtcy9vY3Rva2l0CgojIyBFeGFtcGxl\ncwojIyMgU2hvdyBhIHVzZXIKYGBgcnVieQpPY3Rva2l0LnVzZXIoInNmZXJp\nayIpCj0+IDwjSGFzaGllOjpSYXNoIGJsb2c9Imh0dHA6Ly90d2l0dGVyLmNv\nbS9zZmVyaWsiIGNvbXBhbnk9IkNvZGUgZm9yIEFtZXJpY2EiIGNyZWF0ZWRf\nYXQ9IjIwMDgvMDUvMTQgMTM6MzY6MTIgLTA3MDAiIGVtYWlsPSJzZmVyaWtA\nZ21haWwuY29tIiBmb2xsb3dlcnNfY291bnQ9MTc3IGZvbGxvd2luZ19jb3Vu\ndD04MyBncmF2YXRhcl9pZD0iMWY3NGIxM2YxZTVjNmM2OWNiNWQ3ZmJhYWJi\nMWUyY2IiIGlkPTEwMzA4IGxvY2F0aW9uPSJTYW4gRnJhbmNpc2NvIiBsb2dp\nbj0ic2ZlcmlrIiBuYW1lPSJFcmlrIE1pY2hhZWxzLU9iZXIiIHBlcm1pc3Np\nb249bmlsIHB1YmxpY19naXN0X2NvdW50PTE2IHB1YmxpY19yZXBvX2NvdW50\nPTMwIHR5cGU9IlVzZXIiPgpgYGAKCiMjIyBTaG93IHdobyBhIHVzZXIgZm9s\nbG93cwpgYGBydWJ5Ck9jdG9raXQuZm9sbG93aW5nKCJzZmVyaWsiKQo9PiBb\nInJhaWxzIiwgInB1bHMiLCAid3ljYXRzIiwgImRoaCIsICJqbTMiLCAiam9z\naHN1c3NlciIsICJua2FsbGVuIiwgInRlY2hub3dlZW5pZSIsICJibGFpbmUi\nLCAiYWwzeCIsICJkZWZ1bmt0IiwgInNjaGFjb24iLCAiYm1pemVyYW55Iiwg\nInJ0b21heWtvIiwgImpwcjUiLCAibGhvbGRlbiIsICIxNDBwcm9vZiIsICJl\ncGhyYW16ZXJiIiwgImNhcmxodWRhIiwgImNhcmxsZXJjaGUiLCAiam51bmVt\nYWtlciIsICJqb3NoIiwgImhvdmVyYmlyZCIsICJqYW1pZXciLCAiamVyZW15\nZXZhbnMiLCAiYnJ5bmFyeSIsICJtb2pvZG5hIiwgIm1vam9tYm8iLCAiam9z\naGJ1ZGR5IiwgImlncmlnb3JpayIsICJwZXJwbGV4ZXMiLCAiam9lYXJhc2lu\nIiwgImhhc3NveCIsICJuaWNrbWFyZGVuIiwgInBlbmd3eW5uIiwgIm1tY2dy\nYW5hIiwgInJlZGRhdmlzIiwgInJlaW5oIiwgIm16c2FuZm9yZCIsICJhYW5h\nbmQiLCAicGpoeWV0dCIsICJrbmVhdGgiLCAidGVra3ViIiwgImFkYW1zdGFj\nIiwgInRpbXRydWVtYW4iLCAiYWFyb25ibG9ob3dpYWsiLCAiam9zZXZhbGlt\nIiwgImthYXBhIiwgImh1cnJ5Y2FuZSIsICJqYWNrZGVtcHNleSIsICJkcm9n\ndXMiLCAiY2FtZXJvbnByaWVzdCIsICJkYW5tZWx0b24iLCAibWFyY2VsIiwg\nInIiLCAiYXRtb3MiLCAibWJsZWlnaCIsICJpc2FhY3MiLCAibWF4b2dkZW4i\nLCAiY29kZWZvcmFtZXJpY2EiLCAiY2hhZGsiLCAibGFzZXJsZW1vbiIsICJn\ncnViZXIiLCAibHNlZ2FsIiwgImJibGlta2UiLCAid2F5bmVlc2VndWluIiwg\nImJyaXhlbiIsICJka3ViYiIsICJiaGIiLCAiYmNhcmRhcmVsbGEiLCAiZWxs\naW90dGNhYmxlIiwgImZiam9yayIsICJtbGlnaHRuZXIiLCAiZGlhbmFraW1i\nYWxsIiwgImFtZXJpbmUiLCAiZGFuY2hvaSIsICJkZXZlbG9wIiwgImRtZnJh\nbmNpc2NvIiwgInVucnV0aGxlc3MiLCAidHJvdHRlciIsICJoYW5uZXN0eWRl\nbiIsICJjb2RhaGFsZSIsICJyeSJdCmBgYAoKIyMjIFJlcG9zaXRvcmllcwpG\nb3IgY29udmVuaWVuY2UsIG1ldGhvZHMgdGhhdCByZXF1aXJlIGEgcmVwb3Np\ndG9yeSBhcmd1bWVudCBtYXkgYmUgcGFzc2VkIGluCmFueSBvZiB0aGUgZm9s\nbG93aW5nIGZvcm1zOgoKKiBgInBlbmd3eW5uL29jdG9raXQiYAoqIGB7OnVz\nZXJuYW1lID0+ICJwZW5nd3lubiIsIDpuYW1lID0+ICJvY3Rva2l0In1gCiog\nYHs6dXNlcm5hbWUgPT4gInBlbmd3eW5uIiwgOnJlcG8gPT4gIm9jdG9raXQi\nfWAKKiBpbnN0YW5jZSBvZiBgUmVwb3NpdG9yeWAKCmBgYHJ1YnkKT2N0b2tp\ndC5yZXBvKCJwZW5nd3lubi9vY3Rva2l0IikKPT4gPCNIYXNoaWU6OlJhc2gg\nY3JlYXRlZF9hdD0iMjAwOS8xMi8xMCAxMzo0MTo0OSAtMDgwMCIgZGVzY3Jp\ncHRpb249IlNpbXBsZSBSdWJ5IHdyYXBwZXIgZm9yIHRoZSBHaXRIdWIgQVBJ\nIGFuZCBmZWVkcyIgZm9yaz1mYWxzZSBmb3Jrcz0yNSBoYXNfZG93bmxvYWRz\nPXRydWUgaGFzX2lzc3Vlcz10cnVlIGhhc193aWtpPXRydWUgaG9tZXBhZ2U9\nImh0dHA6Ly93eW5ubmV0aGVybGFuZC5jb20vcHJvamVjdHMvb2N0b2tpdCIg\naW50ZWdyYXRlX2JyYW5jaD0ibWFzdGVyIiBsYW5ndWFnZT0iUnVieSIgbmFt\nZT0ib2N0b2tpdCIgb3Blbl9pc3N1ZXM9OCBvd25lcj0icGVuZ3d5bm4iIHBy\naXZhdGU9ZmFsc2UgcHVzaGVkX2F0PSIyMDExLzA1LzA1IDEwOjQ4OjU3IC0w\nNzAwIiBzaXplPTE4MDQgdXJsPSJodHRwczovL2dpdGh1Yi5jb20vcGVuZ3d5\nbm4vb2N0b2tpdCIgd2F0Y2hlcnM9OTI+CmBgYAoKIyMgQXV0aGVudGljYXRl\nZCBSZXF1ZXN0cwpGb3IgbWV0aG9kcyB0aGF0IHJlcXVpcmUgYXV0aGVudGlj\nYXRpb24sIHlvdSdsbCBuZWVkIHRvIHNldHVwIGEgY2xpZW50IHdpdGgKeW91\nciBsb2dpbiBhbmQgcGFzc3dvcmQuCgpgYGBydWJ5CmNsaWVudCA9IE9jdG9r\naXQ6OkNsaWVudC5uZXcoOmxvZ2luID0+ICJtZSIsIDpwYXNzd29yZCA9PiAi\nc2VrcmV0IikKY2xpZW50LmZvbGxvdyEoInNmZXJpayIpCmBgYAoKQWx0ZXJu\nYXRlbHksIHlvdSBjYW4gYXV0aGVudGljYXRlIHdpdGggYSBHaXRIdWIgT0F1\ndGgyIHRva2VuLiBOb3RlOiB0aGlzIGlzCioqTk9UKiogdGhlIEdpdEh1YiBB\nUEkgdG9rZW4gb24geW91ciBbYWNjb3VudCBwYWdlXVthY2NvdW50XS4KClth\nY2NvdW50XTogaHR0cHM6Ly9naXRodWIuY29tL2FjY291bnQKYGBgcnVieQpj\nbGllbnQgPSBPY3Rva2l0OjpDbGllbnQubmV3KDpsb2dpbiA9PiAibWUiLCA6\nb2F1dGhfdG9rZW4gPT4gIm9hdXRoMnRva2VuIikKY2xpZW50LmZvbGxvdyEo\nInNmZXJpayIpCmBgYAoKIyMgU3VibWl0dGluZyBhIFB1bGwgUmVxdWVzdAox\nLiBbRm9yayB0aGUgcmVwb3NpdG9yeS5dW2ZvcmtdCjIuIFtDcmVhdGUgYSB0\nb3BpYyBicmFuY2guXVticmFuY2hdCjMuIEFkZCBzcGVjcyBmb3IgeW91ciB1\nbmltcGxlbWVudGVkIGZlYXR1cmUgb3IgYnVnIGZpeC4KNC4gUnVuIGBidW5k\nbGUgZXhlYyByYWtlIHNwZWNgLiBJZiB5b3VyIHNwZWNzIHBhc3MsIHJldHVy\nbiB0byBzdGVwIDMuCjUuIEltcGxlbWVudCB5b3VyIGZlYXR1cmUgb3IgYnVn\nIGZpeC4KNi4gUnVuIGBidW5kbGUgZXhlYyByYWtlIHNwZWNgLiBJZiB5b3Vy\nIHNwZWNzIGZhaWwsIHJldHVybiB0byBzdGVwIDUuCjcuIFJ1biBgb3BlbiBj\nb3ZlcmFnZS9pbmRleC5odG1sYC4gSWYgeW91ciBjaGFuZ2VzIGFyZSBub3Qg\nY29tcGxldGVseSBjb3ZlcmVkCiAgIGJ5IHlvdXIgdGVzdHMsIHJldHVybiB0\nbyBzdGVwIDMuCjguIEFkZCBkb2N1bWVudGF0aW9uIGZvciB5b3VyIGZlYXR1\ncmUgb3IgYnVnIGZpeC4KOS4gUnVuIGBidW5kbGUgZXhlYyByYWtlIGRvYzp5\nYXJkYC4gSWYgeW91ciBjaGFuZ2VzIGFyZSBub3QgMTAwJSBkb2N1bWVudGVk\nLCBnbwogICBiYWNrIHRvIHN0ZXAgOC4KMTAuIEFkZCwgY29tbWl0LCBhbmQg\ncHVzaCB5b3VyIGNoYW5nZXMuCjExLiBbU3VibWl0IGEgcHVsbCByZXF1ZXN0\nLl1bcHJdCgpbZm9ya106IGh0dHA6Ly9oZWxwLmdpdGh1Yi5jb20vZm9yay1h\nLXJlcG8vClticmFuY2hdOiBodHRwOi8vbGVhcm4uZ2l0aHViLmNvbS9wL2Jy\nYW5jaGluZy5odG1sCltwcl06IGh0dHA6Ly9oZWxwLmdpdGh1Yi5jb20vc2Vu\nZC1wdWxsLXJlcXVlc3RzLwoKIyMgU3VwcG9ydGVkIFJ1YnkgVmVyc2lvbnMK\nVGhpcyBsaWJyYXJ5IGFpbXMgdG8gc3VwcG9ydCBhbmQgaXMgW3Rlc3RlZCBh\nZ2FpbnN0XVt0cmF2aXNdIHRoZSBmb2xsb3dpbmcgUnVieQppbXBsZW1lbnRh\ndGlvbnM6CgoqIFJ1YnkgMS44LjcKKiBSdWJ5IDEuOS4yCiogUnVieSAxLjku\nMwoqIFtKUnVieV1bXQoqIFtSdWJpbml1c11bXQoKW2pydWJ5XTogaHR0cDov\nL3d3dy5qcnVieS5vcmcvCltydWJpbml1c106IGh0dHA6Ly9ydWJpbmkudXMv\nCgpJZiBzb21ldGhpbmcgZG9lc24ndCB3b3JrIG9uIG9uZSBvZiB0aGVzZSBp\nbnRlcnByZXRlcnMsIGl0IHNob3VsZCBiZSBjb25zaWRlcmVkCmEgYnVnLgoK\nVGhpcyBsaWJyYXJ5IG1heSBpbmFkdmVydGVudGx5IHdvcmsgKG9yIHNlZW0g\ndG8gd29yaykgb24gb3RoZXIgUnVieQppbXBsZW1lbnRhdGlvbnMsIGhvd2V2\nZXIgc3VwcG9ydCB3aWxsIG9ubHkgYmUgcHJvdmlkZWQgZm9yIHRoZSB2ZXJz\naW9ucyBsaXN0ZWQKYWJvdmUuCgpJZiB5b3Ugd291bGQgbGlrZSB0aGlzIGxp\nYnJhcnkgdG8gc3VwcG9ydCBhbm90aGVyIFJ1YnkgdmVyc2lvbiwgeW91IG1h\neQp2b2x1bnRlZXIgdG8gYmUgYSBtYWludGFpbmVyLiBCZWluZyBhIG1haW50\nYWluZXIgZW50YWlscyBtYWtpbmcgc3VyZSBhbGwgdGVzdHMKcnVuIGFuZCBw\nYXNzIG9uIHRoYXQgaW1wbGVtZW50YXRpb24uIFdoZW4gc29tZXRoaW5nIGJy\nZWFrcyBvbiB5b3VyCmltcGxlbWVudGF0aW9uLCB5b3Ugd2lsbCBiZSBwZXJz\nb25hbGx5IHJlc3BvbnNpYmxlIGZvciBwcm92aWRpbmcgcGF0Y2hlcyBpbiBh\nCnRpbWVseSBmYXNoaW9uLiBJZiBjcml0aWNhbCBpc3N1ZXMgZm9yIGEgcGFy\ndGljdWxhciBpbXBsZW1lbnRhdGlvbiBleGlzdCBhdCB0aGUKdGltZSBvZiBh\nIG1ham9yIHJlbGVhc2UsIHN1cHBvcnQgZm9yIHRoYXQgUnVieSB2ZXJzaW9u\nIG1heSBiZSBkcm9wcGVkLgoKIyMgSW5zcGlyYXRpb24KT2N0b2tpdCB3YXMg\naW5zcGlyZWQgYnkgW09jdG9waV1bXSBhbmQgYWltcyB0byBiZSBhIGxpZ2h0\nd2VpZ2h0LApsZXNzLUFjdGl2ZVJlc291cmNleSBhbHRlcm5hdGl2ZS4KCltv\nY3RvcGldOiBodHRwczovL2dpdGh1Yi5jb20vZmNvdXJ5L29jdG9waQoKIyMg\nQ29weXJpZ2h0CkNvcHlyaWdodCAoYykgMjAxMSBXeW5uIE5ldGhlcmxhbmQs\nIEFkYW0gU3RhY292aWFrLCBFcmlrIE1pY2hhZWxzLU9iZXIuIFNlZQpbTElD\nRU5TRV1bXSBmb3IgZGV0YWlscy4KCltsaWNlbnNlXTogaHR0cHM6Ly9naXRo\ndWIuY29tL3Blbmd3eW5uL29jdG9raXQvYmxvYi9tYXN0ZXIvTElDRU5TRQo=\n",
+  "sha": "f8be7910362f4576d2eb3ba721f9c4cd6ee06569",
+  "encoding": "base64",
+  "size": 5354,
+  "name": "README.md",
+  "path": "README.md"
+}

data/spec/octokit/client/contents_spec.rb

@@ -0,0 +1,48 @@
+# -*- encoding: utf-8 -*-
+require 'helper'
+
+describe Octokit::Client::Contents do   
+
+	before do
+    @client = Octokit::Client.new(:login => 'sferik')
+  end
+
+	describe ".readme" do
+
+		it "should return 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"
+		end
+
+	end
+
+	describe ".contents" do
+
+		it "should return 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"
+		end
+
+	end
+
+	describe ".archive_link" do
+
+		it "should return 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/"
+		end
+
+	end
+
+end

data/spec/octokit/client/organizations_spec.rb

@@ -170,6 +170,15 @@ describe Octokit::Client::Organizations do
 
   end
 
+  describe ".remove_organization_member" do
+    it "should remove a member from an organization" do
+      stub_delete("https://api.github.com/orgs/codeforamerica/members/glow-mdsol").
+          to_return(:status => 204)
+      result = @client.remove_organization_member("codeforamerica", "glow-mdsol")
+      result.should be_true
+    end
+
+  end
   describe ".team_repositories" do
 
     it "should return team repositories" do

data/spec/octokit/client/repositories_spec.rb

@@ -315,6 +315,14 @@ describe Octokit::Client::Repositories do
       master.commit.sha.should == "88553a397f7293b3ba176dc27cd1ab6bb93d5d14"
     end
 
+    it "should return a single branch" do
+      branch = JSON.parse(fixture("v3/branches.json").read).last
+      stub_get("/repos/pengwynn/octokit/branches/master").
+        to_return(:body => branch)
+      branch = @client.branch("pengwynn/octokit", "master")
+      branch.commit.sha.should == "88553a397f7293b3ba176dc27cd1ab6bb93d5d14"
+    end
+
   end
 
   describe ".hooks" do

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: octokit
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
   prerelease: 
 platform: ruby
 authors:
 - Wynn Netherland
-- Adam Stacoviak
 - Erik Michaels-Ober
+- Clint Shryock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2012-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70266235724000 !ruby/object:Gem::Requirement
+  requirement: &70323095283380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70266235724000
+  version_requirements: *70323095283380
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70266235739020 !ruby/object:Gem::Requirement
+  requirement: &70323095282500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70266235739020
+  version_requirements: *70323095282500
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70266235738180 !ruby/object:Gem::Requirement
+  requirement: &70323095281440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70266235738180
+  version_requirements: *70323095281440
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70266235737060 !ruby/object:Gem::Requirement
+  requirement: &70323095280200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70266235737060
+  version_requirements: *70323095280200
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70266235735960 !ruby/object:Gem::Requirement
+  requirement: &70323095278780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70266235735960
+  version_requirements: *70323095278780
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70266235735400 !ruby/object:Gem::Requirement
+  requirement: &70323095278340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70266235735400
+  version_requirements: *70323095278340
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &70266235734700 !ruby/object:Gem::Requirement
+  requirement: &70323095276940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70266235734700
+  version_requirements: *70323095276940
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70266235733720 !ruby/object:Gem::Requirement
+  requirement: &70323095272780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70266235733720
+  version_requirements: *70323095272780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70266235732800 !ruby/object:Gem::Requirement
+  requirement: &70323095267460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70266235732800
+  version_requirements: *70323095267460
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70266235748160 !ruby/object:Gem::Requirement
+  requirement: &70323095265340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +122,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70266235748160
+  version_requirements: *70323095265340
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70266235746260 !ruby/object:Gem::Requirement
+  requirement: &70323095263880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +133,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70266235746260
+  version_requirements: *70323095263880
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70266235745600 !ruby/object:Gem::Requirement
+  requirement: &70323095263180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,12 +144,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70266235745600
+  version_requirements: *70323095263180
 description: Simple wrapper for the GitHub v3 API
 email:
 - wynn.netherland@gmail.com
-- adam@stacoviak.com
 - sferik@gmail.com
+- clint@ctshryock.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -170,6 +170,7 @@ files:
 - lib/octokit/client.rb
 - lib/octokit/client/authorizations.rb
 - lib/octokit/client/commits.rb
+- lib/octokit/client/contents.rb
 - lib/octokit/client/downloads.rb
 - lib/octokit/client/events.rb
 - lib/octokit/client/gists.rb
@@ -209,6 +210,7 @@ files:
 - spec/fixtures/v3/commit_comments.json
 - spec/fixtures/v3/commit_create.json
 - spec/fixtures/v3/commits.json
+- spec/fixtures/v3/contents.json
 - spec/fixtures/v3/contributors.json
 - spec/fixtures/v3/download.json
 - spec/fixtures/v3/download_create.json
@@ -247,6 +249,7 @@ files:
 - spec/fixtures/v3/pull_created.json
 - spec/fixtures/v3/pull_request.json
 - spec/fixtures/v3/pull_requests.json
+- spec/fixtures/v3/readme.json
 - spec/fixtures/v3/ref.json
 - spec/fixtures/v3/ref_create.json
 - spec/fixtures/v3/ref_update.json
@@ -269,6 +272,7 @@ files:
 - spec/helper.rb
 - spec/octokit/client/authorizations_spec.rb
 - spec/octokit/client/commits_spec.rb
+- spec/octokit/client/contents_spec.rb
 - spec/octokit/client/downloads_spec.rb
 - spec/octokit/client/events_spec.rb
 - spec/octokit/client/gists_spec.rb
@@ -330,6 +334,7 @@ test_files:
 - spec/fixtures/v3/commit_comments.json
 - spec/fixtures/v3/commit_create.json
 - spec/fixtures/v3/commits.json
+- spec/fixtures/v3/contents.json
 - spec/fixtures/v3/contributors.json
 - spec/fixtures/v3/download.json
 - spec/fixtures/v3/download_create.json
@@ -368,6 +373,7 @@ test_files:
 - spec/fixtures/v3/pull_created.json
 - spec/fixtures/v3/pull_request.json
 - spec/fixtures/v3/pull_requests.json
+- spec/fixtures/v3/readme.json
 - spec/fixtures/v3/ref.json
 - spec/fixtures/v3/ref_create.json
 - spec/fixtures/v3/ref_update.json
@@ -390,6 +396,7 @@ test_files:
 - spec/helper.rb
 - spec/octokit/client/authorizations_spec.rb
 - spec/octokit/client/commits_spec.rb
+- spec/octokit/client/contents_spec.rb
 - spec/octokit/client/downloads_spec.rb
 - spec/octokit/client/events_spec.rb
 - spec/octokit/client/gists_spec.rb