octokit 4.6.2 → 6.1.1

data/lib/octokit/middleware/follow_redirects.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'faraday'
 require 'set'
 
@@ -7,11 +9,9 @@ require 'set'
 # https://github.com/lostisland/faraday_middleware/blob/138766e/lib/faraday_middleware/response/follow_redirects.rb
 
 module Octokit
-
   module Middleware
-
     # Public: Exception thrown when the maximum amount of requests is exceeded.
-    class RedirectLimitReached < Faraday::Error::ClientError
+    class RedirectLimitReached < Faraday::ClientError
       attr_reader :response
 
       def initialize(response)
@@ -30,13 +30,13 @@ module Octokit
     # doesn't support parallelism.
     class FollowRedirects < Faraday::Middleware
       # HTTP methods for which 30x redirects can be followed
-      ALLOWED_METHODS = Set.new [:head, :options, :get, :post, :put, :patch, :delete]
+      ALLOWED_METHODS = Set.new %i[head options get post put patch delete]
 
       # HTTP redirect status codes that this middleware implements
       REDIRECT_CODES  = Set.new [301, 302, 303, 307]
 
       # Keys in env hash which will get cleared between requests
-      ENV_TO_CLEAR    = Set.new [:status, :response, :response_headers]
+      ENV_TO_CLEAR    = Set.new %i[status response response_headers]
 
       # Default value for max redirects followed
       FOLLOW_LIMIT = 3
@@ -44,12 +44,12 @@ module Octokit
       # Regex that matches characters that need to be escaped in URLs, sans
       # the "%" character which we assume already represents an escaped
       # sequence.
-      URI_UNSAFE = /[^\-_.!~*'()a-zA-Z\d;\/?:@&=+$,\[\]%]/
+      URI_UNSAFE = %r{[^\-_.!~*'()a-zA-Z\d;/?:@&=+$,\[\]%]}.freeze
 
       # Public: Initialize the middleware.
       #
       # options - An options Hash (default: {}):
-      #           :limit               - A Fixnum redirect limit (default: 3).
+      #           :limit               - A Integer redirect limit (default: 3).
       def initialize(app, options = {})
         super(app)
         @options = options
@@ -64,7 +64,7 @@ module Octokit
       private
 
       def convert_to_get?(response)
-        ![:head, :options].include?(response.env[:method]) &&
+        !%i[head options].include?(response.env[:method]) &&
           @convert_to_get.include?(response.status)
       end
 
@@ -75,6 +75,7 @@ module Octokit
         response.on_complete do |response_env|
           if follow_redirect?(response_env, response)
             raise(RedirectLimitReached, response) if follows.zero?
+
             new_request_env = update_env(response_env, request_body, response)
             response = perform_with_redirection(new_request_env, follows - 1)
           end
@@ -84,9 +85,12 @@ module Octokit
 
       def update_env(env, request_body, response)
         original_url = env[:url]
-        env[:url] += safe_escape(response["location"])
+        env[:url] += safe_escape(response['location'])
         unless same_host?(original_url, env[:url])
-          env[:request_headers].delete("Authorization")
+          # HACK: Faraday’s Authorization middlewares don’t touch the request if the `Authorization` header is set.
+          #       This is a workaround to drop authentication info.
+          #       See https://github.com/octokit/octokit.rb/pull/1359#issuecomment-925609697
+          env[:request_headers]['Authorization'] = 'dummy'
         end
 
         if convert_to_get?(response)
@@ -122,9 +126,9 @@ module Octokit
       # URI:HTTP using the `+` operator. Doesn't escape "%" characters so to not
       # risk double-escaping.
       def safe_escape(uri)
-        uri.to_s.gsub(URI_UNSAFE) { |match|
-          "%" + match.unpack("H2" * match.bytesize).join("%").upcase
-        }
+        uri.to_s.gsub(URI_UNSAFE) do |match|
+          "%#{match.unpack('H2' * match.bytesize).join('%').upcase}"
+        end
       end
     end
   end

data/lib/octokit/organization.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Octokit
   # GitHub organization class to generate API path urls
   class Organization
@@ -5,7 +7,7 @@ module Octokit
     #
     # @param org [String, Integer] GitHub organization login or id
     # @return [String] Organization Api path
-    def self.path org
+    def self.path(org)
       case org
       when String
         "orgs/#{org}"

data/lib/octokit/rate_limit.rb

@@ -1,29 +1,31 @@
-module Octokit
+# frozen_string_literal: true
 
+module Octokit
   # Class for API Rate Limit info
   #
   # @!attribute [w] limit
-  #   @return [Fixnum] Max tries per rate limit period
+  #   @return [Integer] Max tries per rate limit period
   # @!attribute [w] remaining
-  #   @return [Fixnum] Remaining tries per rate limit period
+  #   @return [Integer] Remaining tries per rate limit period
   # @!attribute [w] resets_at
   #   @return [Time] Indicates when rate limit resets
   # @!attribute [w] resets_in
-  #   @return [Fixnum] Number of seconds when rate limit resets
+  #   @return [Integer] Number of seconds when rate limit resets
   #
   # @see https://developer.github.com/v3/#rate-limiting
   class RateLimit < Struct.new(:limit, :remaining, :resets_at, :resets_in)
-
     # Get rate limit info from HTTP response
     #
     # @param response [#headers] HTTP response
     # @return [RateLimit]
     def self.from_response(response)
       info = new
-      if response && !response.headers.nil?
-        info.limit = (response.headers['X-RateLimit-Limit'] || 1).to_i
-        info.remaining = (response.headers['X-RateLimit-Remaining'] || 1).to_i
-        info.resets_at = Time.at((response.headers['X-RateLimit-Reset'] || Time.now).to_i)
+      headers = response.headers if response.respond_to?(:headers) && !response.headers.nil?
+      headers ||= response.response_headers if response.respond_to?(:response_headers) && !response.response_headers.nil?
+      if headers
+        info.limit = (headers['X-RateLimit-Limit'] || 1).to_i
+        info.remaining = (headers['X-RateLimit-Remaining'] || 1).to_i
+        info.resets_at = Time.at((headers['X-RateLimit-Reset'] || Time.now).to_i)
         info.resets_in = [(info.resets_at - Time.now).to_i, 0].max
       end
 

data/lib/octokit/repo_arguments.rb

@@ -1,9 +1,9 @@
-module Octokit
+# frozen_string_literal: true
 
+module Octokit
   # Class to extract options from Ruby arguments for
   # Repository-related methods
   class RepoArguments < Arguments
-
     # !@attribute [r] repo
     #   @return [Repository]
     attr_reader :repo
@@ -14,6 +14,5 @@ module Octokit
 
       arguments
     end
-
   end
 end

data/lib/octokit/repository.rb

@@ -1,19 +1,21 @@
-module Octokit
+# frozen_string_literal: true
 
+module Octokit
   # Class to parse GitHub repository owner and name from
   # URLs and to generate URLs
   class Repository
     attr_accessor :owner, :name, :id
-    NAME_WITH_OWNER_PATTERN = /\A[\w.-]+\/[\w.-]+\z/i
+
+    NAME_WITH_OWNER_PATTERN = %r{\A[\w.-]+/[\w.-]+\z}i.freeze
 
     # Instantiate from a GitHub repository URL
     #
     # @return [Repository]
     def self.from_url(url)
-      new URI.parse(url).path[1..-1].
-        gsub(/^repos\//,'').
-        split('/', 3)[0..1].
-        join('/')
+      new URI.parse(url).path[1..]
+             .gsub(%r{^repos/}, '')
+             .split('/', 3)[0..1]
+             .join('/')
     end
 
     # @raise [Octokit::InvalidRepository] if the repository
@@ -23,19 +25,17 @@ module Octokit
       when Integer
         @id = repo
       when NAME_WITH_OWNER_PATTERN
-        @owner, @name = repo.split("/")
+        @owner, @name = repo.split('/')
       when Repository
         @owner = repo.owner
         @name = repo.name
       when Hash
-        @name = repo[:repo] ||= repo[:name]
-        @owner = repo[:owner] ||= repo[:user] ||= repo[:username]
+        @name = repo[:repo] || repo[:name]
+        @owner = repo[:owner] || repo[:user] || repo[:username]
       else
-        raise_invalid_repository!
-      end
-      if @owner && @name
-        validate_owner_and_name!
+        raise_invalid_repository!(repo)
       end
+      validate_owner_and_name!(repo) if @owner && @name
     end
 
     # Repository owner/name
@@ -43,7 +43,7 @@ module Octokit
     def slug
       "#{@owner}/#{@name}"
     end
-    alias :to_s :slug
+    alias to_s slug
 
     # @return [String] Repository API path
     def path
@@ -54,7 +54,7 @@ module Octokit
     # Get the api path for a repo
     # @param repo [Integer, String, Hash, Repository] A GitHub repository.
     # @return [String] Api path.
-    def self.path repo
+    def self.path(repo)
       new(repo).path
     end
 
@@ -74,20 +74,22 @@ module Octokit
       "#{Octokit.web_endpoint}#{slug}"
     end
 
-    alias :user :owner
-    alias :username :owner
-    alias :repo :name
+    alias user owner
+    alias username owner
+    alias repo name
 
     private
 
-      def validate_owner_and_name!
-        if @owner.include?('/') || @name.include?('/') || !url.match(URI::ABS_URI)
-          raise_invalid_repository!
-        end
+    def validate_owner_and_name!(repo)
+      if @owner.include?('/') || @name.include?('/') || !url.match(URI::ABS_URI)
+        raise_invalid_repository!(repo)
       end
+    end
 
-      def raise_invalid_repository!
-        raise Octokit::InvalidRepository, "Invalid Repository. Use user/repo format."
-      end
+    def raise_invalid_repository!(repo)
+      msg = "#{repo.inspect} is invalid as a repository identifier. " \
+            'Use the user/repo (String) format, or the repository ID (Integer), or a hash containing :repo and :user keys.'
+      raise Octokit::InvalidRepository, msg
+    end
   end
 end

data/lib/octokit/response/base_middleware.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'faraday'
+
+module Octokit
+  module Response
+    # In Faraday 2.x, Faraday::Response::Middleware was removed
+    BaseMiddleware = defined?(Faraday::Response::Middleware) ? Faraday::Response::Middleware : Faraday::Middleware
+  end
+end

data/lib/octokit/response/feed_parser.rb

@@ -1,21 +1,17 @@
-require 'faraday'
+# frozen_string_literal: true
 
-module Octokit
+require 'octokit/response/base_middleware'
 
+module Octokit
   module Response
-
     # Parses RSS and Atom feed responses.
-    class FeedParser < Faraday::Response::Middleware
-
-      private
-
+    class FeedParser < BaseMiddleware
       def on_complete(env)
-        if env[:response_headers]["content-type"] =~ /(\batom|\brss)/
+        if env[:response_headers]['content-type'] =~ /(\batom|\brss)/
           require 'rss'
           env[:body] = RSS::Parser.parse env[:body]
         end
       end
-
     end
   end
 end

data/lib/octokit/response/raise_error.rb

@@ -1,16 +1,14 @@
-require 'faraday'
+# frozen_string_literal: true
+
+require 'octokit/response/base_middleware'
 require 'octokit/error'
 
 module Octokit
   # Faraday response middleware
   module Response
-
     # This class raises an Octokit-flavored exception based
     # HTTP status codes returned by the API
-    class RaiseError < Faraday::Response::Middleware
-
-      private
-
+    class RaiseError < BaseMiddleware
       def on_complete(response)
         if error = Octokit::Error.from_response(response)
           raise error

data/lib/octokit/user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Octokit
   # GitHub user class to generate API path urls
   class User
@@ -5,14 +7,14 @@ module Octokit
     #
     # @param user [String, Integer] GitHub user login or id
     # @return [String] User Api path
-    def self.path user
+    def self.path(user)
       case user
       when String
         "users/#{user}"
       when Integer
         "user/#{user}"
       else
-        "user"
+        'user'
       end
     end
   end

data/lib/octokit/version.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 module Octokit
   # Current major release.
   # @return [Integer]
-  MAJOR = 4
+  MAJOR = 6
 
   # Current minor release.
   # @return [Integer]
-  MINOR = 6
+  MINOR = 1
 
   # Current patch level.
   # @return [Integer]
-  PATCH = 2
+  PATCH = 1
 
   # Full release version.
   # @return [String]

data/lib/octokit/warnable.rb

@@ -1,17 +1,16 @@
-module Octokit
+# frozen_string_literal: true
 
+module Octokit
   # Allows warnings to be suppressed via environment variable.
   module Warnable
+    module_function
 
     # Wrapper around Kernel#warn to print warnings unless
     # OCTOKIT_SILENT is set to true.
     #
     # @return [nil]
     def octokit_warn(*message)
-      unless ENV['OCTOKIT_SILENT']
-        warn message
-      end
+      warn message unless ENV['OCTOKIT_SILENT']
     end
   end
 end
-

data/lib/octokit.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
+require 'octokit/default'
 require 'octokit/client'
 require 'octokit/enterprise_admin_client'
 require 'octokit/enterprise_management_console_client'
-require 'octokit/default'
 
 # Ruby toolkit for the GitHub API
 module Octokit
-
   class << self
     include Octokit::Configurable
 
@@ -14,6 +15,7 @@ module Octokit
     # @return [Octokit::Client] API wrapper
     def client
       return @client if defined?(@client) && @client.same_options?(options)
+
       @client = Octokit::Client.new(options)
     end
 
@@ -21,7 +23,10 @@ module Octokit
     #
     # @return [Octokit::EnterpriseAdminClient] API wrapper
     def enterprise_admin_client
-      return @enterprise_admin_client if defined?(@enterprise_admin_client) && @enterprise_admin_client.same_options?(options)
+      if defined?(@enterprise_admin_client) && @enterprise_admin_client.same_options?(options)
+        return @enterprise_admin_client
+      end
+
       @enterprise_admin_client = Octokit::EnterpriseAdminClient.new(options)
     end
 
@@ -29,16 +34,19 @@ module Octokit
     #
     # @return [Octokit::EnterpriseManagementConsoleClient] API wrapper
     def enterprise_management_console_client
-      return @enterprise_management_console_client if defined?(@enterprise_management_console_client) && @enterprise_management_console_client.same_options?(options)
+      if defined?(@enterprise_management_console_client) && @enterprise_management_console_client.same_options?(options)
+        return @enterprise_management_console_client
+      end
+
       @enterprise_management_console_client = Octokit::EnterpriseManagementConsoleClient.new(options)
     end
 
     private
 
-    def respond_to_missing?(method_name, include_private=false)
+    def respond_to_missing?(method_name, include_private = false)
       client.respond_to?(method_name, include_private) ||
-      enterprise_admin_client.respond_to?(method_name, include_private) ||
-      enterprise_management_console_client.respond_to?(method_name, include_private)
+        enterprise_admin_client.respond_to?(method_name, include_private) ||
+        enterprise_management_console_client.respond_to?(method_name, include_private)
     end
 
     def method_missing(method_name, *args, &block)
@@ -52,7 +60,6 @@ module Octokit
 
       super
     end
-
   end
 end
 

data/octokit.gemspec

@@ -1,22 +1,25 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'octokit/version'
 
 Gem::Specification.new do |spec|
-  spec.add_development_dependency 'bundler', '~> 1.0'
-  spec.add_dependency 'sawyer', '>= 0.5.3', '~> 0.8.0'
-  spec.authors = ["Wynn Netherland", "Erik Michaels-Ober", "Clint Shryock"]
-  spec.description = %q{Simple wrapper for the GitHub API}
+  spec.add_development_dependency 'bundler', '>= 1', '< 3'
+  spec.add_dependency 'faraday', '>= 1', '< 3'
+  spec.add_dependency 'sawyer', '~> 0.9'
+  spec.authors = ['Wynn Netherland', 'Erik Michaels-Ober', 'Clint Shryock']
+  spec.description = 'Simple wrapper for the GitHub API'
   spec.email = ['wynn.netherland@gmail.com', 'sferik@gmail.com', 'clint@ctshryock.com']
-  spec.files = %w(.document CONTRIBUTING.md LICENSE.md README.md Rakefile octokit.gemspec)
-  spec.files += Dir.glob("lib/**/*.rb")
+  spec.files = %w[.document CONTRIBUTING.md LICENSE.md README.md Rakefile octokit.gemspec]
+  spec.files += Dir.glob('lib/**/*.rb')
   spec.homepage = 'https://github.com/octokit/octokit.rb'
   spec.licenses = ['MIT']
   spec.name = 'octokit'
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.0.0'
+  spec.required_ruby_version = '>= 2.7.0'
   spec.required_rubygems_version = '>= 1.3.5'
-  spec.summary = "Ruby toolkit for working with the GitHub API"
+  spec.summary = 'Ruby toolkit for working with the GitHub API'
   spec.version = Octokit::VERSION.dup
+  spec.metadata = { 'rubygems_mfa_required' => 'true' }
 end