gitlab-dangerfiles 4.0.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c54d1dcf5be1bc4fb1b1f187ba1b203ddef74f661120b9efe9834ee05e95fee8
-  data.tar.gz: ac3617187d9bf2d523324b4320619fb361e30690ac2644e00e6a3edbaf78090c
+  metadata.gz: cc2be0e2c267852cb18d6fc54f9b9e8927d07b62c4c7968ad178f51fcb7f83eb
+  data.tar.gz: 3fe148ac204352fe795280ffe70e8ffabccacdd777156cf21c015c2abcf2cff4
 SHA512:
-  metadata.gz: c1b739e770be63ced18c8abd0a6f1be161bf62a98b86673fe88b95db79b589c57a0431174e43f4acf77e884e4bb8dc40272f17a6cb60282925062d1741f1d573
-  data.tar.gz: e6be44372b6881090c3e9a9d0099405315661c73a84a59ba7848b31f10ed4f72e3e861784fdfff47c985b192d26169ee96378d0d96487494c5d59ddd0e044d18
+  metadata.gz: 56c9ec187d98cd64a85d73504127f945063a6506080a53731f472de15630d501cb1b76a103804c59906b57e78f88f4e0f17d8e9ad2a9bab30639f3339151e366
+  data.tar.gz: 2a621d373863db75f5412e0ce205f85cbeba733d29a26259a8c466c16b35adf24fa3e58961fb29f7e75e923e682bda5320c78da33db6f1df4d679a973896105c

data/.gitlab-ci.yml

@@ -46,15 +46,6 @@ test:rubocop:
     matrix:
       - RUBY_VERSION: ['3.0', '3.1', '3.2']
 
-test:rufo:
-  extends: .default
-  stage: test
-  script:
-    - bundle exec rufo --check .
-  parallel:
-    matrix:
-      - RUBY_VERSION: ['3.0', '3.1', '3.2']
-
 include:
   - template: Security/Dependency-Scanning.gitlab-ci.yml
   - template: Security/SAST.gitlab-ci.yml

data/.rubocop.yml

@@ -25,6 +25,9 @@ RSpec/MultipleMemoizedHelpers:
 RSpec/FilePath:
   Enabled: false
 
+RSpec/SpecFilePathFormat:
+  Enabled: false
+
 Style/HashSyntax:
   EnforcedStyle: ruby19_no_mixed_keys
   # Introduced in Ruby 3.1. Disable for now.

data/.rubocop_todo.yml

@@ -519,3 +519,8 @@ Style/TrailingCommaInArrayLiteral:
     - 'spec/gitlab/dangerfiles/title_linting_spec.rb'
     - 'spec/gitlab/dangerfiles/weightage/maintainers_spec.rb'
     - 'spec/gitlab/dangerfiles/weightage/reviewers_spec.rb'
+
+Style/ArrayIntersect:
+  Exclude:
+    - 'lib/gitlab/dangerfiles/category.rb'
+    - 'lib/danger/plugins/changelog.rb'

data/Gemfile

@@ -2,19 +2,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in gitlab-dangerfiles.gemspec
 gemspec
-
-gem "rake", "~> 12.0"
-gem "guard-rspec"
-gem "yard"
-
-group :development do
-  gem "lefthook", require: false
-end
-
-group :development, :test do
-  gem "gitlab-styles", "~> 9.0.0", require: false
-end
-
-group :test do
-  gem "pry-byebug", "~> 3.8", require: false
-end

data/gitlab-dangerfiles.gemspec

@@ -27,14 +27,21 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "rake", ">= 0"
   spec.add_dependency "danger-gitlab", ">= 8.0.0"
   spec.add_dependency "danger", ">= 9.3.0"
 
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "climate_control"
+  spec.add_development_dependency "gitlab-styles", "~> 10.0"
+  spec.add_development_dependency "guard-rspec", "~> 4.7.3"
+  spec.add_development_dependency "lefthook", "~> 1.3"
+  spec.add_development_dependency "rake", "~> 10.2"
   spec.add_development_dependency "rspec-parameterized"
+  spec.add_development_dependency "rspec", "~> 3.8"
+  # we do not commit the bundle lockfile, so this temporary workaround needs to be
+  # present until 2.21.3 or 2.22.x is released
+  # See https://gitlab.com/gitlab-org/ruby/gems/gitlab-styles/-/issues/63
+  spec.add_development_dependency "rubocop-rails", "!= 2.21.2"
   spec.add_development_dependency "timecop"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "climate_control"
-  spec.add_development_dependency "rufo"
+  spec.add_development_dependency "yard"
 end

data/lib/danger/plugins/roulette.rb

@@ -280,6 +280,12 @@ module Danger
       reviewer = spin_for_person(weighted_reviewers)
       maintainer = spin_for_person(weighted_maintainers)
 
+      # allow projects with small number of reviewers to take from maintainers if possible
+      if reviewer.nil? && weighted_maintainers.uniq.size > 1
+        weighted_maintainers.delete(maintainer)
+        reviewer = spin_for_person(weighted_maintainers)
+      end
+
       Spin.new(category, reviewer, maintainer, false)
     end
 
@@ -316,9 +322,9 @@ module Danger
       rsp = Net::HTTP.get_response(URI.parse(url))
 
       if rsp.is_a?(Net::HTTPRedirection)
-        if (uri = URI.parse(rsp.header["location"]))
-          uri.query = nil
-        end
+        uri = URI.parse(rsp.header["location"])
+
+        uri.query = nil if uri
 
         warnings << "Redirection detected: #{uri}."
         return nil

data/lib/danger/rules/simple_roulette/Dangerfile

@@ -95,9 +95,9 @@ if changes.any?
 
   markdown(MESSAGE)
 
-  if (warnings = warning_list(roulette))
-    markdown(format(WARNING_MESSAGE, warnings: warnings))
-  end
+  warnings = warning_list(roulette)
+
+  markdown(format(WARNING_MESSAGE, warnings: warnings)) if warnings
 
   markdown(TABLE_MARKDOWN + table_header + rows.join("\n")) unless rows.empty?
 end

data/lib/danger/rules/z_add_labels/Dangerfile

@@ -6,8 +6,8 @@ return unless helper.ci?
 
 def post_labels(labels)
   gitlab.api.update_merge_request(helper.mr_target_project_id,
-                                  helper.mr_iid,
-                                  add_labels: labels.join(","))
+    helper.mr_iid,
+    add_labels: labels.join(","))
 rescue Gitlab::Error::Forbidden
   warn("This Merge Request needs to be labelled with #{helper.labels_list(labels)}. Please request a reviewer or maintainer to add them.")
 end

data/lib/gitlab/dangerfiles/teammate.rb

@@ -6,7 +6,7 @@ module Gitlab
   module Dangerfiles
     class Teammate
       attr_reader :options, :username, :name, :role, :specialty, :projects, :available, :hungry, :reduced_capacity, :tz_offset_hours,
-                  :only_maintainer_reviews
+        :only_maintainer_reviews
 
       # The options data are produced by https://gitlab.com/gitlab-org/gitlab-roulette/-/blob/main/lib/team_member.rb
       def initialize(options = {})
@@ -14,7 +14,7 @@ module Gitlab
         @username = options["username"]
         @name = options["name"]
         @markdown_name = options["markdown_name"] ||
-                         default_markdown_name(*options.values_at("username", "name"))
+                         default_markdown_name(options["username"])
         @role = options["role"]
         @specialty = options["specialty"]
         @projects = process_projects(options["projects"])
@@ -89,8 +89,8 @@ module Gitlab
 
       private
 
-      def default_markdown_name(username, name)
-        "[#{name}](https://gitlab.com/#{username}) (`@#{username}`)"
+      def default_markdown_name(username)
+        "[`#{username}`](https://gitlab.com/#{username})"
       end
 
       def process_projects(projects)

data/lib/gitlab/dangerfiles/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "4.0.0"
+    VERSION = "4.2.0"
   end
 end

metadata

@@ -1,71 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.2.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-13 00:00:00.000000000 Z
+date: 2023-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: danger-gitlab
   requirement: !ruby/object:Gem::Requirement
     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-gitlab
+  name: danger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 9.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 9.3.0
 - !ruby/object:Gem::Dependency
-  name: danger
+  name: climate_control
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 9.3.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 9.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: gitlab-styles
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.7.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.7.3
+- !ruby/object:Gem::Dependency
+  name: lefthook
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.2'
 - !ruby/object:Gem::Dependency
   name: rspec-parameterized
   requirement: !ruby/object:Gem::Requirement
@@ -81,21 +123,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.21.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.21.2
+- !ruby/object:Gem::Dependency
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: climate_control
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rufo
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="