danger 8.4.0 → 8.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffff51d2ba87391b59163fab3e28e65c45c6bd4bbdcd00055aaebbe00e409937
-  data.tar.gz: 03da4383110a4a4342e007da66df17de7fc658a5b0490e669c969f5d92827cb5
+  metadata.gz: bcdadafd7f8d81e366907b31b4c0530258864a6f18aa22e801d4467bc1ab35b0
+  data.tar.gz: 1b4e340420a10006b36a55bdbc30570f664c6c88fc2b8ad253f299e1aae30bd5
 SHA512:
-  metadata.gz: bee965c2c6bd5eebc756894c1eb6cfbb750c2b9a50e4b81f54af83fc2ac8916d4b76c49b98a95153c2f9e6a4447a4943ca195f4d3d555fde098d93cd3fb3899d
-  data.tar.gz: dec6c9a3b90fbc27d6389795d1836ea1b4d2c25428dd4b467f18879b550158754195fc068ce90ab400f9e8865033efa175d89629196d8572a405bafedf8ce5b4
+  metadata.gz: 8e5f2b3a004f5f205a672ddcef8bc6fc565e3b8d2ef20a14d4f3b9aca06a8d9f069e16e1369a63b14ad226c9f8f1b89b46fe7aa43b02be34d7da574245c7db55
+  data.tar.gz: 2e5d5bdf35c5425e2c4012002f191df212d2cbc00a73e63eaa5012ab32340a60b3b39df7c9b1527ef70641c739232a4620545e9c478548f6a628ad993366aebd

data/README.md

@@ -76,7 +76,7 @@ I'd strongly recommend using `bundle exec guard` to run your tests as you work.
 
 #### Debugging
 
-Ruby is super dynamic. One of the best ways to debug Ruby code is by using [pry](http://pryrepl.org/). We include pry for developers: when you have a problem, copy these two lines just before your problem and follow the instructions from "[I Want To Be A Danger Wizard](https://danger.systems/guides/troubleshooting.html#i-want-to-be-a-danger-wizard)."
+Ruby is super dynamic. One of the best ways to debug Ruby code is by using [pry](https://pry.github.io/). We include pry for developers: when you have a problem, copy these two lines just before your problem and follow the instructions from "[I Want To Be A Danger Wizard](https://danger.systems/guides/troubleshooting.html#i-want-to-be-a-danger-wizard)."
 
 ```ruby
 require 'pry'

data/lib/danger/ci_source/buildkite.rb

@@ -45,7 +45,7 @@ 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
   end
 end

data/lib/danger/ci_source/gitlab_ci.rb

@@ -66,9 +66,17 @@ module Danger
       merge_request.nil? ? 0 : merge_request.iid
     end
 
+    def self.slug_from(env)
+      if env["DANGER_PROJECT_REPO_URL"]
+        env["DANGER_PROJECT_REPO_URL"].split('/').last(2).join('/')
+      else
+        env["CI_MERGE_REQUEST_PROJECT_PATH"] || env["CI_PROJECT_PATH"]
+      end
+    end
+
     def initialize(env)
-      @env = env
-      @repo_slug = slug_from(env)
+      self.repo_slug = self.class.slug_from(env)
+      self.pull_request_id = self.class.determine_pull_or_merge_request_id(env)
     end
 
     def supported_request_sources
@@ -77,19 +85,5 @@ module Danger
         Danger::RequestSources::GitLab
       ]
     end
-
-    def pull_request_id
-      @pull_request_id ||= self.class.determine_pull_or_merge_request_id(@env)
-    end
-
-    private
-
-    def slug_from(env)
-      if env["DANGER_PROJECT_REPO_URL"]
-        env["DANGER_PROJECT_REPO_URL"].split('/').last(2).join('/')
-      else
-        env["CI_MERGE_REQUEST_PROJECT_PATH"] || env["CI_PROJECT_PATH"]
-      end
-    end
   end
 end

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

@@ -137,7 +137,7 @@ module Danger
 
     def client
       scm_provider = find_scm_provider(remote_url)
-    
+
       case scm_provider
       when :bitbucket_cloud
         require "danger/request_sources/bitbucket_cloud_api"
@@ -151,8 +151,15 @@ module Danger
 
       when :github
         require "octokit"
-        Octokit::Client.new(access_token: ENV["DANGER_GITHUB_API_TOKEN"], api_endpoint: api_url)
-
+        access_token = ENV["DANGER_GITHUB_API_TOKEN"]
+        bearer_token = ENV["DANGER_GITHUB_BEARER_TOKEN"]
+        if bearer_token && !bearer_token.empty?
+          Octokit::Client.new(bearer_token: bearer_token, api_endpoint: api_url)
+        elsif access_token && !access_token.empty?
+          Octokit::Client.new(access_token: access_token, api_endpoint: api_url)
+        else
+          raise "No API token given, please provide one using `DANGER_GITHUB_API_TOKEN` or `DANGER_GITHUB_BEARER_TOKEN`"
+        end
       else
         raise "SCM provider not supported: #{scm_provider}"
       end

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

@@ -148,7 +148,7 @@ module Danger
     # @return [Boolean]
     #
     def pr_draft?
-      pr_json["mergeable_state"] == "draft"
+      pr_json["draft"] == true
     end
 
     # @!group PR Commit Metadata

data/lib/danger/helpers/array_subclass.rb

@@ -19,8 +19,8 @@ module Danger
         respond_to_method(name, *args, &block)
       end
 
-      def respond_to_missing?(name)
-        __array__.respond_to?(name) || super
+      def respond_to_missing?(name, include_all)
+        __array__.respond_to?(name, include_all) || super
       end
 
       def to_a

data/lib/danger/helpers/emoji_mapper.rb

@@ -10,7 +10,7 @@ module Danger
       "bitbucket_server" => {
         "no_entry_sign"    => ":no_entry_sign:",
         "warning"          => ":warning:",
-        "book"             => ":book:",
+        "book"             => ":blue_book:",
         "white_check_mark" => ":white_check_mark:"
       }
     }.freeze

data/lib/danger/request_sources/bitbucket_server.rb

@@ -20,10 +20,12 @@ module Danger
       end
 
       def self.optional_env_vars
-        ["DANGER_BITBUCKETSERVER_CODE_INSIGHTS_REPORT_KEY",
-         "DANGER_BITBUCKETSERVER_CODE_INSIGHTS_REPORT_TITLE",
-         "DANGER_BITBUCKETSERVER_CODE_INSIGHTS_REPORT_DESCRIPTION",
-         "DANGER_BITBUCKETSERVER_CODE_INSIGHTS_REPORT_LOGO_URL"
+        [
+          "DANGER_BITBUCKETSERVER_CODE_INSIGHTS_REPORT_KEY",
+          "DANGER_BITBUCKETSERVER_CODE_INSIGHTS_REPORT_TITLE",
+          "DANGER_BITBUCKETSERVER_CODE_INSIGHTS_REPORT_DESCRIPTION",
+          "DANGER_BITBUCKETSERVER_CODE_INSIGHTS_REPORT_LOGO_URL",
+          "DANGER_BITBUCKETSERVER_VERIFY_SSL"
         ]
       end
 
@@ -110,17 +112,20 @@ module Danger
           markdowns = main_violations[:markdowns] || []
         end
 
-        comment = generate_description(warnings: warnings,
-                                       errors: errors)
-        comment += "\n\n"
-        comment += generate_comment(warnings: warnings,
-                                    errors: errors,
-                                    messages: messages,
-                                    markdowns: markdowns,
-                                    previous_violations: {},
-                                    danger_id: danger_id,
-                                    template: "bitbucket_server")
-        @api.post_comment(comment)
+        has_comments = (warnings.count > 0 || errors.count > 0 || messages.count > 0 || markdowns.count > 0)
+        if has_comments
+          comment = generate_description(warnings: warnings,
+                                         errors: errors)
+          comment += "\n\n"
+          comment += generate_comment(warnings: warnings,
+                                      errors: errors,
+                                      messages: messages,
+                                      markdowns: markdowns,
+                                      previous_violations: {},
+                                      danger_id: danger_id,
+                                      template: "bitbucket_server")
+          @api.post_comment(comment)
+        end
       end
 
       def delete_old_comments(danger_id: "danger")

data/lib/danger/request_sources/bitbucket_server_api.rb

@@ -1,16 +1,18 @@
 # coding: utf-8
 
+require "openssl"
 require "danger/helpers/comments_helper"
 
 module Danger
   module RequestSources
     class BitbucketServerAPI
-      attr_accessor :host, :pr_api_endpoint, :key, :project
+      attr_accessor :host, :verify_ssl, :pr_api_endpoint, :key, :project
 
       def initialize(project, slug, pull_request_id, environment)
         @username = environment["DANGER_BITBUCKETSERVER_USERNAME"]
         @password = environment["DANGER_BITBUCKETSERVER_PASSWORD"]
         self.host = environment["DANGER_BITBUCKETSERVER_HOST"]
+        self.verify_ssl = environment["DANGER_BITBUCKETSERVER_VERIFY_SSL"] == "false" ? false : true
         if self.host && !(self.host.include? "http://") && !(self.host.include? "https://")
           self.host = "https://" + self.host
         end
@@ -57,7 +59,7 @@ module Danger
         body = { text: text }.to_json
         post(uri, body)
       end
-        
+
       def update_pr_build_status(status, changeset, build_job_link, description)
          uri = URI("#{self.host}/rest/build-status/1.0/commits/#{changeset}")
          body = build_status_body(status, build_job_link, description)
@@ -73,7 +75,7 @@ module Danger
       def fetch_json(uri)
         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: use_ssl) do |http|
+        res = http(uri).start do |http|
           http.request(req)
         end
         JSON.parse(res.body, symbolize_names: true)
@@ -84,7 +86,7 @@ module Danger
         req.basic_auth @username, @password
         req.body = body
 
-        res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: use_ssl) do |http|
+        res = http(uri).start do |http|
           http.request(req)
         end
 
@@ -99,11 +101,18 @@ module Danger
       def delete(uri)
         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: use_ssl) do |http|
+        http(uri).start do |http|
           http.request(req)
         end
       end
-        
+
+      def http(uri)
+        http = Net::HTTP.new(uri.hostname, uri.port)
+        http.use_ssl = use_ssl
+        http.verify_mode = verify_ssl ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
+        http
+      end
+
       def build_status_body(status, build_job_link, description)
           body = Hash.new
           body["state"] = status

data/lib/danger/request_sources/github/github.rb

@@ -17,7 +17,7 @@ module Danger
       attr_accessor :pr_json, :issue_json, :support_tokenless_auth, :dismiss_out_of_range_messages
 
       def self.env_vars
-        ["DANGER_GITHUB_API_TOKEN"]
+        ["DANGER_GITHUB_API_TOKEN", "DANGER_GITHUB_BEARER_TOKEN"]
       end
 
       def self.optional_env_vars
@@ -30,7 +30,8 @@ module Danger
         self.support_tokenless_auth = false
         self.dismiss_out_of_range_messages = false
 
-        @token = @environment["DANGER_GITHUB_API_TOKEN"]
+        @access_token = @environment["DANGER_GITHUB_API_TOKEN"]
+        @bearer_token = @environment["DANGER_GITHUB_BEARER_TOKEN"]
       end
 
       def get_pr_from_branch(repo_name, branch_name, owner)
@@ -45,7 +46,7 @@ module Danger
       end
 
       def validates_as_api_source?
-        (@token && !@token.empty?) || self.environment["DANGER_USE_LOCAL_GIT"]
+        valid_bearer_token? || valid_access_token? || self.environment["DANGER_USE_LOCAL_GIT"]
       end
 
       def scm
@@ -72,12 +73,16 @@ module Danger
       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` or `DANGER_GITHUB_BEARER_TOKEN`" if !valid_access_token? && !valid_bearer_token? && !support_tokenless_auth
         @client ||= begin
           Octokit.configure do |config|
             config.connection_options[:ssl] = { verify: verify_ssl }
           end
-          Octokit::Client.new(access_token: @token, auto_paginate: true, api_endpoint: api_url)
+          if valid_bearer_token?
+            Octokit::Client.new(bearer_token: @bearer_token, auto_paginate: true, api_endpoint: api_url)
+          elsif valid_access_token?
+            Octokit::Client.new(access_token: @access_token, auto_paginate: true, api_endpoint: api_url)
+          end
         end
       end
 
@@ -493,6 +498,14 @@ module Danger
 
       private
 
+      def valid_access_token?
+        @access_token && !@access_token.empty?
+      end
+
+      def valid_bearer_token?
+        @bearer_token && !@bearer_token.empty?
+      end
+
       def regular_violations_group(warnings: [], errors: [], messages: [], markdowns: [])
         {
           warnings: warnings.reject(&:inline?),

data/lib/danger/request_sources/gitlab.rb

@@ -304,6 +304,10 @@ module Danger
         end
       end
 
+      def markdown_link_to_message(message, _)
+        "#{message.file}#L#{message.line}: "
+      end
+      
       # @return [String] The organisation name, is nil if it can't be detected
       def organisation
         nil # TODO: Implement this

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "8.4.0".freeze
+  VERSION = "8.4.3".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: 8.4.0
+  version: 8.4.3
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-29 00:00:00.000000000 Z
+date: 2022-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide