danger 5.9.1 → 5.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ca8eae46b86048ebe87922217dd3f833f70dbfc67287e216c8361039d30aa1e
-  data.tar.gz: 9ca45aa70428acc760231c4f31d89a1c841c07003057bb05fb68c418dcb38d9c
+  metadata.gz: 8b735e38e22bfb612463d63cad891c3518dcb0849f4dacc50efb63df75f3414a
+  data.tar.gz: 63dcbbda47a2e018a1a77f767b36f6308d93d3b2fec471c152fb0652e4650ef9
 SHA512:
-  metadata.gz: 134880b979d81ecde590364d6a3d4cdccb14eae30181106c6758fc5fa9e580f49346b46b129d054b6443e975c7305738669bb790ca0674548919f9e40c6ca68e
-  data.tar.gz: 6e5ca5931209b7231aa048fba656aa58096a468bf6446fe39dc313fd943e89196dea4f49fe285228f635afae7b42db6a0678a5449676c7e4664c9454fc2cddef
+  metadata.gz: c8ba3c1cd20528a1a00e3d3d95995eaf5db5eb20396eaf9d380eb532e851a62cbcabf5c4565f8dcefab55ef80738693d3dc973eaeecb8edb1fa681f9879472c2
+  data.tar.gz: '049c8b22d48906ce65182e75c8c7240e8c46252a23d5f366f1f8a91dac393713de70a5507b4b0e4b4128f01e8cdff35dbf8d392787461bcef026a518ef9fa330'

data/lib/danger/ci_source/local_git_repo.rb

@@ -33,7 +33,7 @@ module Danger
     end
 
     def supported_request_sources
-      @supported_request_sources ||= [Danger::RequestSources::GitHub]
+      @supported_request_sources ||= [Danger::RequestSources::GitHub, Danger::RequestSources::BitbucketServer]
     end
 
     def initialize(env = {})
@@ -89,7 +89,9 @@ module Danger
           PullRequestFinder.new(
             remote_info.id,
             remote_info.slug,
-            remote: true
+            remote: true,
+            remote_url: env["LOCAL_GIT_PR_URL"],
+            env: env
           ).call
         else
           PullRequestFinder.new(

data/lib/danger/ci_source/support/find_repo_info_from_url.rb

@@ -8,16 +8,39 @@ module Danger
       (/(pull|merge_requests|pull-requests)/)
       (?<id>\d+)
     }x
+    
+    # Regex used to extract info from Bitbucket server URLs, as they use a quite different format
+    REGEXPBB = %r{
+      (?:[\/:])projects
+      \/([^\/.]+)
+      \/repos\/([^\/.]+)
+      \/pull-requests
+      \/(\d+)
+    }x
+
+    # Regex used to extract info from Bitbucket server URLs, as they use a quite different format
+    REGEXPBB = %r{
+      (?:[\/:])projects
+      \/([^\/.]+)
+      \/repos\/([^\/.]+)
+      \/pull-requests
+      \/(\d+)
+    }x
 
     def initialize(url)
       @url = url
     end
 
     def call
-      matched = url.match(REGEXP)
+      matched = url.match(REGEXPBB)
 
       if matched
-        RepoInfo.new(matched[:slug], matched[:id])
+        RepoInfo.new("#{matched[1]}/#{matched[2]}", matched[3])
+      else
+        matched = url.match(REGEXP)
+        if matched
+          RepoInfo.new(matched[:slug], matched[:id])
+        end
       end
     end
 

data/lib/danger/ci_source/support/pull_request_finder.rb

@@ -4,11 +4,13 @@ require "danger/ci_source/support/no_pull_request"
 
 module Danger
   class PullRequestFinder
-    def initialize(specific_pull_request_id, repo_slug = nil, remote: false, git_logs: "")
+    def initialize(specific_pull_request_id, repo_slug = nil, remote: false, git_logs: "", remote_url: "", env: nil)
       @specific_pull_request_id = specific_pull_request_id
       @git_logs = git_logs
       @repo_slug = repo_slug
       @remote = to_boolean(remote)
+      @remote_url = remote_url
+      @env = env
     end
 
     def call
@@ -19,7 +21,7 @@ module Danger
 
     private
 
-    attr_reader :specific_pull_request_id, :git_logs, :repo_slug, :remote
+    attr_reader :specific_pull_request_id, :git_logs, :repo_slug, :remote, :remote_url, :env
 
     def to_boolean(maybe_string)
       ["true", "1", "yes", "y", true].include?(maybe_string)
@@ -47,11 +49,7 @@ module Danger
         elsif only_squash_and_merged_pull_request_present?
           LocalPullRequest.new(most_recent_squash_and_merged_pull_request)
         elsif remote && remote_pull_request
-          RemotePullRequest.new(
-            remote_pull_request.number.to_s,
-            remote_pull_request.head.sha,
-            remote_pull_request.base.sha
-          )
+          generate_remote_pull_request
         else
           NoPullRequest.new
         end
@@ -63,6 +61,22 @@ module Danger
       !specific_pull_request_id.empty? ? "##{specific_pull_request_id}" : "#\\d+".freeze
     end
 
+    def generate_remote_pull_request
+      if remote_url =~ %r{/pull-requests/}
+        RemotePullRequest.new(
+          remote_pull_request[:id].to_s,
+          remote_pull_request[:fromRef][:latestCommit],
+          remote_pull_request[:toRef][:latestCommit]
+        )
+      else
+        RemotePullRequest.new(
+          remote_pull_request.number.to_s,
+          remote_pull_request.head.sha,
+          remote_pull_request.base.sha
+        )
+      end
+    end
+
     def remote_pull_request
       @_remote_pull_request ||= begin
         client.pull_request(repo_slug, specific_pull_request_id)
@@ -111,8 +125,14 @@ module Danger
     end
 
     def client
-      require "octokit"
-      Octokit::Client.new(access_token: ENV["DANGER_GITHUB_API_TOKEN"], api_endpoint: api_url)
+      if remote_url =~ %r{/pull-requests/}
+        require "danger/request_sources/bitbucket_server_api"
+        project, slug = repo_slug.split("/")
+        RequestSources::BitbucketServerAPI.new(project, slug, specific_pull_request_id, env)
+      else
+        require "octokit"
+        Octokit::Client.new(access_token: ENV["DANGER_GITHUB_API_TOKEN"], api_endpoint: api_url)
+      end
     end
 
     def api_url

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

@@ -10,16 +10,21 @@ module Danger
     def setup(verbose: false)
       source = dm.env.ci_source
       if source.nil? or source.repo_slug.empty?
-        cork.puts "danger local failed because it only works with GitHub projects at the moment. Sorry.".red
+        cork.puts "danger local failed because it only works with GitHub and Bitbucket server projects at the moment. Sorry.".red
         exit 0
       end
-
       gh = dm.env.request_source
       # We can use tokenless here, as it's running on someone's computer
-      # and is IP locked, as opposed to on the CI.
-      gh.support_tokenless_auth = true
+      # and is IP locked, as opposed to on the CI. Only for Github PRs
+      if gh.instance_of? Danger::RequestSources::GitHub
+        gh.support_tokenless_auth = true
+      end
 
-      cork.puts "Running your Dangerfile against this PR - https://#{gh.host}/#{source.repo_slug}/pull/#{source.pull_request_id}"
+      if gh.instance_of? Danger::RequestSources::BitbucketServer
+        cork.puts "Running your Dangerfile against this PR - #{gh.host}/projects/#{source.repo_slug.split('/').first}/repos/#{source.repo_slug.split('/').last}/pull-requests/#{source.pull_request_id}"
+      else
+        cork.puts "Running your Dangerfile against this PR - https://#{gh.host}/#{source.repo_slug}/pull/#{source.pull_request_id}"
+      end
 
       unless verbose
         cork.puts "Turning on --verbose"

data/lib/danger/request_sources/bitbucket_server_api.rb

@@ -31,6 +31,10 @@ module Danger
         @username && !@username.empty? && @password && !@password.empty?
       end
 
+      def pull_request(*)
+        fetch_pr_json
+      end
+
       def fetch_pr_json
         uri = URI(pr_api_endpoint)
         fetch_json(uri)

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "5.9.1".freeze
+  VERSION = "5.10.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.9.1
+  version: 5.10.0
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-09 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide