octokit 4.24.0 → 4.25.1

data/lib/octokit/enterprise_admin_client/admin_stats.rb

@@ -1,18 +1,18 @@
+# frozen_string_literal: true
+
 module Octokit
   class EnterpriseAdminClient
-
     # Methods for the Enterprise Admin Stats API
     #
     # @see https://developer.github.com/v3/enterprise-admin/admin_stats/
     module AdminStats
-
       # Get all available stats
       #
       # @return [Sawyer::Resource] All available stats
       # @example Get all available stats
       #   @client.admin_stats
       def admin_stats
-        get_admin_stats "all"
+        get_admin_stats 'all'
       end
 
       # Get only repository-related stats
@@ -21,7 +21,7 @@ module Octokit
       # @example Get only repository-related stats
       #   @client.admin_repository_stats
       def admin_repository_stats
-        get_admin_stats "repos"
+        get_admin_stats 'repos'
       end
 
       # Get only hooks-related stats
@@ -30,7 +30,7 @@ module Octokit
       # @example Get only hooks-related stats
       #   @client.admin_hooks_stats
       def admin_hooks_stats
-        get_admin_stats "hooks"
+        get_admin_stats 'hooks'
       end
 
       # Get only pages-related stats
@@ -39,7 +39,7 @@ module Octokit
       # @example Get only pages-related stats
       #   @client.admin_pages_stats
       def admin_pages_stats
-        get_admin_stats "pages"
+        get_admin_stats 'pages'
       end
 
       # Get only organization-related stats
@@ -48,7 +48,7 @@ module Octokit
       # @example Get only organization-related stats
       #   @client.admin_organization_stats
       def admin_organization_stats
-        get_admin_stats "orgs"
+        get_admin_stats 'orgs'
       end
 
       # Get only user-related stats
@@ -57,7 +57,7 @@ module Octokit
       # @example Get only user-related stats
       #   @client.admin_users_stats
       def admin_users_stats
-        get_admin_stats "users"
+        get_admin_stats 'users'
       end
 
       # Get only pull request-related stats
@@ -66,7 +66,7 @@ module Octokit
       # @example Get only pull request-related stats
       #   @client.admin_pull_requests_stats
       def admin_pull_requests_stats
-        get_admin_stats "pulls"
+        get_admin_stats 'pulls'
       end
 
       # Get only issue-related stats
@@ -75,7 +75,7 @@ module Octokit
       # @example Get only issue-related stats
       #   @client.admin_issues_stats
       def admin_issues_stats
-        get_admin_stats "issues"
+        get_admin_stats 'issues'
       end
 
       # Get only milestone-related stats
@@ -84,7 +84,7 @@ module Octokit
       # @example Get only milestone-related stats
       #   @client.admin_milestones_stats
       def admin_milestones_stats
-        get_admin_stats "milestones"
+        get_admin_stats 'milestones'
       end
 
       # Get only gist-related stats
@@ -93,7 +93,7 @@ module Octokit
       # @example Get only gist-related stats
       #   @client.admin_gits_stats
       def admin_gists_stats
-        get_admin_stats "gists"
+        get_admin_stats 'gists'
       end
 
       # Get only comment-related stats
@@ -102,7 +102,7 @@ module Octokit
       # @example Get only comment-related stats
       #   @client.admin_comments_stats
       def admin_comments_stats
-        get_admin_stats "comments"
+        get_admin_stats 'comments'
       end
 
       private
@@ -115,6 +115,5 @@ module Octokit
         get "enterprise/stats/#{metric}"
       end
     end
-
   end
 end

data/lib/octokit/enterprise_admin_client/license.rb

@@ -1,18 +1,17 @@
+# frozen_string_literal: true
+
 module Octokit
   class EnterpriseAdminClient
-
     # Methods for the Enterprise License API
     #
     # @see https://developer.github.com/v3/enterprise-admin/license/
     module License
-
       # Get information about the Enterprise license
       #
       # @return [Sawyer::Resource] The license information
       def license_info
-        get "enterprise/settings/license"
+        get 'enterprise/settings/license'
       end
-
     end
   end
 end

data/lib/octokit/enterprise_admin_client/orgs.rb

@@ -1,11 +1,11 @@
+# frozen_string_literal: true
+
 module Octokit
   class EnterpriseAdminClient
-
     # Methods for the Enterprise Orgs API
     #
     # @see https://developer.github.com/v3/enterprise-admin/orgs/
     module Orgs
-
       # Create a new organization on the instance.
       #
       # @param login [String] The organization's username.
@@ -19,9 +19,8 @@ module Octokit
       def create_organization(login, admin, options = {})
         options[:login] = login
         options[:admin] = admin
-        post "admin/organizations", options
+        post 'admin/organizations', options
       end
-
     end
   end
 end

data/lib/octokit/enterprise_admin_client/search_indexing.rb

@@ -1,11 +1,11 @@
+# frozen_string_literal: true
+
 module Octokit
   class EnterpriseAdminClient
-
     # Methods for the Enterprise Search Indexing API
     #
     # @see https://developer.github.com/v3/enterprise-admin/search_indexing/
     module SearchIndexing
-
       # Queue a User or Organization to be indexed
       #
       # @param user [String] A GitHub Enterprise user or organization
@@ -13,7 +13,7 @@ module Octokit
       def index_user(user)
         queue_index user
       end
-      alias :index_organization :index_user
+      alias index_organization index_user
 
       # Queue a Repository to be indexed
       #
@@ -46,7 +46,7 @@ module Octokit
       def index_users_repositories(user)
         queue_index "#{user}/*"
       end
-      alias :index_organizations_repositories :index_users_repositories
+      alias index_organizations_repositories index_users_repositories
 
       # Queue an index of all the issues across all of a user's or
       # organization's repositories
@@ -56,7 +56,7 @@ module Octokit
       def index_users_repositories_issues(user)
         queue_index "#{user}/*/issues"
       end
-      alias :index_organizations_repositories_issues :index_users_repositories_issues
+      alias index_organizations_repositories_issues index_users_repositories_issues
 
       # Queue an index of all the code contained in all of a user's or
       # organization's repositories
@@ -66,7 +66,7 @@ module Octokit
       def index_users_repositories_code(user)
         queue_index "#{user}/*/code"
       end
-      alias :index_organizations_repositories_code :index_users_repositories_code
+      alias index_organizations_repositories_code index_users_repositories_code
 
       private
 
@@ -75,9 +75,8 @@ module Octokit
       # @param target [String] Target to index
       # @return [Sawyer:Resource] Result of the queuing containing `:message`
       def queue_index(target)
-        post "staff/indexing_jobs", :target => target
+        post 'staff/indexing_jobs', target: target
       end
     end
-
   end
 end

data/lib/octokit/enterprise_admin_client/users.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module Octokit
   class EnterpriseAdminClient
-
     # Methods for the Enterprise User Administration API
     #
     # @see https://developer.github.com/enterprise/v3/enterprise-admin/users/
@@ -15,7 +16,7 @@ module Octokit
       def create_user(login, email, options = {})
         options[:login] = login
         options[:email] = email
-        post "admin/users", options
+        post 'admin/users', options
       end
 
       # Promote an ordinary user to a site administrator
@@ -111,7 +112,7 @@ module Octokit
       # @example
       #   @admin_client.list_all_keys
       def list_all_keys(options = {})
-        get "admin/keys", options
+        get 'admin/keys', options
       end
 
       # Deletes a public SSH keys.
@@ -121,7 +122,7 @@ module Octokit
       # @example
       #   @admin_client.delete_key(1)
       def delete_key(id, options = {})
-        boolean_from_response :delete,  "admin/keys/#{id}", options
+        boolean_from_response :delete, "admin/keys/#{id}", options
       end
     end
   end

data/lib/octokit/enterprise_admin_client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'octokit/connection'
 require 'octokit/configurable'
 require 'octokit/warnable'
@@ -8,7 +10,6 @@ require 'octokit/enterprise_admin_client/search_indexing'
 require 'octokit/enterprise_admin_client/users'
 
 module Octokit
-
   # EnterpriseAdminClient is only meant to be used by GitHub Enterprise Admins
   # and provides access the Admin only API endpoints including Admin Stats,
   # Management Console, and the Search Indexing API.
@@ -17,7 +18,6 @@ module Octokit
   #   and GitHub Enterprise.
   # @see https://developer.github.com/v3/enterprise/
   class EnterpriseAdminClient
-
     include Octokit::Configurable
     include Octokit::Connection
     include Octokit::Warnable
@@ -29,12 +29,18 @@ module Octokit
 
     def initialize(options = {})
       # Use options passed in, but fall back to module defaults
+      #
+      # rubocop:disable Style/HashEachMethods
+      #
+      # This may look like a `.keys.each` which should be replaced with `#each_key`, but
+      # this doesn't actually work, since `#keys` is just a method we've defined ourselves.
+      # The class doesn't fulfill the whole `Enumerable` contract.
       Octokit::Configurable.keys.each do |key|
+        # rubocop:enable Style/HashEachMethods
         instance_variable_set(:"@#{key}", options[key] || Octokit.instance_variable_get(:"@#{key}"))
       end
 
       login_from_netrc unless user_authenticated? || application_authenticated?
     end
-
   end
 end

data/lib/octokit/enterprise_management_console_client/management_console.rb

@@ -1,11 +1,11 @@
+# frozen_string_literal: true
+
 module Octokit
   class EnterpriseManagementConsoleClient
-
     # Methods for the Enterprise Management Console API
     #
     # @see https://developer.github.com/v3/enterprise-admin/management_console/
     module ManagementConsole
-
       # Uploads a license for the first time
       #
       # @param license [String] The path to your .ghl license file.
@@ -16,19 +16,19 @@ module Octokit
       def upload_license(license, settings = nil)
         conn = faraday_configuration
 
-        params = { }
+        params = {}
         params[:license] = Faraday::UploadIO.new(license, 'binary')
         params[:password] = @management_console_password
-        params[:settings] = "#{settings.to_json}" unless settings.nil?
+        params[:settings] = settings.to_json.to_s unless settings.nil?
 
-        @last_response = conn.post("/setup/api/start", params)
+        @last_response = conn.post('/setup/api/start', params)
       end
 
       # Start a configuration process.
       #
       # @return nil
       def start_configuration
-        post "/setup/api/configure", password_hash
+        post '/setup/api/configure', password_hash
       end
 
       # Upgrade an Enterprise installation
@@ -39,27 +39,27 @@ module Octokit
       def upgrade(license)
         conn = faraday_configuration
 
-        params = { }
+        params = {}
         params[:license] = Faraday::UploadIO.new(license, 'binary')
         params[:api_key] = @management_console_password
-        @last_response = conn.post("/setup/api/upgrade", params)
+        @last_response = conn.post('/setup/api/upgrade', params)
       end
 
       # Get information about the Enterprise installation
       #
       # @return [Sawyer::Resource] The installation information
       def config_status
-        get "/setup/api/configcheck", password_hash
+        get '/setup/api/configcheck', password_hash
       end
-      alias :config_check :config_status
+      alias config_check config_status
 
       # Get information about the Enterprise installation
       #
       # @return [Sawyer::Resource] The settings
       def settings
-        get "/setup/api/settings", password_hash
+        get '/setup/api/settings', password_hash
       end
-      alias :get_settings :settings
+      alias get_settings settings
 
       # Modify the Enterprise settings
       #
@@ -68,17 +68,17 @@ module Octokit
       # @return [nil]
       def edit_settings(settings)
         queries = password_hash
-        queries[:query][:settings] = "#{settings.to_json}"
-        put "/setup/api/settings", queries
+        queries[:query][:settings] = settings.to_json.to_s
+        put '/setup/api/settings', queries
       end
 
       # Get information about the Enterprise maintenance status
       #
       # @return [Sawyer::Resource] The maintenance status
       def maintenance_status
-        get "/setup/api/maintenance", password_hash
+        get '/setup/api/maintenance', password_hash
       end
-      alias :get_maintenance_status :maintenance_status
+      alias get_maintenance_status maintenance_status
 
       # Start (or turn off) the Enterprise maintenance mode
       #
@@ -86,18 +86,18 @@ module Octokit
       # @return [nil]
       def set_maintenance_status(maintenance)
         queries = password_hash
-        queries[:query][:maintenance] = "#{maintenance.to_json}"
-        post "/setup/api/maintenance", queries
+        queries[:query][:maintenance] = maintenance.to_json.to_s
+        post '/setup/api/maintenance', queries
       end
-      alias :edit_maintenance_status :set_maintenance_status
+      alias edit_maintenance_status set_maintenance_status
 
       # Fetch the authorized SSH keys on the Enterprise install
       #
       # @return [Sawyer::Resource] An array of authorized SSH keys
       def authorized_keys
-        get "/setup/api/settings/authorized-keys", password_hash
+        get '/setup/api/settings/authorized-keys', password_hash
       end
-      alias :get_authorized_keys :authorized_keys
+      alias get_authorized_keys authorized_keys
 
       # Add an authorized SSH keys on the Enterprise install
       #
@@ -108,7 +108,7 @@ module Octokit
         case key
         when String
           if File.exist?(key)
-            key = File.open(key, "r")
+            key = File.open(key, 'r')
             content = key.read.strip
             key.close
           else
@@ -120,7 +120,7 @@ module Octokit
         end
 
         queries[:query][:authorized_key] = content
-        post "/setup/api/settings/authorized-keys", queries
+        post '/setup/api/settings/authorized-keys', queries
       end
 
       # Removes an authorized SSH keys from the Enterprise install
@@ -132,7 +132,7 @@ module Octokit
         case key
         when String
           if File.exist?(key)
-            key = File.open(key, "r")
+            key = File.open(key, 'r')
             content = key.read.strip
             key.close
           else
@@ -144,27 +144,27 @@ module Octokit
         end
 
         queries[:query][:authorized_key] = content
-        delete "/setup/api/settings/authorized-keys", queries
+        delete '/setup/api/settings/authorized-keys', queries
       end
-      alias :delete_authorized_key :remove_authorized_key
-
+      alias delete_authorized_key remove_authorized_key
     end
+
     private
 
     def password_hash
-      { :query => { :api_key => @management_console_password } }
+      { query: { api_key: @management_console_password } }
     end
 
     # We fall back to raw Faraday for handling the licenses because I'm suspicious
     # that Sawyer isn't handling binary POSTs correctly: https://github.com/lostisland/sawyer/blob/03fca4c020f465ec42856d0486ec3991859b0aed/lib/sawyer/agent.rb#L85
     def faraday_configuration
-      @faraday_configuration ||= Faraday.new(:url => @management_console_endpoint) do |http|
+      @faraday_configuration ||= Faraday.new(url: @management_console_endpoint) do |http|
         http.headers[:user_agent] = user_agent
         http.request :multipart
         http.request :url_encoded
 
         # Disabling SSL is essential for certain self-hosted Enterprise instances
-        if self.connection_options[:ssl] && !self.connection_options[:ssl][:verify]
+        if connection_options[:ssl] && !connection_options[:ssl][:verify]
           http.ssl[:verify] = false
         end
 

data/lib/octokit/enterprise_management_console_client.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require 'octokit/configurable'
 require 'octokit/connection'
 require 'octokit/warnable'
 require 'octokit/enterprise_management_console_client/management_console'
 
 module Octokit
-
   # EnterpriseManagementConsoleClient is only meant to be used by GitHub Enterprise Admins
   # and provides access to the management console API endpoints.
   #
@@ -12,7 +13,6 @@ module Octokit
   #   and GitHub Enterprise.
   # @see https://developer.github.com/v3/enterprise-admin/management_console/
   class EnterpriseManagementConsoleClient
-
     include Octokit::Configurable
     include Octokit::Connection
     include Octokit::Warnable
@@ -20,7 +20,13 @@ module Octokit
 
     def initialize(options = {})
       # Use options passed in, but fall back to module defaults
+      # rubocop:disable Style/HashEachMethods
+      #
+      # This may look like a `.keys.each` which should be replaced with `#each_key`, but
+      # this doesn't actually work, since `#keys` is just a method we've defined ourselves.
+      # The class doesn't fulfill the whole `Enumerable` contract.
       Octokit::Configurable.keys.each do |key|
+        # rubocop:enable Style/HashEachMethods
         instance_variable_set(:"@#{key}", options[key] || Octokit.instance_variable_get(:"@#{key}"))
       end
     end

data/lib/octokit/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Octokit
   # Custom error class for rescuing from all GitHub errors
   class Error < StandardError
@@ -34,13 +36,13 @@ module Octokit
       end
     end
 
-     def build_error_context
-       if RATE_LIMITED_ERRORS.include?(self.class)
-         @context = Octokit::RateLimit.from_response(@response)
-       end
-     end
+    def build_error_context
+      if RATE_LIMITED_ERRORS.include?(self.class)
+        @context = Octokit::RateLimit.from_response(@response)
+      end
+    end
 
-    def initialize(response=nil)
+    def initialize(response = nil)
       @response = response
       super(build_error_message)
       build_error_context
@@ -118,7 +120,7 @@ module Octokit
     # Array of validation errors
     # @return [Array<Hash>] Error info
     def errors
-      if data && data.is_a?(Hash)
+      if data&.is_a?(Hash)
         data[:errors] || []
       else
         []
@@ -152,15 +154,13 @@ module Octokit
       @data ||=
         if (body = @response[:body]) && !body.empty?
           if body.is_a?(String) &&
-            @response[:response_headers] &&
-            @response[:response_headers][:content_type] =~ /json/
+             @response[:response_headers] &&
+             @response[:response_headers][:content_type] =~ /json/
 
             Sawyer::Agent.serializer.decode(body)
           else
             body
           end
-        else
-          nil
         end
     end
 
@@ -183,7 +183,7 @@ module Octokit
       summary = +"\nError summary:\n"
       summary << data[:errors].map do |error|
         if error.is_a? Hash
-          error.map { |k,v| "  #{k}: #{v}" }
+          error.map { |k, v| "  #{k}: #{v}" }
         else
           "  #{error}"
         end
@@ -196,18 +196,20 @@ module Octokit
       return nil if @response.nil?
 
       message = +"#{@response[:method].to_s.upcase} "
-      message << redact_url(@response[:url].to_s.dup) + ": "
+      message << redact_url(@response[:url].to_s.dup) + ': '
       message << "#{@response[:status]} - "
-      message << "#{response_message}" unless response_message.nil?
-      message << "#{response_error}" unless response_error.nil?
-      message << "#{response_error_summary}" unless response_error_summary.nil?
+      message << response_message.to_s unless response_message.nil?
+      message << response_error.to_s unless response_error.nil?
+      message << response_error_summary.to_s unless response_error_summary.nil?
       message << " // See: #{documentation_url}" unless documentation_url.nil?
       message
     end
 
     def redact_url(url_string)
       %w[client_secret access_token].each do |token|
-        url_string.gsub!(/#{token}=\S+/, "#{token}=(redacted)") if url_string.include? token
+        if url_string.include? token
+          url_string.gsub!(/#{token}=\S+/, "#{token}=(redacted)")
+        end
       end
       url_string
     end
@@ -225,10 +227,10 @@ module Octokit
   # Raised when GitHub returns a 401 HTTP status code
   # and headers include "X-GitHub-OTP"
   class OneTimePasswordRequired < ClientError
-    #@private
-    OTP_DELIVERY_PATTERN = /required; (\w+)/i
+    # @private
+    OTP_DELIVERY_PATTERN = /required; (\w+)/i.freeze
 
-    #@private
+    # @private
     def self.required_header(headers)
       OTP_DELIVERY_PATTERN.match headers['X-GitHub-OTP'].to_s
     end
@@ -350,5 +352,5 @@ module Octokit
   # Raised when a repository is created with an invalid format
   class InvalidRepository < ArgumentError; end
 
-  RATE_LIMITED_ERRORS = [Octokit::TooManyRequests, Octokit::AbuseDetected]
+  RATE_LIMITED_ERRORS = [Octokit::TooManyRequests, Octokit::AbuseDetected].freeze
 end

data/lib/octokit/gist.rb

@@ -1,8 +1,8 @@
-module Octokit
+# frozen_string_literal: true
 
+module Octokit
   # Class to parse and create Gist URLs
   class Gist
-
     # !@attribute id
     #   @return [String] Gist ID
     attr_accessor :id
@@ -31,6 +31,5 @@ module Octokit
     def url
       "https://gist.github.com/#{@id}"
     end
-
   end
 end