danger 3.5.5 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c92b72cb5561d7e1421f18365fc62b481c9762d8
-  data.tar.gz: f8cdf206cb65498b8312019dfc839d70d4360ef2
+  metadata.gz: 829cfd070afd91b790b2aac00e62a09d0e8e169e
+  data.tar.gz: 5d52205da94c5a538fb1f148be5719733864c76a
 SHA512:
-  metadata.gz: 3dc93f4a46211f5924006f83797e15a02284faf6f515343daf211041a066719916292df8b49f60a360ff828d910686bcdef932676ca91c68c3c9e414ea93034d
-  data.tar.gz: 1a615082ce6d120d6732357ce403247da7a607affe8620ea2a2edb55cc9c239b3bdb585c2c39967e6c3d71db493f4b1c4ffd125481009049f54ff12e961c6fdd
+  metadata.gz: 8b540ce368e451e7287f5fa711281c1426c0f1118c9b8b753244425d7e9626251f16e50cc4bfce19dc42dab9ded3b33cf6bde007b872cd8dc52045593ab0efdb
+  data.tar.gz: ee493e7e72148446b71082a52fef7a23efee22f0ec3bc92bbb6c9e3005b5d7fffaea04abf51eba94b6e4bcfcc4f564ea52f82358d7b862a7322dc17a6adba8cc

data/README.md

@@ -45,6 +45,8 @@ We keep all of the end-user documentation at [http://danger.systems](http://dang
 
 Some quick links: [Guides Index](http://danger.systems/guides.html), [DSL Reference](http://danger.systems/reference.html), [Getting Started](http://danger.systems/guides/getting_started.html) and [What does Danger Do?](http://danger.systems/guides/what_does_danger_do.html).
 
+Sidenote: There is a [pure JS version](https://github.com/danger/danger-js) in the works, it's at the point where it can fail your build but that's about it for now, would love help there if it interests you.
+
 ## I'm here to help out!
 
 Brilliant. So, let's get you set up.

data/lib/danger/ci_source/jenkins.rb

@@ -17,6 +17,12 @@ module Danger
   #
   # With that set up, you can edit your job to add `bundle exec danger` at the build action.
   #
+  # ##### Pipeline
+  # If your're using [pipelines](https://jenkins.io/solutions/pipeline/) you should be using the [GitHub branch source plugin](https://wiki.jenkins-ci.org/display/JENKINS/GitHub+Branch+Source+Plugin)
+  # for easy setup and handling of PRs.
+  #
+  # After you've set up the plugin, add a `sh 'bundle exec danger'` line in your pipeline script and make sure that build PRs is enabled.
+  #
   # #### GitLab
   # You will want to be using the [GitLab Plugin](https://github.com/jenkinsci/gitlab-plugin)
   # in order to ensure that you have the build environment set up for MR integration.
@@ -53,7 +59,7 @@ module Danger
     end
 
     def initialize(env)
-      self.repo_url = env.fetch("GIT_URL_1") { env["GIT_URL"] }
+      self.repo_url = self.class.repo_url(env)
       self.pull_request_id = self.class.pull_request_id(env)
 
       repo_matches = self.repo_url.match(%r{([\/:])([^\/]+\/[^\/.]+)(?:.git)?$})
@@ -63,9 +69,34 @@ module Danger
     def self.pull_request_id(env)
       if env["ghprbPullId"]
         env["ghprbPullId"]
+      elsif env["CHANGE_ID"]
+        env["CHANGE_ID"]
       else
         env["gitlabMergeRequestId"]
       end
     end
+
+    def self.repo_url(env)
+      if env["GIT_URL_1"]
+        env["GIT_URL_1"]
+      elsif env["CHANGE_URL"]
+        change_url = env["CHANGE_URL"]
+        case change_url
+        when %r{\/pull\/} # GitHub
+          matches = change_url.match(%r{(.+)\/pull\/[0-9]+})
+          matches[1] unless matches.nil?
+        when %r{\/merge_requests\/} # GitLab
+          matches = change_url.match(%r{(.+)\/merge_requests\/[0-9]+})
+          matches[1] unless matches.nil?
+        when %r{\/pull-requests\/} # Bitbucket
+          matches = change_url.match(%r{(.+)\/pull-requests\/[0-9]+})
+          matches[1] unless matches.nil?
+        else
+          change_url
+        end
+      else
+        env["GIT_URL"]
+      end
+    end
   end
 end

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

@@ -15,7 +15,7 @@ module Danger
   # By default, using `fail` would fail the corresponding build. Either via an API call, or
   # via the return value for the danger command.
   #
-  # It is possible to have Danger ignore specific warnings or errors by writing `Danger: Ignore "[warning/error text]`.
+  # It is possible to have Danger ignore specific warnings or errors by writing `Danger: Ignore "[warning/error text]"`.
   #
   # Sidenote: Messaging is the only plugin which adds functions to the root of the Dangerfile.
   #

data/lib/danger/request_sources/github.rb

@@ -3,6 +3,8 @@ require "octokit"
 require "danger/helpers/comments_helper"
 require "danger/helpers/comment"
 
+require "danger/request_sources/support/get_ignored_violation"
+
 module Danger
   module RequestSources
     class GitHub < RequestSource
@@ -83,13 +85,11 @@ module Danger
         end
 
         fetch_issue_details(self.pr_json)
-        self.ignored_violations = ignored_violations_from_pr(self.pr_json)
+        self.ignored_violations = ignored_violations_from_pr
       end
 
-      def ignored_violations_from_pr(pr_json)
-        pr_body = pr_json["body"]
-        return [] if pr_body.nil?
-        pr_body.chomp.scan(/>\s*danger\s*:\s*ignore\s*"(.*)"/i).flatten
+      def ignored_violations_from_pr
+        GetIgnoredViolation.new(self.pr_json["body"]).call
       end
 
       def fetch_issue_details(pr_json)

data/lib/danger/request_sources/gitlab.rb

@@ -3,6 +3,8 @@ require "gitlab"
 require "danger/helpers/comments_helper"
 require "danger/helpers/comment"
 
+require "danger/request_sources/support/get_ignored_violation"
+
 module Danger
   module RequestSources
     class GitLab < RequestSource
@@ -88,19 +90,19 @@ module Danger
       def fetch_details
         self.mr_json = client.merge_request(escaped_ci_slug, self.ci_source.pull_request_id)
         self.commits_json = client.merge_request_commits(escaped_ci_slug, self.ci_source.pull_request_id)
-        self.ignored_violations = ignored_violations_from_pr(self.mr_json)
+        self.ignored_violations = ignored_violations_from_pr
       end
 
-      def ignored_violations_from_pr(mr_json)
-        pr_body = mr_json.description
-        return [] if pr_body.nil?
-        pr_body.chomp.scan(/>\s*danger\s*:\s*ignore\s*"(.*)"/i).flatten
+      def ignored_violations_from_pr
+        GetIgnoredViolation.new(self.mr_json.description).call
       end
 
-      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)
         editable_comments = mr_comments.select { |comment| comment.generated_by_danger?(danger_id) }
 
-        if editable_comments.empty?
+        should_create_new_comment = new_comment || editable_comments.empty?
+
+        if should_create_new_comment
           previous_violations = {}
         else
           comment = editable_comments.first.body

data/lib/danger/request_sources/support/get_ignored_violation.rb

@@ -0,0 +1,17 @@
+class GetIgnoredViolation
+  IGNORE_REGEXP = />*\s*danger\s*:\s*ignore\s*"(?<error>[^"]*)"/i
+
+  def initialize(body)
+    @body = body
+  end
+
+  def call
+    return [] unless body
+
+    body.chomp.scan(IGNORE_REGEXP).flatten
+  end
+
+  private
+
+  attr_reader :body
+end

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "3.5.5".freeze
+  VERSION = "3.6.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: 3.5.5
+  version: 3.6.0
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -447,6 +447,7 @@ files:
 - lib/danger/request_sources/github.rb
 - lib/danger/request_sources/gitlab.rb
 - lib/danger/request_sources/request_source.rb
+- lib/danger/request_sources/support/get_ignored_violation.rb
 - lib/danger/scm_source/git_repo.rb
 - lib/danger/version.rb
 homepage: https://github.com/danger/danger
@@ -469,7 +470,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Like Unit Tests, but for your Team Culture.