octokit 4.1.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94d991c0ebb91eff8b87688e204c80b3820bcdbc
-  data.tar.gz: e81a6b01eadef14a4a2680dc192e6915a750af7c
+  metadata.gz: 73f0bf2bde2a97e167a1fa41e45d4d5a71fb655c
+  data.tar.gz: 30568c40a8b5f36a3856e68887d350156a52b99b
 SHA512:
-  metadata.gz: a000cbae7cfd114165a405ca9cba6dc2ed847d979ec5b9a427ca5516ccda7705af72494eb82a5ba64c880c30acc9e40ef74b6cce7232d897ef17d39f77dbb5d8
-  data.tar.gz: ad4876a4392214c9a8b2c353bb7ff76f81d028c27c765e6b7c2da5c7404ec3c8801cd59a175d0377f129aab1f5c8cc688be846b33ff12d018fe2fbcf59804503
+  metadata.gz: 2f35e8d8ea32a30434c9906744b15248905eda5cda4b53152d85ee3543673e1e6a96a64651168123506a1de6e247018e699396aac43cc6b65d646687b53bd4e8
+  data.tar.gz: ccbc3c6e9392ca6ecccec7548d0e2653480cf792403916d1d56e083915bb302166e4def32f02c98e47d87786b6e427d18afbbf3d8713abeb297f08fa5a239a8c

data/CONTRIBUTING.md

@@ -18,5 +18,5 @@
 11. [Submit a pull request.][pr]
 
 [fork]: https://help.github.com/articles/fork-a-repo
-[branch]: http://learn.github.com/p/branching.html
+[branch]: https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/
 [pr]: https://help.github.com/articles/using-pull-requests

data/lib/octokit/client/authorizations.rb

@@ -66,7 +66,12 @@ module Octokit
           client_id, client_secret = fetch_client_id_and_secret(options)
           raise ArgumentError.new("Client ID and Secret required for idempotent authorizations") unless client_id && client_secret
 
-          put "authorizations/clients/#{client_id}", options.merge(:client_secret => client_secret)
+          if fingerprint = options.delete(:fingerprint)
+            put "authorizations/clients/#{client_id}/#{fingerprint}", options.merge(:client_secret => client_secret)
+          else
+            put "authorizations/clients/#{client_id}", options.merge(:client_secret => client_secret)
+          end
+
         else
           post 'authorizations', options
         end

data/lib/octokit/client/issues.rb

@@ -15,7 +15,7 @@ module Octokit
       # @option options [String] :assignee User login.
       # @option options [String] :creator User login.
       # @option options [String] :mentioned User login.
-      # @option options [String] :labels List of comma separated Label names. Example: <tt>bug,ui,@high</tt>.
+      # @option options [Array<String>] :labels List of Label names. Example: <tt>['bug', 'ui', '@high']</tt>.
       # @option options [String] :sort (created) Sort: <tt>created</tt>, <tt>updated</tt>, or <tt>comments</tt>.
       # @option options [String] :direction (desc) Direction: <tt>asc</tt> or <tt>desc</tt>.
       # @option options [Integer] :page (1) Page number.
@@ -38,7 +38,7 @@ module Octokit
       # @param options [Sawyer::Resource] A customizable set of options.
       # @option options [String] :filter (assigned) State: <tt>assigned</tt>, <tt>created</tt>, <tt>mentioned</tt>, <tt>subscribed</tt> or <tt>closed</tt>.
       # @option options [String] :state (open) State: <tt>open</tt>, <tt>closed</tt>, or <tt>all</tt>.
-      # @option options [String] :labels List of comma separated Label names. Example: <tt>bug,ui,@high</tt>.
+      # @option options [Array<String>] :labels List of Label names. Example: <tt>['bug', 'ui', '@high']</tt>.
       # @option options [String] :sort (created) Sort: <tt>created</tt>, <tt>updated</tt>, or <tt>comments</tt>.
       # @option options [String] :direction (desc) Direction: <tt>asc</tt> or <tt>desc</tt>.
       # @option options [Integer] :page (1) Page number.
@@ -59,7 +59,7 @@ module Octokit
       # @param options [Sawyer::Resource] A customizable set of options.
       # @option options [String] :filter (assigned) State: <tt>assigned</tt>, <tt>created</tt>, <tt>mentioned</tt>, <tt>subscribed</tt> or <tt>closed</tt>.
       # @option options [String] :state (open) State: <tt>open</tt>, <tt>closed</tt>, or <tt>all</tt>.
-      # @option options [String] :labels List of comma separated Label names. Example: <tt>bug,ui,@high</tt>.
+      # @option options [Array<String>] :labels List of Label names. Example: <tt>['bug', 'ui', '@high']</tt>.
       # @option options [String] :sort (created) Sort: <tt>created</tt>, <tt>updated</tt>, or <tt>comments</tt>.
       # @option options [String] :direction (desc) Direction: <tt>asc</tt> or <tt>desc</tt>.
       # @option options [Integer] :page (1) Page number.
@@ -121,7 +121,7 @@ module Octokit
       # @param options [Hash] A customizable set of options.
       # @option options [String] :assignee User login.
       # @option options [Integer] :milestone Milestone number.
-      # @option options [String] :labels List of comma separated Label names. Example: <tt>bug,ui,@high</tt>.
+      # @option options [Array<String>] :labels List of Label names. Example: <tt>['bug', 'ui', '@high']</tt>.
       # @return [Sawyer::Resource] The updated Issue
       # @see https://developer.github.com/v3/issues/#edit-an-issue
       # @example Close Issue #25 from octokit/octokit.rb
@@ -137,7 +137,7 @@ module Octokit
       # @param options [Hash] A customizable set of options.
       # @option options [String] :assignee User login.
       # @option options [Integer] :milestone Milestone number.
-      # @option options [String] :labels List of comma separated Label names. Example: <tt>bug,ui,@high</tt>.
+      # @option options [Array<String>] :labels List of Label names. Example: <tt>['bug', 'ui', '@high']</tt>.
       # @return [Sawyer::Resource] The updated Issue
       # @see https://developer.github.com/v3/issues/#edit-an-issue
       # @example Reopen Issue #25 from octokit/octokit.rb
@@ -167,7 +167,7 @@ module Octokit
       #   @option options [String] :body Updated body of the issue
       #   @option options [String] :assignee User login.
       #   @option options [Integer] :milestone Milestone number.
-      #   @option options [String] :labels List of comma separated Label names. Example: <tt>bug,ui,@high</tt>.
+      # @option options [Array<String>] :labels List of Label names. Example: <tt>['bug', 'ui', '@high']</tt>.
       #   @option options [String] :state State of the issue. <tt>open</tt> or <tt>closed</tt>
       # @return [Sawyer::Resource] The updated Issue
       # @see https://developer.github.com/v3/issues/#edit-an-issue

data/lib/octokit/client/licenses.rb

@@ -27,6 +27,19 @@ module Octokit
         options = ensure_api_media_type(:licenses, options)
         get "licenses/#{license_name}", options
       end
+
+      # Returns the contents of the repository’s license file, if one is detected.
+      #
+      # @see https://developer.github.com/v3/licenses/#get-a-repositorys-license
+      # @param repo [Integer, String, Repository, Hash] A GitHub repository
+      # @option options [String] :ref name of the Commit/Branch/Tag. Defaults to 'master'.
+      # @return [Sawyer::Resource] The detail of the license file
+      # @example
+      #   Octokit.license_contents 'benbalter/licensee'
+      def repository_license_contents(repo, options = {})
+        options = ensure_api_media_type(:licenses, options)
+        get "#{Repository.path repo}/license", options
+      end
     end
   end
 end

data/lib/octokit/client/organizations.rb

@@ -498,7 +498,7 @@ module Octokit
       # @return [Array<Sawyer::Resource>] Array of team resources.
       # @see https://developer.github.com/v3/orgs/teams/#list-user-teams
       def user_teams(options = {})
-        paginate "/user/teams", options
+        paginate "user/teams", options
       end
 
       # Check if a user has a team membership.

data/lib/octokit/client/repositories.rb

@@ -483,6 +483,44 @@ module Octokit
       end
       alias :get_branch :branch
 
+      # Lock a single branch from a repository
+      #
+      # Requires authenticated client
+      #
+      # @param repo [Integer, String, Hash, Repository] A GitHub repository.
+      # @param branch [String] Branch name
+      # @param required_status_checks [Hash]
+      # @return [Sawyer::Resource] The protected branch
+      # @see https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection
+      # @example
+      #   @client.protect_branch('octokit/octokit.rb', 'master', foo)
+      def protect_branch(repo, branch, required_status_checks = {}, options = {})
+        if !required_status_checks.empty?
+          required_status_checks = { :required_status_checks => required_status_checks }
+        end
+
+        protection = { :protection => { :enabled => true }.merge(required_status_checks) }
+        options    = ensure_api_media_type(:branch_protection, options.merge(protection))
+
+        patch "#{Repository.path repo}/branches/#{branch}", options
+      end
+
+      # Unlock a single branch from a repository
+      #
+      # Requires authenticated client
+      #
+      # @param repo [Integer, String, Hash, Repository] A GitHub repository.
+      # @param branch [String] Branch name
+      # @return [Sawyer::Resource] The unprotected branch
+      # @see https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection
+      # @example
+      #   @client.unprotect_branch('octokit/octokit.rb', 'master')
+      def unprotect_branch(repo, branch, options = {})
+        protection = { :protection => { :enabled => false } }
+        options = ensure_api_media_type(:branch_protection, options.merge(protection))
+        patch "#{Repository.path repo}/branches/#{branch}", options
+      end
+
       # List users available for assigning to issues.
       #
       # Requires authenticated client for private repos.

data/lib/octokit/enterprise_admin_client/users.rb

@@ -52,6 +52,16 @@ module Octokit
         patch "admin/users/#{old_login}", options
       end
 
+      # Deletes a user.
+      #
+      # @param username [String] The username to delete.
+      # @see https://developer.github.com/v3/users/administration/#delete-a-user
+      # @example
+      #   @admin_client.delete_key(1)
+      def delete_user(id, options = {})
+        boolean_from_response :delete,  "admin/users/#{id}", options
+      end
+
       # Suspend a user.
       #
       # @param user [String] Username of the user to suspend.

data/lib/octokit/error.rb

@@ -66,6 +66,8 @@ module Octokit
         Octokit::AbuseDetected
       elsif body =~ /repository access blocked/i
         Octokit::RepositoryUnavailable
+      elsif body =~ /email address must be verified/i
+        Octokit::UnverifiedEmail
       else
         Octokit::Forbidden
       end
@@ -199,6 +201,10 @@ module Octokit
   # and body matches 'repository access blocked'
   class RepositoryUnavailable < Forbidden; end
 
+  # Raised when GitHub returns a 403 HTTP status code
+  # and body matches 'email address must be verified'
+  class UnverifiedEmail < Forbidden; end
+
   # Raised when GitHub returns a 404 HTTP status code
   class NotFound < ClientError; end
 

data/lib/octokit/preview.rb

@@ -4,14 +4,15 @@ module Octokit
   module Preview
 
     PREVIEW_TYPES = {
-      :migrations    => 'application/vnd.github.wyandotte-preview+json'.freeze,
-      :licenses      => 'application/vnd.github.drax-preview+json'.freeze
+      :branch_protection => 'application/vnd.github.loki-preview+json'.freeze,
+      :migrations        => 'application/vnd.github.wyandotte-preview+json'.freeze,
+      :licenses          => 'application/vnd.github.drax-preview+json'.freeze
     }
 
     def ensure_api_media_type(type, options)
       if options[:accept].nil?
         options[:accept] = PREVIEW_TYPES[type]
-        warn_preview(:migrations)
+        warn_preview(type)
       end
       options
     end

data/lib/octokit/version.rb

@@ -5,11 +5,11 @@ module Octokit
 
   # Current minor release.
   # @return [Integer]
-  MINOR = 1
+  MINOR = 2
 
   # Current patch level.
   # @return [Integer]
-  PATCH = 1
+  PATCH = 0
 
   # Full release version.
   # @return [String]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octokit
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.2.0
 platform: ruby
 authors:
 - Wynn Netherland
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby toolkit for working with the GitHub API