gitlab-dangerfiles 3.4.0 → 3.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d8182a9895b7c4ce505c6c31271030222ef4e3eefaee2569edccfe1a3ce892a
-  data.tar.gz: 32f4cd7af125f0cf2a96f7bb000eb725f2c58a7a5576349fe3905dd93302c53d
+  metadata.gz: '098225565fa51922d5b158fa2da0a4e3aa7420c3fca45e3acee1c3b3cfaa1ba0'
+  data.tar.gz: ca80ccfdc03823eff324d59faff1eac19ed1e93798ff0833feef5d7b414c5e45
 SHA512:
-  metadata.gz: fdb2baf7afe55ad315269cf4231efa717099dbb931ca5a6f3d7b268d9551b337fa5265627b8e134d739383a4cf72f5bf68588a19010bd4327c04297baaf3a49f
-  data.tar.gz: bdfa7d3753215241101362459e869cf53b1b4f141e96c58f9a31aac02a1dcb4aadae2caf98115704e8814664f0b74c466781aafe8da02d8f0bd00793857ccfb8
+  metadata.gz: cae6d044924941d20f295da7b5b01aa77ba848a5a87c3894e5c9d8e0894499bdfd03425be5412960daa3724eba5dad11f3f3be02ee8dff80e83ca3b503a86f5f
+  data.tar.gz: 4903888e704177bb13b9ba3d5a207201ae703bebe047fc4f9f27483f36ba4f0aa5af2c5e5a5d72478c67c51a06319046bb1ba6f6bad52ba14cb18642f178972e

data/Gemfile

@@ -7,6 +7,10 @@ gem "rake", "~> 12.0"
 gem "guard-rspec"
 gem "yard"
 
+group :development do
+  gem "lefthook", require: false
+end
+
 group :test do
   gem "pry-byebug", "~> 3.8", require: false
 end

data/README.md

@@ -215,12 +215,19 @@ Latest documentation can be found at <https://www.rubydoc.info/gems/gitlab-dange
 
 ## Development
 
+### Initial setup
+
 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 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.
 
+### Activate lefthook locally
+
+```shell
+lefthook install
+```
 ## Contributing
 
 Bug reports and merge requests are welcome at https://gitlab.com/gitlab-org/gitlab-dangerfiles. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://gitlab.com/gitlab-org/gitlab-dangerfiles/blob/master/CODE_OF_CONDUCT.md).

data/lefthook.yml

@@ -0,0 +1,11 @@
+# EXAMPLE USAGE
+# Refer for explanation to following link:
+# https://github.com/evilmartians/lefthook/blob/master/docs/full_guide.md
+#
+
+pre-push:
+  commands:
+    # Runs RUby FOrmatter (rufo)
+    rufo:
+      run: bundle exec rufo --check .
+      glob: '*.rb'

data/lib/danger/plugins/roulette.rb

@@ -162,12 +162,44 @@ module Danger
       end
     end
 
+    # Spin a reviewer for a particular approval rule
+    #
+    # @param [Hash] rule of approval
+    #
+    # @return [Gitlab::Dangerfiles::Teammate]
     def spin_for_approver(rule)
-      approvers = rule["eligible_approvers"].map do |approver|
+      # This will filter out approvers who are not even reviewers who
+      # don't show up in roulette data we're relying on.
+      # That's why `filter_map` is used.
+      approvers = rule["eligible_approvers"].filter_map do |approver|
         find_member(approver["username"])
       end
 
-      spin_for_person(approvers)
+      spin_for_person(approvers) || spin_for_approver_fallback(rule)
+    end
+
+    # It can be possible that we don't have a valid reviewer for approval.
+    # In this case, we sample again without considering:
+    #
+    # * If they're available
+    # * If they're an actual reviewer from roulette data
+    #
+    # We do this because we strictly require an approval from the approvers.
+    #
+    # @param [Hash] rule of approval
+    #
+    # @return [Gitlab::Dangerfiles::Teammate]
+    def spin_for_approver_fallback(rule)
+      fallback_approvers = rule["eligible_approvers"].map do |approver|
+        find_member(approver["username"]) ||
+          Gitlab::Dangerfiles::Teammate.new(approver)
+      end
+
+      # Intentionally not using `spin_for_person` to skip `valid_person?`.
+      # This should strictly return someone so we don't filter anything,
+      # and it's a fallback mechanism which should not happen often that
+      # deserves a complex algorithm.
+      fallback_approvers.sample(random: random)
     end
 
     def spin_for_category(project, category, timezone_experiment: false)
@@ -194,6 +226,10 @@ module Danger
     def http_get_json(url)
       rsp = Net::HTTP.get_response(URI.parse(url))
 
+      if rsp.is_a?(Net::HTTPRedirection)
+        raise "Redirection detected: #{rsp.header["location"]}"
+      end
+
       unless rsp.is_a?(Net::HTTPOK)
         raise HTTPError, "Failed to read #{url}: #{rsp.code} #{rsp.message}"
       end

data/lib/gitlab/dangerfiles/changes.rb

@@ -62,7 +62,7 @@ module Gitlab
 
       # @return [Array<String>] an array of the changed files.
       def files
-        map(&:file)
+        map(&:file).uniq
       end
 
       private

data/lib/gitlab/dangerfiles/teammate.rb

@@ -10,7 +10,8 @@ module Gitlab
         @options = options
         @username = options["username"]
         @name = options["name"]
-        @markdown_name = options["markdown_name"]
+        @markdown_name = options["markdown_name"] ||
+                         default_markdown_name(*options.values_at("username", "name"))
         @role = options["role"]
         @projects = process_projects(options["projects"])
         @available = options["available"]
@@ -66,7 +67,7 @@ module Gitlab
       end
 
       def markdown_name(author: nil)
-        "#{@markdown_name} (#{utc_offset_text(author)})"
+        "#{@markdown_name}#{utc_offset_text(author)}"
       end
 
       def local_hour
@@ -83,6 +84,10 @@ module Gitlab
 
       private
 
+      def default_markdown_name(username, name)
+        "[#{name}](https://gitlab.com/#{username}) (`@#{username}`)"
+      end
+
       def process_projects(projects)
         return nil unless projects
 
@@ -92,15 +97,19 @@ module Gitlab
       end
 
       def utc_offset_text(author = nil)
+        return unless tz_offset_hours
+
         offset_text = if floored_offset_hours >= 0
             "UTC+#{floored_offset_hours}"
           else
             "UTC#{floored_offset_hours}"
           end
 
-        return offset_text unless author
-
-        "#{offset_text}, #{offset_diff_compared_to_author(author)}"
+        if author
+          " (#{offset_text}, #{offset_diff_compared_to_author(author)})"
+        else
+          " (#{offset_text})"
+        end
       end
 
       def offset_diff_compared_to_author(author)

data/lib/gitlab/dangerfiles/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "3.4.0"
+    VERSION = "3.4.3"
   end
 end

data/lib/gitlab/dangerfiles.rb

@@ -58,7 +58,7 @@ module Gitlab
         danger_plugin.import_plugin(File.expand_path("../danger/plugins/*.rb", __dir__))
 
         Dir.glob(File.expand_path("danger/plugins/*.rb", config.project_root)).sort.each do |path|
-          puts "Importing plugin at #{path}" if dangerfile.verbose
+          puts "Importing plugin at #{path}" if helper_plugin.ci?
           danger_plugin.import_plugin(path)
         end
       end
@@ -87,10 +87,9 @@ module Gitlab
         return if helper_plugin.release_automation?
 
         rules = filtered_rules(only, except)
-        puts "Running rules: #{rules}\n" if dangerfile.verbose
 
         rules.each do |rule, path|
-          puts "Importing rule #{rule} at #{path}" if dangerfile.verbose
+          puts "Importing rule #{rule} at #{path}" if helper_plugin.ci?
           danger_plugin.import_dangerfile(path: path)
         end
       end
@@ -116,45 +115,45 @@ module Gitlab
 
       attr_reader :dangerfile
 
+      def filtered_rules(only_rules, except_rules)
+        only_rules = Array(only_rules).compact.map(&:to_s)
+
+        rules = allowed_rules_based_on_context.reject { |rule, _v| except_rules.include?(rule) }
+
+        if only_rules.any?
+          rules.select! { |rule, _v| only_rules.include?(rule) }
+        end
+
+        rules.sort.to_h
+      end
+
+      def allowed_rules_based_on_context
+        helper_plugin.ci? ? all_rules : local_rules
+      end
+
+      def all_rules
+        all_gem_rules.merge(custom_rules)
+      end
+
       def all_gem_rules
-        @all_gem_rules ||= Dir.glob(File.join(RULES_DIR, "*")).sort.each_with_object({}) do |path, memo|
+        @all_gem_rules ||= Dir.glob(File.join(RULES_DIR, "*")).each_with_object({}) do |path, memo|
           rule_name = File.basename(path)
           memo[rule_name] = path if File.directory?(path) && File.exist?(File.join(path, "Dangerfile"))
         end
       end
 
       def custom_rules
-        @custom_rules ||= Dir.glob(File.expand_path("danger/*", config.project_root)).sort.each_with_object({}) do |path, memo|
+        @custom_rules ||= Dir.glob(File.expand_path("danger/*", config.project_root)).each_with_object({}) do |path, memo|
           rule_name = File.basename(path)
           memo[rule_name] = path if File.directory?(path) && File.exist?(File.join(path, "Dangerfile"))
         end
       end
 
-      def all_rules
-        all_gem_rules.merge(custom_rules)
-      end
-
       def local_rules
         ci_only_rules = CI_ONLY_RULES | config.ci_only_rules
         all_rules.reject { |rule, _v| ci_only_rules.include?(rule) }
       end
 
-      def allowed_rules_based_on_context
-        helper_plugin.ci? ? all_rules : local_rules
-      end
-
-      def filtered_rules(only_rules, except_rules)
-        only_rules = Array(only_rules).compact.map(&:to_s)
-
-        rules = allowed_rules_based_on_context.reject { |rule, _v| except_rules.include?(rule) }
-
-        if only_rules.any?
-          rules.select! { |rule, _v| only_rules.include?(rule) }
-        end
-
-        rules
-      end
-
       def danger_plugin
         @danger_plugin ||= dangerfile.plugins[Danger::DangerfileDangerPlugin]
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.3
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-16 00:00:00.000000000 Z
+date: 2022-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -163,6 +163,7 @@ files:
 - fixtures/emojis/aliases.json
 - fixtures/emojis/digests.json
 - gitlab-dangerfiles.gemspec
+- lefthook.yml
 - lib/danger/plugins/changelog.rb
 - lib/danger/plugins/internal/helper.rb
 - lib/danger/plugins/roulette.rb