danger 9.4.2 → 9.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 159f9e62814cd8724e55f7f8584d936e87baec3b6ebb554a37e7990b60a911c1
-  data.tar.gz: cff0e62eb89fc5893521f8116a0c97c084fa460c7702508565914b719f872d3b
+  metadata.gz: 235adb876d4329ef24664c6139ed7266298db3f672415e83cf78d1b9dfb87af9
+  data.tar.gz: 359771a09da8778f29d3d6d0fa26d803474813ae8d4a154fdef66489f7b3919b
 SHA512:
-  metadata.gz: e6ea6863e7becfab88b477d72ee6c0c077db24db33773d0fb9948b641e2ee088be8086340091adfb4c85933458ae5c51f1f075babc49009bd0d2f6544b8f011f
-  data.tar.gz: 5b3288475743c4156a12edbb2e68666622fedc16726714243572f29740b686c54050f01e9bf042b2a9bbba45c646a8933a5cfcd22b3b4b431aaa56edb8dbfe8f
+  metadata.gz: ee8c64ffa617f2dc8e4c9dd00861dfac8243c6898cd4b10f2185358b95bbe3278ab6d3265db375cd6cb7fc33d1b5e6c7499db879a735f8e22e46737e5fc8a2da
+  data.tar.gz: 82bc4ac05e20fda0f0fc0936ed14eeadb8446effd43f65c673edbdcb6af364c3c0c22106bf8e3d667e1efba1e11ee9e9d9d83b7f13818b85779159f9bcbed9ad

data/lib/danger/danger_core/message_aggregator.rb

@@ -5,8 +5,8 @@ require "danger/helpers/message_groups_array_helper"
 
 module Danger
   class MessageAggregator
-    def self.aggregate(*args)
-      new(*args).aggregate
+    def self.aggregate(*args, **kwargs)
+      new(*args, **kwargs).aggregate
     end
 
     def initialize(warnings: [],

data/lib/danger/request_sources/github/github.rb

@@ -252,14 +252,16 @@ module Danger
       end
 
       def submit_inline_comments!(warnings: [], errors: [], messages: [], markdowns: [], previous_violations: [], danger_id: "danger")
-        # Avoid doing any fetchs if there's no inline comments
-        return {} if (warnings + errors + messages + markdowns).select(&:inline?).empty?
-
-        diff_lines = self.pr_diff.lines
         pr_comments = client.pull_request_comments(ci_source.repo_slug, ci_source.pull_request_id)
         danger_comments = pr_comments.select { |comment| Comment.from_github(comment).generated_by_danger?(danger_id) }
         non_danger_comments = pr_comments - danger_comments
 
+        if (warnings + errors + messages + markdowns).select(&:inline?).empty?
+          delete_old_inline_violations(danger_comments: danger_comments, non_danger_comments: non_danger_comments)
+          return {}
+        end
+
+        diff_lines = self.pr_diff.lines
         warnings = submit_inline_comments_for_kind!(:warning, warnings, diff_lines, danger_comments, previous_violations["warning"], danger_id: danger_id)
         errors = submit_inline_comments_for_kind!(:error, errors, diff_lines, danger_comments, previous_violations["error"], danger_id: danger_id)
         messages = submit_inline_comments_for_kind!(:message, messages, diff_lines, danger_comments, previous_violations["message"], danger_id: danger_id)
@@ -267,6 +269,17 @@ module Danger
 
         # submit removes from the array all comments that are still in force
         # so we strike out all remaining ones
+        delete_old_inline_violations(danger_comments: danger_comments, non_danger_comments: non_danger_comments)
+
+        {
+          warnings: warnings,
+          errors: errors,
+          messages: messages,
+          markdowns: markdowns
+        }
+      end
+
+      def delete_old_inline_violations(danger_comments: [], non_danger_comments: [])
         danger_comments.each do |comment|
           violation = violations_from_table(comment["body"]).first
           if !violation.nil? && violation.sticky
@@ -285,13 +298,6 @@ module Danger
             client.delete_pull_request_comment(ci_source.repo_slug, comment["id"]) if replies.empty?
           end
         end
-
-        {
-          warnings: warnings,
-          errors: errors,
-          messages: messages,
-          markdowns: markdowns
-        }
       end
 
       def messages_are_equivalent(m1, m2)
@@ -343,8 +349,10 @@ module Danger
 
           if matching_comments.empty?
             begin
+              # Since Octokit v8, the signature of create_pull_request_comment has been changed.
+              # See https://github.com/danger/danger/issues/1475 for detailed information.
               client.create_pull_request_comment(ci_source.repo_slug, ci_source.pull_request_id,
-                                                 body, head_ref, m.file, position)
+                                                 body, head_ref, m.file, (Octokit::MAJOR >= 8 ? m.line : position))
             rescue Octokit::UnprocessableEntity => e
               # Show more detail for UnprocessableEntity error
               message = [e, "body: #{body}", "head_ref: #{head_ref}", "filename: #{m.file}", "position: #{position}"].join("\n")

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "9.4.2".freeze
+  VERSION = "9.4.3".freeze
   DESCRIPTION = "Like Unit Tests, but for your Team Culture.".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger
 version: !ruby/object:Gem::Version
-  version: 9.4.2
+  version: 9.4.3
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-13 00:00:00.000000000 Z
+date: 2024-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -344,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Like Unit Tests, but for your Team Culture.