danger 3.5.4 → 3.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 989776d07fb68d675c57bb156dcb3a5e8a42f9c1
-  data.tar.gz: 8c797383ea005b6c60b1896dcf1acb071dc08de7
+  metadata.gz: c92b72cb5561d7e1421f18365fc62b481c9762d8
+  data.tar.gz: f8cdf206cb65498b8312019dfc839d70d4360ef2
 SHA512:
-  metadata.gz: 3a619a8989461ac9cc409610c71d0b1cd30f445c064e4c9a190a66b88bcd50bfedfce9c48fa3cbc0038257ac6ae18582ec2a52565ebca9ec0197df1c1405df47
-  data.tar.gz: 4d54581d81ac705ffcd9a700ebb339f61e17bef7bd612a6c99837253e91b6a5b36f91242e9f26313f6d30c099c0a7934b811dd028424c0ee7e92f458321687cb
+  metadata.gz: 3dc93f4a46211f5924006f83797e15a02284faf6f515343daf211041a066719916292df8b49f60a360ff828d910686bcdef932676ca91c68c3c9e414ea93034d
+  data.tar.gz: 1a615082ce6d120d6732357ce403247da7a607affe8620ea2a2edb55cc9c239b3bdb585c2c39967e6c3d71db493f4b1c4ffd125481009049f54ff12e961c6fdd

data/lib/danger/commands/runner.rb

@@ -37,8 +37,8 @@ module Danger
       @base = argv.option("base")
       @head = argv.option("head")
       @fail_on_errors = argv.option("fail-on-errors", false)
-      new_comment = argv.flag?("new-comment")
-      @danger_id = new_comment ? Time.now.strftime("%v %H:%M:%S") : argv.option("danger_id", "danger")
+      @new_comment = argv.flag?("new-comment")
+      @danger_id = argv.option("danger_id", "danger")
       @cork = Cork::Board.new(silent: argv.option("silent", false),
                               verbose: argv.option("verbose", false))
       super
@@ -58,7 +58,7 @@ module Danger
         ["--fail-on-errors=<true|false>", "Should always fail the build process, defaults to false"],
         ["--dangerfile=<path/to/dangerfile>", "The location of your Dangerfile"],
         ["--danger_id=<id>", "The identifier of this Danger instance"],
-        ["--new-comment", "Makes the build process ignore other Danger instances, resulting in a new comment. Overrides '--danger_id'."]
+        ["--new-comment", "Makes Danger post a new comment instead of editing it's previous one"]
       ].concat(super)
     end
 
@@ -68,6 +68,7 @@ module Danger
         head: @head,
         dangerfile_path: @dangerfile_path,
         danger_id: @danger_id,
+        new_comment: @new_comment,
         fail_on_errors: @fail_on_errors
       )
     end

data/lib/danger/danger_core/dangerfile.rb

@@ -241,7 +241,7 @@ module Danger
       violation_report[:errors].count > 0
     end
 
-    def post_results(danger_id)
+    def post_results(danger_id, new_comment)
       violations = violation_report
 
       env.request_source.update_pull_request!(
@@ -249,7 +249,8 @@ module Danger
         errors: violations[:errors],
         messages: violations[:messages],
         markdowns: status_report[:markdowns],
-        danger_id: danger_id
+        danger_id: danger_id,
+        new_comment: new_comment
       )
     end
 
@@ -258,7 +259,7 @@ module Danger
       env.scm.diff_for_folder(".".freeze, from: base_branch, to: head_branch)
     end
 
-    def run(base_branch, head_branch, dangerfile_path, danger_id)
+    def run(base_branch, head_branch, dangerfile_path, danger_id, new_comment)
       # Setup internal state
       init_plugins
       env.fill_environment_vars
@@ -273,7 +274,7 @@ module Danger
         # Push results to the API
         # Pass along the details of the run to the request source
         # to send back to the code review site.
-        post_results(danger_id)
+        post_results(danger_id, new_comment)
 
         # Print results in the terminal
         print_results

data/lib/danger/danger_core/executor.rb

@@ -11,6 +11,7 @@ module Danger
             head: nil,
             dangerfile_path: nil,
             danger_id: nil,
+            new_comment: nil,
             fail_on_errors: nil)
       # Create a silent Cork instance if cork is nil, as it's likely a test
       cork ||= Cork::Board.new(silent: false, verbose: false)
@@ -27,7 +28,8 @@ module Danger
           base_branch(base),
           head_branch(head),
           dangerfile_path,
-          danger_id
+          danger_id,
+          new_comment
         )
       end
 

data/lib/danger/request_sources/github.rb

@@ -105,15 +105,16 @@ module Danger
       end
 
       # Sending data to GitHub
-      def update_pull_request!(warnings: [], errors: [], messages: [], markdowns: [], danger_id: "danger")
+      def update_pull_request!(warnings: [], errors: [], messages: [], markdowns: [], danger_id: "danger", new_comment: false)
         comment_result = {}
         editable_comments = issue_comments.select { |comment| comment.generated_by_danger?(danger_id) }
+        last_comment = editable_comments.last
+        should_create_new_comment = new_comment || last_comment.nil?
 
-        if editable_comments.empty?
+        if should_create_new_comment
           previous_violations = {}
         else
-          comment = editable_comments.first.body
-          previous_violations = parse_comment(comment)
+          previous_violations = parse_comment(last_comment.body)
         end
 
         main_violations = (warnings + errors + messages + markdowns).reject(&:inline?)
@@ -154,11 +155,10 @@ module Danger
                                   danger_id: danger_id,
                                   template: "github")
 
-          if editable_comments.empty?
+          if should_create_new_comment
             comment_result = client.add_comment(ci_source.repo_slug, ci_source.pull_request_id, body)
           else
-            original_id = editable_comments.first.id
-            comment_result = client.update_comment(ci_source.repo_slug, original_id, body)
+            comment_result = client.update_comment(ci_source.repo_slug, last_comment.id, body)
           end
         end
 
@@ -199,6 +199,7 @@ module Danger
             end
           else
             puts message
+            puts "\nDanger does not have write access to the PR to set a PR status.".yellow
           end
         end
       end

data/lib/danger/scm_source/git_repo.rb

@@ -12,10 +12,10 @@ module Danger
 
       ensure_commitish_exists!(from)
       ensure_commitish_exists!(to)
-      merge_base = repo.merge_base(from, to)
 
-      ensure_commitish_exists!(merge_base)
-      self.diff = repo.diff(merge_base.to_s, to)
+      merge_base = find_merge_base(repo, from, to)
+
+      self.diff = repo.diff(merge_base, to)
       self.log = repo.log.between(from, to)
     end
 
@@ -29,7 +29,7 @@ module Danger
     end
 
     def head_commit
-      exec "rev-parse HEAD"
+      exec("rev-parse HEAD")
     end
 
     def origins
@@ -37,46 +37,60 @@ module Danger
     end
 
     def ensure_commitish_exists!(commitish)
-      exec("fetch") if exec("rev-parse --quiet --verify \"#{commitish}^{commit}\"").empty?
+      git_shallow_fetch if commit_not_exists?(commitish)
 
-      if exec("rev-parse --quiet --verify \"#{commitish}^{commit}\"").empty?
+      if commit_not_exists?(commitish)
         raise_if_we_cannot_find_the_commit(commitish)
       end
     end
 
     private
 
+    def git_shallow_fetch
+      exec("fetch --unshallow")
+    end
+
     def default_env
       { "LANG" => "en_US.UTF-8" }
     end
 
-    def raise_if_we_cannot_find_the_commit(commit)
-      raise "Commit #{commit[0..7]} doesn't exist. Are you running `danger local/pr` against the correct repository? Also this usually happens when you rebase/reset and force-pushed."
+    def raise_if_we_cannot_find_the_commit(commitish)
+      raise "Commit #{commitish[0..7]} doesn't exist. Are you running `danger local/pr` against the correct repository? Also this usually happens when you rebase/reset and force-pushed."
     end
-  end
-end
 
-# For full context see:
-# https://github.com/danger/danger/issues/160
-# and https://github.com/danger/danger/issues/316
-#
-# for which the fix comes from an unmerged PR from 2012
-# https://github.com/schacon/ruby-git/pull/43
+    def commit_exists?(sha1)
+      !commit_not_exists?(sha1)
+    end
 
-module Git
-  class Base
-    def merge_base(commit1, commit2, *other_commits)
-      Git::Object.new self, self.lib.merge_base(commit1, commit2, *other_commits)
+    def commit_not_exists?(sha1)
+      exec("rev-parse --quiet --verify #{sha1}^{commit}").empty?
+    end
+
+    def find_merge_base(repo, from, to)
+      possible_merge_base = possible_merge_base(repo, from, to)
+
+      unless possible_merge_base
+        git_shallow_fetch
+        possible_merge_base = possible_merge_base(repo, from, to)
+      end
+
+      raise "Cannot find a merge base between #{from} and #{to}." unless possible_merge_base
+
+      possible_merge_base
+    end
+
+    def possible_merge_base(repo, from, to)
+      [repo.merge_base(from, to)].find { |base| commit_exists?(base) }
     end
   end
+end
 
-  class Lib
+module Git
+  class Base
+    # Use git-merge-base https://git-scm.com/docs/git-merge-base to
+    # find as good common ancestors as possible for a merge
     def merge_base(commit1, commit2, *other_commits)
-      arr_opts = []
-      arr_opts << commit1
-      arr_opts << commit2
-      arr_opts += other_commits
-      command("merge-base", arr_opts)
+      Open3.popen2("git", "merge-base", "--all", commit1, commit2, *other_commits) { |_stdin, stdout, _wait_thr| stdout.read.rstrip }
     end
   end
 end

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "3.5.4".freeze
+  VERSION = "3.5.5".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: 3.5.4
+  version: 3.5.5
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -269,14 +269,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.38'
+        version: '0.44'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.38'
+        version: '0.44'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement