octokit 4.15.0 → 6.0.0

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..-1]
+             .gsub(%r{^repos/}, '')
+             .split('/', 3)[0..1]
+             .join('/')
     end
 
     # @raise [Octokit::InvalidRepository] if the repository
@@ -23,7 +25,7 @@ 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
@@ -33,9 +35,7 @@ module Octokit
       else
         raise_invalid_repository!(repo)
       end
-      if @owner && @name
-        validate_owner_and_name!(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,22 +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!(repo)
-        if @owner.include?('/') || @name.include?('/') || !url.match(URI::ABS_URI)
-          raise_invalid_repository!(repo)
-        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!(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
+    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,11 +1,13 @@
+# frozen_string_literal: true
+
 module Octokit
   # Current major release.
   # @return [Integer]
-  MAJOR = 4
+  MAJOR = 6
 
   # Current minor release.
   # @return [Integer]
-  MINOR = 15
+  MINOR = 0
 
   # Current patch level.
   # @return [Integer]

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,23 +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', '< 3'
-  spec.add_dependency 'sawyer', '>= 0.5.3', '~> 0.8.0'
-  spec.add_dependency 'faraday', '>= 0.9'
-  spec.authors = ["Wynn Netherland", "Erik Michaels-Ober", "Clint Shryock"]
-  spec.description = %q{Simple wrapper for the GitHub API}
+  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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octokit
 version: !ruby/object:Gem::Version
-  version: 4.15.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Wynn Netherland
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2022-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -33,37 +33,37 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: sawyer
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.3
-    - - "~>"
+        version: '1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.3
-    - - "~>"
+        version: '1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: sawyer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 description: Simple wrapper for the GitHub API
@@ -85,9 +85,14 @@ files:
 - lib/octokit/arguments.rb
 - lib/octokit/authentication.rb
 - lib/octokit/client.rb
+- lib/octokit/client/actions_artifacts.rb
+- lib/octokit/client/actions_secrets.rb
+- lib/octokit/client/actions_workflow_jobs.rb
+- lib/octokit/client/actions_workflow_runs.rb
+- lib/octokit/client/actions_workflows.rb
 - lib/octokit/client/apps.rb
-- lib/octokit/client/authorizations.rb
 - lib/octokit/client/checks.rb
+- lib/octokit/client/commit_branches.rb
 - lib/octokit/client/commit_comments.rb
 - lib/octokit/client/commit_pulls.rb
 - lib/octokit/client/commits.rb
@@ -110,6 +115,7 @@ files:
 - lib/octokit/client/meta.rb
 - lib/octokit/client/milestones.rb
 - lib/octokit/client/notifications.rb
+- lib/octokit/client/oauth_applications.rb
 - lib/octokit/client/objects.rb
 - lib/octokit/client/organizations.rb
 - lib/octokit/client/pages.rb
@@ -129,6 +135,7 @@ files:
 - lib/octokit/client/source_import.rb
 - lib/octokit/client/stats.rb
 - lib/octokit/client/statuses.rb
+- lib/octokit/client/tokens.rb
 - lib/octokit/client/traffic.rb
 - lib/octokit/client/users.rb
 - lib/octokit/configurable.rb
@@ -146,10 +153,10 @@ files:
 - lib/octokit/gist.rb
 - lib/octokit/middleware/follow_redirects.rb
 - lib/octokit/organization.rb
-- lib/octokit/preview.rb
 - lib/octokit/rate_limit.rb
 - lib/octokit/repo_arguments.rb
 - lib/octokit/repository.rb
+- lib/octokit/response/base_middleware.rb
 - lib/octokit/response/feed_parser.rb
 - lib/octokit/response/raise_error.rb
 - lib/octokit/user.rb
@@ -159,7 +166,8 @@ files:
 homepage: https://github.com/octokit/octokit.rb
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -168,14 +176,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Ruby toolkit for working with the GitHub API