danger 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f0959f195af33185bbbdb41f1056e67a7c9babf
-  data.tar.gz: 61223153953f39a208c7c9edfa9103b1748d8124
+  metadata.gz: 1bf87af94fa6f272c52fff0a149ca15b0328e76d
+  data.tar.gz: 5c9e4dffa0eddc1cee08eb7884d8d7729c4c1c1b
 SHA512:
-  metadata.gz: abf51e8a4378186c34e869654f0216ff18501ebdc79d304c7a9c8b271c22219226d334fe9e466a4c1d41f476e32385f26c9764de5a6e23bf96b0de9d83ed8aba
-  data.tar.gz: 8a6bc14ef8e75a917d43a8b65f7366610d784775a54abb411f87ca1146b83b4599161ef96f7f503cdc4c3bfd9fcaa70ac9fe53d5b2003356a7ca47055c411a8e
+  metadata.gz: 36721c111dd986918c83e747b8ccebc3325f187289103e7770537533a99173c2f1c14f6f9835d811172ea409b79be0f5ea748ac0c03344c261bac85e0aaf3915
+  data.tar.gz: fb5ea6d86915a9628dcc9906a67b265edd4aae7831448c605c3807bc243a9539c1464840926e1c171f5739760f967d7700ed32b5d64e3abae9b1520b0da7b9d8

data/lib/danger/ci_source/buildkite.rb

@@ -23,7 +23,8 @@ module Danger
     end
 
     def self.validates_as_pr?(env)
-      ["BUILDKITE_PULL_REQUEST_REPO", "BUILDKITE_PULL_REQUEST"].all? { |x| env[x] }
+      exists = ["BUILDKITE_PULL_REQUEST_REPO", "BUILDKITE_PULL_REQUEST"].all? { |x| env[x] }
+      exists && !env["BUILDKITE_PULL_REQUEST_REPO"].empty?
     end
 
     def initialize(env)

data/lib/danger/comment_generators/github.md.erb

@@ -14,12 +14,21 @@
      </tr>
   </thead>
   <tbody>
-    <%- table[:content].each do |violation| -%>
+    <%- max_num_violations = 700 %>
+    <%- table[:content].take(max_num_violations).each do |violation| -%>
     <tr>
       <td>:<%= table[:emoji] %>:</td>
       <td data-sticky="<%= violation.sticky %>"><%= violation.message %></td>
     </tr>
     <%- end -%>
+    <%- if table[:content].length > max_num_violations -%>
+      <tr>
+        <td>:warning:</td>
+        <td>
+        Danger found <%= table[:content].length %> violations with this PR. Due to GitHub's max issue comment size, the number shown has been truncated to <%= max_num_violations %>.
+        </td>
+      </tr>
+    <%- end -%>
     <%- table[:resolved].each do |message| -%>
       <tr>
         <td>:white_check_mark:</td>

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

@@ -158,7 +158,7 @@ module Danger
 
     # @!group GitHub Misc
     # The hash that represents the PR's JSON. For an example of what this looks like
-    # see the [Danger Fixture'd one](https://raw.githubusercontent.com/danger/danger/master/spec/fixtures/pr_response.json).
+    # see the [Danger Fixture'd one](https://raw.githubusercontent.com/danger/danger/master/spec/fixtures/github_api/pr_response.json).
     # @return [Hash]
     #
     def pr_json

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

@@ -22,7 +22,7 @@ module Danger
   #
   #          fail "This build didn't pass tests"
   #
-  # @example Failing a build, but not keeping it's value around on subsequent runs
+  # @example Failing a build, but not keeping its value around on subsequent runs
   #
   #          fail("This build didn't pass tests", sticky: false)
   #

data/lib/danger/request_source/github.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
-require 'octokit'
-require 'danger/helpers/comments_helper'
+require "octokit"
+require "danger/helpers/comments_helper"
 
 module Danger
   module RequestSources
@@ -15,9 +15,9 @@ module Danger
         self.support_tokenless_auth = false
 
         Octokit.auto_paginate = true
-        @token = @environment['DANGER_GITHUB_API_TOKEN']
-        if @environment['DANGER_GITHUB_API_HOST']
-          Octokit.api_endpoint = @environment['DANGER_GITHUB_API_HOST']
+        @token = @environment["DANGER_GITHUB_API_TOKEN"]
+        if @environment["DANGER_GITHUB_API_HOST"]
+          Octokit.api_endpoint = @environment["DANGER_GITHUB_API_HOST"]
         end
       end
 
@@ -26,16 +26,16 @@ module Danger
       end
 
       def host
-        @host = @environment['DANGER_GITHUB_HOST'] || 'github.com'
+        @host = @environment["DANGER_GITHUB_HOST"] || "github.com"
       end
 
       def client
-        raise 'No API token given, please provide one using `DANGER_GITHUB_API_TOKEN`' if !@token && !support_tokenless_auth
+        raise "No API token given, please provide one using `DANGER_GITHUB_API_TOKEN`" if !@token && !support_tokenless_auth
         @client ||= Octokit::Client.new(access_token: @token)
       end
 
       def pr_diff
-        @pr_diff ||= client.pull_request(ci_source.repo_slug, ci_source.pull_request_id, accept: 'application/vnd.github.v3.diff')
+        @pr_diff ||= client.pull_request(ci_source.repo_slug, ci_source.pull_request_id, accept: "application/vnd.github.v3.diff")
       end
 
       def setup_danger_branches
@@ -69,11 +69,11 @@ 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")
         comment_result = {}
 
         issues = client.issue_comments(ci_source.repo_slug, ci_source.pull_request_id)
-        editable_issues = issues.reject { |issue| issue[:body].include?("generated_by_#{danger_id}") == false }
+        editable_issues = issues.select { |issue| danger_issue?(issue, danger_id) }
 
         if editable_issues.empty?
           previous_violations = {}
@@ -92,7 +92,7 @@ module Danger
                                  markdowns: markdowns,
                        previous_violations: previous_violations,
                                  danger_id: danger_id,
-                                  template: 'github')
+                                  template: "github")
 
           if editable_issues.empty?
             comment_result = client.add_comment(ci_source.repo_slug, ci_source.pull_request_id, body)
@@ -106,11 +106,11 @@ module Danger
         # Note: this can terminate the entire process.
         submit_pull_request_status!(warnings: warnings,
                                       errors: errors,
-                                 details_url: comment_result['html_url'])
+                                 details_url: comment_result["html_url"])
       end
 
       def submit_pull_request_status!(warnings: [], errors: [], details_url: [])
-        status = (errors.count.zero? ? 'success' : 'failure')
+        status = (errors.count.zero? ? "success" : "failure")
         message = generate_description(warnings: warnings, errors: errors)
 
         latest_pr_commit_ref = self.pr_json[:head][:sha]
@@ -122,7 +122,7 @@ module Danger
         begin
           client.create_status(ci_source.repo_slug, latest_pr_commit_ref, status, {
             description: message,
-            context: 'danger/danger',
+            context: "danger/danger",
             target_url: details_url
           })
         rescue
@@ -133,7 +133,7 @@ module Danger
             # We need to fail the actual build here
             is_private = pr_json[:base][:repo][:private]
             if is_private
-              abort("\nDanger has failed this build. \nFound #{'error'.danger_pluralize(errors.count)} and I don't have write access to the PR set a PR status.")
+              abort("\nDanger has failed this build. \nFound #{'error'.danger_pluralize(errors.count)} and I don't have write access to the PR to set a PR status.")
             else
               abort("\nDanger has failed this build. \nFound #{'error'.danger_pluralize(errors.count)}.")
             end
@@ -144,10 +144,10 @@ module Danger
       end
 
       # Get rid of the previously posted comment, to only have the latest one
-      def delete_old_comments!(except: nil, danger_id: 'danger')
+      def delete_old_comments!(except: nil, danger_id: "danger")
         issues = client.issue_comments(ci_source.repo_slug, ci_source.pull_request_id)
         issues.each do |issue|
-          next unless issue[:body].include?("generated_by_#{danger_id}")
+          next unless danger_issue?(issue, danger_id)
           next if issue[:id] == except
           client.delete_comment(ci_source.repo_slug, issue[:id])
         end
@@ -190,10 +190,16 @@ module Danger
       end
 
       # @return [String] A URL to the specific file, ready to be downloaded
-      def file_url(organisation: nil, repository: nil, branch: 'master', path: nil)
+      def file_url(organisation: nil, repository: nil, branch: "master", path: nil)
         organisation ||= self.organisation
         "https://raw.githubusercontent.com/#{organisation}/#{repository}/#{branch}/#{path}"
       end
+
+      private
+
+      def danger_issue?(issue, danger_id)
+        issue[:body].include?("generated_by_#{danger_id}")
+      end
     end
   end
 end

data/lib/danger/scm_source/git_repo.rb

@@ -8,7 +8,9 @@ module Danger
 
     def diff_for_folder(folder, from: "master", to: "HEAD")
       repo = Git.open folder
-      self.diff = repo.diff(from, to)
+
+      merge_base = repo.merge_base(from, to)
+      self.diff = repo.diff(merge_base.to_s, to)
       self.log = repo.log.between(from, to)
     end
 
@@ -25,3 +27,28 @@ module Danger
     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
+
+module Git
+  class Base
+    def merge_base(commit1, commit2, *other_commits)
+      Git::Object.new self, self.lib.merge_base(commit1, commit2, *other_commits)
+    end
+  end
+
+  class Lib
+    def merge_base(commit1, commit2, *other_commits)
+      arr_opts = []
+      arr_opts << commit1
+      arr_opts << commit2
+      arr_opts += other_commits
+      command("merge-base", arr_opts)
+    end
+  end
+end

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "2.1.2".freeze
+  VERSION = "2.1.3".freeze
   DESCRIPTION = "Automate your PR etiquette.".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-07 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide