danger 5.11.1 → 5.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f393145687ffadd684dd2202482cc478346a2a8e2d82df81e11b30a373292dc6
-  data.tar.gz: c91d3ec700cb5402ad87a4e49b6e898811610df81d6274e42dcb39e1c74cbcc1
+  metadata.gz: 073d0e00dcf8fab23ef166afb9084ec50c86e7f739616650f716e2d3f8074a6f
+  data.tar.gz: 6122124ff2f3cbad49516ff8a883917f91132f6e97926413508f856c322d766b
 SHA512:
-  metadata.gz: 184da256cc00896440990935eaecb0ad1b9b917cba1816cc0e95b2d48bdbd68f6157aa89d3297f4e538904038d3672124a05dc29ce89360bda6d1caf606bb9e2
-  data.tar.gz: c2b41799bec19df9439289d0430365af21ab1aaef8dc76114b87d7f92848fd654a7bc133c7ea3dc53f91b1f5254259fde32e3a8b38ffc916609420f077f2e31b
+  metadata.gz: 46c3511779f86f30194e3246f1e8ca3fb6c7b879c3728b511b3d5df9935dfd83f5c7b86bd31502550d6820f5a8ca7533966f9d849332b9078e639cd5abd32b48
+  data.tar.gz: 29d0f8f813403dc039f6e2eef1b7170de5f3161b4d61702f7716387b9d58360b173fef1fbf636014e69bfa04cfbb26a80623d43bb50172b928c68cafe9d72189

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Orta, Felix Krause
+Copyright (c) 2019 Orta, Felix Krause
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/danger/ci_source/github_actions.rb

@@ -3,11 +3,11 @@ require "danger/request_sources/github/github"
 module Danger
   # ### CI Setup
   #
-  # You can use `duck8823/actions/danger` Action in your .github/main.workflow.
+  # You can use `danger/danger` Action in your .github/main.workflow.
   #
   #  ```
   # action "Danger" {
-  #    uses = "duck8823/actions/danger"
+  #    uses = "danger/danger"
   # }
   #  ```
   #
@@ -17,7 +17,7 @@ module Danger
   #
   # ```
   # action "Danger" {
-  #    uses = "duck8823/actions/danger"
+  #    uses = "danger/danger"
   #    secrets = ["GITHUB_TOKEN"]
   # }
   # ```

data/lib/danger/ci_source/gitlab_ci.rb

@@ -32,10 +32,10 @@ module Danger
     end
 
     def self.determine_merge_request_id(env)
-      return env["CI_MERGE_REQUEST_ID"] if env["CI_MERGE_REQUEST_ID"]
+      return env["CI_MERGE_REQUEST_IID"] if env["CI_MERGE_REQUEST_IID"]
       return 0 unless env["CI_COMMIT_SHA"]
 
-      project_path = env["CI_PROJECT_PATH"]
+      project_path = env["CI_MERGE_REQUEST_PROJECT_PATH"] || env["CI_PROJECT_PATH"]
       base_commit = env["CI_COMMIT_SHA"]
       client = RequestSources::GitLab.new(nil, env).client
 
@@ -49,8 +49,8 @@ module Danger
 
     def initialize(env)
       @env = env
-      @repo_slug = env["CI_PROJECT_PATH"]
-      @project_url = env["CI_PROJECT_URL"]
+      @repo_slug = env["CI_MERGE_REQUEST_PROJECT_PATH"] || env["CI_PROJECT_PATH"]
+      @project_url = env["CI_MERGE_REQUEST_PROJECT_URL"] || env["CI_PROJECT_URL"]
     end
 
     def supported_request_sources

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, Danger::RequestSources::BitbucketServer]
+      @supported_request_sources ||= [Danger::RequestSources::GitHub, Danger::RequestSources::BitbucketServer, Danger::RequestSources::BitbucketCloud]
     end
 
     def initialize(env = {})

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

@@ -62,18 +62,29 @@ module Danger
     end
 
     def generate_remote_pull_request
-      if remote_url =~ %r{/pull-requests/}
+      scm_provider = find_scm_provider(remote_url)
+
+      case scm_provider
+      when :bitbucket_cloud
+        RemotePullRequest.new(
+          remote_pull_request[:id].to_s,
+          remote_pull_request[:source][:commit][:hash],
+          remote_pull_request[:destination][:commit][:hash]
+        )
+      when :bitbucket_server
         RemotePullRequest.new(
           remote_pull_request[:id].to_s,
           remote_pull_request[:fromRef][:latestCommit],
           remote_pull_request[:toRef][:latestCommit]
         )
-      else
+      when :github
         RemotePullRequest.new(
           remote_pull_request.number.to_s,
           remote_pull_request.head.sha,
           remote_pull_request.base.sha
         )
+      else
+        raise "SCM provider not supported: #{scm_provider}"
       end
     end
 
@@ -125,13 +136,25 @@ module Danger
     end
 
     def client
-      if remote_url =~ %r{/pull-requests/}
+      scm_provider = find_scm_provider(remote_url)
+    
+      case scm_provider
+      when :bitbucket_cloud
+        require "danger/request_sources/bitbucket_cloud_api"
+        branch_name = ENV["DANGER_BITBUCKET_TARGET_BRANCH"] # Optional env variable (specifying the target branch) to help find the PR.
+        RequestSources::BitbucketCloudAPI.new(repo_slug, specific_pull_request_id, branch_name, env)
+
+      when :bitbucket_server
         require "danger/request_sources/bitbucket_server_api"
         project, slug = repo_slug.split("/")
         RequestSources::BitbucketServerAPI.new(project, slug, specific_pull_request_id, env)
-      else
+
+      when :github
         require "octokit"
         Octokit::Client.new(access_token: ENV["DANGER_GITHUB_API_TOKEN"], api_endpoint: api_url)
+
+      else
+        raise "SCM provider not supported: #{scm_provider}"
       end
     end
 
@@ -142,5 +165,15 @@ module Danger
         end
       end
     end
+
+    def find_scm_provider(remote_url)
+      if remote_url =~ %r{/bitbucket.org/}
+        :bitbucket_cloud
+      elsif remote_url =~ %r{/pull-requests/}
+        :bitbucket_server
+      else
+        :github
+      end
+    end
   end
 end

data/lib/danger/commands/pr.rb

@@ -8,7 +8,7 @@ require "no_proxy_fix"
 
 module Danger
   class PR < Runner
-    self.summary = "Run the Dangerfile locally against Pull Requests (works with forks, too). Does not post to the PR.".freeze
+    self.summary = "Run the Dangerfile locally against Pull Requests (works with forks, too). Does not post to the PR. Usage: danger pr <URL>".freeze
     self.command = "pr".freeze
 
     def self.options
@@ -46,6 +46,9 @@ module Danger
       unless @dangerfile_path
         help! "Could not find a Dangerfile."
       end
+      unless @pr_url
+        help! "Could not find a pull-request. Usage: danger pr <URL>"
+      end
     end
 
     def run

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

@@ -97,7 +97,7 @@ module Danger
     # @return [String]
     #
     def pr_author
-      @bs.pr_json[:author][:user][:slug].to_s
+      @bs.pr_json[:author][:username]
     end
 
     # @!group PR Commit Metadata
@@ -105,7 +105,7 @@ module Danger
     # @return [String]
     #
     def branch_for_base
-      @bs.pr_json[:toRef][:displayId].to_s
+      @bs.pr_json[:destination][:branch][:name]
     end
 
     # @!group PR Commit Metadata
@@ -113,7 +113,7 @@ module Danger
     # @return [String]
     #
     def pr_link
-      @bs.pr_json[:links][:self].flat_map { |l| l[:href] }.first.to_s
+      @bs.pr_json[:links][:self][:href]
     end
 
     # @!group PR Commit Metadata
@@ -121,7 +121,7 @@ module Danger
     # @return [String]
     #
     def branch_for_head
-      @bs.pr_json[:fromRef][:displayId].to_s
+      @bs.pr_json[:destination][:branch][:name]
     end
 
     # @!group PR Commit Metadata
@@ -129,7 +129,7 @@ module Danger
     # @return [String]
     #
     def base_commit
-      @bs.pr_json[:toRef][:latestCommit].to_s
+      @bs.pr_json[:destination][:commit][:hash]
     end
 
     # @!group PR Commit Metadata
@@ -137,63 +137,8 @@ module Danger
     # @return [String]
     #
     def head_commit
-      @bs.pr_json[:fromRef][:latestCommit].to_s
+      @bs.pr_json[:source][:commit][:hash]
     end
 
-    # @!group Bitbucket Cloud Misc
-    # Returns a list of HTML anchors for a file, or files in the head repository.
-    # It returns a string of multiple anchors if passed an array.
-    # @param    [String or Array<String>] paths
-    #           A list of strings to convert to github anchors
-    # @param    [Bool] full_path
-    #           Shows the full path as the link's text, defaults to `true`.
-    #
-    # @return [String]
-    #
-    def html_link(paths, full_path: true)
-      create_link(paths, full_path) { |href, text| create_html_link(href, text) }
-    end
-
-    # @!group Bitbucket Cloud Misc
-    # Returns a list of Markdown links for a file, or files in the head repository.
-    # It returns a string of multiple links if passed an array.
-    # @param    [String or Array<String>] paths
-    #           A list of strings to convert to Markdown links
-    # @param    [Bool] full_path
-    #           Shows the full path as the link's text, defaults to `true`.
-    #
-    # @return [String]
-    #
-    def markdown_link(paths, full_path: true)
-      create_link(paths, full_path) { |href, text| create_markdown_link(href, text) }
-    end
-
-    private
-
-    def create_link(paths, full_path)
-      paths = [paths] unless paths.kind_of?(Array)
-      commit = head_commit
-      repo = pr_json[:fromRef][:repository][:links][:self].flat_map { |l| l[:href] }.first
-
-      paths = paths.map do |path|
-        path, line = path.split("#")
-        url_path = path.start_with?("/") ? path : "/#{path}"
-        text = full_path ? path : File.basename(path)
-        url_path.gsub!(" ", "%20")
-        line_ref = line ? "##{line}" : ""
-        yield("#{repo}#{url_path}?at=#{commit}#{line_ref}", text)
-      end
-
-      return paths.first if paths.count < 2
-      paths.first(paths.count - 1).join(", ") + " & " + paths.last
-    end
-
-    def create_html_link(href, text)
-      "<a href='#{href}'>#{text}</a>"
-    end
-
-    def create_markdown_link(href, text)
-      "[#{text}](#{href})"
-    end
   end
 end

data/lib/danger/request_sources/bitbucket_cloud_api.rb

@@ -5,13 +5,14 @@ require "danger/helpers/comments_helper"
 module Danger
   module RequestSources
     class BitbucketCloudAPI
-      attr_accessor :project, :slug, :pull_request_id
+      attr_accessor :host, :project, :slug, :pull_request_id
 
       def initialize(repo_slug, pull_request_id, branch_name, environment)
         @username = environment["DANGER_BITBUCKETCLOUD_USERNAME"]
         @password = environment["DANGER_BITBUCKETCLOUD_PASSWORD"]
         self.project, self.slug = repo_slug.split("/")
         self.pull_request_id = pull_request_id || fetch_pr_from_branch(branch_name)
+        self.host = "https://bitbucket.org/"
       end
 
       def inspect
@@ -28,6 +29,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)
@@ -73,15 +78,21 @@ module Danger
       end
 
       def fetch_json(uri)
+        raise credentials_not_available unless credentials_given?
+
         req = Net::HTTP::Get.new(uri.request_uri, { "Content-Type" => "application/json" })
         req.basic_auth @username, @password
         res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
           http.request(req)
         end
+        raise error_fetching_json(uri.to_s, res.code) unless res.code == "200"
+
         JSON.parse(res.body, symbolize_names: true)
       end
 
       def post(uri, body)
+        raise credentials_not_available unless credentials_given?
+
         req = Net::HTTP::Post.new(uri.request_uri, { "Content-Type" => "application/json" })
         req.basic_auth @username, @password
         req.body = body
@@ -91,12 +102,23 @@ module Danger
       end
 
       def delete(uri)
+        raise credentials_not_available unless credentials_given?
+        
         req = Net::HTTP::Delete.new(uri.request_uri, { "Content-Type" => "application/json" })
         req.basic_auth @username, @password
         Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
           http.request(req)
         end
       end
+
+      def credentials_not_available
+        "Credentials not available. Provide DANGER_BITBUCKETCLOUD_USERNAME and DANGER_BITBUCKETCLOUD_PASSWORD as environment variables."
+      end
+
+      def error_fetching_json(url, status_code)
+        "Error fetching json for: #{url}, status code: #{status_code}"
+      end
+
     end
   end
 end

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "5.11.1".freeze
+  VERSION = "5.12.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.11.1
+  version: 5.12.0
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-07 00:00:00.000000000 Z
+date: 2019-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide