danger 8.2.3 → 8.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd811a6fad28534b9e0b28ccbed30d0694e4ab3408ad22852a8897a56c55f2ed
-  data.tar.gz: 747e7a6ff6fce272eb7b732ced8f6358602159725e5490a3ce783f7ce06dcc83
+  metadata.gz: 423862c4ae06fbd90dbc52ae126b171c3af53da1867f6051db5e1e00cd1cb09e
+  data.tar.gz: 45d13ff59705d33a756f8a221ef597f8c29f534511a9cd310241d2730b118e59
 SHA512:
-  metadata.gz: 54612a3b0e7999fce7289a884febff1548edbfa92af9947a8c8cc4bbef5fa69451ac88b493bc2ba0125e23ef96f7a46846a7a3b1e7adb8ac4d8f98aafa0065ce
-  data.tar.gz: 6612a1c511c7fe579c2734f6b4c8b15955dc2a2dd196a4a0277a901d61307b58c2abdd7f000867c1f212d2db065b39c8dfcd9f83c774154b1089a37395f45096
+  metadata.gz: 3a1e23473e3012edb47a6860ca50a4e0e12512ade5c2796b79720c71ba049c034060893505a5264df3ee36439ae702dffe1cc9472da4e6357d2cef7ba81e24b8
+  data.tar.gz: 4e186a0412277f4d3add84821f39529900c9faec5439ccd62329bc24e6a753c19feafe68208f9ff3b7fe8b12e64ba8b31379b7af5273f24dfa230ec804f12648

data/lib/danger/ci_source/azure_pipelines.rb

@@ -19,7 +19,11 @@ module Danger
   #
   class AzurePipelines < CI
     def self.validates_as_ci?(env)
-      env.key?("AGENT_ID") && env["BUILD_REPOSITORY_PROVIDER"] != "TfsGit"
+      # AGENT_ID is being used by AppCenter as well, so checking here to make sure AppCenter CI doesn't get a false positive for AzurePipelines
+      # Anyone working with AzurePipelines could provide a better/truly unique env key to avoid checking for AppCenter
+      !Danger::Appcenter::validates_as_ci?(env) &&
+      env.key?("AGENT_ID") &&
+      env["BUILD_REPOSITORY_PROVIDER"] != "TfsGit"
     end
 
     def self.validates_as_pr?(env)

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/codemagic.rb

@@ -0,0 +1,58 @@
+# https://docs.codemagic.io/building/environment-variables/
+
+module Danger
+  # ### CI Setup
+  #
+  # Add a script step to your workflow:
+  #
+  # ```
+  # - name: Running Danger
+  #   script: |
+  #     bundle install
+  #     bundle exec danger
+  # ```
+  #
+  # ### Token Setup
+  #
+  # Add the following environment variables to your workflow's environment configuration.
+  # https://docs.codemagic.io/getting-started/yaml/
+  #
+  # #### GitHub
+  # Add the `DANGER_GITHUB_API_TOKEN` to your build user's ENV.
+  #
+  # #### GitLab
+  # Add the `DANGER_GITLAB_API_TOKEN` to your build user's ENV.
+  #
+  # #### Bitbucket Cloud
+  # Add the `DANGER_BITBUCKETSERVER_USERNAME`, `DANGER_BITBUCKETSERVER_PASSWORD`
+  # to your build user's ENV.
+  #
+  # #### Bitbucket server
+  # Add the `DANGER_BITBUCKETSERVER_USERNAME`, `DANGER_BITBUCKETSERVER_PASSWORD`
+  # and `DANGER_BITBUCKETSERVER_HOST` to your build user's ENV.
+  #
+  class Codemagic < CI
+    def self.validates_as_ci?(env)
+      env.key? "FCI_PROJECT_ID"
+    end
+
+    def self.validates_as_pr?(env)
+      return !env["FCI_PULL_REQUEST_NUMBER"].to_s.empty?
+    end
+
+    def supported_request_sources
+      @supported_request_sources ||= [
+        Danger::RequestSources::GitHub,
+        Danger::RequestSources::GitLab,
+        Danger::RequestSources::BitbucketServer,
+        Danger::RequestSources::BitbucketCloud
+      ]
+    end
+
+    def initialize(env)
+      self.pull_request_id = env["FCI_PULL_REQUEST_NUMBER"]
+      self.repo_slug = env["FCI_REPO_SLUG"]
+      self.repo_url = GitRepo.new.origins # Codemagic doesn't provide a repo url env variable for n
+    end
+  end
+end

data/lib/danger/ci_source/jenkins.rb

@@ -133,7 +133,7 @@ module Danger
           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 = 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]+})

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/ci_source/xcode_cloud.rb

@@ -0,0 +1,38 @@
+module Danger
+  # ### CI Setup
+  #
+  # In order to work with Xcode Cloud and Danger, you will need to add `bundle exec danger` to 
+  # the `ci_scripts/ci_post_xcodebuild.sh` (Xcode Cloud's expected filename for a post-action build script).
+  # More details and documentation on Xcode Cloud configuration can be found [here](https://developer.apple.com/documentation/xcode/writing-custom-build-scripts).
+  # 
+  # ### Token Setup
+  #
+  # You will need to add the `DANGER_GITHUB_API_TOKEN` to your build environment. 
+  # If running on GitHub Enterprise, make sure you also set the expected values for 
+  # both `DANGER_GITHUB_API_HOST` and `DANGER_GITHUB_HOST`.
+  #  
+  class XcodeCloud < CI
+    def self.validates_as_ci?(env)
+      env.key? "CI_XCODEBUILD_ACTION"
+    end
+
+    def self.validates_as_pr?(env)
+      env.key? "CI_PULL_REQUEST_NUMBER"
+    end
+
+    def supported_request_sources
+      @supported_request_sources ||= [
+        Danger::RequestSources::GitHub,
+        Danger::RequestSources::GitLab, 
+        Danger::RequestSources::BitbucketCloud, 
+        Danger::RequestSources::BitbucketServer
+      ]
+    end
+
+    def initialize(env)
+      self.repo_slug = env["CI_PULL_REQUEST_SOURCE_REPO"]
+      self.pull_request_id = env["CI_PULL_REQUEST_NUMBER"]
+      self.repo_url = env["CI_PULL_REQUEST_HTML_URL"]
+    end
+  end
+end

data/lib/danger/comment_generators/gitlab_inline.md.erb

@@ -17,10 +17,5 @@
 <%= current %>
 <%# the previous line has to be aligned far to the left, otherwise markdown can break easily %>
 <%- end -%>
-<%# We need to add the generated_by_ to identify comments from danger. But with inlines %>
-<%# it might be a little annoying, so we set on the table, but if we have markdown we add the footer anyway %>
-<%- if @markdowns.count > 0 -%>
-<p align="right" data-meta="generated_by_<%= @danger_id %>">
-  Generated by :no_entry_sign: <a href="http://danger.systems/">Danger</a>
-</p>
-<%- end -%>
+<%# Add the generated_by_ as a html coment to identify comments from danger. %>
+<!-- "generated_by_<%= @danger_id %>" -->

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

@@ -143,6 +143,14 @@ module Danger
       @github.issue_json["labels"].map { |l| l[:name] }
     end
 
+    # @!group PR Metadata
+    # Whether the PR is a Draft.
+    # @return [Boolean]
+    #
+    def pr_draft?
+      pr_json["mergeable_state"] == "draft"
+    end
+
     # @!group PR Commit Metadata
     # The branch to which the PR is going to be merged into.
     # @return [String]

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

@@ -131,6 +131,22 @@ module Danger
       @gitlab.mr_diff
     end
 
+    # @!group MR Changes
+    # The array of changes
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    #
+    def mr_changes
+      @gitlab.mr_changes.changes
+    end
+
+    # @!group MR Closes issues
+    # The array of issues that this MR closes
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    #
+    def mr_closes_issues
+      @gitlab.mr_closes_issues
+    end
+
     # @!group MR Commit Metadata
     # The branch to which the MR is going to be merged into
     # @deprecated Please use {#branch_for_base} instead

data/lib/danger/helpers/comments_helper.rb

@@ -148,7 +148,7 @@ module Danger
       def generate_description(warnings: nil, errors: nil, template: "github")
         emoji_mapper = EmojiMapper.new(template)
         if errors.empty? && warnings.empty?
-          return "All green. #{random_compliment}"
+          return ENV['DANGER_SUCCESS_MESSAGE'] || "All green. #{random_compliment}"
         else
           message = "#{emoji_mapper.map('warning')} "
           message += "#{'Error'.danger_pluralize(errors.count)}. " unless errors.empty?

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

@@ -130,6 +130,12 @@ module Danger
         end
       end
 
+      def mr_closes_issues
+        @mr_closes_issues ||= begin
+          client.merge_request_closes_issues(ci_source.repo_slug, ci_source.pull_request_id)
+        end
+      end
+
       def setup_danger_branches
         # we can use a GitLab specific feature here:
         base_branch = self.mr_json.source_branch
@@ -298,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.2.3".freeze
+  VERSION = "8.4.2".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.2.3
+  version: 8.4.2
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -219,6 +219,7 @@ files:
 - lib/danger/ci_source/cirrus.rb
 - lib/danger/ci_source/code_build.rb
 - lib/danger/ci_source/codefresh.rb
+- lib/danger/ci_source/codemagic.rb
 - lib/danger/ci_source/codeship.rb
 - lib/danger/ci_source/concourse.rb
 - lib/danger/ci_source/dotci.rb
@@ -243,6 +244,7 @@ files:
 - lib/danger/ci_source/teamcity.rb
 - lib/danger/ci_source/travis.rb
 - lib/danger/ci_source/vsts.rb
+- lib/danger/ci_source/xcode_cloud.rb
 - lib/danger/ci_source/xcode_server.rb
 - lib/danger/clients/rubygems_client.rb
 - lib/danger/commands/dangerfile/gem.rb