danger 8.0.5 → 8.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6ea9c4a38578c0c9cd6e762b689010bce9de3bc6479134cce2f6c45afdce925
-  data.tar.gz: 4f131339c436c4ee163660341e0471c0c456b0251da17c6a5f5511f2fc3ac708
+  metadata.gz: 3b175fad0150fdcb243c42f37c0b9683a7dc00db8b3be4ef81d01be0103b90bb
+  data.tar.gz: d422bf7eadd533e5591f1ac43cde404f38d124a3c398469a1b9563c5338e8370
 SHA512:
-  metadata.gz: 93226e7a7fe9b4300efb93ac07e59932eda1b25cae739f1f48d132f0d77f9d5f6a861d226785981f6580587cfd11380db5ec4e0935adea7c3707f35a5dc2af3d
-  data.tar.gz: 7cca48807d7cb110180f88b62d1af13591ba83791f0f1528384dcd2c4c3247394fec2abfb9c1bc592e496659d3d14f6f46e1813af125570c967713b9d602251c
+  metadata.gz: d36a05ed7713cf0b50936c04feaa4cb49c8ba035b539ff265c9d7e231c2670efba007f5f4a2bf58936cab24c7aa0e09d5c9a2a9edff9714689fc5b03cc31d870
+  data.tar.gz: 611a647c06bab7c3949ded7ff12b5498b966d54f10056481ae720dfa3801f48ac27085d112f69c186feb5638b2b82b0f7583c0f020af33af8251705429fbf614

data/lib/danger/core_ext/file_list.rb

@@ -9,7 +9,7 @@ module Danger
     def include?(pattern)
       self.each do |current|
         unless current.nil?
-          return true if File.fnmatch(pattern, current) || pattern == current
+          return true if File.fnmatch(pattern, current, File::FNM_EXTGLOB) || pattern == current
         end
       end
       return false

data/lib/danger/danger_core/plugins/dangerfile_gitlab_plugin.rb

@@ -227,6 +227,23 @@ module Danger
       paths.first(paths.count - 1).join(", ") + " & " + paths.last
     end
 
+    # @!group Gitlab Misc
+    # Use to ignore inline messages which lay outside a diff's range, thereby not posting the comment.
+    # You can set hash to change behavior per each kinds. (ex. `{warning: true, error: false}`)
+    # @param    [Bool] or [Hash<Symbol, Bool>] dismiss
+    #           Ignore out of range inline messages, defaults to `true`
+    #
+    # @return   [void]
+    def dismiss_out_of_range_messages(dismiss = true)
+      if dismiss.kind_of?(Hash)
+        @gitlab.dismiss_out_of_range_messages = dismiss
+      elsif dismiss.kind_of?(TrueClass)
+        @gitlab.dismiss_out_of_range_messages = true
+      elsif dismiss.kind_of?(FalseClass)
+        @gitlab.dismiss_out_of_range_messages = false
+      end
+    end
+
     %i(title body author labels json diff).each do |suffix|
       alias_method "pr_#{suffix}".to_sym, "mr_#{suffix}".to_sym
     end

data/lib/danger/helpers/comments_helper.rb

@@ -11,7 +11,7 @@ module Danger
       include Danger::Helpers::CommentsParsingHelper
 
       def markdown_parser(text)
-        Kramdown::Document.new(text, input: "GFM")
+        Kramdown::Document.new(text, input: "GFM", smart_quotes: %w[apos apos quot quot])
       end
 
       # !@group Extension points

data/lib/danger/request_sources/gitlab.rb

@@ -8,7 +8,7 @@ module Danger
   module RequestSources
     class GitLab < RequestSource
       include Danger::Helpers::CommentsHelper
-      attr_accessor :mr_json, :commits_json
+      attr_accessor :mr_json, :commits_json, :dismiss_out_of_range_messages
 
       FIRST_GITLAB_GEM_WITH_VERSION_CHECK = Gem::Version.new("4.6.0")
       FIRST_VERSION_WITH_INLINE_COMMENTS = Gem::Version.new("10.8.0")
@@ -24,6 +24,7 @@ module Danger
       def initialize(ci_source, environment)
         self.ci_source = ci_source
         self.environment = environment
+        self.dismiss_out_of_range_messages = false
 
         @token = @environment["DANGER_GITLAB_API_TOKEN"]
       end
@@ -302,6 +303,16 @@ module Danger
         nil # TODO: Implement this
       end
 
+      def dismiss_out_of_range_messages_for(kind)
+        if self.dismiss_out_of_range_messages.kind_of?(Hash) && self.dismiss_out_of_range_messages[kind]
+          self.dismiss_out_of_range_messages[kind]
+        elsif self.dismiss_out_of_range_messages == true
+          self.dismiss_out_of_range_messages
+        else
+          false
+        end
+      end
+
       # @return [String] A URL to the specific file, ready to be downloaded
       def file_url(organisation: nil, repository: nil, branch: nil, path: nil)
         branch ||= 'master'
@@ -397,10 +408,9 @@ module Danger
 
         messages.reject do |m|
           next false unless m.file && m.line
-
-          # Keep the change it's in a file changed in this diff
-          next if !mr_changed_paths.include?(m.file)
-
+          # Reject if it's out of range and in dismiss mode
+          next true if dismiss_out_of_range_messages_for(kind) && is_out_of_range(mr_changes.changes, m)
+          
           # Once we know we're gonna submit it, we format it
           if is_markdown_content
             body = generate_inline_markdown_body(m, danger_id: danger_id, template: "gitlab")
@@ -473,7 +483,6 @@ module Danger
         range_header_regexp = /@@ -(?<old>[0-9]+)(,([0-9]+))? \+(?<new>[0-9]+)(,([0-9]+))? @@.*/
 
         change = changes.find { |c| c["new_path"] == message.file }
-
         # If there is no changes or rename only or deleted, return nil.
         return nil if change.nil? || change["diff"].empty? || change["deleted_file"]
 
@@ -520,6 +529,41 @@ module Danger
           line: current_old_line - current_new_line + message.line.to_i
         }
       end
+
+      def is_out_of_range(changes, message)
+        change = changes.find { |c| c["new_path"] == message.file }  
+        # If there is no changes or rename only or deleted, return out of range.
+        return true if change.nil? || change["diff"].empty? || change["deleted_file"]
+        
+        # If new file then return in range
+        return false if change["new_file"]
+
+        addition_lines = generate_addition_lines(change["diff"])
+        return false if addition_lines.include?(message.line.to_i)
+
+        return true
+      end
+
+      def generate_addition_lines(diff) 
+        range_header_regexp = /@@ -(?<old>[0-9]+)(,([0-9]+))? \+(?<new>[0-9]+)(,([0-9]+))? @@.*/
+        addition_lines = []
+        line_number = 0
+        diff.each_line do |line|
+          if line.match range_header_regexp
+            line = line.split('+').last
+            line = line.split(' ').first
+            range_string = line.split(',')
+            line_number = range_string[0].to_i - 1
+          elsif line.start_with?('+')
+            addition_lines.push(line_number)
+          elsif line.start_with?('-')
+            line_number=line_number-1
+          end
+          line_number=line_number+1
+        end
+        addition_lines
+      end
+
     end
   end
 end

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "8.0.5".freeze
+  VERSION = "8.0.6".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: 8.0.5
+  version: 8.0.6
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-31 00:00:00.000000000 Z
+date: 2020-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide