gitlab-dangerfiles 2.1.2 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea2d871bd7f9bcfe97b5229b988c399738ccae1230be2ef32ceec69f7b4d5233
-  data.tar.gz: b895893d467f02be866c8d5ef2f3377aece5d9c705c5ba234017484a25b957e2
+  metadata.gz: 9f81554a60bebe4dbb5cec0a4499df086b580778f5bd2d82a67613a9af166a78
+  data.tar.gz: 83c066d44caca9a1bf05386269f15d92b781891e90b1f3e709cf190faffbb773
 SHA512:
-  metadata.gz: 496a766fea976ba5fa69dd355825fee1203b65d9f11f2505be7940ae97fed1026e3c7e6846df97c44f899a8a6359f2b5df532ff4790a5a52acda6b5e87621268
-  data.tar.gz: e1401aa5f69f5f793f565ddb3aa2ee6fb9da77188fdbcc77b3795beaecbfffb6a1f8956136253f4e15ca213e5188732b0a46943586936393c6e2ab1223f5ac45
+  metadata.gz: d9369900511e47644c72f843f52f8b212528f1604a50a07427cab956822974ea9b71f5051a4d8313cf962a7430b9ea150c0f3deeca3ed2360542729b1f79d279
+  data.tar.gz: 9d2cc70542f4df753a6d30d194a43c883a1960aefe517f0b1001609ec47cb764c9c90b7a166d633b7a50a4e49a046bc90cdb56b5c3ed0d02c052909458453d65

data/gitlab-dangerfiles.gemspec

@@ -27,7 +27,8 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "danger-gitlab"
+  spec.add_dependency "danger-gitlab", ">= 8.0.0"
+  spec.add_dependency "danger", ">= 8.3.1"
 
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-parameterized"

data/lib/danger/plugins/helper.rb

@@ -416,7 +416,7 @@ module Danger
       return nil unless ci?
       return nil if defined?(@force_changes_from_git)
 
-      @changes_from_api ||= gitlab_helper.mr_changes.to_h["changes"]
+      @changes_from_api ||= gitlab_helper.mr_changes
     rescue
       # Fallback to the Git strategy in any case
       @force_changes_from_git = true

data/lib/danger/plugins/roulette.rb

@@ -34,7 +34,7 @@ module Danger
     #
     # @return [Array<Spin>]
     def spin(project, categories = [nil], timezone_experiment: false)
-      spins = categories.sort.map do |category|
+      spins = categories.sort_by(&:to_s).map do |category|
         including_timezone = INCLUDE_TIMEZONE_FOR_CATEGORY.fetch(category, timezone_experiment)
 
         spin_for_category(project, category, timezone_experiment: including_timezone)

data/lib/danger/rules/commit_messages/Dangerfile

@@ -5,7 +5,7 @@ require_relative "../../../gitlab/dangerfiles/merge_request_linter"
 
 COMMIT_MESSAGE_GUIDELINES = "https://docs.gitlab.com/ee/development/contributing/merge_request_workflow.html#commit-messages-guidelines"
 MORE_INFO = "For more information, take a look at our [Commit message guidelines](#{COMMIT_MESSAGE_GUIDELINES})."
-THE_DANGER_JOB_TEXT = "the `%<job_name>` job"
+THE_DANGER_JOB_TEXT = "the `%<job_name>s` job"
 MAX_COMMITS_COUNT = helper.config.max_commits_count
 MAX_COMMITS_COUNT_EXCEEDED_MESSAGE = <<~MSG
 This merge request includes more than %<max_commits_count>d commits. Each commit should meet the following criteria:

data/lib/gitlab/dangerfiles/commit_linter.rb

@@ -12,6 +12,7 @@ module Gitlab
       SHORT_REFERENCE_REGEX = %r{([\w\-\/]+)?(?<!`)(#|!|&)\d+(?<!`)}.freeze
       # Milestone
       MS_SHORT_REFERENCE_REGEX = %r{([\w\-\/]+)?(?<!`)%"?\d{1,3}\.\d{1,3}"?(?<!`)}.freeze
+      SUGGESTIONS_APPLIED_COMMIT_REGEX = /Apply \d+ suggestion\(s\) to \d+ file\(s\)/.freeze
 
       def self.problems_mapping
         super.merge(
@@ -41,7 +42,7 @@ module Gitlab
       end
 
       def suggestion?
-        commit.message.start_with?("Apply suggestion to")
+        SUGGESTIONS_APPLIED_COMMIT_REGEX.match?(commit.message)
       end
 
       def merge?

data/lib/gitlab/dangerfiles/spec_helper.rb

@@ -104,7 +104,7 @@ RSpec.shared_context "with dangerfile" do
   end
 
   let(:fake_git) { double("fake-git", added_files: added_files, modified_files: modified_files, deleted_files: deleted_files, renamed_files: renamed_files) }
-  let(:fake_helper) { double("fake-helper", changes: changes, mr_iid: 1234, mr_title: mr_title, mr_labels: mr_labels) }
+  let(:fake_helper) { double("fake-helper", changes: changes, added_files: added_files, modified_files: modified_files, deleted_files: deleted_files, renamed_files: renamed_files, mr_iid: 1234, mr_title: mr_title, mr_labels: mr_labels) }
 
   before do
     allow(dangerfile).to receive(:git).and_return(fake_git)

data/lib/gitlab/dangerfiles/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "2.1.2"
+    VERSION = "2.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.2
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2021-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-gitlab
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 8.0.0
+- !ruby/object:Gem::Dependency
+  name: danger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 8.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 8.3.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement