gitlab-dangerfiles 0.7.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8a22cec902c95d63352af51b2b0460e7cb761ddda7ee7ab2833077686ee5428
-  data.tar.gz: 1eb6288e842695e9811d6f8ba88cf43d8c75caa1c441a3419aed3f5988c11864
+  metadata.gz: f299245a993fb11dfa01fb1f8c3a09167c0fd327c07c7580368f0b7fbd0c4da5
+  data.tar.gz: 18b3be58359757bd1587106ddcce00d80f4ce25d6179b3ce394505449ca3fda4
 SHA512:
-  metadata.gz: 81214e30c00e1b8c3f164a8b3bdfbc135902b5292a1064a8f4acbcd26ef5f9d9b0e83ebea83c51621e1742b2b6df13af1e81732fb4c9256bb254cac153370170
-  data.tar.gz: dd5be048537a4604d21774622effdb3e02d82aa3aefaaecb5bdcf598a96efcbff9ade89100c753cb26cff12b85b7cded1fdde71bbae10035ea341717b9704c67
+  metadata.gz: 6916956a8eedeef8ef292e10a7a31ea4269648f1136c3dca198f0567f563f0534d3fa5c75e37bb66b451e817067971b62390334e4f2060988f83b611d51b6c49
+  data.tar.gz: e20cc032bcff74bc423d2d0b50c6026b4ea05f99fde5b053a9941249b52bf799e34cea420028d5411fe4646b52a409d886baaca2da56289e739f53fc9a9b8e61

data/gitlab-dangerfiles.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "danger"
+  spec.add_dependency "danger-gitlab"
 
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-parameterized"

data/lib/danger/helper.rb

@@ -19,6 +19,7 @@ module Danger
       test: "~test ~Quality for `spec/features/*`",
       engineering_productivity: '~"Engineering Productivity" for CI, Danger',
       ci_template: '~"ci::templates"',
+      product_intelligence: '~"product intelligence"',
     }.freeze
 
     HTTPError = Class.new(StandardError)
@@ -51,8 +52,62 @@ module Danger
       JSON.parse(rsp.body)
     end
 
+    def added_files
+      @added_files ||= if changes_from_api
+          changes_from_api.select { |file| file["new_file"] }.map { |file| file["new_path"] }
+        else
+          git.added_files.to_a
+        end
+    end
+
+    def modified_files
+      @modified_files ||= if changes_from_api
+          changes_from_api.select { |file| !file["new_file"] && !file["deleted_file"] && !file["renamed_file"] }.map { |file| file["new_path"] }
+        else
+          git.modified_files.to_a
+        end
+    end
+
+    def renamed_files
+      @renamed_files ||= if changes_from_api
+          changes_from_api.select { |file| file["renamed_file"] }.each_with_object([]) do |file, memo|
+            memo << { before: file["old_path"], after: file["new_path"] }
+          end
+        else
+          git.renamed_files.to_a
+        end
+    end
+
+    def deleted_files
+      @deleted_files ||= if changes_from_api
+          changes_from_api.select { |file| file["deleted_file"] }.map { |file| file["new_path"] }
+        else
+          git.deleted_files.to_a
+        end
+    end
+
+    def diff_for_file(filename)
+      if changes_from_api
+        changes_hash = changes_from_api.find { |file| file["new_path"] == filename }
+        changes_hash["diff"] if changes_hash
+      else
+        git.diff_for_file(filename)&.patch
+      end
+    end
+
+    def changes_from_api
+      return nil unless ci?
+      return nil if defined?(@force_changes_from_git)
+
+      @changes_from_api ||= gitlab_helper.api.merge_request_changes(gitlab_helper.mr_json["project_id"], gitlab_helper.mr_json["iid"]).to_h["changes"]
+    rescue
+      # Fallback to the Git strategy in any case
+      @force_changes_from_git = true
+      nil
+    end
+
     # Returns a list of all files that have been added, modified or renamed.
-    # `git.modified_files` might contain paths that already have been renamed,
+    # `modified_files` might contain paths that already have been renamed,
     # so we need to remove them from the list.
     #
     # Considering these changes:
@@ -70,10 +125,10 @@ module Danger
     # @return [Array<String>]
     def all_changed_files
       Set.new
-        .merge(git.added_files.to_a)
-        .merge(git.modified_files.to_a)
-        .merge(git.renamed_files.map { |x| x[:after] })
-        .subtract(git.renamed_files.map { |x| x[:before] })
+        .merge(added_files)
+        .merge(modified_files)
+        .merge(renamed_files.map { |x| x[:after] })
+        .subtract(renamed_files.map { |x| x[:before] })
         .to_a
         .sort
     end
@@ -87,10 +142,10 @@ module Danger
     #   "+      # Test change",
     #   "-      # Old change" ]
     def changed_lines(changed_file)
-      diff = git.diff_for_file(changed_file)
+      diff = diff_for_file(changed_file)
       return [] unless diff
 
-      diff.patch.split("\n").select { |line| %r{^[+-]}.match?(line) }
+      diff.split("\n").select { |line| %r{^[+-]}.match?(line) }
     end
 
     def release_automation?
@@ -117,23 +172,23 @@ module Danger
     # @return [Gitlab::Dangerfiles::Changes]
     def changes(categories)
       Gitlab::Dangerfiles::Changes.new([]).tap do |changes|
-        git.added_files.each do |file|
+        added_files.each do |file|
           categories_for_file(file, categories).each { |category| changes << Gitlab::Dangerfiles::Change.new(file, :added, category) }
         end
 
-        git.modified_files.each do |file|
+        modified_files.each do |file|
           categories_for_file(file, categories).each { |category| changes << Gitlab::Dangerfiles::Change.new(file, :modified, category) }
         end
 
-        git.deleted_files.each do |file|
+        deleted_files.each do |file|
           categories_for_file(file, categories).each { |category| changes << Gitlab::Dangerfiles::Change.new(file, :deleted, category) }
         end
 
-        git.renamed_files.map { |x| x[:before] }.each do |file|
+        renamed_files.map { |x| x[:before] }.each do |file|
           categories_for_file(file, categories).each { |category| changes << Gitlab::Dangerfiles::Change.new(file, :renamed_before, category) }
         end
 
-        git.renamed_files.map { |x| x[:after] }.each do |file|
+        renamed_files.map { |x| x[:after] }.each do |file|
           categories_for_file(file, categories).each { |category| changes << Gitlab::Dangerfiles::Change.new(file, :renamed_after, category) }
         end
       end
@@ -169,31 +224,31 @@ module Danger
     end
 
     def mr_iid
-      return "" unless gitlab_helper
+      return "" unless ci?
 
       gitlab_helper.mr_json["iid"]
     end
 
     def mr_title
-      return "" unless gitlab_helper
+      return "" unless ci?
 
       gitlab_helper.mr_json["title"]
     end
 
     def mr_web_url
-      return "" unless gitlab_helper
+      return "" unless ci?
 
       gitlab_helper.mr_json["web_url"]
     end
 
     def mr_labels
-      return [] unless gitlab_helper
+      return [] unless ci?
 
       gitlab_helper.mr_labels
     end
 
     def mr_target_branch
-      return "" unless gitlab_helper
+      return "" unless ci?
 
       gitlab_helper.mr_json["target_branch"]
     end

data/lib/danger/roulette.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative "helper"
 require_relative "../gitlab/dangerfiles/teammate"
 require_relative "../gitlab/dangerfiles/weightage/maintainers"
 require_relative "../gitlab/dangerfiles/weightage/reviewers"
@@ -25,7 +26,7 @@ module Danger
     # for each change category that a Merge Request contains.
     #
     # @return [Array<Spin>]
-    def spin(project, categories, timezone_experiment: false)
+    def spin(project, categories = [nil], timezone_experiment: false)
       spins = categories.sort.map do |category|
         including_timezone = INCLUDE_TIMEZONE_FOR_CATEGORY.fetch(category, timezone_experiment)
 
@@ -59,6 +60,8 @@ module Danger
             # 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
           end
+        when :product_intelligence
+          spin.optional_role = :maintainer
         end
       end
 

data/lib/gitlab/dangerfiles.rb

@@ -2,5 +2,8 @@ require "gitlab/dangerfiles/version"
 
 module Gitlab
   module Dangerfiles
+    def self.import_plugins(danger)
+      danger.import_plugin(File.expand_path("../danger/*.rb", __dir__))
+    end
   end
 end

data/lib/gitlab/dangerfiles/base_linter.rb

@@ -59,7 +59,7 @@ module Gitlab
       private
 
       def subject
-        TitleLinting.remove_draft_flag(message_parts[0])
+        @subject ||= TitleLinting.remove_draft_flag(message_parts[0])
       end
 
       def subject_too_short?
@@ -75,6 +75,7 @@ module Gitlab
       end
 
       def subject_starts_with_lowercase?
+        return false if subject.empty?
         return false if ("A".."Z").cover?(subject[0])
 
         first_char = subject.sub(/\A(\[.+\]|\w+:)\s/, "")[0]

data/lib/gitlab/dangerfiles/commit_linter.rb

@@ -6,6 +6,7 @@ require_relative "emoji_checker"
 module Gitlab
   module Dangerfiles
     class CommitLinter < BaseLinter
+      MAX_CHANGED_FILES_IN_COMMIT = 3
       MAX_CHANGED_LINES_IN_COMMIT = 30
       SHORT_REFERENCE_REGEX = %r{([\w\-\/]+)?(?<!`)(#|!|&|%)\d+(?<!`)}.freeze
 

data/lib/gitlab/dangerfiles/spec_helper.rb

@@ -45,17 +45,63 @@ end
 
 RSpec.shared_context "with dangerfile" do
   let(:dangerfile) { DangerSpecHelper.testing_dangerfile }
-  let(:added_files) { %w[added1] }
-  let(:modified_files) { %w[modified1] }
-  let(:deleted_files) { %w[deleted1] }
-  let(:renamed_before_file) { "renamed_before" }
-  let(:renamed_after_file) { "renamed_after" }
+  let(:added_files) { %w[added-from-git] }
+  let(:modified_files) { %w[modified-from-git] }
+  let(:deleted_files) { %w[deleted-from-git] }
+  let(:renamed_before_file) { "renamed_before-from-git" }
+  let(:renamed_after_file) { "renamed_after-from-git" }
   let(:renamed_files) { [{ before: renamed_before_file, after: renamed_after_file }] }
   let(:change_class) { Gitlab::Dangerfiles::Change }
   let(:changes_class) { Gitlab::Dangerfiles::Changes }
   let(:changes) { changes_class.new([]) }
   let(:mr_title) { "Fake Title" }
   let(:mr_labels) { [] }
+  let(:mr_changes_from_api) do
+    {
+      "changes" => [
+        {
+          "old_path" => "added-from-api",
+          "new_path" => "added-from-api",
+          "a_mode" => "100644",
+          "b_mode" => "100644",
+          "new_file" => true,
+          "renamed_file" => false,
+          "deleted_file" => false,
+          "diff" => "@@ -49,6 +49,14 @@\n- vendor/ruby/\n     policy: pull\n \n+.danger-review-cache:\n",
+        },
+        {
+          "old_path" => "modified-from-api",
+          "new_path" => "modified-from-api",
+          "a_mode" => "100644",
+          "b_mode" => "100644",
+          "new_file" => false,
+          "renamed_file" => false,
+          "deleted_file" => false,
+          "diff" => "@@ -49,6 +49,14 @@\n- vendor/ruby/\n     policy: pull\n \n+.danger-review-cache:\n",
+        },
+        {
+          "old_path" => "renamed_before-from-api",
+          "new_path" => "renamed_after-from-api",
+          "a_mode" => "100644",
+          "b_mode" => "100644",
+          "new_file" => false,
+          "renamed_file" => true,
+          "deleted_file" => false,
+          "diff" => "@@ -49,6 +49,14 @@\n- vendor/ruby/\n     policy: pull\n \n+.danger-review-cache:\n",
+        },
+        {
+          "old_path" => "deleted-from-api",
+          "new_path" => "deleted-from-api",
+          "a_mode" => "100644",
+          "b_mode" => "100644",
+          "new_file" => false,
+          "renamed_file" => false,
+          "deleted_file" => true,
+          "diff" => "@@ -49,6 +49,14 @@\n- vendor/ruby/\n     policy: pull\n \n+.danger-review-cache:\n",
+        },
+      ],
+    }
+  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) }

data/lib/gitlab/dangerfiles/teammate.rb

@@ -101,6 +101,13 @@ module Gitlab
           return true if capabilities(project).include?("#{kind} engineering_productivity")
 
           capabilities(project).include?("#{kind} backend")
+        when :product_intelligence
+          return false unless role[/Engineer, Product Intelligence/]
+
+          # any reviewer of project from Product Intelligence team can review MR
+          kind == :reviewer && capabilities(project).any?
+        when nil
+          capabilities(project).include?("#{kind}")
         else
           capabilities(project).include?("#{kind} #{category}")
         end

data/lib/gitlab/dangerfiles/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "0.7.0"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Rémy Coutable
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: danger
+  name: danger-gitlab
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="