danger-dangermattic 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ea5b40de9b9c82ffa11d1f10449caacbdd87051a9f2d1d7765a73869fe923a6
-  data.tar.gz: 82a8e207c33c9cddde899d05094bd6e1a128d6d8ce95e4847f59248a3f0af1c0
+  metadata.gz: 66a39c7ad38136864bbd67059f745b33696fb7ab1800e97ec1c4c68e202e6e7c
+  data.tar.gz: 90963d4ef7ed174e4a3338a3e8ebf10547f01cd12a7db3676765ca227644a719
 SHA512:
-  metadata.gz: 7c059b2ecabb7c0e126811bb3f5f8b0b3555feec5ed14a1df606dfcc61201a7540cf1242622802c0f76b6b4f59836a8038f275fb0491476b397d0967a673f2ea
-  data.tar.gz: 9cf786de34875f9cdd091aa479d285f13a8a78950c86bb480467c3f8aab6499dbbf7b3b7142d8cd6c8237b38c6247f38251f77e0e264ab4fb3c65cc81d557302
+  metadata.gz: 05aa2a90ee456be78bd33ed04314156b1ce1fb0acab0ac82c521682c52a4ea6158d39b5d8ea1cb86b145aeb1064adb236aef0ab939495b52fe26db9ac5651e0b
+  data.tar.gz: 75fd9ac41bac54605e0eb7546d1cd25676fcc5b39674e6ed09250343521059c3033f767054d08729082eab7404e5800166ea1b658db224bbe815e1b7c7d9f80c

data/.buildkite/pipeline.yml

@@ -4,10 +4,9 @@ agents:
 # Nodes with values to reuse in the pipeline.
 common_params:
   - &docker_plugin "docker#v5.7.0"
-  - &docker_ruby_image "public.ecr.aws/docker/library/ruby:3.2.2"
   - &common_plugins
     - *docker_plugin :
-        image: *docker_ruby_image
+        image: $DOCKER_RUBY_IMAGE
 
 steps:
   #################
@@ -63,7 +62,7 @@ steps:
     command: .buildkite/gem-push.sh
     plugins:
       - *docker_plugin :
-          image: *docker_ruby_image
+          image: $DOCKER_RUBY_IMAGE
           propagate-environment: true
           environment:
             - "RUBYGEMS_API_KEY"

data/.buildkite/shared-pipeline-vars

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+RUBY_VERSION="$(cat .ruby-version)"
+export RUBY_VERSION
+
+export DOCKER_RUBY_IMAGE="public.ecr.aws/docker/library/ruby:$RUBY_VERSION"

data/.github/workflows/reusable-run-danger.yml

@@ -30,7 +30,7 @@ jobs:
         with:
           fetch-depth: 100
       - name: 💎 Ruby Setup
-        uses: ruby/setup-ruby@d45b1a4e94b71acab930e56e79c6aa188764e7f9 # v1.316.0
+        uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
         with:
           bundler-cache: true
       - name: ☢️ Danger PR Check

data/.ruby-version

@@ -1 +1 @@
-3.2.2
+3.4.9

data/CHANGELOG.md

@@ -20,6 +20,12 @@ _None_
 
 _None_
 
+## 1.4.1
+
+### Bug Fixes
+
+- `github_utils`: `requested_reviewers?` now detects review requests assigned to a GitHub team when Danger runs with a token that cannot see the organization's teams. [#141]
+
 ## 1.4.0
 
 ### New Features

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danger-dangermattic (1.4.0)
+    danger-dangermattic (1.4.1)
       danger (~> 9.5, >= 9.5.3)
       danger-plugin-api (~> 1.0)
       danger-rubocop (~> 0.13)
@@ -197,7 +197,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.0)
   danger-dangermattic!
   guard (~> 2.18)
   guard-rspec (~> 4.7)
@@ -209,4 +208,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.6.8
+  4.0.18

data/danger-dangermattic.gemspec

@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'danger-rubocop', '~> 0.13'
 
   # General ruby development
-  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 13.1'
 
   # Testing support

data/lib/dangermattic/gem_version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dangermattic
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

data/lib/dangermattic/plugins/common/github_utils.rb

@@ -27,17 +27,19 @@ module Danger
     #
     # @return [Boolean] True if there are active reviewers, otherwise false.
     def active_reviewers?
-      repo_name = github.pr_json['base']['repo']['full_name']
-      pr_number = github.pr_json['number']
-
-      !github.api.pull_request_reviews(repo_name, pr_number).empty?
+      !github.api.pull_request_reviews(pr_repo_name, pr_number).empty?
     end
 
     # Checks if there are requested teams or reviewers who haven't reacted yet.
     #
     # @return [Boolean] True if there are requested teams or reviewers, otherwise false.
     def requested_reviewers?
-      has_requested_reviews = !github.pr_json['requested_teams'].to_a.empty? || !github.pr_json['requested_reviewers'].to_a.empty?
+      # GitHub strips `requested_teams` from the pull request payload — and therefore from `pr_json` —
+      # for tokens that cannot see the organization's teams, such as a bot account that is only an
+      # outside collaborator. The dedicated endpoint reports them regardless.
+      review_requests = github.api.pull_request_review_requests(pr_repo_name, pr_number)
+      has_requested_reviews = !review_requests['users'].to_a.empty? || !review_requests['teams'].to_a.empty?
+
       has_requested_reviews || active_reviewers?
     end
 
@@ -64,5 +66,15 @@ module Danger
 
       has_wip_label || has_wip_title
     end
+
+    private
+
+    def pr_repo_name
+      github.pr_json['base']['repo']['full_name']
+    end
+
+    def pr_number
+      github.pr_json['number']
+    end
   end
 end

data/spec/github_utils_spec.rb

@@ -13,9 +13,7 @@ module Danger
         instance_double(Danger::DangerfileGitHubPlugin, {
                           pr_json: {
                             'base' => { 'repo' => { 'full_name' => 'Automattic/dangermattic' } },
-                            'number' => 42,
-                            'requested_teams' => [],
-                            'requested_reviewers' => []
+                            'number' => 42
                           },
                           api: instance_double(Octokit::Client),
                           branch_for_base: 'main',
@@ -44,8 +42,20 @@ module Danger
       end
 
       describe '#requested_reviewers?' do
-        it 'returns true when there are requested reviewers' do
-          allow(github.pr_json).to receive(:[]).with('requested_teams').and_return(['team1'])
+        before do
+          allow(github.api).to receive_messages(
+            pull_request_review_requests: { 'users' => [], 'teams' => [] },
+            pull_request_reviews: []
+          )
+        end
+
+        it 'returns true when a user has been requested for review' do
+          allow(github.api).to receive(:pull_request_review_requests).and_return({ 'users' => ['user1'], 'teams' => [] })
+          expect(@plugin.requested_reviewers?).to be(true)
+        end
+
+        it 'returns true when only a team has been requested for review' do
+          allow(github.api).to receive(:pull_request_review_requests).and_return({ 'users' => [], 'teams' => ['team1'] })
           expect(@plugin.requested_reviewers?).to be(true)
         end
 
@@ -55,7 +65,6 @@ module Danger
         end
 
         it 'returns false when there are no requested reviewers or active reviewers' do
-          allow(github.api).to receive(:pull_request_reviews).and_return([])
           expect(@plugin.requested_reviewers?).to be(false)
         end
       end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: danger-dangermattic
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Automattic
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -58,20 +57,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +191,7 @@ extra_rdoc_files: []
 files:
 - ".buildkite/gem-push.sh"
 - ".buildkite/pipeline.yml"
+- ".buildkite/shared-pipeline-vars"
 - ".bundle/config"
 - ".github/CODEOWNERS"
 - ".github/dependabot.yml"
@@ -303,7 +289,6 @@ homepage: https://github.com/Automattic/dangermattic
 licenses:
 - MPL-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -318,8 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A shared collection of Danger plugins
 test_files: []