gitlab-dangerfiles 2.1.1 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e4bc738b166a81e3e3ebd009c67eb6205bd40155f624d62ee3b8b4e2a4c3203
-  data.tar.gz: 7b0be83cf24f080a0d7d468db5656526de8a3937206624dcbba2cb59d44a5911
+  metadata.gz: 10b4151926ec3f1b573d1891138cca88e74e349484914f806307639e31aa8f5c
+  data.tar.gz: 3cfcb8533e082e7b157f6a99ea9e84aa3d357cd4035270bcfd717e2212182611
 SHA512:
-  metadata.gz: bae09716c429d549b9624223997b20b3f0c75470aa72ccb6293f145b294bbbf97bd04c7e4ce0aeb791898b9eb3ba23f1b0d87b2e3b77d667d9c07de6f2d63749
-  data.tar.gz: 2c2a4745c78288a38dec0e93f0193b5507b46680a7d029f34e1f8e90400e882ab17ef144d00f2085be06d91dbc4685df7d36af7af47bf029a94f38916f6c4586
+  metadata.gz: 50fe7e8cd2e7ca176639e416d6406f3ab327b95f61e7f07c1d329561cb172bbb73ca8cffb775d14dd4c4b3d375bdba5fd044ee9cc344298f8f27b3195d0765f1
+  data.tar.gz: debd9b7c5a598ee1bb2274900cd61a00b00a5ef96ad3af58b3445e30ba078ed49a5efa86976c11542e0b2652b4fb792604c16654c3f616315a37b63352c145cf

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

@@ -6,6 +6,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"
+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:
 
@@ -17,8 +18,6 @@ This merge request includes more than %<max_commits_count>d commits. Each commit
 If this merge request contains commits that do not meet this criteria and/or contains intermediate work, please rebase these commits into a smaller number of commits or split this merge request into multiple smaller merge requests.
 MSG
 
-max_commits_count = helper.config.max_commits_count
-
 def fail_commit(commit, message, more_info: true)
   self.fail(build_message(commit, message, more_info: more_info))
 end
@@ -104,8 +103,8 @@ def lint_commits(commits)
       end
     end
   else
-    if count_non_fixup_commits(commit_linters) > max_commits_count
-      self.warn(format(MAX_COMMITS_COUNT_EXCEEDED_MESSAGE, max_commits_count: max_commits_count))
+    if count_non_fixup_commits(commit_linters) > MAX_COMMITS_COUNT
+      self.warn(format(MAX_COMMITS_COUNT_EXCEEDED_MESSAGE, max_commits_count: MAX_COMMITS_COUNT))
     end
   end
 

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.1"
+    VERSION = "2.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.1
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-15 00:00:00.000000000 Z
+date: 2021-07-07 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