danger 5.5.6 → 5.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61383a6d5b7a7fc024301f2545a31d856434a864
-  data.tar.gz: b61fe74b6a19b467bf8326375d4625b3571cbb18
+  metadata.gz: ac631daf8aaea436429afb68d8a534b84b03c9a9
+  data.tar.gz: aed843fe3d16f9e09fa1b1b0dbb300e0cb33f958
 SHA512:
-  metadata.gz: 700d46d636e7713591e0eb913d402beaf52a1baf429c13dd20a4ffad4d243027fbe42a42294dcf45e85b0784c0c40657739743784c01c3c50ec677ad90ede9e8
-  data.tar.gz: 16ae3a9a8bc609ee5c9a968e658852936318cb74e0aed4efed3846db6d3c87e69cf87841e732eaf272a10dfa88c591f462e043c4d13c884ae5e053335044423a
+  metadata.gz: d84b21f613d955ebac96ad8561126d53eb6caff28959909d10d9061e4204a470714500e98674375db4a4e405173a788e64113ef31a994429164ec5b00e979a79
+  data.tar.gz: d80f497254260a8d6cc65e61c92b7a9ac0cf7b660cb94e7e4b7d82791a02c010ff78bc36a4c5bf3ecc0c42a587641f49e238af265e672072dd8bba293cfa4e77

data/lib/danger/ci_source/bitrise.rb

@@ -29,7 +29,11 @@ module Danger
     end
 
     def supported_request_sources
-      @supported_request_sources ||= [Danger::RequestSources::GitHub, Danger::RequestSources::GitLab]
+      @supported_request_sources ||= [
+        Danger::RequestSources::GitHub,
+        Danger::RequestSources::GitLab,
+        Danger::RequestSources::BitbucketServer
+      ]
     end
 
     def initialize(env)

data/lib/danger/ci_source/teamcity.rb

@@ -38,6 +38,32 @@ module Danger
   #
   # We would love some advice on improving this setup.
   #
+  # #### BitBucket Cloud
+  #
+  # You will need to add the following environment variables as build parameters or by exporting them inside your
+  # Simple Command Runner.
+  # - `DANGER_BITBUCKETCLOUD_USERNAME`
+  # - `DANGER_BITBUCKETCLOUD_PASSWORD`
+  # - `BITBUCKET_REPO_SLUG`
+  # - `BITBUCKET_REPO_URL`
+  #
+  # You will also need to set the `BITBUCKET_BRANCH_NAME` environment variable.
+  # TeamCity provides `%teamcity.build.branch%`, which you can use at the top of your Simple Command Runner:
+  # ```sh
+  # export BITBUCKET_BRANCH_NAME="%teamcity.build.branch%"
+  # ```
+  #
+  # #### BitBucket Server
+  #
+  # You will need to add the following environment variables as build parameters or by exporting them inside your
+  # Simple Command Runner.
+  # - `DANGER_BITBUCKETSERVER_USERNAME`
+  # - `DANGER_BITBUCKETSERVER_PASSWORD`
+  # - `DANGER_BITBUCKETSERVER_HOST`
+  # - `BITBUCKETSERVER_REPO_SLUG`
+  # - `BITBUCKETSERVER_PULL_REQUEST_ID`
+  # - `BITBUCKETSERVER_REPO_URL`
+  #
   class TeamCity < CI
     class << self
       def validates_as_github_pr?(env)
@@ -47,6 +73,14 @@ module Danger
       def validates_as_gitlab_pr?(env)
         ["GITLAB_REPO_SLUG", "GITLAB_PULL_REQUEST_ID", "GITLAB_REPO_URL"].all? { |x| env[x] && !env[x].empty? }
       end
+
+      def validates_as_bitbucket_cloud_pr?(env)
+        ["BITBUCKET_REPO_SLUG", "BITBUCKET_BRANCH_NAME", "BITBUCKET_REPO_URL"].all? { |x| env[x] && !env[x].empty? }
+      end
+
+      def validates_as_bitbucket_server_pr?(env)
+        ["BITBUCKETSERVER_REPO_SLUG", "BITBUCKETSERVER_PULL_REQUEST_ID", "BITBUCKETSERVER_REPO_URL"].all? { |x| env[x] && !env[x].empty? }
+      end
     end
 
     def self.validates_as_ci?(env)
@@ -54,22 +88,25 @@ module Danger
     end
 
     def self.validates_as_pr?(env)
-      validates_as_github_pr?(env) || validates_as_gitlab_pr?(env)
+      validates_as_github_pr?(env) || validates_as_gitlab_pr?(env) || validates_as_bitbucket_cloud_pr?(env) || validates_as_bitbucket_server_pr?(env)
     end
 
     def supported_request_sources
-      @supported_request_sources ||= [Danger::RequestSources::GitHub, Danger::RequestSources::GitLab]
+      @supported_request_sources ||= [Danger::RequestSources::GitHub, Danger::RequestSources::GitLab, Danger::RequestSources::BitbucketCloud, Danger::RequestSources::BitbucketServer]
     end
 
     def initialize(env)
       # NB: Unfortunately TeamCity doesn't provide these variables
       # automatically so you have to add these variables manually to your
       # project or build configuration
-
       if self.class.validates_as_github_pr?(env)
         extract_github_variables!(env)
       elsif self.class.validates_as_gitlab_pr?(env)
         extract_gitlab_variables!(env)
+      elsif self.class.validates_as_bitbucket_cloud_pr?(env)
+        extract_bitbucket_variables!(env)
+      elsif self.class.validates_as_bitbucket_server_pr?(env)
+        extract_bitbucket_server_variables!(env)
       end
     end
 
@@ -86,5 +123,28 @@ module Danger
       self.pull_request_id = env["GITLAB_PULL_REQUEST_ID"].to_i
       self.repo_url        = env["GITLAB_REPO_URL"]
     end
+
+    def extract_bitbucket_variables!(env)
+      self.repo_slug       = env["BITBUCKET_REPO_SLUG"]
+      self.pull_request_id = bitbucket_pr_from_env(env)
+      self.repo_url        = env["BITBUCKET_REPO_URL"]
+    end
+
+    def extract_bitbucket_server_variables!(env)
+      self.repo_slug       = env["BITBUCKETSERVER_REPO_SLUG"]
+      self.pull_request_id = env["BITBUCKETSERVER_PULL_REQUEST_ID"].to_i
+      self.repo_url        = env["BITBUCKETSERVER_REPO_URL"]
+    end
+
+    # This is a little hacky, because Bitbucket doesn't provide us a PR id
+    def bitbucket_pr_from_env(env)
+      branch_name = env["BITBUCKET_BRANCH_NAME"]
+      repo_slug   = env["BITBUCKET_REPO_SLUG"]
+      begin
+        Danger::RequestSources::BitbucketCloudAPI.new(repo_slug, nil, branch_name, env).pull_request_id
+      rescue
+        raise "Failed to find a pull request for branch \"#{branch_name}\" on Bitbucket."
+      end
+    end
   end
 end

data/lib/danger/danger_core/dangerfile.rb

@@ -223,7 +223,7 @@ module Danger
                   else
                     formatted
                   end
-          rows = violations[key]
+          rows = violations[key].uniq
           print_list(title, rows)
         end
 
@@ -246,10 +246,10 @@ module Danger
       violations = violation_report
 
       env.request_source.update_pull_request!(
-        warnings: violations[:warnings],
-        errors: violations[:errors],
-        messages: violations[:messages],
-        markdowns: status_report[:markdowns],
+        warnings: violations[:warnings].uniq,
+        errors: violations[:errors].uniq,
+        messages: violations[:messages].uniq,
+        markdowns: status_report[:markdowns].uniq,
         danger_id: danger_id,
         new_comment: new_comment
       )

data/lib/danger/danger_core/messages/markdown.rb

@@ -17,6 +17,18 @@ module Danger
         other.line == line
     end
 
+    def hash
+      h = 1
+      h = h * 31 + message.hash
+      h = h * 17 + file.hash
+      h = h * 17 + line.hash
+      h
+    end
+
+    def eql?(other)
+      return self == other
+    end
+
     # @return [Boolean] returns true if is a file or line, false otherwise
     def inline?
       file || line

data/lib/danger/danger_core/messages/violation.rb

@@ -19,6 +19,19 @@ module Danger
         other.line == line
     end
 
+    def hash
+      h = 1
+      h = h * 31 + message.hash
+      h = h * 13 + sticky.hash
+      h = h * 17 + file.hash
+      h = h * 17 + line.hash
+      h
+    end
+
+    def eql?(other)
+      return self == other
+    end
+
     # @return [Boolean] returns true if is a file or line, false otherwise
     def inline?
       file || line

data/lib/danger/request_sources/bitbucket_cloud.rb

@@ -20,8 +20,7 @@ module Danger
         self.ci_source = ci_source
         self.environment = environment
 
-        project, slug = ci_source.repo_slug.split("/")
-        @api = BitbucketCloudAPI.new(project, slug, ci_source.pull_request_id, environment)
+        @api = BitbucketCloudAPI.new(ci_source.repo_slug, ci_source.pull_request_id, nil, environment)
       end
 
       def validates_as_ci?

data/lib/danger/request_sources/bitbucket_cloud_api.rb

@@ -5,13 +5,13 @@ require "danger/helpers/comments_helper"
 module Danger
   module RequestSources
     class BitbucketCloudAPI
-      attr_accessor :host, :pr_api_endpoint, :pr_api_endpoint_v1
+      attr_accessor :project, :slug, :pull_request_id
 
-      def initialize(project, slug, pull_request_id, environment)
+      def initialize(repo_slug, pull_request_id, branch_name, environment)
         @username = environment["DANGER_BITBUCKETCLOUD_USERNAME"]
         @password = environment["DANGER_BITBUCKETCLOUD_PASSWORD"]
-        self.pr_api_endpoint = "https://api.bitbucket.org/2.0/repositories/#{project}/#{slug}/pullrequests/#{pull_request_id}"
-        self.pr_api_endpoint_v1 = "https://api.bitbucket.org/1.0/repositories/#{project}/#{slug}/pullrequests/#{pull_request_id}"
+        self.project, self.slug = repo_slug.split("/")
+        self.pull_request_id = pull_request_id || fetch_pr_from_branch(branch_name)
       end
 
       def inspect
@@ -51,6 +51,27 @@ module Danger
 
       private
 
+      def base_url(version)
+        "https://api.bitbucket.org/#{version}.0/repositories/#{project}/#{slug}/pullrequests"
+      end
+
+      def pr_api_endpoint
+        "#{base_url(2)}/#{pull_request_id}"
+      end
+
+      def pr_api_endpoint_v1
+        "#{base_url(1)}/#{pull_request_id}"
+      end
+
+      def prs_api_endpoint(branch_name)
+        "#{base_url(2)}?q=source.branch.name=\"#{branch_name}\""
+      end
+
+      def fetch_pr_from_branch(branch_name)
+        uri = URI(URI.escape(prs_api_endpoint(branch_name)))
+        fetch_json(uri)[:values][0][:id]
+      end
+
       def fetch_json(uri)
         req = Net::HTTP::Get.new(uri.request_uri, { "Content-Type" => "application/json" })
         req.basic_auth @username, @password

data/lib/danger/request_sources/bitbucket_server.rb

@@ -49,8 +49,12 @@ module Danger
       def setup_danger_branches
         base_branch = self.pr_json[:toRef][:id].sub("refs/heads/", "")
         base_commit = self.pr_json[:toRef][:latestCommit]
+        # Support for older versions of Bitbucket Server
+        base_commit = self.pr_json[:toRef][:latestChangeset] if self.pr_json[:fromRef].key? :latestChangeset
         head_branch = self.pr_json[:fromRef][:id].sub("refs/heads/", "")
         head_commit = self.pr_json[:fromRef][:latestCommit]
+        # Support for older versions of Bitbucket Server
+        head_commit = self.pr_json[:fromRef][:latestChangeset] if self.pr_json[:fromRef].key? :latestChangeset
 
         # Next, we want to ensure that we have a version of the current branch at a known location
         scm.ensure_commitish_exists_on_branch! base_branch, base_commit

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "5.5.6".freeze
+  VERSION = "5.5.7".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.5.6
+  version: 5.5.7
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-31 00:00:00.000000000 Z
+date: 2018-01-24 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.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Like Unit Tests, but for your Team Culture.