gitlab-dangerfiles 0.9.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 953603fac4ea1f44a40296e63e5d67943f0a0ec2d67631eb24822d3c01b76749
-  data.tar.gz: 47c1026b0081cbd279cd097f122b29a6ef382dbb43ea5ce7a714935ead7288d9
+  metadata.gz: f9f8e727ceb4fd8d6a8163b5c2637cb117426e30d3002ae5772b7031c83bc98a
+  data.tar.gz: 650de232d49a5cb7a022ed53e4607ddc8941ba0615e5cc73214da44d2e838967
 SHA512:
-  metadata.gz: 6e36bec78c26703d1b964ea580b9d3cd1425926d968c80480a901f7c14ebb6f0a0509820adc612587796d85ed29e83ca0c3e9569a288a90a5beab1c1693f92da
-  data.tar.gz: b7fa2dcf949685dd1c24382e8b83c1b06b57c5abc75e85c6123313dae8d9936d8c90b3d8c58e9af237c07a497b6d0eb3c9e929c2dab840baec42bf338883b8c0
+  metadata.gz: fe6821b98e683ead18db025365f4efe6821ca92773f8baacfec88ab12131ab1597d735a1262d2cf65928d24b9b72182a1db2d2cb3435edd6c52248eb029ecd87
+  data.tar.gz: e984610303236d5d6f964ed04c61f924560cf2e29b04c1b485434f0755dc9dd676d486b879972f02b4463da4d499fd070e2a8629bfb570cee93e88b0e4eaf531

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

@@ -51,8 +51,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 +124,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 +141,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 +171,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 +223,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/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/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Dangerfiles
-    VERSION = "0.9.0"
+    VERSION = "1.0.0"
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-dangerfiles
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Rémy Coutable
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-17 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:
     - - ">="