octokit 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42f87b8ae5be0908f5ebf3ea440b326dfeb90a67
-  data.tar.gz: c81981cf6ef79e3e12a1af37100ce931b3a5ecbe
+  metadata.gz: 94d991c0ebb91eff8b87688e204c80b3820bcdbc
+  data.tar.gz: e81a6b01eadef14a4a2680dc192e6915a750af7c
 SHA512:
-  metadata.gz: 3b0c8b13dcad559baeaed2e3ffd5eeba73755baaeca30cc0b36514d9050fc3a6f7f6d8638465cb7b1e0bc3c6807c08cba6760eb3ff0bb8453781557ab9d7b42a
-  data.tar.gz: 4d3967580680dddd45f89fd64c327512ce90f64829070c82070e9dae2109308772f1879b8b5ea1c952b10b63313656b3d9a625aa156b7fec7c6c41354b1ab903
+  metadata.gz: a000cbae7cfd114165a405ca9cba6dc2ed847d979ec5b9a427ca5516ccda7705af72494eb82a5ba64c880c30acc9e40ef74b6cce7232d897ef17d39f77dbb5d8
+  data.tar.gz: ad4876a4392214c9a8b2c353bb7ff76f81d028c27c765e6b7c2da5c7404ec3c8801cd59a175d0377f129aab1f5c8cc688be846b33ff12d018fe2fbcf59804503

data/README.md

@@ -639,8 +639,11 @@ Constraint][pvc] with two digits of precision. For example:
 
     spec.add_dependency 'octokit', '~> 3.0'
 
+The changes made between versions can be seen on the [project releases page][releases].
+
 [semver]: http://semver.org/
 [pvc]: http://guides.rubygems.org/patterns/#pessimistic-version-constraint
+[releases]: https://github.com/octokit/octokit.rb/releases
 
 ## License
 

data/lib/octokit/client/authorizations.rb

@@ -113,12 +113,16 @@ module Octokit
       # Check scopes for a token
       #
       # @param token [String] GitHub OAuth token
+      # @param options [Hash] Header params for request
       # @return [Array<String>] OAuth scopes
       # @see https://developer.github.com/v3/oauth/#scopes
-      def scopes(token = @access_token)
+      def scopes(token = @access_token, options = {})
         raise ArgumentError.new("Access token required") if token.nil?
 
-        agent.call(:get, "user", :headers => {"Authorization" => "token #{token}" }).
+        auth = { "Authorization" => "token #{token}" }
+        headers = (options.delete(:headers) || {}).merge(auth)
+
+        agent.call(:get, "user", :headers => headers).
           headers['X-OAuth-Scopes'].
           to_s.
           split(',').

data/lib/octokit/client/repositories.rb

@@ -13,6 +13,8 @@ module Octokit
       # @return [Sawyer::Resource] if a repository exists, false otherwise
       def repository?(repo, options = {})
         !!repository(repo, options)
+      rescue Octokit::InvalidRepository
+        false
       rescue Octokit::NotFound
         false
       end

data/lib/octokit/enterprise_admin_client/users.rb

@@ -106,7 +106,7 @@ module Octokit
 
       # Deletes a public SSH keys.
       #
-      # @param [id] Number The ID of the key to delete.
+      # @param id [Number] The ID of the key to delete.
       # @see https://developer.github.com/v3/users/administration/#delete-a-public-key
       # @example
       #   @admin_client.delete_key(1)

data/lib/octokit/error.rb

@@ -238,4 +238,8 @@ module Octokit
   # Raised when a method requires an application client_id
   # and secret but none is provided
   class ApplicationCredentialsRequired < StandardError; end
+
+  # Raised when a repository is created with an invalid format
+  class InvalidRepository < ArgumentError; end
+
 end

data/lib/octokit/repository.rb

@@ -4,6 +4,7 @@ module Octokit
   # URLs and to generate URLs
   class Repository
     attr_accessor :owner, :name, :id
+    NAME_WITH_OWNER_PATTERN = /\A[\w.-]+\/[\w.-]+\z/i
 
     # Instantiate from a GitHub repository URL
     #
@@ -12,15 +13,14 @@ module Octokit
       Repository.new(URI.parse(url).path[1..-1])
     end
 
+    # @raise [Octokit::InvalidRepository] if the repository
+    #   has an invalid format
     def initialize(repo)
       case repo
       when Integer
         @id = repo
-      when String
-        @owner, @name = repo.split('/')
-        unless @owner && @name
-          raise ArgumentError, "Invalid Repository. Use user/repo format."
-        end
+      when NAME_WITH_OWNER_PATTERN
+        @owner, @name = repo.split("/")
       when Repository
         @owner = repo.owner
         @name = repo.name
@@ -28,7 +28,10 @@ module Octokit
         @name = repo[:repo] ||= repo[:name]
         @owner = repo[:owner] ||= repo[:user] ||= repo[:username]
       else
-        raise ArgumentError, "Invalid Repository. Use user/repo format."
+        raise_invalid_repository!
+      end
+      if @owner && @name
+        validate_owner_and_name!
       end
     end
 
@@ -71,5 +74,17 @@ module Octokit
     alias :user :owner
     alias :username :owner
     alias :repo :name
+
+    private
+
+      def validate_owner_and_name!
+        if @owner.include?('/') || @name.include?('/') || !url.match(/\A#{URI.regexp}\z/)
+          raise_invalid_repository!
+        end
+      end
+
+      def raise_invalid_repository!
+        raise Octokit::InvalidRepository, "Invalid Repository. Use user/repo format."
+      end
   end
 end

data/lib/octokit/version.rb

@@ -9,7 +9,7 @@ module Octokit
 
   # Current patch level.
   # @return [Integer]
-  PATCH = 0
+  PATCH = 1
 
   # Full release version.
   # @return [String]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octokit
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Wynn Netherland
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-22 00:00:00.000000000 Z
+date: 2015-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler