octokit 7.2.0 → 9.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab72372e0317944ac3a6c8b4e166bad268bea9524ef8bde2f5cacb13ee471d28
-  data.tar.gz: 19be89924891fb2a771d17fb739fad7454bc8cb79c66950d7c64eb426ab2aef5
+  metadata.gz: b64084ad94f7ab597007ce5baa5e9daa39e85c0270c0993cde6bf416a2834a2c
+  data.tar.gz: 429a34488349b5692bc28e6051571e3e4bddfd7f697be93bd0e24c7329d1bd18
 SHA512:
-  metadata.gz: 38724e4929489a803f1aa9e3186633217bd8473585b35a90ee82fd2985abc361b03af97c96e089759e1c1d2388fcb6cc4fba2d496aae0abfcc214265e0a54770
-  data.tar.gz: b2b589fccec5e74cddc322b850ac9bd04a0dd7300476b6b3758059bcba62b7651a10d634683f0e427ea4c049e78ee52542319206571493ce84241a326af5d6d7
+  metadata.gz: c52b64720e7ffa14ab04bf59283194dd8a0b83ba73bf9acc3c0cfbb4ef36ba6e87257f7650969d597135c8c75eb3bc1bf7a3b7a20f2746c5670e92f7cea95a9f
+  data.tar.gz: b0598cc84a8d4571d9e3fc64d1ed63dcef618fba37e2d9e33346ef42a766e366bc2e38fc02b7c9561b0fc7fe28a7ed8984599390deb305f86af8e98b21033b29

data/README.md

@@ -81,7 +81,7 @@ Install via Rubygems
 
 ... or add to your Gemfile
 
-    gem "octokit", "~> 5.0"
+    gem "octokit"
 
 Access the library in Ruby:
 
@@ -213,15 +213,7 @@ user.login
 # => "defunkt"
 ```
 
-You can [create access tokens through your GitHub Account Settings](https://help.github.com/articles/creating-an-access-token-for-command-line-use)
-or with a basic authenticated Octokit client:
-
-```ruby
-client = Octokit::Client.new(:login => 'defunkt', :password => 'c0d3b4ssssss!')
-
-client.create_authorization(:scopes => ["user"], :note => "Name of token")
-# => <your new oauth token>
-```
+You can [create access tokens through your GitHub Account Settings](https://help.github.com/articles/creating-an-access-token-for-command-line-use).
 
 ### Two-Factor Authentication
 
@@ -237,18 +229,6 @@ client = Octokit::Client.new \
 user = client.user("defunkt", :headers => { "X-GitHub-OTP" => "<your 2FA token>" })
 ```
 
-As you can imagine, this gets annoying quickly since two-factor auth tokens are very short lived. So it is recommended to create an oauth token for the user to communicate with the API:
-
-```ruby
-client = Octokit::Client.new \
-  :login    => 'defunkt',
-  :password => 'c0d3b4ssssss!'
-
-client.create_authorization(:scopes => ["user"], :note => "Name of token",
-                            :headers => { "X-GitHub-OTP" => "<your 2FA token>" })
-# => <your new oauth token>
-```
-
 ### Using a .netrc file
 
 Octokit supports reading credentials from a netrc file (defaulting to
@@ -729,6 +709,9 @@ Octokit:
 | `OCTOKIT_TEST_GITHUB_ENTERPRISE_MANAGEMENT_CONSOLE_PASSWORD` | GitHub Enterprise management console password.                                                                                                                                                    |
 | `OCTOKIT_TEST_GITHUB_ENTERPRISE_ENDPOINT`                    | GitHub Enterprise hostname.                                                                                                                                                                       |
 | `OCTOKIT_TEST_GITHUB_ENTERPRISE_MANAGEMENT_CONSOLE_ENDPOINT` | GitHub Enterprise Management Console endpoint.                                                                                                                                                    |
+| `OCTOKIT_TEST_GITHUB_MANAGE_GHES_ENDPOINT`                          | GitHub Enterprise Server GHES Manage Endpoint.                                                                                                                                                    |
+| `OCTOKIT_TEST_GITHUB_MANAGE_GHES_USERNAME`                          | GitHub Enterprise Server GHES Manage Username.                                                                                                                                                    |
+| `OCTOKIT_TEST_GITHUB_MANAGE_GHES_PASSWORD`                          | GitHub Enterprise Server GHES Manage Password.                                                                                                                                                    |
 | `OCTOKIT_TEST_GITHUB_INTEGRATION`                            | [GitHub Integration](https://developer.github.com/early-access/integrations/) owned by your test organization.                                                                                    |
 | `OCTOKIT_TEST_GITHUB_INTEGRATION_INSTALLATION`               | Installation of the GitHub Integration specified above.                                                                                                                                           |
 | `OCTOKIT_TEST_INTEGRATION_PEM_KEY`                           | File path to the private key generated from your integration.                                                                                                                                     |
@@ -758,6 +741,7 @@ implementations:
 * Ruby 3.0
 * Ruby 3.1
 * Ruby 3.2
+* Ruby 3.3
 
 If something doesn't work on one of these Ruby versions, it's a bug.
 

data/lib/octokit/arguments.rb

@@ -8,7 +8,7 @@ module Octokit
 
     def initialize(args)
       @options = args.last.is_a?(::Hash) ? args.pop : {}
-      super(args)
+      super
     end
   end
 end

data/lib/octokit/client/actions_secrets.rb

@@ -15,6 +15,15 @@ module Octokit
         get "#{Repository.path repo}/actions/secrets/public-key"
       end
 
+      # Get public key for secrets encryption
+      #
+      # @param org [String] A GitHub organization
+      # @return [Hash] key_id and key
+      # @see https://developer.github.com/v3/actions/secrets/#get-your-public-key
+      def get_org_actions_public_key(org)
+        get "#{Organization.path org}/actions/secrets/public-key"
+      end
+
       # List secrets
       #
       # @param repo [Integer, String, Hash, Repository] A GitHub repository
@@ -26,6 +35,17 @@ module Octokit
         end
       end
 
+      # List org secrets
+      #
+      # @param org [String] A GitHub organization
+      # @return [Hash] total_count and list of secrets (each item is hash with name, created_at and updated_at)
+      # @see https://developer.github.com/v3/actions/secrets/#list-organization-secrets
+      def list_org_actions_secrets(org)
+        paginate "#{Organization.path org}/actions/secrets" do |data, last_response|
+          data.secrets.concat last_response.data.secrets
+        end
+      end
+
       # Get a secret
       #
       # @param repo [Integer, String, Hash, Repository] A GitHub repository
@@ -36,6 +56,16 @@ module Octokit
         get "#{Repository.path repo}/actions/secrets/#{name}"
       end
 
+      # Get an org secret
+      #
+      # @param org [String] A GitHub organization
+      # @param name [String] Name of secret
+      # @return [Hash] name, created_at and updated_at
+      # @see https://developer.github.com/v3/actions/secrets/#get-a-secret
+      def get_org_actions_secret(org, name)
+        get "#{Organization.path org}/actions/secrets/#{name}"
+      end
+
       # Create or update secrets
       #
       # @param repo [Integer, String, Hash, Repository] A GitHub repository
@@ -46,6 +76,16 @@ module Octokit
         put "#{Repository.path repo}/actions/secrets/#{name}", options
       end
 
+      # Create or update org secrets
+      #
+      # @param org [String] A GitHub organization
+      # @param name [String] Name of secret
+      # @param options [Hash] encrypted_value and key_id
+      # @see https://developer.github.com/v3/actions/secrets/#create-or-update-a-secret
+      def create_or_update_org_actions_secret(org, name, options)
+        put "#{Organization.path org}/actions/secrets/#{name}", options
+      end
+
       # Delete a secret
       #
       # @param repo [Integer, String, Hash, Repository] A GitHub repository
@@ -55,6 +95,15 @@ module Octokit
         boolean_from_response :delete, "#{Repository.path repo}/actions/secrets/#{name}"
       end
 
+      # Delete an org secret
+      #
+      # @param org [String] A GitHub organization
+      # @param name [String] Name of secret
+      # @see https://developer.github.com/v3/actions/secrets/#delete-a-secret
+      def delete_org_actions_secret(org, name)
+        boolean_from_response :delete, "#{Organization.path org}/actions/secrets/#{name}"
+      end
+
       # Get environment public key for secrets encryption
       #
       # @param repo [Integer, String, Hash, Repository] A GitHub repository

data/lib/octokit/client/apps.rb

@@ -231,6 +231,18 @@ module Octokit
         end
       end
 
+      # Returns a delivery for the webhook configured for a GitHub App.
+      #
+      # @param delivery_id [String] The id of a GitHub App Hook Delivery
+      # @param options [Hash] A customizable set of options
+      #
+      # @see https://docs.github.com/en/rest/apps/webhooks#get-a-delivery-for-an-app-webhook
+      #
+      # @return [<Sawyer::Resource>] The webhook delivery
+      def app_hook_delivery(delivery_id, options = {})
+        get "/app/hook/deliveries/#{delivery_id}", options
+      end
+
       # Redeliver a delivery for the webhook configured for a GitHub App.
       #
       # @param delivery_id [Integer] The id of a GitHub App Hook Delivery

data/lib/octokit/client/code_scanning.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'base64'
 require 'tempfile'
 require 'zlib'
 
@@ -10,6 +9,144 @@ module Octokit
     #
     # @see https://docs.github.com/rest/code-scanning
     module CodeScanning
+      # Updates a code scanning default setup configuration
+      #
+      # @param repo [Integer, String, Repository, Hash] A GitHub repository
+      # @param state [String] The desired state of code scanning default setup
+      # @param query_suite [String] CodeQL query suite to be used
+      # @param languages [Array] List of CodeQL languages to be analyzed
+      #
+      # @return [Sawyer::Resource] Action Run information
+      # @see https://docs.github.com/en/rest/code-scanning/code-scanning#update-a-code-scanning-default-setup-configuration
+      def update_code_scanning_default_config(repo, state, query_suite = nil, languages = nil, options = {})
+        options[:state] = state
+        options[:query_suite] = query_suite if query_suite
+        options[:languages] = languages if languages
+
+        patch "#{Repository.path repo}/code-scanning/default-setup", options
+      end
+
+      # Get Code Scanning Default Configuration
+      #
+      # @param repo [Integer, String, Repository, Hash] A GitHub repository
+      #
+      # @return [Sawyer::Resource] CodeQl Default Setup Configuration Information
+      # @see https://docs.github.com/en/rest/code-scanning/code-scanning#get-a-code-scanning-default-setup-configuration
+      def get_code_scanning_default_config(repo, options = {})
+        get "#{Repository.path repo}/code-scanning/default-setup", options
+      end
+
+      # Gets a CodeQL database for a language in a repository
+      #
+      # @param repo [Integer, String, Repository, Hash] A GitHub repository
+      # @param language [String]
+      #
+      # @return [Sawyer::Resource] CodeQl Default Setup Configuration Information
+      # @see https://docs.github.com/en/rest/code-scanning/code-scanning#get-a-codeql-database-for-a-repository
+      def get_codeql_database_for_repo(repo, language, options = {})
+        get "#{Repository.path repo}/code-scanning/codeql/databases/#{language}", options
+      end
+
+      # Lists the CodeQL databases that are available in a repository
+      #
+      # @param repo [Integer, String, Repository, Hash] A GitHub repository
+      #
+      # @return [Array] List of CodeQL Databases
+      # @see https://docs.github.com/en/rest/code-scanning/code-scanning#list-codeql-databases-for-a-repository
+      def list_codeql_database_for_repo(repo, options = {})
+        get "#{Repository.path repo}/code-scanning/codeql/databases", options
+      end
+
+      # Delete a specified code scanning analysis from a repository
+      #
+      # @param repo [Integer, String, Repository, Hash] A GitHub repository
+      # @param analysis_id [Integer] ID of the code scanning analysis
+      #
+      # @return [Sawyer::Resource] Next Code Scanning Analysis Information
+      # @see https://docs.github.com/en/rest/code-scanning/code-scanning#delete-a-code-scanning-analysis-from-a-repository
+      def delete_code_scanning_analysis(repo, analysis_id, options = {})
+        delete "#{Repository.path repo}/code-scanning/analyses/#{analysis_id}", options
+      end
+
+      # Get a code scanning analysis for a repository
+      #
+      # @param repo [Integer, String, Repository, Hash] A GitHub repository
+      # @param analysis_id [Integer] ID of the code scanning analysis
+      #
+      # @return [Sawyer::Resource] Code Scanning Analysis
+      # @see https://docs.github.com/en/rest/code-scanning/code-scanning#get-a-code-scanning-analysis-for-a-repository
+      def get_code_scanning_analysis(repo, analysis_id, options = {})
+        get "#{Repository.path repo}/code-scanning/analyses/#{analysis_id}", options
+      end
+
+      # List code scanning analyses for a repository
+      #
+      # @param repo [Integer, String, Repository, Hash] A GitHub repository
+      #
+      # @return [Array] List of Code Scanning Analyses
+      # @see https://docs.github.com/en/rest/code-scanning/code-scanning#list-code-scanning-analyses-for-a-repository
+      def list_code_scanning_analysis(repo, options = {})
+        paginate "#{Repository.path repo}/code-scanning/analyses", options
+      end
+
+      # List instances of a code scanning alert
+      #
+      # @param repo [Integer, String, Repository, Hash] A GitHub repository
+      # @param alert_number [Integer] The number that identifies an alert
+      #
+      # @return [Array] List of Code Scanning Alerts
+      # @see https://docs.github.com/en/rest/code-scanning/code-scanning#list-instances-of-a-code-scanning-alert
+      def list_instances_of_code_scanning_alert(repo, alert_number, options = {})
+        paginate "#{Repository.path repo}/code-scanning/alerts/#{alert_number}/instances", options
+      end
+
+      # Update a code scanning alert
+      #
+      # @param repo [Integer, String, Repository, Hash] A GitHub repository
+      # @param alert_number [Integer] The number that identifies an alert
+      # @param state [String] The reason for dismissing or closing the alert. Required when the state is dismissed
+      #
+      # @return [Sawyer::Resource] Code Scanning Alert information
+      # @see https://docs.github.com/en/rest/code-scanning/code-scanning#update-a-code-scanning-alert
+      def update_code_scanning_alert(repo, alert_number, state, reason, comment = nil, options = {})
+        options[:state] = state
+        options[:dismissed_reason] = reason
+        options[:dismissed_comment] = comment if comment
+
+        patch "#{Repository.path repo}/code-scanning/alerts/#{alert_number}", options
+      end
+
+      # Gets a single code scanning alert
+      #
+      # @param repo [Integer, String, Repository, Hash] A GitHub repository
+      # @param alert_number [Integer] The number that identifies an alert
+      #
+      # @return [Sawyer::Resource] Code Scanning Alert
+      # @see https://docs.github.com/en/rest/code-scanning/code-scanning#get-a-code-scanning-alert
+      def get_code_scanning_alert(repo, alert_number, options = {})
+        get "#{Repository.path repo}/code-scanning/alerts/#{alert_number}", options
+      end
+
+      # List code scanning alerts for a repository
+      #
+      # @param org [String] A GitHub organization
+      #
+      # @return [Array] Code Scanning Alert information
+      # @see https://docs.github.com/en/rest/code-scanning/code-scanning#list-code-scanning-alerts-for-a-repository
+      def list_code_scanning_alerts_for_repo(repo, options = {})
+        paginate "#{Repository.path repo}/code-scanning/alerts", options
+      end
+
+      # List code scanning alerts for an organization
+      #
+      # @param org [String] A GitHub organization
+      #
+      # @return [Array] Code Scanning Alert information
+      # @see https://docs.github.com/en/rest/code-scanning/code-scanning#list-code-scanning-alerts-for-an-organization
+      def list_code_scanning_alerts_for_org(org, options = {})
+        paginate "orgs/#{org}/code-scanning/alerts", options
+      end
+
       # Uploads SARIF data containing the results of a code scanning analysis
       #
       # @param repo [Integer, String, Repository, Hash] A GitHub repository
@@ -45,7 +182,7 @@ module Octokit
           Zlib::GzipWriter.open(tempfile) do |gz_file|
             gz_file.write File.binread(file)
           end
-          Base64.strict_encode64(tempfile.read)
+          [tempfile.read].pack('m0') # Base64.strict_encode64
         end
       end
     end

data/lib/octokit/client/codespaces_secrets.rb

@@ -15,6 +15,15 @@ module Octokit
         get "#{Repository.path repo}/codespaces/secrets/public-key"
       end
 
+      # Get public key for secrets encryption
+      #
+      # @param org [String] A GitHub organization
+      # @return [Hash] key_id and key
+      # @see https://docs.github.com/en/rest/codespaces/organization-secrets?apiVersion=2022-11-28#get-an-organization-public-key
+      def get_org_codespaces_public_key(org)
+        get "#{Organization.path org}/codespaces/secrets/public-key"
+      end
+
       # List secrets
       #
       # @param repo [Integer, String, Hash, Repository] A GitHub repository
@@ -26,6 +35,17 @@ module Octokit
         end
       end
 
+      # List org secrets
+      #
+      # @param org [String] A GitHub organization
+      # @return [Hash] total_count and list of secrets (each item is hash with name, created_at and updated_at)
+      # @see https://docs.github.com/en/rest/codespaces/organization-secrets?apiVersion=2022-11-28#list-organization-secrets
+      def list_org_codespaces_secrets(org)
+        paginate "#{Organization.path org}/codespaces/secrets" do |data, last_response|
+          data.secrets.concat last_response.data.secrets
+        end
+      end
+
       # Get a secret
       #
       # @param repo [Integer, String, Hash, Repository] A GitHub repository
@@ -36,6 +56,16 @@ module Octokit
         get "#{Repository.path repo}/codespaces/secrets/#{name}"
       end
 
+      # Get an org secret
+      #
+      # @param org [String] A GitHub organization
+      # @param name [String] Name of secret
+      # @return [Hash] name, created_at, updated_at, and visibility
+      # @see https://docs.github.com/en/rest/codespaces/organization-secrets?apiVersion=2022-11-28#get-an-organization-secret
+      def get_org_codespaces_secret(org, name)
+        get "#{Organization.path org}/codespaces/secrets/#{name}"
+      end
+
       # Create or update secrets
       #
       # @param repo [Integer, String, Hash, Repository] A GitHub repository
@@ -46,6 +76,16 @@ module Octokit
         put "#{Repository.path repo}/codespaces/secrets/#{name}", options
       end
 
+      # Create or update org secrets
+      #
+      # @param org [String] A GitHub organization
+      # @param name [String] Name of secret
+      # @param options [Hash] encrypted_value and key_id
+      # @see https://docs.github.com/en/rest/codespaces/organization-secrets?apiVersion=2022-11-28#create-or-update-an-organization-secret
+      def create_or_update_org_codespaces_secret(org, name, options)
+        put "#{Organization.path org}/codespaces/secrets/#{name}", options
+      end
+
       # Delete a secret
       #
       # @param repo [Integer, String, Hash, Repository] A GitHub repository
@@ -54,6 +94,15 @@ module Octokit
       def delete_codespaces_secret(repo, name)
         boolean_from_response :delete, "#{Repository.path repo}/codespaces/secrets/#{name}"
       end
+
+      # Delete an org secret
+      #
+      # @param org [String] A GitHub organization
+      # @param name [String] Name of secret
+      # @see https://docs.github.com/en/rest/codespaces/organization-secrets?apiVersion=2022-11-28#delete-an-organization-secret
+      def delete_org_codespaces_secret(org, name)
+        boolean_from_response :delete, "#{Organization.path org}/codespaces/secrets/#{name}"
+      end
     end
   end
 end

data/lib/octokit/client/contents.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'base64'
-
 module Octokit
   class Client
     # Methods for the Repo Contents API
@@ -80,7 +78,7 @@ module Octokit
         end
         raise ArgumentError, 'content or :file option required' if content.nil?
 
-        options[:content] = Base64.strict_encode64(content)
+        options[:content] = [content].pack('m0') # Base64.strict_encode64
         options[:message] = message
         url = "#{Repository.path repo}/contents/#{path}"
         put url, options

data/lib/octokit/client/dependabot_secrets.rb

@@ -15,6 +15,15 @@ module Octokit
         get "#{Repository.path repo}/dependabot/secrets/public-key"
       end
 
+      # Get public key for secrets encryption
+      #
+      # @param org [String] A GitHub organization
+      # @return [Hash] key_id and key
+      # @see https://docs.github.com/en/rest/dependabot/organization-secrets?apiVersion=2022-11-28#get-an-organization-public-key
+      def get_org_dependabot_public_key(org)
+        get "#{Organization.path org}/dependabot/secrets/public-key"
+      end
+
       # List secrets
       #
       # @param repo [Integer, String, Hash, Repository] A GitHub repository
@@ -26,6 +35,17 @@ module Octokit
         end
       end
 
+      # List org secrets
+      #
+      # @param org [String] A GitHub organization
+      # @return [Hash] total_count and list of secrets (each item is hash with name, created_at and updated_at)
+      # @see https://docs.github.com/en/rest/dependabot/organization-secrets?apiVersion=2022-11-28#list-organization-secrets
+      def list_org_dependabot_secrets(org)
+        paginate "#{Organization.path org}/dependabot/secrets" do |data, last_response|
+          data.secrets.concat last_response.data.secrets
+        end
+      end
+
       # Get a secret
       #
       # @param repo [Integer, String, Hash, Repository] A GitHub repository
@@ -36,6 +56,16 @@ module Octokit
         get "#{Repository.path repo}/dependabot/secrets/#{name}"
       end
 
+      # Get an org secret
+      #
+      # @param org [String] A GitHub organization
+      # @param name [String] Name of secret
+      # @return [Hash] name, created_at, updated_at, and visibility
+      # @see https://docs.github.com/en/rest/dependabot/organization-secrets?apiVersion=2022-11-28#get-an-organization-secret
+      def get_org_dependabot_secret(org, name)
+        get "#{Organization.path org}/dependabot/secrets/#{name}"
+      end
+
       # Create or update secrets
       #
       # @param repo [Integer, String, Hash, Repository] A GitHub repository
@@ -46,6 +76,16 @@ module Octokit
         put "#{Repository.path repo}/dependabot/secrets/#{name}", options
       end
 
+      # Create or update org secrets
+      #
+      # @param org [String] A GitHub organization
+      # @param name [String] Name of secret
+      # @param options [Hash] encrypted_value and key_id
+      # @see https://docs.github.com/en/rest/dependabot/organization-secrets?apiVersion=2022-11-28#create-or-update-an-organization-secret
+      def create_or_update_org_dependabot_secret(org, name, options)
+        put "#{Organization.path org}/dependabot/secrets/#{name}", options
+      end
+
       # Delete a secret
       #
       # @param repo [Integer, String, Hash, Repository] A GitHub repository
@@ -54,6 +94,15 @@ module Octokit
       def delete_dependabot_secret(repo, name)
         boolean_from_response :delete, "#{Repository.path repo}/dependabot/secrets/#{name}"
       end
+
+      # Delete an org secret
+      #
+      # @param org [String] A GitHub organization
+      # @param name [String] Name of secret
+      # @see https://docs.github.com/en/rest/dependabot/organization-secrets?apiVersion=2022-11-28#delete-an-organization-secret
+      def delete_org_dependabot_secret(org, name)
+        boolean_from_response :delete, "#{Organization.path org}/dependabot/secrets/#{name}"
+      end
     end
   end
 end

data/lib/octokit/client/deployments.rb

@@ -22,7 +22,7 @@ module Octokit
       # @return [Array<Sawyer::Resource>] A list of deployments
       # @see https://developer.github.com/v3/repos/deployments/#list-deployments
       def deployments(repo, options = {})
-        get("#{Repository.path repo}/deployments", options)
+        paginate("#{Repository.path repo}/deployments", options)
       end
       alias list_deployments deployments
 
@@ -60,7 +60,7 @@ module Octokit
       # @see https://developer.github.com/v3/repos/deployments/#list-deployment-statuses
       def deployment_statuses(deployment_url, options = {})
         deployment = get(deployment_url, accept: options[:accept])
-        get(deployment.rels[:statuses].href, options)
+        paginate(deployment.rels[:statuses].href, options)
       end
       alias list_deployment_statuses deployment_statuses
 

data/lib/octokit/client/environments.rb

@@ -24,7 +24,10 @@ module Octokit
       # @return [Sawyer::Resource] Total count of environments and list of environments
       # @see https://docs.github.com/en/rest/deployments/environments#list-environments
       def environments(repo, options = {})
-        get("#{Repository.path repo}/environments", options)
+        paginate("#{Repository.path repo}/environments", options) do |data, last_response|
+          data.environments.concat last_response.data.environments
+          data.total_count += last_response.data.total_count
+        end
       end
       alias list_environments environments
 

data/lib/octokit/client/oauth_applications.rb

@@ -65,7 +65,7 @@ module Octokit
       #
       # @example
       #  client = Octokit::Client.new(:client_id => 'abcdefg12345', :client_secret => 'secret')
-      #  client.delete_token('deadbeef1234567890deadbeef987654321')
+      #  client.delete_app_token('deadbeef1234567890deadbeef987654321')
       def delete_app_token(access_token, options = {})
         options[:access_token] = access_token
 

data/lib/octokit/client/pull_requests.rb

@@ -197,21 +197,30 @@ module Octokit
       # @param body [String] Comment content
       # @param commit_id [String] Sha of the commit to comment on.
       # @param path [String] Relative path of the file to comment on.
-      # @param position [Integer] Line index in the diff to comment on.
+      # @param line [Integer] Optional line index in the diff to comment on.
+      #                       For a multi-line comment, the last line of the range
+      #                       and specify 'start_line' in the 'options'.
+      #                       If not specified, the comment will be on the whole file.
       # @return [Sawyer::Resource] Hash representing the new comment
       # @deprecated The position will be deprecated in the next major version. Please refer to the details below.
       # @see https://developer.github.com/v3/pulls/comments/#create-a-comment
       # @example
       #   @client.create_pull_request_comment("octokit/octokit.rb", 163, ":shipit:",
       #     "2d3201e4440903d8b04a5487842053ca4883e5f0", "lib/octokit/request.rb", 47)
-      def create_pull_request_comment(repo, pull_id, body, commit_id, path, position, options = {})
-        octokit_warn 'Deprecated: The position will be deprecated in the next major version.'
-        options.merge!({
-                         body: body,
-                         commit_id: commit_id,
-                         path: path,
-                         position: position
-                       })
+      def create_pull_request_comment(repo, pull_id, body, commit_id, path, line = nil, options = {})
+        comment = {
+          body: body,
+          commit_id: commit_id,
+          path: path
+        }
+
+        if line.nil?
+          comment[:subject_type] = 'file'
+        else
+          comment[:line] = line
+        end
+
+        options.merge! comment
         post "#{Repository.path repo}/pulls/#{pull_id}/comments", options
       end
       alias create_pull_comment create_pull_request_comment