octokit 5.0.0 → 5.3.0

data/lib/octokit/client/reactions.rb

@@ -17,7 +17,6 @@ module Octokit
       #
       # @return [Array<Sawyer::Resource>] Array of Hashes representing the reactions.
       def commit_comment_reactions(repo, id, options = {})
-        options = ensure_api_media_type(:reactions, options)
         get "#{Repository.path repo}/comments/#{id}/reactions", options
       end
 
@@ -34,7 +33,7 @@ module Octokit
       #
       # @return [<Sawyer::Resource>] Hash representing the reaction
       def create_commit_comment_reaction(repo, id, reaction, options = {})
-        options = ensure_api_media_type(:reactions, options.merge(content: reaction))
+        options = options.merge(content: reaction)
         post "#{Repository.path repo}/comments/#{id}/reactions", options
       end
 
@@ -49,7 +48,6 @@ module Octokit
       #
       # @return [Array<Sawyer::Resource>] Array of Hashes representing the reactions.
       def issue_reactions(repo, number, options = {})
-        options = ensure_api_media_type(:reactions, options)
         get "#{Repository.path repo}/issues/#{number}/reactions", options
       end
 
@@ -67,7 +65,7 @@ module Octokit
       #
       # @return [<Sawyer::Resource>] Hash representing the reaction.
       def create_issue_reaction(repo, number, reaction, options = {})
-        options = ensure_api_media_type(:reactions, options.merge(content: reaction))
+        options = options.merge(content: reaction)
         post "#{Repository.path repo}/issues/#{number}/reactions", options
       end
 
@@ -83,7 +81,6 @@ module Octokit
       #
       # @return [Array<Sawyer::Resource>] Array of Hashes representing the reactions.
       def issue_comment_reactions(repo, id, options = {})
-        options = ensure_api_media_type(:reactions, options)
         get "#{Repository.path repo}/issues/comments/#{id}/reactions", options
       end
 
@@ -101,7 +98,7 @@ module Octokit
       #
       # @return [<Sawyer::Resource>] Hashes representing the reaction.
       def create_issue_comment_reaction(repo, id, reaction, options = {})
-        options = ensure_api_media_type(:reactions, options.merge(content: reaction))
+        options = options.merge(content: reaction)
         post "#{Repository.path repo}/issues/comments/#{id}/reactions", options
       end
 
@@ -117,7 +114,6 @@ module Octokit
       #
       # @return [Array<Sawyer::Resource>] Array of Hashes representing the reactions.
       def pull_request_review_comment_reactions(repo, id, options = {})
-        options = ensure_api_media_type(:reactions, options)
         get "#{Repository.path repo}/pulls/comments/#{id}/reactions", options
       end
 
@@ -135,7 +131,7 @@ module Octokit
       #
       # @return [<Sawyer::Resource>] Hash representing the reaction.
       def create_pull_request_review_comment_reaction(repo, id, reaction, options = {})
-        options = ensure_api_media_type(:reactions, options.merge(content: reaction))
+        options = options.merge(content: reaction)
         post "#{Repository.path repo}/pulls/comments/#{id}/reactions", options
       end
 
@@ -150,7 +146,6 @@ module Octokit
       #
       # @return [Boolean] Return true if reaction was deleted, false otherwise.
       def delete_reaction(id, options = {})
-        options = ensure_api_media_type(:reactions, options)
         boolean_from_response :delete, "reactions/#{id}", options
       end
     end

data/lib/octokit/client/repositories.rb

@@ -13,9 +13,7 @@ module Octokit
       # @return [Boolean]
       def repository?(repo, options = {})
         !!repository(repo, options)
-      rescue Octokit::InvalidRepository
-        false
-      rescue Octokit::NotFound
+      rescue Octokit::InvalidRepository, Octokit::NotFound
         false
       end
 
@@ -47,9 +45,6 @@ module Octokit
       # @return [Sawyer::Resource] Repository information
       def edit_repository(repo, options = {})
         repo = Repository.new(repo)
-        if options.include? :is_template
-          options = ensure_api_media_type(:template_repositories, options)
-        end
         options[:name] ||= repo.name
         patch "repos/#{repo}", options
       end
@@ -160,9 +155,6 @@ module Octokit
         opts = options.dup
         organization = opts.delete :organization
         opts.merge! name: name
-        if opts.include? :is_template
-          opts = ensure_api_media_type(:template_repositories, opts)
-        end
 
         if organization.nil?
           post 'user/repos', opts
@@ -195,7 +187,6 @@ module Octokit
       # @param options [Array<Integer>] :team_ids ID of the team or teams to add to the repository. Teams can only be added to organization-owned repositories.
       # @return [Sawyer::Resource] Repository info for the transferred repository
       def transfer_repository(repo, new_owner, options = {})
-        options = ensure_api_media_type(:transfer_repository, options)
         post "#{Repository.path repo}/transfer", options.merge({ new_owner: new_owner })
       end
       alias transfer_repo transfer_repository
@@ -211,7 +202,6 @@ module Octokit
       # @return [Sawyer::Resource] Repository info for the new repository
       def create_repository_from_template(repo, name, options = {})
         options.merge! name: name
-        options = ensure_api_media_type(:template_repositories, options)
         post "#{Repository.path repo}/generate", options
       end
       alias create_repo_from_template create_repository_from_template
@@ -431,8 +421,7 @@ module Octokit
       # @example List topics for octokit/octokit.rb
       #   client.topics('octokit/octokit.rb')
       def topics(repo, options = {})
-        opts = ensure_api_media_type(:topics, options)
-        paginate "#{Repository.path repo}/topics", opts
+        paginate "#{Repository.path repo}/topics", options
       end
 
       # Replace all topics for a repository
@@ -448,8 +437,7 @@ module Octokit
       # @example Clear all topics for octokit/octokit.rb
       #   client.replace_all_topics('octokit/octokit.rb', [])
       def replace_all_topics(repo, names, options = {})
-        opts = ensure_api_media_type(:topics, options)
-        put "#{Repository.path repo}/topics", opts.merge(names: names)
+        put "#{Repository.path repo}/topics", options.merge(names: names)
       end
 
       # List contributors to a repo
@@ -601,10 +589,9 @@ module Octokit
       # @example
       #   @client.protect_branch('octokit/octokit.rb', 'master', foo)
       def protect_branch(repo, branch, options = {})
-        opts = ensure_api_media_type(:branch_protection, options)
-        opts[:restrictions] ||= nil
-        opts[:required_status_checks] ||= nil
-        put "#{Repository.path repo}/branches/#{branch}/protection", opts
+        options[:restrictions] ||= nil
+        options[:required_status_checks] ||= nil
+        put "#{Repository.path repo}/branches/#{branch}/protection", options
       end
 
       # Get branch protection summary
@@ -617,12 +604,9 @@ module Octokit
       # @example
       #   @client.branch_protection('octokit/octokit.rb', 'master')
       def branch_protection(repo, branch, options = {})
-        opts = ensure_api_media_type(:branch_protection, options)
-        begin
-          get "#{Repository.path repo}/branches/#{branch}/protection", opts
-        rescue Octokit::BranchNotProtected
-          nil
-        end
+        get "#{Repository.path repo}/branches/#{branch}/protection", options
+      rescue Octokit::BranchNotProtected
+        nil
       end
 
       # Unlock a single branch from a repository
@@ -636,8 +620,7 @@ module Octokit
       # @example
       #   @client.unprotect_branch('octokit/octokit.rb', 'master')
       def unprotect_branch(repo, branch, options = {})
-        opts = ensure_api_media_type(:branch_protection, options)
-        boolean_from_response :delete, "#{Repository.path repo}/branches/#{branch}/protection", opts
+        boolean_from_response :delete, "#{Repository.path repo}/branches/#{branch}/protection", options
       end
 
       # Rename a single branch from a repository
@@ -763,8 +746,7 @@ module Octokit
       # @example
       #   @client.vulnerability_alerts_enabled?("octokit/octokit.rb")
       def vulnerability_alerts_enabled?(repo, options = {})
-        opts = ensure_api_media_type(:vulnerability_alerts, options)
-        boolean_from_response(:get, "#{Repository.path repo}/vulnerability-alerts", opts)
+        boolean_from_response(:get, "#{Repository.path repo}/vulnerability-alerts", options)
       end
 
       # Enable vulnerability alerts for a repository
@@ -777,8 +759,7 @@ module Octokit
       # @example Enable vulnerability alerts for a repository
       #   @client.enable_vulnerability_alerts("octokit/octokit.rb")
       def enable_vulnerability_alerts(repo, options = {})
-        opts = ensure_api_media_type(:vulnerability_alerts, options)
-        boolean_from_response(:put, "#{Repository.path repo}/vulnerability-alerts", opts)
+        boolean_from_response(:put, "#{Repository.path repo}/vulnerability-alerts", options)
       end
 
       # Disable vulnerability alerts for a repository
@@ -791,8 +772,7 @@ module Octokit
       # @example Disable vulnerability alerts for a repository
       #   @client.disable_vulnerability_alerts("octokit/octokit.rb")
       def disable_vulnerability_alerts(repo, options = {})
-        opts = ensure_api_media_type(:vulnerability_alerts, options)
-        boolean_from_response(:delete, "#{Repository.path repo}/vulnerability-alerts", opts)
+        boolean_from_response(:delete, "#{Repository.path repo}/vulnerability-alerts", options)
       end
     end
   end

data/lib/octokit/client/reviews.rb

@@ -161,7 +161,7 @@ module Octokit
         # TODO(5.0): remove deprecated behavior
         if reviewers.is_a?(Array)
           octokit_warn(
-            'Deprecated: Octokit::Client#request_pull_request_review '\
+            'Deprecated: Octokit::Client#request_pull_request_review ' \
             "no longer takes a separate :reviewers argument.\n" \
             'Please update your call to pass :reviewers and :team_reviewers as part of the options hash.'
           )
@@ -194,7 +194,7 @@ module Octokit
         # TODO(5.0): remove deprecated behavior
         if !reviewers.empty? && !options.empty?
           octokit_warn(
-            'Deprecated: Octokit::Client#delete_pull_request_review_request '\
+            'Deprecated: Octokit::Client#delete_pull_request_review_request ' \
             "no longer takes a separate :reviewers argument.\n" \
             'Please update your call to pass :reviewers and :team_reviewers as part of the options hash.'
           )

data/lib/octokit/client/search.rb

@@ -31,7 +31,6 @@ module Octokit
       # @return [Sawyer::Resource] Search results object
       # @see https://developer.github.com/v3/search/#search-commits
       def search_commits(query, options = {})
-        options = ensure_api_media_type(:commit_search, options)
         search 'search/commits', query, options
       end
 
@@ -64,6 +63,20 @@ module Octokit
       end
       alias search_repos search_repositories
 
+      # Search topics
+      #
+      # @param query [String] Search term and qualifiers
+      # @param options [Hash] Sort and pagination options
+      # @option options [String] :sort Sort field
+      # @option options [String] :order Sort order (asc or desc)
+      # @option options [Integer] :page Page of paginated results
+      # @option options [Integer] :per_page Number of items per page
+      # @return [Sawyer::Resource] Search results object
+      # @see https://developer.github.com/v3/search/#search-topics
+      def search_topics(query, options = {})
+        search 'search/topics', query, options
+      end
+
       # Search users
       #
       # @param query [String] Search term and qualifiers

data/lib/octokit/client/source_import.rb

@@ -42,7 +42,7 @@ module Octokit
           octokit_warn 'Octokit#start_source_import vcs parameter is now an option, please update your call before the next major Octokit version update.'
           arguments.options.merge!(vcs: vcs)
         end
-        options = ensure_api_media_type(:source_imports, arguments.options.merge(vcs_url: vcs_url))
+        options = arguments.options.merge(vcs_url: vcs_url)
         put "#{Repository.path arguments.repo}/import", options
       end
 
@@ -55,7 +55,6 @@ module Octokit
       # @example
       #   @client.source_import_progress("octokit/octokit.rb")
       def source_import_progress(repo, options = {})
-        options = ensure_api_media_type(:source_imports, options)
         get "#{Repository.path repo}/import", options
       end
 
@@ -76,7 +75,6 @@ module Octokit
       #    :vcs_password  => "secret"
       #   })
       def update_source_import(repo, options = {})
-        options = ensure_api_media_type(:source_imports, options)
         patch "#{Repository.path repo}/import", options
       end
 
@@ -91,7 +89,6 @@ module Octokit
       # @example
       #   @client.source_import_commit_authors("octokit/octokit.rb")
       def source_import_commit_authors(repo, options = {})
-        options = ensure_api_media_type(:source_imports, options)
         get "#{Repository.path repo}/import/authors", options
       end
 
@@ -111,7 +108,7 @@ module Octokit
       #     :name => "Hubot the Robot"
       #   })
       def map_source_import_commit_author(author_url, values, options = {})
-        options = ensure_api_media_type(:source_imports, options.merge(values))
+        options = options.merge(values)
         patch author_url, options
       end
 
@@ -124,7 +121,6 @@ module Octokit
       # @example
       #   @client.cancel_source_import("octokit/octokit.rb")
       def cancel_source_import(repo, options = {})
-        options = ensure_api_media_type(:source_imports, options)
         boolean_from_response :delete, "#{Repository.path repo}/import", options
       end
 
@@ -139,7 +135,6 @@ module Octokit
       # @example
       #   @client.source_import_large_files("octokit/octokit.rb")
       def source_import_large_files(repo, options = {})
-        options = ensure_api_media_type(:source_imports, options)
         get "#{Repository.path repo}/import/large_files", options
       end
 
@@ -153,7 +148,7 @@ module Octokit
       # @example
       #   @client.opt_in_source_import_lfs("octokit/octokit.rb", "opt_in")
       def set_source_import_lfs_preference(repo, use_lfs, options = {})
-        options = ensure_api_media_type(:source_imports, options.merge(use_lfs: use_lfs))
+        options = options.merge(use_lfs: use_lfs)
         patch "#{Repository.path repo}/import/lfs", options
       end
     end

data/lib/octokit/client/traffic.rb

@@ -14,8 +14,7 @@ module Octokit
       # @example
       #   @client.top_referrers('octokit/octokit.rb')
       def top_referrers(repo, options = {})
-        opts = ensure_api_media_type(:traffic, options)
-        get "#{Repository.path repo}/traffic/popular/referrers", opts
+        get "#{Repository.path repo}/traffic/popular/referrers", options
       end
 
       # Get the top 10 popular contents over the last 14 days
@@ -26,8 +25,7 @@ module Octokit
       # @example
       #   @client.top_paths('octokit/octokit.rb')
       def top_paths(repo, options = {})
-        opts = ensure_api_media_type(:traffic, options)
-        get "#{Repository.path repo}/traffic/popular/paths", opts
+        get "#{Repository.path repo}/traffic/popular/paths", options
       end
 
       # Get the total number of views and breakdown per day or week for the
@@ -43,8 +41,7 @@ module Octokit
       # @example Views per week
       #   @client.views('octokit/octokit.rb', per: 'week')
       def views(repo, options = {})
-        opts = ensure_api_media_type(:traffic, options)
-        get "#{Repository.path repo}/traffic/views", opts
+        get "#{Repository.path repo}/traffic/views", options
       end
 
       # Get the total number of clones and breakdown per day or week for the
@@ -60,8 +57,7 @@ module Octokit
       # @example Clones per week
       #   @client.clones('octokit/octokit.rb', per: 'week')
       def clones(repo, options = {})
-        opts = ensure_api_media_type(:traffic, options)
-        get "#{Repository.path repo}/traffic/clones", opts
+        get "#{Repository.path repo}/traffic/clones", options
       end
     end
   end

data/lib/octokit/client/users.rb

@@ -352,7 +352,6 @@ module Octokit
       #   @client.start_migration(['octocat/hello-world'])
       # @see https://docs.github.com/en/rest/reference/migrations#start-a-user-migration
       def start_user_migration(repositories, options = {})
-        options = ensure_api_media_type(:migrations, options)
         options[:repositories] = repositories
         post 'user/migrations', options
       end
@@ -364,7 +363,6 @@ module Octokit
       # @return [Array<Sawyer::Resource>] Array of migration resources.
       # @see https://docs.github.com/en/rest/reference/migrations#list-user-migrations
       def user_migrations(options = {})
-        options = ensure_api_media_type(:migrations, options)
         paginate 'user/migrations', options
       end
 
@@ -375,7 +373,6 @@ module Octokit
       # @param id [Integer] ID number of the migration.
       # @see https://docs.github.com/en/rest/reference/migrations#get-a-user-migration-status
       def user_migration_status(id, options = {})
-        options = ensure_api_media_type(:migrations, options)
         get "user/migrations/#{id}", options
       end
 
@@ -386,7 +383,6 @@ module Octokit
       # @param id [Integer] ID number of the migration.
       # @see https://docs.github.com/en/rest/reference/migrations#download-a-user-migration-archive
       def user_migration_archive_url(id, options = {})
-        options = ensure_api_media_type(:migrations, options)
         url = "user/migrations/#{id}/archive"
 
         response = client_without_redirects(options).get(url)
@@ -400,7 +396,6 @@ module Octokit
       # @param id [Integer] ID number of the migration.
       # @see https://docs.github.com/en/rest/reference/migrations#delete-a-user-migration-archive
       def delete_user_migration_archive(id, options = {})
-        options = ensure_api_media_type(:migrations, options)
         delete "user/migrations/#{id}/archive", options
       end
 
@@ -411,7 +406,6 @@ module Octokit
       # @param id [Integer] ID number of the migration.
       # @see https://docs.github.com/en/rest/reference/migrations#list-repositories-for-a-user-migration
       def user_migration_repositories(id, options = {})
-        options = ensure_api_media_type(:migrations, options)
         get "user/migrations/#{id}/repositories", options
       end
 
@@ -423,7 +417,6 @@ module Octokit
       # @param repo [String] Name of the repository.
       # @see https://docs.github.com/en/rest/reference/migrations#unlock-a-user-repository
       def unlock_user_repository(id, repo, options = {})
-        options = ensure_api_media_type(:migrations, options)
         delete "user/migrations/#{id}/repos/#{repo}/lock", options
       end
     end

data/lib/octokit/client.rb

@@ -11,9 +11,9 @@ require 'octokit/rate_limit'
 require 'octokit/repository'
 require 'octokit/user'
 require 'octokit/organization'
-require 'octokit/preview'
 require 'octokit/client/actions_secrets'
 require 'octokit/client/actions_workflows'
+require 'octokit/client/actions_workflow_jobs'
 require 'octokit/client/actions_workflow_runs'
 require 'octokit/client/apps'
 require 'octokit/client/authorizations'
@@ -73,7 +73,6 @@ module Octokit
     include Octokit::Authentication
     include Octokit::Configurable
     include Octokit::Connection
-    include Octokit::Preview
     include Octokit::Warnable
     include Octokit::Client::ActionsSecrets
     include Octokit::Client::Authorizations
@@ -93,6 +92,7 @@ module Octokit
     include Octokit::Client::Gitignore
     include Octokit::Client::Hooks
     include Octokit::Client::ActionsWorkflows
+    include Octokit::Client::ActionsWorkflowJobs
     include Octokit::Client::ActionsWorkflowRuns
     include Octokit::Client::Apps
     include Octokit::Client::Issues

data/lib/octokit/configurable.rb

@@ -134,9 +134,7 @@ module Octokit
     end
 
     def login
-      @login ||= begin
-        user.login if token_authenticated?
-      end
+      @login ||= (user.login if token_authenticated?)
     end
 
     def netrc?
@@ -146,7 +144,7 @@ module Octokit
     private
 
     def options
-      Hash[Octokit::Configurable.keys.map { |key| [key, instance_variable_get(:"@#{key}")] }]
+      Octokit::Configurable.keys.map { |key| [key, instance_variable_get(:"@#{key}")] }.to_h
     end
 
     def fetch_client_id_and_secret(overrides = {})

data/lib/octokit/connection.rb

@@ -201,7 +201,7 @@ module Octokit
       end
       query = options.delete(:query)
       opts = { query: options }
-      opts[:query].merge!(query) if query&.is_a?(Hash)
+      opts[:query].merge!(query) if query.is_a?(Hash)
       opts[:headers] = headers unless headers.empty?
 
       opts

data/lib/octokit/default.rb

@@ -49,55 +49,55 @@ module Octokit
       # Configuration options
       # @return [Hash]
       def options
-        Hash[Octokit::Configurable.keys.map { |key| [key, send(key)] }]
+        Octokit::Configurable.keys.map { |key| [key, send(key)] }.to_h
       end
 
       # Default access token from ENV
       # @return [String]
       def access_token
-        ENV['OCTOKIT_ACCESS_TOKEN']
+        ENV.fetch('OCTOKIT_ACCESS_TOKEN', nil)
       end
 
       # Default API endpoint from ENV or {API_ENDPOINT}
       # @return [String]
       def api_endpoint
-        ENV['OCTOKIT_API_ENDPOINT'] || API_ENDPOINT
+        ENV.fetch('OCTOKIT_API_ENDPOINT') { API_ENDPOINT }
       end
 
       # Default pagination preference from ENV
       # @return [String]
       def auto_paginate
-        ENV['OCTOKIT_AUTO_PAGINATE']
+        ENV.fetch('OCTOKIT_AUTO_PAGINATE', nil)
       end
 
       # Default bearer token from ENV
       # @return [String]
       def bearer_token
-        ENV['OCTOKIT_BEARER_TOKEN']
+        ENV.fetch('OCTOKIT_BEARER_TOKEN', nil)
       end
 
       # Default OAuth app key from ENV
       # @return [String]
       def client_id
-        ENV['OCTOKIT_CLIENT_ID']
+        ENV.fetch('OCTOKIT_CLIENT_ID', nil)
       end
 
       # Default OAuth app secret from ENV
       # @return [String]
       def client_secret
-        ENV['OCTOKIT_SECRET']
+        ENV.fetch('OCTOKIT_SECRET', nil)
       end
 
       # Default management console password from ENV
       # @return [String]
       def management_console_password
-        ENV['OCTOKIT_ENTERPRISE_MANAGEMENT_CONSOLE_PASSWORD']
+        ENV.fetch('OCTOKIT_ENTERPRISE_MANAGEMENT_CONSOLE_PASSWORD', nil)
       end
 
       # Default management console endpoint from ENV
       # @return [String]
       def management_console_endpoint
-        ENV['OCTOKIT_ENTERPRISE_MANAGEMENT_CONSOLE_ENDPOINT']
+        ENV.fetch('OCTOKIT_ENTERPRISE_MANAGEMENT_CONSOLE_ENDPOINT', nil)
       end
 
       # Default options for Faraday::Connection
@@ -114,13 +114,13 @@ module Octokit
       # Default media type from ENV or {MEDIA_TYPE}
       # @return [String]
       def default_media_type
-        ENV['OCTOKIT_DEFAULT_MEDIA_TYPE'] || MEDIA_TYPE
+        ENV.fetch('OCTOKIT_DEFAULT_MEDIA_TYPE') { MEDIA_TYPE }
       end
 
       # Default GitHub username for Basic Auth from ENV
       # @return [String]
       def login
-        ENV['OCTOKIT_LOGIN']
+        ENV.fetch('OCTOKIT_LOGIN', nil)
       end
 
       # Default middleware stack for Faraday::Connection
@@ -133,13 +133,13 @@ module Octokit
       # Default GitHub password for Basic Auth from ENV
       # @return [String]
       def password
-        ENV['OCTOKIT_PASSWORD']
+        ENV.fetch('OCTOKIT_PASSWORD', nil)
       end
 
       # Default pagination page size from ENV
       # @return [Integer] Page size
       def per_page
-        page_size = ENV['OCTOKIT_PER_PAGE']
+        page_size = ENV.fetch('OCTOKIT_PER_PAGE', nil)
 
         page_size&.to_i
       end
@@ -147,7 +147,7 @@ module Octokit
       # Default proxy server URI for Faraday connection from ENV
       # @return [String]
       def proxy
-        ENV['OCTOKIT_PROXY']
+        ENV.fetch('OCTOKIT_PROXY', nil)
       end
 
       # Default SSL verify mode from ENV
@@ -162,25 +162,25 @@ module Octokit
       # Default User-Agent header string from ENV or {USER_AGENT}
       # @return [String]
       def user_agent
-        ENV['OCTOKIT_USER_AGENT'] || USER_AGENT
+        ENV.fetch('OCTOKIT_USER_AGENT') { USER_AGENT }
       end
 
       # Default web endpoint from ENV or {WEB_ENDPOINT}
       # @return [String]
       def web_endpoint
-        ENV['OCTOKIT_WEB_ENDPOINT'] || WEB_ENDPOINT
+        ENV.fetch('OCTOKIT_WEB_ENDPOINT') { WEB_ENDPOINT }
       end
 
       # Default behavior for reading .netrc file
       # @return [Boolean]
       def netrc
-        ENV['OCTOKIT_NETRC'] || false
+        ENV.fetch('OCTOKIT_NETRC', false)
       end
 
       # Default path for .netrc file
       # @return [String]
       def netrc_file
-        ENV['OCTOKIT_NETRC_FILE'] || File.join(ENV['HOME'].to_s, '.netrc')
+        ENV.fetch('OCTOKIT_NETRC_FILE') { File.join(Dir.home.to_s, '.netrc') }
       end
     end
   end