gitlab-dangerfiles 2.2.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f9d4db82aaf60ca573623de5e99c72f5518baef3181d8c854b52131ab4abf60
-  data.tar.gz: 06bb46e9c0c500cfa1d9e3aef672d529d99f70283ed66fd87291c66117205a96
+  metadata.gz: 1f4f4363298e91b36384ef61e96ea5c3ff8dfa81ee3c768e60d24349ad2df7ce
+  data.tar.gz: cac0bdb7f5bea8b30afca63a9d70ed1c081abf0e5d16101f08fbc9276764698d
 SHA512:
-  metadata.gz: 57da7c2b5d0bb5c47fff3b663d9fa9d3465b7eec5d343423148b11f78079224c5d8682692863ec9736fdccbd42cccf3e3127a7b85ce3f2973baa8108421e6ed0
-  data.tar.gz: be63b6430ab6bf1e4cfab3ee6849355331ccedb340a1fcdf1a4347c254a6c52c1feea88a3f9e67d2c2d3bd1aa734f22b59fca852558e788a5e4353b8f4456572
+  metadata.gz: 3b201247f2fa32c72063c18db9533be9a2244b090dfe64bfe825497f298e747f1b511e91f83cfe58c51c79673283c174ccbfc419acd85d766b21b38c321f5e54
+  data.tar.gz: c84b0389e48d61c4c686049a55c94edffb5d30c400195411a829857711110ea3cc98ef53d7c6a37267725e667bc7618ecc17d6264258cef091302bfdf5c4be4c

data/README.md

@@ -7,7 +7,7 @@ The goal of this gem is to centralize Danger plugins and rules that to be used b
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'gitlab-dangerfiles'
+gem 'gitlab-dangerfiles', require: false
 ```
 
 And then execute:
@@ -29,6 +29,8 @@ $ gem install gitlab-dangerfiles
 In your project's `Dangerfile`, add the following two line to import the plugins and rules from this gem:
 
 ```ruby
+require 'gitlab-dangerfiles'
+
 # Get an instance of Gitlab::Dangerfiles
 gitlab_dangerfiles = Gitlab::Dangerfiles::Engine.new(self)
 

data/lib/danger/plugins/helper.rb

@@ -17,7 +17,9 @@ module Danger
       none: "",
       qa: "~QA",
       test: "~test ~Quality for `spec/features/*`",
+      # Deprecated as of 2.3.0 in favor of tooling
       engineering_productivity: '~"Engineering Productivity" for CI, Danger',
+      tooling: "~tooling for CI, Danger",
       ci_template: '~"ci::templates"',
       product_intelligence: '~"product intelligence"',
     }.freeze
@@ -211,7 +213,7 @@ module Danger
     #                   +filename_regex+ is the regex pattern to match file names. +changes_regex+ is the regex pattern to
     #                   match changed lines in files that match +filename_regex+
     #
-    # @return [Array<Symbol>] the categories a file is in, e.g., +[:frontend]+, +[:backend]+, or +%i[frontend engineering_productivity]+
+    # @return [Array<Symbol>] the categories a file is in, e.g., +[:frontend]+, +[:backend]+, or +%i[frontend tooling]+
     #   using filename regex (+filename_regex+) and specific change regex (+changes_regex+) from the given +categories+ hash.
     def categories_for_file(filename, categories)
       _, categories = categories.find do |key, _|

data/lib/danger/plugins/roulette.rb

@@ -58,7 +58,7 @@ module Danger
             # Fetch an already picked backend reviewer, or pick one otherwise
             spin.reviewer = backend_spin&.reviewer || spin_for_category(project, :backend, timezone_experiment: including_timezone).reviewer
           end
-        when :engineering_productivity
+        when :tooling, :engineering_productivity # Deprecated as of 2.3.0 in favor of tooling
           if spin.maintainer.nil?
             # Fetch an already picked backend maintainer, or pick one otherwise
             spin.maintainer = backend_spin&.maintainer || spin_for_category(project, :backend, timezone_experiment: including_timezone).maintainer

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

@@ -28,6 +28,10 @@ module Gitlab
         @problems = {}
       end
 
+      def inspect
+        "#{self.class}:#{object_id} @commit=#{@commit} @problems=#{@problems}"
+      end
+
       def failed?
         problems.any?
       end

data/lib/gitlab/dangerfiles/commit_linter.rb

@@ -9,9 +9,9 @@ module Gitlab
       MAX_CHANGED_FILES_IN_COMMIT = 3
       MAX_CHANGED_LINES_IN_COMMIT = 30
       # Issue, MR, Epic
-      SHORT_REFERENCE_REGEX = %r{([\w\-\/]+)?(?<!`)(#|!|&)\d+(?<!`)}.freeze
+      SHORT_REFERENCE_REGEX = %r{(\S*([\w\-\/]+)?(?<!`)(#|!|&)\d+(?<!`))}.freeze
       # Milestone
-      MS_SHORT_REFERENCE_REGEX = %r{([\w\-\/]+)?(?<!`)%"?\d{1,3}\.\d{1,3}"?(?<!`)}.freeze
+      MS_SHORT_REFERENCE_REGEX = %r{(\S*([\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
@@ -143,8 +143,13 @@ module Gitlab
       end
 
       def message_contains_short_reference?
-        commit.message.match?(SHORT_REFERENCE_REGEX) ||
-          commit.message.match?(MS_SHORT_REFERENCE_REGEX)
+        match_data = commit.message.match(SHORT_REFERENCE_REGEX) ||
+                     commit.message.match(MS_SHORT_REFERENCE_REGEX)
+
+        return false unless match_data
+
+        # Any URL would include "//". This works for http/https/ftp etc.
+        !match_data[1].include?("//")
       end
 
       def emoji_checker

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

@@ -95,7 +95,7 @@ module Gitlab
           area = role[/Software Engineer in Test(?:.*?, (\w+))/, 1]
 
           area && labels.any?("devops::#{area.downcase}") if kind == :reviewer
-        when :engineering_productivity
+        when :tooling, :engineering_productivity # Deprecated as of 2.3.0 in favor of tooling
           return false unless role[/Engineering Productivity/]
           return true if kind == :reviewer
           return true if capabilities(project).include?("#{kind} engineering_productivity")

data/lib/gitlab/dangerfiles/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "2.2.0"
+    VERSION = "2.3.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.1
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-06 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger-gitlab