gitlab-dangerfiles 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4d0b46a9dcbc098c76a6acb7eda61791470b8a8914e47650532f6fe44158d0f
-  data.tar.gz: f9aa9d41af6ae110acc46de51c9f19457555567ef520aa5b65d91e5fc85eb916
+  metadata.gz: b25f2e8617ff29a3ea964b59774b02c395127c4800bfa1552affd2e71bf62a89
+  data.tar.gz: 813ca1c6dbd433cd43f1f5ef0efc44a514af3edf7cf7ed07d75eea50640817da
 SHA512:
-  metadata.gz: 778edd2df54298a54b37218e6479b6566016248aed13f68a58d1fd43df6ac3bf4e0aee4d47494e0771899be984e5b0cfa667cfb99033f0c9cefde5c4cbe29aa9
-  data.tar.gz: 740003a2197153bcfb8431329e6eb3653707f34276a3cd34afb9cba1b60e6e8b08fe6884a46a14abb70869b957a2f5510ddc765bf5018885021fba571f1e0890
+  metadata.gz: d5208cc7b7c588c5fe7403f3b79631313a71c64007ed572fe8a5848a1c229f59f9e653f0b263c5c73efc85a1339fda852d2f44f376cca19f2d2ecac8e406b111
+  data.tar.gz: 4b31682875c0c7f5037463d035a57cb9ccd4215d68879105ce4a369539d1e155b6da7b620f942611d9d0fc92251bf58338614230bd16008dbd715974ffee57d9

data/README.md

@@ -172,6 +172,31 @@ include:
 
 See a [real world example](https://gitlab.com/gitlab-org/ruby/gems/gitlab-styles/-/merge_requests/105).
 
+#### Without `Gemfile`
+
+Danger is a Ruby project and uses [`bundler`](https://bundler.io/) to manage
+its dependencies. This requires a project to have a `Gemfile` and
+`Gemfile.lock` commited. This is helpful especially if Danger is also used
+locally - with `lefthook`, for example.
+
+In order to skip Ruby and `bundler` dependency in a project, use `bundle` commands directly
+in the CI configuration:
+
+```yaml
+include:
+  - project: 'gitlab-org/quality/pipeline-common'
+    file: '/ci/danger-review.yml'
+
+danger-review:
+  before_script:
+    - bundle init
+    # For latest version
+    - bundle add gitlab-dangerfiles
+    # OR
+    # For a pinned version
+    - bundle add gitlab-dangerfiles --version 3.1.0
+```
+
 ## Rake tasks
 
 You can import this gem's Rake tasks by adding the following to your project's `Rakefile`:
@@ -192,7 +217,9 @@ Latest documentation can be found at <https://www.rubydoc.info/gems/gitlab-dange
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`. 
+
+To release a new version, update the version number in `version.rb`, and get the MR merged by a maintainer. This will be then be packaged into a gem and pushed to [rubygems.org](https://rubygems.org) by the CI/CD.
 
 ## Contributing
 

data/lib/danger/plugins/internal/helper.rb

@@ -17,7 +17,7 @@ module Danger
       none: "",
       qa: "~QA",
       ux: "~UX",
-      test: "~test ~Quality for `spec/features/*`",
+      test: "~test for `spec/features/*`",
       # Deprecated as of 2.3.0 in favor of tooling
       engineering_productivity: '~"Engineering Productivity" for CI, Danger',
       tooling: '~"maintenance::workflow" / ~"maintenance::pipelines" for CI, Danger',

data/lib/danger/rules/commits_counter/Dangerfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+if git.commits.size > 20
+  failure 'This MR has more than 20 commits. You need to rebase this branch to have fewer commits.'
+end

data/lib/gitlab/dangerfiles/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "3.1.0"
+    VERSION = "3.2.0"
   end
 end

data/lib/gitlab/dangerfiles/weightage/reviewers.rb

@@ -13,15 +13,15 @@ module Gitlab
       # | reduced capacity reviewer    |                              1 |
       # | reviewer                     |                              2 |
       # | hungry reviewer              |                              4 |
-      # | reduced capacity traintainer |                              3 |
-      # | traintainer                  |                              6 |
-      # | hungry traintainer           |                              8 |
+      # | reduced capacity traintainer |                              1 |
+      # | traintainer                  |                              2 |
+      # | hungry traintainer           |                              6 |
       # +------------------------------+--------------------------------+
       #
       # @api private
       class Reviewers
         DEFAULT_REVIEWER_WEIGHT = Gitlab::Dangerfiles::Weightage::CAPACITY_MULTIPLIER * Gitlab::Dangerfiles::Weightage::BASE_REVIEWER_WEIGHT
-        TRAINTAINER_WEIGHT = 3
+        TRAINTAINER_WEIGHT = 2
 
         def initialize(reviewers, traintainers)
           @reviewers = reviewers
@@ -32,6 +32,8 @@ module Gitlab
           # TODO: take CODEOWNERS into account?
           # https://gitlab.com/gitlab-org/gitlab/issues/26723
 
+          remove_traintainers_from_reviewers!
+
           weighted_reviewers + weighted_traintainers
         end
 
@@ -39,25 +41,33 @@ module Gitlab
 
         attr_reader :reviewers, :traintainers
 
+        def remove_traintainers_from_reviewers!
+          # Sometimes folks will add themselves as traintainers and not remove themselves as reviewers.
+          # There seems no way currently to ensure only one of these entries exists for a person.
+          # We need to protect ourselves from that scenario here as the code assumes a reviewer will only
+          # appear in reviewers or traintainers, not both.
+          reviewers.reject! { |reviewer| traintainers.include?(reviewer) }
+        end
+
         def weighted_reviewers
           reviewers.each_with_object([]) do |reviewer, total_reviewers|
-            add_weighted_reviewer(total_reviewers, reviewer, Gitlab::Dangerfiles::Weightage::BASE_REVIEWER_WEIGHT)
+            add_weighted_reviewer(total_reviewers, reviewer, DEFAULT_REVIEWER_WEIGHT)
           end
         end
 
         def weighted_traintainers
           traintainers.each_with_object([]) do |reviewer, total_traintainers|
-            add_weighted_reviewer(total_traintainers, reviewer, TRAINTAINER_WEIGHT)
+            add_weighted_reviewer(total_traintainers, reviewer, DEFAULT_REVIEWER_WEIGHT + TRAINTAINER_WEIGHT)
           end
         end
 
-        def add_weighted_reviewer(reviewers, reviewer, weight)
+        def add_weighted_reviewer(reviewers, reviewer, added_weight_for_hungry)
           if reviewer.reduced_capacity
-            reviewers.fill(reviewer, reviewers.size, weight)
+            reviewers.fill(reviewer, reviewers.size, Gitlab::Dangerfiles::Weightage::BASE_REVIEWER_WEIGHT)
           elsif reviewer.hungry
-            reviewers.fill(reviewer, reviewers.size, weight * Gitlab::Dangerfiles::Weightage::CAPACITY_MULTIPLIER + DEFAULT_REVIEWER_WEIGHT)
+            reviewers.fill(reviewer, reviewers.size, DEFAULT_REVIEWER_WEIGHT + added_weight_for_hungry)
           else
-            reviewers.fill(reviewer, reviewers.size, weight * Gitlab::Dangerfiles::Weightage::CAPACITY_MULTIPLIER)
+            reviewers.fill(reviewer, reviewers.size, DEFAULT_REVIEWER_WEIGHT)
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-19 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -169,6 +169,7 @@ files:
 - lib/danger/rules/changelog/Dangerfile
 - lib/danger/rules/changes_size/Dangerfile
 - lib/danger/rules/commit_messages/Dangerfile
+- lib/danger/rules/commits_counter/Dangerfile
 - lib/danger/rules/simple_roulette/Dangerfile
 - lib/danger/rules/type_label/Dangerfile
 - lib/danger/rules/z_add_labels/Dangerfile