gitlab-dangerfiles 4.9.0 → 4.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98bba3bef6a0636a636a8b1e038baf11ac64f9b2139a7196990a093cd94c11e7
-  data.tar.gz: 6b65192e78b836b3efac843ea670560d2a169b3bd1135989bc968ce0fdc089a3
+  metadata.gz: 833ebf65ece50022cfe565242ddb8af684071fdd9abab0d24f94fdf3331b8c37
+  data.tar.gz: 10782785c698f9a32ff8f215cbdf1e8407ce5c85caf7f60faa69ff234748b635
 SHA512:
-  metadata.gz: 3f46e0a6ac334fe988c303bcb12b7bb58ecd2162fe5c5c3a8547b165e6037e535a4fa9308ec2503c421fdc3a09f8fd66d2702c79375585b99325d399bf65750f
-  data.tar.gz: d024b3cb5fc602e1811bb3692cd559119ae653827c06c9051c8e858f200c23f6a8f059193289d33d3e7e7d8f3ea247dee19fc9a20f96e66a0e8f1416bb29b9bf
+  metadata.gz: bb2ffba4936cdb33385fb88eec7958bc56b87cce7735c8fc59c79afdb73ccb88e0817cf567a63378612602ba54a2236b029a2059d831933ad72b2db4f4c9d17a
+  data.tar.gz: 22bffdd675c0254a09504a00dcb4fbc949f53f53f0b814e1b1accf500c7e571c022a866256ec60e0f666ffb401fd4a44650f3c88139e539e8ce59c434bc0d45d

data/.gitlab/merge_request_templates/Release.md

@@ -2,7 +2,7 @@
 commit from this merge request, and `<NEW_VERSION>` with the upcoming version number. -->
 ## Diff
 
-https://gitlab.com/gitlab-org/ruby/gems/gitlab-dangerfiles/-/compare/v<PREVIOUS_VERSION>...<COMMIT_UPDATING_VERSION>
+https://gitlab.com/gitlab-org/ruby/gems/gitlab-dangerfiles/-/compare/<PREVIOUS_VERSION>...<COMMIT_UPDATING_VERSION>
 
 ## Checklist
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gitlab-dangerfiles (4.9.0)
+    gitlab-dangerfiles (4.9.1)
       danger (>= 9.3.0)
       danger-gitlab (>= 8.0.0)
       rake (~> 13.0)
@@ -117,6 +117,7 @@ GEM
     parallel (1.22.1)
     parser (3.2.1.0)
       ast (~> 2.4.1)
+      racc
     proc_to_ast (0.1.0)
       coderay
       parser
@@ -125,6 +126,7 @@ GEM
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.0.1)
+    racc (1.8.1)
     rack (3.0.4.1)
     rainbow (3.1.1)
     rake (13.0.6)
@@ -220,6 +222,7 @@ DEPENDENCIES
   gitlab-styles (~> 10.0)
   guard-rspec (~> 4.7.3)
   lefthook (~> 1.3)
+  racc (~> 1.8)
   rspec (~> 3.8)
   rspec-parameterized
   rubocop-rails (< 2.21.2)

data/README.md

@@ -336,8 +336,8 @@ For example, to test `gitlab-dangerfiles` changes from the `your-branch-name` br
 
 ```ruby
 group :development, :test, :danger do
-  gem 'gitlab-dangerfiles', '~> 3.4.3', require: false,
-  git: 'https://gitlab.com/gitlab-org/ruby/gems/gitlab-dangerfiles.git',
+  gem 'gitlab-dangerfiles', require: false, feature_category: :tooling,
+  git: 'https://gitlab.com/gitlab-org/ruby/gems/gitlab-dangerfiles.git', # rubocop:disable Cop/GemFetcher -- Testing unreleased changes
   ref: 'your-branch-name'
 end
 ```

data/gitlab-dangerfiles.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "lefthook", "~> 1.3"
   spec.add_development_dependency "rspec-parameterized"
   spec.add_development_dependency "rspec", "~> 3.8"
+  spec.add_development_dependency "racc", "~> 1.8"
   # we do not commit the bundle lockfile, so this temporary workaround needs to be
   # present until 2.21.3 or 2.22.x is released
   # See https://gitlab.com/gitlab-org/ruby/gems/gitlab-styles/-/issues/63

data/lib/danger/plugins/roulette.rb

@@ -45,7 +45,7 @@ module Danger
     # @param categories [Array<Symbol>] An array of categories symbols.
     #
     # @return [Array<Spin>]
-    def spin(project = nil, categories = [:none], ux_fallback_wider_community_reviewer: teammate_pedroms)
+    def spin(project = nil, categories = [:none], ux_fallback_wider_community_reviewer: ux_fallback_reviewer)
       # TODO: Deprecate the project argument. It prevents us from
       # memorizing Spinner and can cause unexpected results if it's
       # passing a different project than the merge request project.
@@ -89,8 +89,9 @@ module Danger
 
     private
 
-    def teammate_pedroms
-      @teammate_pedroms ||= Gitlab::Dangerfiles::Teammate.find_member("pedroms")
+    def ux_fallback_reviewer
+      teammates = %w[pedroms annabeldunstone seggenberger jmiocene clavimoniere]
+      Gitlab::Dangerfiles::Teammate.find_member(teammates.sample)
     end
 
     def spin_for_approval_rule?(rule)

data/lib/gitlab/dangerfiles/capability.rb

@@ -62,15 +62,13 @@ module Gitlab
 
       class ImportIntegrateBE < Capability
         def has_capability?(teammate)
-          kind == :reviewer &&
-            teammate.role.match?(/Backend Engineer.+Manage:Import and Integrate/)
+          kind == :reviewer && teammate.role.match?(/Backend Engineer.+:Import and Integrate/)
         end
       end
 
       class ImportIntegrateFE < Capability
         def has_capability?(teammate)
-          kind == :reviewer &&
-            teammate.role.match?(/Frontend Engineer.+Manage:Import and Integrate/)
+          kind == :reviewer && teammate.role.match?(/Frontend Engineer.+:Import and Integrate/)
         end
       end
 

data/lib/gitlab/dangerfiles/spec_helper.rb

@@ -168,8 +168,8 @@ RSpec.shared_context "with teammates" do
   let(:software_engineer_in_import_integrate_fe) do
     Gitlab::Dangerfiles::Teammate.new(
       "username" => "software-engineer-in-import-and-integrate-fe",
-      "name" => "Software Engineer in Import and Integrate FE",
-      "role" => "Frontend Engineer, Manage:Import and Integrate",
+      "name" => "Frontend Engineer in Import and Integrate",
+      "role" => "AnyRole Frontend Engineer, AnyStage:Import and Integrate",
       "projects" => { "gitlab" => "reviewer frontend" },
       "available" => true,
       "tz_offset_hours" => 2.0
@@ -179,8 +179,8 @@ RSpec.shared_context "with teammates" do
   let(:software_engineer_in_import_integrate_be) do
     Gitlab::Dangerfiles::Teammate.new(
       "username" => "software-engineer-in-import-and-integrate-be",
-      "name" => "Software Engineer in Import and Integrate BE",
-      "role" => "Backend Engineer, Manage:Import and Integrate",
+      "name" => "Backend Engineer in Import and Integrate",
+      "role" => "AnyRole Backend Engineer, AnyStage:Import and Integrate",
       "projects" => { "gitlab" => "reviewer backend" },
       "available" => true,
       "tz_offset_hours" => 2.0
@@ -224,7 +224,7 @@ RSpec.shared_context "with teammates" do
     Gitlab::Dangerfiles::Teammate.new(
       "username" => "import-and-integrate-backend-reviewer",
       "name" => "Import and Integrate BE engineer",
-      "role" => "Backend Engineer, Manage:Import and Integrate",
+      "role" => "AnyRole Backend Engineer, AnyStage:Import and Integrate",
       "projects" => { "gitlab" => "reviewer backend" },
       "available" => backend_reviewer_available,
       "tz_offset_hours" => 2.0
@@ -235,7 +235,7 @@ RSpec.shared_context "with teammates" do
     Gitlab::Dangerfiles::Teammate.new(
       "username" => "import-and-integrate-frontend-reviewer",
       "name" => "Import and Integrate FE engineer",
-      "role" => "Frontend Engineer, Manage:Import and Integrate",
+      "role" => "AnyRole Frontend Engineer, AnyStage:Import and Integrate",
       "projects" => { "gitlab" => "reviewer frontend" },
       "available" => true,
       "tz_offset_hours" => 2.0
@@ -285,7 +285,7 @@ RSpec.shared_context "with teammates" do
   end
 
   let(:teammate_json) { teammates.to_json }
-  let(:teammate_pedroms) { instance_double(Gitlab::Dangerfiles::Teammate, name: "Pedro") }
+  let(:ux_fallback_reviewer) { instance_double(Gitlab::Dangerfiles::Teammate) }
   let(:company_members) { Gitlab::Dangerfiles::Teammate.fetch_company_members }
 
   before do

data/lib/gitlab/dangerfiles/spinner.rb

@@ -18,7 +18,7 @@ module Gitlab
         @team_author = team_author
         @labels = labels
         @categories = categories.reject do |category|
-          import_and_integrate_reject_category?(category)
+          import_and_integrate_reject_category?(project, category, labels)
         end
         @random = random
         @ux_fallback_wider_community_reviewer = ux_fallback_wider_community_reviewer
@@ -98,12 +98,13 @@ module Gitlab
 
       attr_reader :random, :ux_fallback_wider_community_reviewer
 
+      # Reject Import and Integrate categories if the MR author has reviewing abilities for the category.
+      #
       # @param [String] category name
       # @return [Boolean]
-      def import_and_integrate_reject_category?(category)
-        # Reject Import and Integrate categories if the MR author has reviewing abilities for the category.
-        team_author&.import_integrate_be?(project, category, labels) ||
-          team_author&.import_integrate_fe?(project, category, labels)
+      def import_and_integrate_reject_category?(project, category, labels)
+        [:import_integrate_be, :import_integrate_fe].include?(category) && team_author &&
+          (team_author.reviewer?(project, category, labels) || team_author.maintainer?(project, category, labels))
       end
 
       # MR includes QA changes, but also other changes, and author isn't an SET

data/lib/gitlab/dangerfiles/teammate.rb

@@ -141,18 +141,6 @@ module Gitlab
         has_capability?(project, category, :maintainer, labels)
       end
 
-      def import_integrate_be?(project, category, labels)
-        return false unless category == :import_integrate_be
-
-        has_capability?(project, category, :reviewer, labels)
-      end
-
-      def import_integrate_fe?(project, category, labels)
-        return false unless category == :import_integrate_fe
-
-        has_capability?(project, category, :reviewer, labels)
-      end
-
       def markdown_name(author: nil)
         "#{@markdown_name}#{utc_offset_text(author)}"
       end

data/lib/gitlab/dangerfiles/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "4.9.0"
+    VERSION = "4.9.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 4.9.0
+  version: 4.9.1
 platform: ruby
 authors:
 - GitLab
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-28 00:00:00.000000000 Z
+date: 2025-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.8'
+- !ruby/object:Gem::Dependency
+  name: racc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement