danger 5.2.2 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72f0e5d81fa65411996bf4e0ab4a5fbcf27ca666
-  data.tar.gz: 858ad689324e7f7ab3a63f0a12271d75eaf539e4
+  metadata.gz: 280aa14f35fab7d31eca02ca079f3fd139f3f4ba
+  data.tar.gz: 356443a6e67ca27bf08cb760b96bfe909d3b40ec
 SHA512:
-  metadata.gz: 4539d2b0b778acf486d7daea6ff5e9624bcc4d50e8e26b2eb0a534bfc2acb5f9168d4c169f3e10af6f9c7dca21458415e2b0a9059f7dad76ce556a9664a4f4af
-  data.tar.gz: f2297c80d5e22a04954640ba16311b92bc229608532a12d41dc24aeebfbb2e9a957ed862192e285962f142c74023283b91bb2c0883fe30370db4e8fe7c528e4e
+  metadata.gz: f3fe03e6240ad5b9ef1fd1efe6161b46ce562ca5d851ed5f01719d52679c7f31124e3f920746ee97a5c445e5d751b8dff340b0e7f57cdc4ec441ca8fc896d119
+  data.tar.gz: d2ce6b122c7727f462aa53ca5b2d1797007bb8e811bbcb59fa1a0deaa722f5368c3d542cdfbd0622407cf38e168617d54f9ec31c35ee6c9afd601b8d3559e421

data/lib/danger/ci_source/jenkins.rb

@@ -29,6 +29,11 @@ module Danger
   #
   # With that set up, you can edit your job to add `bundle exec danger` at the build action.
   #
+  # #### General
+  #
+  # People occasionally see issues with Danger not classing your CI runs as a PR, to give you visibilty
+  # the Jenkins side of Danger expects to see one of these env vars: ghprbPullId, CHANGE_ID or gitlabMergeRequestId
+  #
   # ### Token Setup
   #
   # #### GitHub

data/lib/danger/commands/init.rb

@@ -143,9 +143,14 @@ module Danger
     end
 
     def current_repo_slug
-      @git = GitRepo.new
-      repo_matches = @git.origins.match(%r{([\/:])([^\/]+\/[^\/.]+)(?:.git)?$})
-      (repo_matches[2] || "[Your/Repo]").strip
+      git = GitRepo.new
+
+      author_repo_regexp = %r{(?:[\/:])([^\/]+\/[^\/]+)(?:.git)?$}
+      last_git_regexp = /.git$/
+
+      matches = git.origins.match(author_repo_regexp)
+
+      matches ? matches[1].gsub(last_git_regexp, "").strip : "[Your/Repo]"
     end
 
     def setup_danger_ci

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

@@ -83,6 +83,14 @@ module Danger
       @git.renamed_files
     end
 
+    # @!group Git Metadata
+    # Whole diff
+    # @return [Git::Diff] from the gem `git`
+    #
+    def diff
+      @git.diff
+    end
+
     # @!group Git Metadata
     # The overall lines of code added/removed in the diff
     # @return [Fixnum]

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

@@ -226,12 +226,19 @@ module Danger
 
     # @!group GitHub Misc
     # Use to ignore inline messages which lay outside a diff's range, thereby not posting them in the main comment.
-    # @param    [Bool] dismiss
+    # 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)
-      @github.dismiss_out_of_range_messages = dismiss == true
+    def dismiss_out_of_range_messages(dismiss = true)
+      if dismiss.kind_of?(Hash)
+        @github.dismiss_out_of_range_messages = dismiss
+      elsif dismiss.kind_of?(TrueClass)
+        @github.dismiss_out_of_range_messages = true
+      elsif dismiss.kind_of?(FalseClass)
+        @github.dismiss_out_of_range_messages = false
+      end
     end
 
     %i(title body author labels json).each do |suffix|

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

@@ -245,18 +245,10 @@ module Danger
         danger_comments = pr_comments.select { |comment| Comment.from_github(comment).generated_by_danger?(danger_id) }
         non_danger_comments = pr_comments - danger_comments
 
-        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
-        )
+        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)
+        markdowns = submit_inline_comments_for_kind!(:markdown, 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
@@ -293,18 +285,19 @@ module Danger
           m1.message.sub(blob_regexp, "") == m2.message.sub(blob_regexp, "")
       end
 
-      def submit_inline_comments_for_kind!(emoji, messages, diff_lines, danger_comments, previous_violations, danger_id: "danger")
+      def submit_inline_comments_for_kind!(kind, messages, diff_lines, danger_comments, previous_violations, danger_id: "danger")
         head_ref = pr_json["head"]["sha"]
         previous_violations ||= []
-        is_markdown_content = emoji.nil?
+        is_markdown_content = kind == :markdown
+        emoji = { warning: "warning", error: "no_entry_sign", message: "book" }[kind]
 
         messages.reject do |m|
           next false unless m.file && m.line
 
-          position = find_position_in_diff diff_lines, m
+          position = find_position_in_diff diff_lines, m, kind
 
           # Keep the change if it's line is not in the diff and not in dismiss mode
-          next self.dismiss_out_of_range_messages if position.nil?
+          next dismiss_out_of_range_messages_for(kind) if position.nil?
 
           # Once we know we're gonna submit it, we format it
           if is_markdown_content
@@ -349,7 +342,7 @@ module Danger
         end
       end
 
-      def find_position_in_diff(diff_lines, message)
+      def find_position_in_diff(diff_lines, message, kind)
         range_header_regexp = /@@ -([0-9]+),([0-9]+) \+(?<start>[0-9]+)(,(?<end>[0-9]+))? @@.*/
         file_header_regexp = %r{^diff --git a/.*}
 
@@ -372,7 +365,7 @@ module Danger
           # so we do it one by one ignoring the deleted lines
           if !file_line.nil? && !line.start_with?("-")
             if file_line == message.line
-              file_line = nil if dismiss_out_of_range_messages && !line.start_with?("+")
+              file_line = nil if dismiss_out_of_range_messages_for(kind) && !line.start_with?("+")
               break
             end
             file_line += 1
@@ -432,6 +425,16 @@ module Danger
         nil
       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)
         organisation ||= self.organisation

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "5.2.2".freeze
+  VERSION = "5.3.0".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.2
+  version: 5.3.0
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide