gitlab-dangerfiles 3.6.5 → 3.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a126428046a10355043b190fbf80e70dec6c01a6e9d8778770455a8c30d748c
-  data.tar.gz: 65060b4bd492f3887c22fb6a09fba51c5262f4680e45c364a1ec775a1968a844
+  metadata.gz: e8d0bdb87447c7436d0814db68d0e65423a2d693a2d89abdf59331cff1287253
+  data.tar.gz: b79304e093b0be5dc9d0609b957c318c4e672b48a49263624bb9b3922885dfe4
 SHA512:
-  metadata.gz: 4ca9f2ea3ebf80b9fa8f0f7ce19a01309acc2e120c8661fd618f59b0e48bf638098826257050be4af32cc9553c797dd3af1cd7a1784d234f27c240ec407a6ada
-  data.tar.gz: 14ba2e996756f8beab4e046e87a1d6739285cdf55dbdcf357bdc6768f8a1ff7101797e6c5baf7fce90aa28dfbe3f41c28f3b386a4351090003162368271432cc
+  metadata.gz: 3173b6d8ec73814d7b0d3fdcf32270178fc76b38024ab4ba41cf106589f5f7fa4b9f0dfea9cb8fc9213b011c39691a695948caaca58455b80135e6c9af13d071
+  data.tar.gz: f0922b64b753e15aff30716ca1a6ade6afc6b74bbeda983dfa29190a382990e7d21311175b058f3ef26d7071273426a5ea66e8a8843a57f18411e284f07fe38c

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:

data/lib/danger/plugins/changelog.rb

@@ -16,9 +16,9 @@ module Danger
     CHANGELOG_MODIFIED_URL_TEXT = "**CHANGELOG.md was edited.** Please remove the additions and follow the [changelog guidelines](https://docs.gitlab.com/ee/development/changelog.html).\n\n"
     CHANGELOG_MISSING_URL_TEXT = "**[CHANGELOG missing](https://docs.gitlab.com/ee/development/changelog.html)**:\n\n"
     IF_REVERT_MR_TEXT = <<~MARKDOWN
-      If you are in a revert MR, consider using the revert MR template to add labels to skip changelog checks ([docs](https://docs.gitlab.com/ee/development/pipelines#revert-mrs)).
+      In a revert merge request? Use the revert merge request template to add labels [that skip changelog checks](https://docs.gitlab.com/ee/development/pipelines#revert-mrs).
 
-      If this is reverting something in the current milestone, we don't need to add a changelog. In this case, we can skip changelog checks by adding `~"regression:*"` label, and re-run the danger job (there is a link at the bottom of this comment).
+      Reverting something in the current milestone? A changelog isn't required. Skip changelog checks by adding `~"regression:*"` label, then re-run the danger job (there is a link at the bottom of this comment).
     MARKDOWN
 
     OPTIONAL_CHANGELOG_MESSAGE = {
@@ -137,7 +137,7 @@ module Danger
       check_result.error(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)
+      check_result.warning(IF_REVERT_MR_TEXT) if helper.revert_mr?
 
       add_danger_messages(check_result)
     end

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/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "3.6.5"
+    VERSION = "3.6.7"
   end
 end

metadata

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