danger 5.4.3 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46b84e6217c921dda10765acbe116a3da6ee00cd
-  data.tar.gz: 558617a4e1e01d226d08e9f6170641ddcd0cedb8
+  metadata.gz: 035ce582ea667e60dfda80d1c6c3292c17d7f384
+  data.tar.gz: faa2bacbc0e417f69e21b6fcf3e301f0789c90f5
 SHA512:
-  metadata.gz: 3bd2d6c49555450e934aa5ac675b4db0eb658ce7571dda6699564ff479fd1e7e360339a441ad6da45850869c7871d38ebfa8febcd118944381d852f1f302a8c0
-  data.tar.gz: dc2616251d6a850d51387a6d18111a8ba23e49f7cbdaeec631d5669acde68397cf3a11c97efea57db4ebf3476d73ce5d2b3f307c6330356f5a2637dafd74e2fe
+  metadata.gz: e139a3aa585b191a0d2959e4565a56626b5d66c11f03926c5c1ee91625d28a085309b4491aa489a1d9b220de8220af534cfc0f4481d13fa0a68a48f1059f4d30
+  data.tar.gz: 945bd0fecf7c392b19ce7928ea76938e862c540121f771accc791ad60fcc8722b3c18d4a287f5bcfb7500d9ec5dd5c9d52b5d7ae9dd91cb32029c9be7dc3df82

data/lib/danger/ci_source/jenkins.rb

@@ -32,7 +32,11 @@ module Danger
   # #### 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
+  # the Jenkins side of Danger expects to see one of these env vars:
+  # - ghprbPullId
+  # - CHANGE_ID
+  # - gitlabMergeRequestIid
+  # - gitlabMergeRequestId
   #
   # ### Token Setup
   #
@@ -81,6 +85,8 @@ module Danger
         env["ghprbPullId"]
       elsif env["CHANGE_ID"]
         env["CHANGE_ID"]
+      elsif env["gitlabMergeRequestIid"]
+        env["gitlabMergeRequestIid"]
       else
         env["gitlabMergeRequestId"]
       end

data/lib/danger/commands/local_helpers/pry_setup.rb

@@ -9,7 +9,7 @@ module Danger
       validate_pry_available
       FileUtils.cp dangerfile_path, DANGERFILE_COPY
       File.open(DANGERFILE_COPY, "a") do |f|
-        f.write("binding.pry; File.delete(\"#{DANGERFILE_COPY}\")")
+        f.write("\nbinding.pry; File.delete(\"#{DANGERFILE_COPY}\")")
       end
       DANGERFILE_COPY
     end

data/lib/danger/helpers/comment.rb

@@ -16,7 +16,7 @@ module Danger
     end
 
     def generated_by_danger?(danger_id)
-      body.include?("generated_by_#{danger_id}")
+      body.include?("\"generated_by_#{danger_id}\"")
     end
   end
 end

data/lib/danger/request_sources/bitbucket_cloud.rb

@@ -46,16 +46,18 @@ module Danger
       end
 
       def setup_danger_branches
+        base_branch = self.pr_json[:destination][:branch][:name]
         base_commit = self.pr_json[:destination][:commit][:hash]
+        head_branch = self.pr_json[:source][:branch][:name]
         head_commit = self.pr_json[:source][:commit][:hash]
 
         # Next, we want to ensure that we have a version of the current branch at a known location
-        scm.ensure_commitish_exists! base_commit
+        scm.ensure_commitish_exists_on_branch! base_branch, base_commit
         self.scm.exec "branch #{EnvironmentManager.danger_base_branch} #{base_commit}"
 
         # OK, so we want to ensure that we have a known head branch, this will always represent
         # the head of the PR ( e.g. the most recent commit that will be merged. )
-        scm.ensure_commitish_exists! head_commit
+        scm.ensure_commitish_exists_on_branch! head_branch, head_commit
         self.scm.exec "branch #{EnvironmentManager.danger_head_branch} #{head_commit}"
       end
 

data/lib/danger/request_sources/bitbucket_server.rb

@@ -47,16 +47,18 @@ module Danger
       end
 
       def setup_danger_branches
+        base_branch = self.pr_json[:toRef][:id].sub("refs/heads/", "")
         base_commit = self.pr_json[:toRef][:latestCommit]
+        head_branch = self.pr_json[:fromRef][:id].sub("refs/heads/", "")
         head_commit = self.pr_json[:fromRef][:latestCommit]
 
         # Next, we want to ensure that we have a version of the current branch at a known location
-        scm.ensure_commitish_exists! base_commit
+        scm.ensure_commitish_exists_on_branch! base_branch, base_commit
         self.scm.exec "branch #{EnvironmentManager.danger_base_branch} #{base_commit}"
 
         # OK, so we want to ensure that we have a known head branch, this will always represent
         # the head of the PR ( e.g. the most recent commit that will be merged. )
-        scm.ensure_commitish_exists! head_commit
+        scm.ensure_commitish_exists_on_branch! head_branch, head_commit
         self.scm.exec "branch #{EnvironmentManager.danger_head_branch} #{head_commit}"
       end
 

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

@@ -98,16 +98,18 @@ module Danger
 
       def setup_danger_branches
         # we can use a github specific feature here:
+        base_branch = self.pr_json["base"]["ref"]
         base_commit = self.pr_json["base"]["sha"]
+        head_branch = self.pr_json["head"]["ref"]
         head_commit = self.pr_json["head"]["sha"]
 
         # Next, we want to ensure that we have a version of the current branch at a known location
-        scm.ensure_commitish_exists! base_commit
+        scm.ensure_commitish_exists_on_branch! base_branch, base_commit
         self.scm.exec "branch #{EnvironmentManager.danger_base_branch} #{base_commit}"
 
         # OK, so we want to ensure that we have a known head branch, this will always represent
         # the head of the PR ( e.g. the most recent commit that will be merged. )
-        scm.ensure_commitish_exists! head_commit
+        scm.ensure_commitish_exists_on_branch! head_branch, head_commit
         self.scm.exec "branch #{EnvironmentManager.danger_head_branch} #{head_commit}"
       end
 

data/lib/danger/request_sources/gitlab.rb

@@ -78,15 +78,17 @@ module Danger
       end
 
       def setup_danger_branches
+        base_branch = self.mr_json.source_branch
+        head_branch = self.mr_json.target_branch
         head_commit = self.scm.head_commit
 
         # Next, we want to ensure that we have a version of the current branch at a known location
-        scm.ensure_commitish_exists! base_commit
+        scm.ensure_commitish_exists_on_branch! base_branch, base_commit
         self.scm.exec "branch #{EnvironmentManager.danger_base_branch} #{base_commit}"
 
         # OK, so we want to ensure that we have a known head branch, this will always represent
         # the head of the PR ( e.g. the most recent commit that will be merged. )
-        scm.ensure_commitish_exists! head_commit
+        scm.ensure_commitish_exists_on_branch! head_branch, head_commit
         self.scm.exec "branch #{EnvironmentManager.danger_head_branch} #{head_commit}"
       end
 

data/lib/danger/request_sources/vsts.rb

@@ -53,16 +53,18 @@ module Danger
       end
 
       def setup_danger_branches
+        base_branch = self.pr_json[:targetRefName].sub("refs/heads/", "")
         base_commit = self.pr_json[:lastMergeTargetCommit][:commitId]
+        head_branch = self.pr_json[:sourceRefName].sub("refs/heads/", "")
         head_commit = self.pr_json[:lastMergeSourceCommit][:commitId]
 
         # Next, we want to ensure that we have a version of the current branch at a known location
-        scm.ensure_commitish_exists! base_commit
+        scm.ensure_commitish_exists_on_branch! base_branch, base_commit
         self.scm.exec "branch #{EnvironmentManager.danger_base_branch} #{base_commit}"
 
         # OK, so we want to ensure that we have a known head branch, this will always represent
         # the head of the PR ( e.g. the most recent commit that will be merged. )
-        scm.ensure_commitish_exists! head_commit
+        scm.ensure_commitish_exists_on_branch! head_branch, head_commit
         self.scm.exec "branch #{EnvironmentManager.danger_head_branch} #{head_commit}"
       end
 

data/lib/danger/scm_source/git_repo.rb

@@ -64,11 +64,29 @@ module Danger
     end
 
     def ensure_commitish_exists!(commitish)
-      git_in_depth_fetch if commit_not_exists?(commitish)
+      return ensure_commitish_exists_on_branch!(commitish, commitish) if commit_is_ref?(commitish)
+      return if commit_exists?(commitish)
 
-      if commit_not_exists?(commitish)
-        raise_if_we_cannot_find_the_commit(commitish)
-      end
+      git_in_depth_fetch
+      raise_if_we_cannot_find_the_commit(commitish) if commit_not_exists?(commitish)
+    end
+
+    def ensure_commitish_exists_on_branch!(branch, commitish)
+      return if commit_exists?(commitish)
+
+      depth = 0
+      success =
+        (3..6).any? do |factor|
+          depth += Math.exp(factor).to_i
+
+          git_fetch_branch_to_depth(branch, depth)
+          commit_exists?(commitish)
+        end
+
+      return if success
+
+      git_in_depth_fetch
+      raise_if_we_cannot_find_the_commit(commitish) if commit_not_exists?(commitish)
     end
 
     private
@@ -77,6 +95,10 @@ module Danger
       exec("fetch --depth 1000000")
     end
 
+    def git_fetch_branch_to_depth(branch, depth)
+      exec("fetch --depth=#{depth} --prune origin +refs/heads/#{branch}:refs/remotes/origin/#{branch}")
+    end
+
     def default_env
       { "LANG" => "en_US.UTF-8" }
     end
@@ -95,17 +117,35 @@ module Danger
 
     def find_merge_base(repo, from, to)
       possible_merge_base = possible_merge_base(repo, from, to)
+      return possible_merge_base if possible_merge_base
 
-      unless possible_merge_base
-        git_in_depth_fetch
-        possible_merge_base = possible_merge_base(repo, from, to)
-      end
+      possible_merge_base = find_merge_base_with_incremental_fetch(repo, from, to)
+      return possible_merge_base if possible_merge_base
+
+      git_in_depth_fetch
+      possible_merge_base = possible_merge_base(repo, from, to)
 
       raise "Cannot find a merge base between #{from} and #{to}." unless possible_merge_base
 
       possible_merge_base
     end
 
+    def find_merge_base_with_incremental_fetch(repo, from, to)
+      from_is_ref = commit_is_ref?(from)
+      to_is_ref = commit_is_ref?(to)
+
+      return unless from_is_ref || to_is_ref
+
+      depth = 0
+      (3..6).any? do |factor|
+        depth += Math.exp(factor).to_i
+
+        git_fetch_branch_to_depth(from, depth) if from_is_ref
+        git_fetch_branch_to_depth(to, depth) if to_is_ref
+        possible_merge_base(repo, from, to)
+      end
+    end
+
     def possible_merge_base(repo, from, to)
       [repo.merge_base(from, to)].find { |base| commit_exists?(base) }
     end
@@ -113,6 +153,10 @@ module Danger
     def commits_in_branch_count(from, to)
       exec("rev-list #{from}..#{to} --count").to_i
     end
+
+    def commit_is_ref?(commit)
+      /[a-f0-9]{5,40}/ !~ commit
+    end
   end
 end
 

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "5.4.3".freeze
+  VERSION = "5.5.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.4.3
+  version: 5.5.0
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -487,7 +487,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Like Unit Tests, but for your Team Culture.