danger 5.2.1 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d74236f8bd9ddb9051beca311ddb9f291dccfd8b
-  data.tar.gz: 1165b856f1f001e97b853e57bb72ba9456d22dac
+  metadata.gz: 72f0e5d81fa65411996bf4e0ab4a5fbcf27ca666
+  data.tar.gz: 858ad689324e7f7ab3a63f0a12271d75eaf539e4
 SHA512:
-  metadata.gz: ef9cd9ba1e8703321b2cad8750c904047b9aae5fbf5aadd2f25a23da14e73ed1a1a778a277cc653c7fdba6f0280d06d0858b02f0cf4252b09bddb85c971de07a
-  data.tar.gz: 9558fcf118e4a16e7bf81baa81c10fc131eb8c0a37e125b8a1e515e4c1b47ab8adb17b0065a82812322421e672ebf2ade86c93c376c5b2eb456522e6419d8fc3
+  metadata.gz: 4539d2b0b778acf486d7daea6ff5e9624bcc4d50e8e26b2eb0a534bfc2acb5f9168d4c169f3e10af6f9c7dca21458415e2b0a9059f7dad76ce556a9664a4f4af
+  data.tar.gz: f2297c80d5e22a04954640ba16311b92bc229608532a12d41dc24aeebfbb2e9a957ed862192e285962f142c74023283b91bb2c0883fe30370db4e8fe7c528e4e

data/lib/danger/core_ext/file_list.rb

@@ -1,8 +1,11 @@
+require "danger/helpers/array_subclass"
+
 module Danger
-  class FileList < Array
+  class FileList
+    include Helpers::ArraySublcass
+
     # Information about pattern: http://ruby-doc.org/core-2.2.0/File.html#method-c-fnmatch
     # e.g. "**/something.*" for any file called something with any extension
-
     def include?(pattern)
       self.each do |current|
         return true if File.fnmatch(pattern, current)

data/lib/danger/helpers/array_subclass.rb

@@ -0,0 +1,61 @@
+module Danger
+  module Helpers
+    module ArraySublcass
+      include Comparable
+
+      def initialize(array)
+        @__array__ = array
+      end
+
+      def kind_of?(compare_class)
+        return true if compare_class == self.class
+
+        dummy.kind_of?(compare_class)
+      end
+
+      def method_missing(name, *args, &block)
+        super unless __array__.respond_to?(name)
+
+        respond_to_method(name, *args, &block)
+      end
+
+      def respond_to_missing?(name)
+        __array__.respond_to?(name) || super
+      end
+
+      def to_a
+        __array__
+      end
+
+      def to_ary
+        __array__
+      end
+
+      def <=>(other)
+        return unless other.kind_of?(self.class)
+
+        __array__ <=> other.instance_variable_get(:@__array__)
+      end
+
+      private
+
+      attr_accessor :__array__
+
+      def dummy
+        Class.new(Array).new
+      end
+
+      def respond_to_method(name, *args, &block)
+        result = __array__.send(name, *args, &block)
+        return result unless result.kind_of?(Array)
+
+        if name =~ /!/
+          __array__ = result
+          self
+        else
+          self.class.new(result)
+        end
+      end
+    end
+  end
+end

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

@@ -130,63 +130,67 @@ module Danger
         last_comment = editable_comments.last
         should_create_new_comment = new_comment || last_comment.nil?
 
-        if should_create_new_comment
-          previous_violations = {}
-        else
-          previous_violations = parse_comment(last_comment.body)
-        end
+        previous_violations =
+          if should_create_new_comment
+            {}
+          else
+            parse_comment(last_comment.body)
+          end
 
-        cmp = proc do |a, b|
-          next -1 unless a.file
-          next 1 unless b.file
+        regular_violations = regular_violations_group(
+          warnings: warnings,
+          errors: errors,
+          messages: messages,
+          markdowns: markdowns
+        )
 
-          next a.line <=> b.line if a.file == b.file
-          next a.file <=> b.file
-        end
+        inline_violations = inline_violations_group(
+          warnings: warnings,
+          errors: errors,
+          messages: messages,
+          markdowns: markdowns
+        )
 
-        # Sort to group inline comments by file
-        # We copy because we need to mutate this arrays for inlines
-        comment_warnings = warnings.sort(&cmp)
-        comment_errors = errors.sort(&cmp)
-        comment_messages = messages.sort(&cmp)
-        comment_markdowns = markdowns.sort(&cmp)
-
-        submit_inline_comments!(warnings: comment_warnings,
-                                  errors: comment_errors,
-                                messages: comment_messages,
-                                markdowns: comment_markdowns,
-                      previous_violations: previous_violations,
-                                danger_id: danger_id)
-
-        main_violations = comment_warnings + comment_errors + comment_messages + comment_markdowns
-        if previous_violations.empty? && main_violations.empty?
+        rest_inline_violations = submit_inline_comments!({
+          danger_id: danger_id,
+          previous_violations: previous_violations
+        }.merge(inline_violations))
+
+        main_violations = merge_violations(
+          regular_violations, rest_inline_violations
+        )
+
+        main_violations_sum = main_violations.values.inject(:+)
+
+        if previous_violations.empty? && main_violations_sum.empty?
           # Just remove the comment, if there's nothing to say.
           delete_old_comments!(danger_id: danger_id)
         end
 
         # If there are still violations to show
-        unless main_violations.empty?
-          body = generate_comment(warnings: comment_warnings,
-                                    errors: comment_errors,
-                                  messages: comment_messages,
-                                  markdowns: comment_markdowns,
-                        previous_violations: previous_violations,
-                                  danger_id: danger_id,
-                                  template: "github")
-
-          if should_create_new_comment
-            comment_result = client.add_comment(ci_source.repo_slug, ci_source.pull_request_id, body)
-          else
-            comment_result = client.update_comment(ci_source.repo_slug, last_comment.id, body)
-          end
+        if main_violations_sum.any?
+          body = generate_comment({
+            template: "github",
+            danger_id: danger_id,
+            previous_violations: previous_violations
+          }.merge(main_violations))
+
+          comment_result =
+            if should_create_new_comment
+              client.add_comment(ci_source.repo_slug, ci_source.pull_request_id, body)
+            else
+              client.update_comment(ci_source.repo_slug, last_comment.id, body)
+            end
         end
 
         # Now, set the pull request status.
         # Note: this can terminate the entire process.
-        submit_pull_request_status!(warnings: warnings,
-                                      errors: errors,
-                                 details_url: comment_result["html_url"],
-                                   danger_id: danger_id)
+        submit_pull_request_status!(
+          warnings: warnings,
+          errors: errors,
+          details_url: comment_result["html_url"],
+          danger_id: danger_id
+        )
       end
 
       def submit_pull_request_status!(warnings: [], errors: [], details_url: [], danger_id: "danger")
@@ -234,17 +238,25 @@ module Danger
 
       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?
+        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
 
-        submit_inline_comments_for_kind!("warning", warnings, diff_lines, danger_comments, previous_violations["warning"], danger_id: danger_id)
-        submit_inline_comments_for_kind!("no_entry_sign", errors, diff_lines, danger_comments, previous_violations["error"], danger_id: danger_id)
-        submit_inline_comments_for_kind!("book", messages, diff_lines, danger_comments, previous_violations["message"], danger_id: danger_id)
-        submit_inline_comments_for_kind!(nil, markdowns, diff_lines, danger_comments, [], danger_id: danger_id)
+        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!(
+          "no_entry_sign", errors, diff_lines, danger_comments, previous_violations["error"], danger_id: danger_id
+        )
+        messages = submit_inline_comments_for_kind!(
+          "book", messages, diff_lines, danger_comments, previous_violations["message"], danger_id: danger_id
+        )
+        markdowns = submit_inline_comments_for_kind!(
+          nil, markdowns, diff_lines, danger_comments, [], danger_id: danger_id
+        )
 
         # submit removes from the array all comments that are still in force
         # so we strike out all remaining ones
@@ -266,6 +278,13 @@ 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)
@@ -279,7 +298,7 @@ module Danger
         previous_violations ||= []
         is_markdown_content = emoji.nil?
 
-        submit_inline = proc do |m|
+        messages.reject do |m|
           next false unless m.file && m.line
 
           position = find_position_in_diff diff_lines, m
@@ -328,8 +347,6 @@ module Danger
           # Remove this element from the array
           next true
         end
-
-        messages.reject!(&submit_inline)
       end
 
       def find_position_in_diff(diff_lines, message)
@@ -430,6 +447,41 @@ module Danger
           @download_url = "https://raw.githubusercontent.com/#{organisation}/#{repository}/#{branch}/#{path}"
         end
       end
+
+      private
+
+      def regular_violations_group(warnings: [], errors: [], messages: [], markdowns: [])
+        {
+          warnings: warnings.reject(&:inline?),
+          errors: errors.reject(&:inline?),
+          messages: messages.reject(&:inline?),
+          markdowns: markdowns.reject(&:inline?)
+        }
+      end
+
+      def inline_violations_group(warnings: [], errors: [], messages: [], markdowns: [])
+        cmp = proc do |a, b|
+          next -1 unless a.file
+          next 1 unless b.file
+
+          next a.line <=> b.line if a.file == b.file
+          next a.file <=> b.file
+        end
+
+        # Sort to group inline comments by file
+        {
+          warnings: warnings.select(&:inline?).sort(&cmp),
+          errors: errors.select(&:inline?).sort(&cmp),
+          messages: messages.select(&:inline?).sort(&cmp),
+          markdowns: markdowns.select(&:inline?).sort(&cmp)
+        }
+      end
+
+      def merge_violations(*violation_groups)
+        violation_groups.inject({}) do |accumulator, group|
+          accumulator.merge(group) { |_, old, fresh| old + fresh }
+        end
+      end
     end
   end
 end

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "5.2.1".freeze
+  VERSION = "5.2.2".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: 5.2.1
+  version: 5.2.2
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -422,6 +422,7 @@ files:
 - lib/danger/danger_core/plugins/dangerfile_gitlab_plugin.rb
 - lib/danger/danger_core/plugins/dangerfile_messaging_plugin.rb
 - lib/danger/danger_core/standard_error.rb
+- lib/danger/helpers/array_subclass.rb
 - lib/danger/helpers/comment.rb
 - lib/danger/helpers/comments_helper.rb
 - lib/danger/helpers/comments_parsing_helper.rb