gitlab-dangerfiles 3.6.6 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe954dbacd967eb64f63f537578e4960bc9047e4669c3e5829eafab2d7a09bcf
-  data.tar.gz: fb0f4784b78d62d8fcf4d7c695a3589e0ca6cfb345043fee4538ae8513a1226d
+  metadata.gz: 2c8b3755415a3a732fc13c70da4176927062a9d5b6452a7d2513d3ef29617c89
+  data.tar.gz: 1822e18dcc9e51d93f0ea1f3df574aaf5c1dd5ec1b0fd552bfea34f8b114971d
 SHA512:
-  metadata.gz: c28b7ea174d422b1963fb450d2a25d470fca59992c3659262a577ecb29c48eb551fa29856c3c48c929ff26bc42fc6cb9e4cac997125fa51273cf9efb8b131cfb
-  data.tar.gz: 7e64f86bb7ed4c3805d6e1d229e6bcba37583b5e33f33fe8bbba230a8e603f08083b049c20de7d0621b78e88c6179bfc97087cee05577cdbe6de18519b5a35f2
+  metadata.gz: d86af6131e0703fcab736fb75f09b62d1e656bec379f76f8bee6223899e99b34a085c86dc94d7c6d99ce88642acbea4d9079050ab50331abbc10d6c47c0fcc76
+  data.tar.gz: dc878dcd339bed44e0cb4059ec965cce1f6e0513099002126779640c3f8986417bbfabdbbec1ffd4137729839d682d8f7bc6f69cf1654ee03b9a75007f561f93

data/.gitlab-ci.yml

@@ -35,7 +35,7 @@ test:rspec:
     - bundle exec rspec
   parallel:
     matrix:
-      - RUBY_VERSION: ['2.7', '3.0']
+      - RUBY_VERSION: ['3.0', '3.1', '3.2']
 
 test:rubocop:
   extends: .default
@@ -44,7 +44,7 @@ test:rubocop:
     - bundle exec rubocop -P -E .
   parallel:
     matrix:
-      - RUBY_VERSION: ['2.7', '3.0']
+      - RUBY_VERSION: ['3.0', '3.1', '3.2']
 
 test:rufo:
   extends: .default
@@ -53,7 +53,7 @@ test:rufo:
     - bundle exec rufo --check .
   parallel:
     matrix:
-      - RUBY_VERSION: ['2.7', '3.0']
+      - RUBY_VERSION: ['3.0', '3.1', '3.2']
 
 include:
   - template: Security/Dependency-Scanning.gitlab-ci.yml

data/.rubocop.yml

@@ -27,6 +27,8 @@ RSpec/FilePath:
 
 Style/HashSyntax:
   EnforcedStyle: ruby19_no_mixed_keys
+  # Introduced in Ruby 3.1. Disable for now.
+  EnforcedShorthandSyntax: never
 
 # To respect rufo formatting
 Style/StringLiterals:
@@ -36,6 +38,10 @@ Style/StringLiterals:
 Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: consistent_comma
 
+# To respect rufo formatting
+Style/TrailingCommaInArguments:
+  Enabled: false
+
 # To respect rufo formatting
 Layout/MultilineOperationIndentation:
   Enabled: false

data/lib/danger/plugins/changelog.rb

@@ -134,7 +134,7 @@ module Danger
     def critical_checks
       check_result = ChangelogCheckResult.empty
 
-      check_result.error(modified_text) if git.modified_files.include?("CHANGELOG.md")
+      check_result.warning(modified_text) if git.modified_files.include?("CHANGELOG.md")
 
       # Help the user to apply the correct labels to skip this danger check in case it's a revert MR
       check_result.warning(IF_REVERT_MR_TEXT) if helper.revert_mr?

data/lib/danger/plugins/roulette.rb

@@ -120,6 +120,10 @@ module Danger
       end
     end
 
+    def warnings
+      @warnings ||= []
+    end
+
     private
 
     def spin_for_approval_rule?(rule)
@@ -258,16 +262,18 @@ module Danger
     #
     # @param [String] url
     #
-    # @return [Hash, Array]
+    # @return [Hash, Array, NilClass]
     def http_get_json(url)
       rsp = Net::HTTP.get_response(URI.parse(url))
 
       if rsp.is_a?(Net::HTTPRedirection)
-        raise "Redirection detected: #{rsp.header["location"]}"
+        warnings << "Redirection detected. Stopping."
+        return nil
       end
 
       unless rsp.is_a?(Net::HTTPOK)
-        raise HTTPError, "Failed to read #{url}: #{rsp.code} #{rsp.message}"
+        warnings << "HTTPError: Failed to read #{url}: #{rsp.code}."
+        return nil
       end
 
       JSON.parse(rsp.body)
@@ -279,10 +285,11 @@ module Danger
     # @return [Array<Gitlab::Dangerfiles::Teammate>]
     def company_members
       @company_members ||= begin
-          data = http_get_json(ROULETTE_DATA_URL)
+          data = http_get_json(ROULETTE_DATA_URL) || []
           data.map { |hash| Gitlab::Dangerfiles::Teammate.new(hash) }
         rescue JSON::ParserError
-          raise "Failed to parse JSON response from #{ROULETTE_DATA_URL}"
+          warnings << "Failed to parse JSON response from #{ROULETTE_DATA_URL}"
+          []
         end
     end
 

data/lib/danger/rules/simple_roulette/Dangerfile

@@ -39,6 +39,11 @@ TABLE_HEADER_WITHOUT_CATEGORIES = <<MARKDOWN
 | -------- | ---------- |
 MARKDOWN
 
+WARNING_MESSAGE = <<MARKDOWN
+⚠ Failed to retrieve information ⚠
+%{warnings}
+MARKDOWN
+
 OPTIONAL_REVIEW_TEMPLATE = '%{role} review is optional'
 NOT_AVAILABLE_TEMPLATE = 'No %{role} available'
 
@@ -69,6 +74,12 @@ def markdown_row_for_spins(category, spins_array, show_category_column:)
   row
 end
 
+def warning_list(roulette)
+  return unless roulette.warnings.any?
+
+  roulette.warnings.map { |warning| "* #{warning}" }.join("\n")
+end
+
 changes = helper.changes_by_category
 
 # Replicating label based categories from:
@@ -101,5 +112,10 @@ if changes.any?
   table_header = show_category_column ? TABLE_HEADER_WITH_CATEGORIES : TABLE_HEADER_WITHOUT_CATEGORIES
 
   markdown(MESSAGE)
+
+  if (warnings = warning_list(roulette))
+    markdown(format(WARNING_MESSAGE, warnings: warnings))
+  end
+
   markdown(TABLE_MARKDOWN + table_header + rows.join("\n")) unless rows.empty?
 end

data/lib/gitlab/dangerfiles/category.rb

@@ -92,11 +92,46 @@ module Gitlab
       class UX < Category
         private
 
+        def has_particular_capability?(teammate)
+          if labels.any?("Community contribution")
+            can_review_wider_community_contribution?(teammate)
+          else
+            super
+          end
+        end
+
         def has_universal_capability?(teammate)
-          teammate.projects.each_value.find do |capabilities|
+          # No universal reviewer for community contribution.
+          # If we do, then picking from corresponding group won't be accurate.
+          # After solving the following issue, then we can revisit this:
+          # https://gitlab.com/gitlab-org/ruby/gems/gitlab-dangerfiles/-/issues/58
+          return false if labels.any?("Community contribution")
+
+          teammate.projects.each_value.any? do |capabilities|
             capabilities.include?(capability)
           end
         end
+
+        def can_review_wider_community_contribution?(teammate)
+          # Pick corresponding group for community contribution
+          # Role can be:
+          # Product Designer, Create:Source Code
+          # Product Designer, Verify:Pipeline Insights, Verify:Runner
+          # Product Designer, Release
+          # Specialty can be:
+          # Source Code
+          # [Growth: Activation, Growth: Expansion]
+          # Runner
+          areas = teammate.role[/Product Designer(?:.*?, (.+))/, 1]&.split(",")
+
+          group_labels = [*teammate.specialty, *areas].map do |field|
+            group = field.strip.sub(/^.+: ?/, "").downcase
+
+            "group::#{group}"
+          end
+
+          (group_labels & labels).any?
+        end
       end
     end
   end

data/lib/gitlab/dangerfiles/teammate.rb

@@ -5,10 +5,10 @@ require_relative "category"
 module Gitlab
   module Dangerfiles
     class Teammate
-      attr_reader :options, :username, :name, :role, :projects, :available, :hungry, :reduced_capacity, :tz_offset_hours,
+      attr_reader :options, :username, :name, :role, :specialty, :projects, :available, :hungry, :reduced_capacity, :tz_offset_hours,
                   :only_maintainer_reviews
 
-      # The options data are produced by https://gitlab.com/gitlab-org/gitlab-roulette/-/blob/master/lib/team_member.rb
+      # The options data are produced by https://gitlab.com/gitlab-org/gitlab-roulette/-/blob/main/lib/team_member.rb
       def initialize(options = {})
         @options = options
         @username = options["username"]
@@ -16,6 +16,7 @@ module Gitlab
         @markdown_name = options["markdown_name"] ||
                          default_markdown_name(*options.values_at("username", "name"))
         @role = options["role"]
+        @specialty = options["specialty"]
         @projects = process_projects(options["projects"])
         @available = options["available"]
         @hungry = options["hungry"]

data/lib/gitlab/dangerfiles/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "3.6.6"
+    VERSION = "3.7.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 3.6.6
+  version: 3.7.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-25 00:00:00.000000000 Z
+date: 2023-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake