danger 6.3.1 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c582d1189749d620a69040b53f7fc73c581efd772c39ab7931cd7ed886522fe8
-  data.tar.gz: 59a22185cdd2cd993ceef9f01934e7757fa6f4f4cd4229e76634bca4b13dd5b1
+  metadata.gz: 5a19704ff72b8d86ac14c19bed3ccd7276c0e0c724200439b5d3a39625409c09
+  data.tar.gz: a4b77b3e810f26f237b2057ca4214f21b6108630036aeb61228d3f2ae2e4f163
 SHA512:
-  metadata.gz: 9e6f93dae26ee18d328f10d1287c4dc0127b3199e8b055992795d4440180625010b7ecb5d229241b4d415918846cdecd9d46d214fc51b66ed43c399203ce0490
-  data.tar.gz: f0ea9446eadaa3705337982b51bf1abd49ca96e9ddecf14b888c69b48cad6ceec7ff5d59cd48f18061d8128c6c12c3cc9be12d8149461eedc8d6388f65e17179
+  metadata.gz: c4e2eb7edc403b2ef01c2d84cf2dabacdd79426a903084e9a22d8d3506bf0519721eebfe18cff7415d83ffce992b8cb7a416661d8c2da6880dbe0f2871d19c2a
+  data.tar.gz: 077f053cadf83b885c866329512426e0d8d7e31c6259b59c3e726532d3bddf28dca78c4aa2d760f20bed13ab7f116e4f736a276c7ab5c4793123572229fe4b0d

data/lib/danger/ci_source/bitrise.rb

@@ -21,7 +21,7 @@ module Danger
   #
   # ### bitbucket server and bitrsie
   #
-  # Danger will read the environemnt variable GIT_REPOSITORY_URL to construct the Bitbucket Server API URL 
+  # Danger will read the environment variable GIT_REPOSITORY_URL to construct the Bitbucket Server API URL 
   # finding the project and repo slug in the GIT_REPOSITORY_URL variable. This GIT_REPOSITORY_URL variable 
   # comes from the App Settings tab for your Bitrsie App. If you are manually setting a repo URL in the 
   # Git Clone Repo step, you may need to set adjust this propery in the settings tab, maybe even fake it.
@@ -48,13 +48,16 @@ module Danger
     def initialize(env)
       self.pull_request_id = env["BITRISE_PULL_REQUEST"]
       self.repo_url = env["GIT_REPOSITORY_URL"]
-  
-      if repo_url.include? ".com/"
-        repo_matches = self.repo_url.match(%r{\.com/(.*)})[1].split(/\.git$|$/)[0]
-      elsif repo_url.include? ".com:"
-        repo_matches = self.repo_url.match(%r{\.com:(.*)})[1].split(/\.git$|$/)[0]
-      end
       
+      matcher_url = self.repo_url
+
+      #If the URL contains https:// as :// leads to inaccurate matching. So we remove it and proceed to match.
+      if repo_url.include? "https://"
+        matcher_url["https://"] = ''
+      end
+
+      repo_matches = matcher_url.match(%r{([\/:])(([^\/]+\/)+[^\/]+?)(\.git$|$)})[2]
+
       self.repo_slug = repo_matches unless repo_matches.nil?
       
     end

data/lib/danger/ci_source/github_actions.rb

@@ -3,25 +3,18 @@ require "danger/request_sources/github/github"
 module Danger
   # ### CI Setup
   #
-  # You can use `danger/danger` Action in your .github/main.workflow.
+  # You can use `danger/danger` Action in your `.github/workflows/xxx.yml`.
+  # And so, you can use GITHUB_TOKEN secret as `DANGER_GITHUB_API_TOKEN` environment variable.
   #
   #  ```
-  # action "Danger" {
-  #    uses = "danger/danger"
-  # }
+  #  ...
+  #    steps:
+  #      - uses: actions/checkout@v1
+  #      - uses: danger/danger@master
+  #        env:
+  #          DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   #  ```
   #
-  # ### Token Setup
-  #
-  # Set DANGER_GITHUB_API_TOKEN to secrets, or you can also use GITHUB_TOKEN.
-  #
-  # ```
-  # action "Danger" {
-  #    uses = "danger/danger"
-  #    secrets = ["GITHUB_TOKEN"]
-  # }
-  # ```
-  #
   class GitHubActions < CI
     def self.validates_as_ci?(env)
       env.key? "GITHUB_ACTION"

data/lib/danger/commands/local.rb

@@ -66,12 +66,15 @@ module Danger
 
     private
 
+    # this method is a duplicate of Commands::PR#configure_octokit
+    # - worth a refactor sometime?
     def configure_octokit(cache_dir)
       # setup caching for Github calls to hitting the API rate limit too quickly
       cache_file = File.join(cache_dir, "danger_local_cache")
       cache = HTTPCache.new(cache_file, clear_cache: @clear_http_cache)
       Octokit.middleware = Faraday::RackBuilder.new do |builder|
         builder.use Faraday::HttpCache, store: cache, serializer: Marshal, shared_cache: false
+        builder.use Octokit::Middleware::FollowRedirects
         builder.use Octokit::Response::RaiseError
         builder.adapter Faraday.default_adapter
       end

data/lib/danger/commands/pr.rb

@@ -83,6 +83,7 @@ module Danger
       end
       Octokit.middleware = Faraday::RackBuilder.new do |builder|
         builder.use Faraday::HttpCache, store: cache, serializer: Marshal, shared_cache: false
+        builder.use Octokit::Middleware::FollowRedirects
         builder.use Octokit::Response::RaiseError
         builder.adapter Faraday.default_adapter
       end

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

@@ -2,7 +2,7 @@
   <%- table[:content].each do |violation| -%>
 <%= @emoji_mapper.map(table[:emoji]) if table[:emoji] %> <%= violation.message %>
   <%- end -%>
-  <%- table[:resolved].each do |message| -%>
+  <%- table[:resolved] && table[:resolved].each do |message| -%>
 <%= @emoji_mapper.map("white_check_mark") %> <%= message %>
   <%- end -%>
 <%- end -%>

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

@@ -0,0 +1,12 @@
+<%- @message_group.messages.each do |message| -%>
+  <%- next if message.type == :markdown -%>
+<%= @emoji_mapper.from_type(message.type) -%> <%= message.message %>
+
+<%- end -%>
+<%- @resolved.each do |message| -%>
+<%= @emoji_mapper.map("white_check_mark") %> <%= message %>
+<%- end -%>
+
+<%= @message_group.markdowns.map(&:message).join("\n\n") %>
+
+Generated by :no_entry_sign: [Danger](https://danger.systems/ "generated_by_<%= @danger_id %>")

data/lib/danger/danger_core/dangerfile.rb

@@ -2,6 +2,7 @@
 
 require "danger/danger_core/dangerfile_dsl"
 require "danger/danger_core/standard_error"
+require "danger/danger_core/message_aggregator"
 
 require "danger/danger_core/plugins/dangerfile_messaging_plugin"
 require "danger/danger_core/plugins/dangerfile_danger_plugin"
@@ -60,7 +61,6 @@ module Danger
     # that the core DSLs have, then starts looking at plugins support.
 
     # rubocop:disable Style/MethodMissing
-
     def method_missing(method_sym, *arguments, &_block)
       @core_plugins.each do |plugin|
         if plugin.public_methods(false).include?(method_sym)
@@ -243,16 +243,26 @@ module Danger
 
     def post_results(danger_id, new_comment, remove_previous_comments)
       violations = violation_report
-
-      env.request_source.update_pull_request!(
-        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,
-        remove_previous_comments: remove_previous_comments
-      )
+      report = {
+          warnings: violations[:warnings].uniq,
+          errors: violations[:errors].uniq,
+          messages: violations[:messages].uniq,
+          markdowns: status_report[:markdowns].uniq,
+          danger_id: danger_id
+      }
+
+      if env.request_source.respond_to?(:update_pr_by_line!) && ENV["DANGER_MESSAGE_AGGREGATION"]
+        env.request_source.update_pr_by_line!(message_groups: MessageAggregator.aggregate(**report),
+                                             new_comment: new_comment,
+                                             remove_previous_comments: remove_previous_comments,
+                                             danger_id: report[:danger_id])
+      else
+        env.request_source.update_pull_request!(
+          **report,
+          new_comment: new_comment,
+          remove_previous_comments: remove_previous_comments
+        )
+      end
     end
 
     def setup_for_running(base_branch, head_branch)

data/lib/danger/danger_core/executor.rb

@@ -63,7 +63,7 @@ module Danger
       unless EnvironmentManager.pr?(system_env)
         ci_name = EnvironmentManager.local_ci_source(system_env).name.split("::").last
 
-        msg = "Not a #{ci_name} Pull Request - skipping `danger` run. "
+        msg = "Not a #{ci_name} #{commit_request(ci_name)} - skipping `danger` run. "
         # circle won't run danger properly if the commit is pushed and build runs before the PR exists
         # https://danger.systems/guides/troubleshooting.html#circle-ci-doesnt-run-my-build-consistently
         # the best solution is to enable `fail_if_no_pr`, and then re-run the job once the PR is up
@@ -83,5 +83,10 @@ module Danger
     def head_branch(user_specified_head_branch)
       user_specified_head_branch || EnvironmentManager.danger_head_branch
     end
+
+    def commit_request(ci_name)
+      return "Merge Request" if ci_name == 'GitLabCI'
+      return "Pull Request"
+    end
   end
 end

data/lib/danger/danger_core/message_aggregator.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+require "danger/danger_core/message_group"
+require "danger/helpers/message_groups_array_helper"
+
+module Danger
+  class MessageAggregator
+    def self.aggregate(*args)
+      new(*args).aggregate
+    end
+
+    def initialize(warnings: [],
+                   errors: [],
+                   messages: [],
+                   markdowns: [],
+                   danger_id: "danger")
+      @messages = warnings + errors + messages + markdowns
+      @danger_id = danger_id
+    end
+
+    # aggregates the messages into an array of MessageGroups
+    # @return [[MessageGroup]]
+    def aggregate
+      # oookay I took some shortcuts with this one.
+      # first, sort messages by file and line
+      @messages.sort! { |a, b| a.compare_by_file_and_line(b) }
+
+      # now create an initial empty message group
+      first_group = MessageGroup.new(file: nil,
+                                     line: nil)
+      @message_groups = @messages.reduce([first_group]) do |groups, msg|
+        # We get to take a shortcut because we sorted the messages earlier - only
+        # have to see if we can append msg to the last group in the list
+        if groups.last << msg
+          # we appended it, so return groups unchanged
+          groups
+        else
+          # have to create a new group since msg wasn't appended to the other
+          # group
+          new_group = MessageGroup.new(file: msg.file,
+                                       line: msg.line)
+          new_group << msg
+          groups << new_group
+        end
+      end
+
+      @message_groups.extend(Helpers::MessageGroupsArrayHelper)
+    end
+  end
+end

data/lib/danger/danger_core/message_group.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module Danger
+  class MessageGroup
+    def initialize(file: nil, line: nil)
+      @file = file
+      @line = line
+    end
+
+    # Returns whether this `MessageGroup` is for the same line of code as
+    #   `other`, taking which file they are in to account.
+    # @param other [MessageGroup, Markdown, Violation]
+    # @return [Boolean] whether this `MessageGroup` is for the same line of code
+    def same_line?(other)
+      other.file == file && other.line == line
+    end
+
+    # Merges two `MessageGroup`s that represent the same line of code
+    # In future, perhaps `MessageGroup` will be able to represent a group of
+    # messages for multiple lines.
+    def merge(other)
+      raise ArgumentError, "Cannot merge with MessageGroup for a different line" unless same_line?(other)
+
+      @messages = (messages + other.messages).uniq
+    end
+
+    # Adds a message to the group.
+    # @param message [Markdown, Violation] the message to add
+    def <<(message)
+      # TODO: insertion sort
+      return nil unless same_line?(message)
+
+      inserted = false
+      messages.each.with_index do |other, idx|
+        if (message <=> other) == -1
+          inserted = true
+          messages.insert(idx, message)
+          break
+        end
+      end
+      messages << message unless inserted
+      messages
+    end
+
+    # The list of messages in this group. This list will be sorted in decreasing
+    # order of severity (error, warning, message, markdown)
+    def messages
+      @messages ||= []
+    end
+
+    attr_reader :file, :line
+
+    # @return a hash of statistics. Currently only :warnings_count and
+    # :errors_count
+    def stats
+      stats = { warnings_count: 0, errors_count: 0 }
+      messages.each do |msg|
+        stats[:warnings_count] += 1 if msg.type == :warning
+        stats[:errors_count] += 1 if msg.type == :error
+      end
+      stats
+    end
+
+    def markdowns
+      messages.select { |x| x.type == :markdown }
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+module Danger
+  class BaseMessage
+    attr_accessor :message, :file, :line, :type
+
+    def initialize(type:, message:, file: nil, line: nil)
+      @type = type
+      @message = message
+      @file = file
+      @line = line
+    end
+
+    def compare_by_file_and_line(other)
+      order = cmp_nils(file, other.file)
+      return order unless order.nil?
+
+      order = file <=> other.file
+      return order unless order.zero?
+
+      order = cmp_nils(line, other.line)
+      return order unless order.nil?
+
+      line <=> other.line
+    end
+    # compares a and b based entirely on whether one or the other is nil
+    # arguments are in the same order as `a <=> b`
+    # nil is sorted earlier - so cmp_nils(nil, 1) => -1
+    #
+    # If neither are nil, rather than returning `a <=> b` which would seem
+    # like the obvious shortcut, `nil` is returned.
+    # This allows us to distinguish between cmp_nils returning 0 for a
+    # comparison of filenames, which means "a comparison on the lines is
+    # meaningless - you cannot have a line number for a nil file - so they
+    # should be sorted the same", and a <=> b returning 0, which means "the
+    # files are the same, so compare on the lines"
+    #
+    # @return 0, 1, -1, or nil
+    def cmp_nils(a, b)
+      if a.nil? && b.nil?
+        0
+      elsif a.nil?
+        -1
+      elsif b.nil?
+        1
+      end
+    end
+
+    def eql?(other)
+      return self == other
+    end
+
+    # @return [Boolean] returns true if is a file or line, false otherwise
+    def inline?
+      file || line
+    end
+  end
+end

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

@@ -1,11 +1,11 @@
+# frozen_string_literal: true
+require "danger/danger_core/messages/base"
+
 module Danger
-  class Markdown
-    attr_accessor :message, :file, :line
+  class Markdown < BaseMessage
 
     def initialize(message, file = nil, line = nil)
-      self.message = message
-      self.file = file
-      self.line = line
+      super(type: :markdown, message: message, file: file, line: line)
     end
 
     def ==(other)
@@ -25,15 +25,6 @@ module Danger
       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
-    end
-
     def to_s
       extra = []
       extra << "file: #{file}" unless file
@@ -41,5 +32,11 @@ module Danger
 
       "Markdown #{message} { #{extra.join ', '.freeze} }"
     end
+
+    def <=>(other)
+      return 1 if other.type != :markdown
+
+      compare_by_file_and_line(other)
+    end
   end
 end

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

@@ -1,12 +1,17 @@
+# frozen_string_literal: true
+
+require "danger/danger_core/messages/base"
+
 module Danger
-  class Violation
-    attr_accessor :message, :sticky, :file, :line
+  class Violation < BaseMessage
+    VALID_TYPES = %I[error warning message].freeze
+    attr_accessor :sticky
 
-    def initialize(message, sticky, file = nil, line = nil)
-      self.message = message
+    def initialize(message, sticky, file = nil, line = nil, type: :warning)
+      raise ArgumentError unless VALID_TYPES.include?(type)
+
+      super(type: type, message: message, file: file, line: line)
       self.sticky = sticky
-      self.file = file
-      self.line = line
     end
 
     def ==(other)
@@ -28,13 +33,12 @@ module Danger
       h
     end
 
-    def eql?(other)
-      return self == other
-    end
+    def <=>(other)
+      types = VALID_TYPES + [:markdown]
+      order = types.index(type) <=> types.index(other.type)
+      return order unless order.zero?
 
-    # @return [Boolean] returns true if is a file or line, false otherwise
-    def inline?
-      file || line
+      compare_by_file_and_line(other)
     end
 
     def to_s
@@ -42,8 +46,9 @@ module Danger
       extra << "sticky: #{sticky}"
       extra << "file: #{file}" if file
       extra << "line: #{line}" if line
+      extra << "type: #{type}"
 
-      "Violation #{message} { #{extra.join ', '.freeze} }"
+      "Violation #{message} { #{extra.join ', '} }"
     end
   end
 end

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

@@ -136,14 +136,14 @@ module Danger
     # @return [Hash] with keys `:insertions`, `:deletions` giving line counts, and `:before`, `:after` giving file contents, or nil if the file has no changes or does not exist
     #
     def info_for_file(file)
-      return nil unless modified_files.include?(file)
+      return nil unless modified_files.include?(file) || added_files.include?(file) || deleted_files.include?(file)
       stats = @git.diff.stats[:files][file]
       diff = @git.diff[file]
       {
         insertions: stats[:insertions],
         deletions: stats[:deletions],
-        before: diff.blob(:src).contents,
-        after: diff.blob(:dst).contents
+        before: added_files.include?(file) || deleted_files.include?(file) ? nil : diff.blob(:src).contents,
+        after: added_files.include?(file) || deleted_files.include?(file) ? nil : diff.blob(:dst).contents
       }
     end
 

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

@@ -124,7 +124,7 @@ module Danger
       line = options.fetch(:line, nil)
 
       messages.flatten.each do |message|
-        @messages << Violation.new(message, sticky, file, line) if message
+        @messages << Violation.new(message, sticky, file, line, type: :message) if message
       end
     end
 
@@ -149,7 +149,7 @@ module Danger
 
       warnings.flatten.each do |warning|
         next if should_ignore_violation(warning)
-        @warnings << Violation.new(warning, sticky, file, line) if warning
+        @warnings << Violation.new(warning, sticky, file, line, type: :warning) if warning
       end
     end
 
@@ -174,7 +174,7 @@ module Danger
 
       failures.flatten.each do |failure|
         next if should_ignore_violation(failure)
-        @errors << Violation.new(failure, sticky, file, line) if failure
+        @errors << Violation.new(failure, sticky, file, line, type: :error) if failure
       end
     end
 

data/lib/danger/helpers/comments_helper.rb

@@ -76,7 +76,7 @@ module Danger
         }
       end
 
-      def apply_template(tables: [], markdowns: [], danger_id: "danger", template: "github")
+      def apply_template(tables: [], markdowns: [], danger_id: "danger", template: "github", request_source: template)
         require "erb"
 
         md_template = File.join(Danger.gem_path, "lib/danger/comment_generators/#{template}.md.erb")
@@ -86,7 +86,7 @@ module Danger
         @tables = tables
         @markdowns = markdowns.map(&:message)
         @danger_id = danger_id
-        @emoji_mapper = EmojiMapper.new(template)
+        @emoji_mapper = EmojiMapper.new(request_source.sub("_inline",""))
 
         return ERB.new(File.read(md_template), 0, "-").result(binding)
       end
@@ -104,7 +104,32 @@ module Danger
         )
       end
 
-      def generate_inline_comment_body(emoji, message, danger_id: "danger", resolved: [], template: "github")
+      # resolved is essentially reserved for future use - eventually we might
+      # have some nice generic resolved-thing going :)
+      def generate_message_group_comment(message_group:,
+                                         danger_id: "danger",
+                                         resolved: [],
+                                         template: "github")
+        # cheating a bit - I don't want to alter the apply_template API
+        # so just sneak around behind its back setting some instance variables
+        # to get them to show up in the template
+        @message_group = message_group
+        @resolved = resolved
+        request_source_name = template.sub("_message_group", "")
+
+
+        apply_template(danger_id: danger_id,
+                       markdowns: message_group.markdowns,
+                       template: template,
+                       request_source: request_source_name)
+          .sub(/\A\n*/, "")
+      end
+
+      def generate_inline_comment_body(emoji,
+                                       message,
+                                       danger_id: "danger",
+                                       resolved: false,
+                                       template: "github")
         apply_template(
           tables: [{ content: [message], resolved: resolved, emoji: emoji }],
           danger_id: danger_id,

data/lib/danger/helpers/emoji_mapper.rb

@@ -15,16 +15,25 @@ module Danger
       }
     }.freeze
 
+    TYPE_TO_EMOJI = {
+      error: "no_entry_sign",
+      warning: "warning",
+      message: "book",
+    }.freeze
+
     def initialize(template)
-      template.sub!('_inline', '')
       @template = DATA.has_key?(template) ? template : "github"
     end
 
     def map(emoji)
-      emoji.delete! ":"
+      emoji&.delete! ":"
       DATA[template][emoji]
     end
 
+    def from_type(type)
+      map(TYPE_TO_EMOJI[type])
+    end
+
     private
 
     attr_reader :template

data/lib/danger/helpers/message_groups_array_helper.rb

@@ -0,0 +1,31 @@
+module Danger
+  module Helpers
+    module MessageGroupsArrayHelper
+      FakeArray = Struct.new(:count) do
+        def empty?
+          count.zero?
+        end
+      end
+
+      def fake_warnings_array
+        FakeArray.new(counts[:warnings])
+      end
+
+      def fake_errors_array
+        FakeArray.new(counts[:errors])
+      end
+
+      def counts
+        return @counts if @counts
+
+        @counts = { warnings: 0, errors: 0 }
+        each do |message_group, counts|
+          group_stats = message_group.stats
+          @counts[:warnings] += group_stats[:warnings_count]
+          @counts[:errors] += group_stats[:errors_count]
+        end
+        @counts
+      end
+    end
+  end
+end

data/lib/danger/request_sources/bitbucket_cloud.rb

@@ -2,6 +2,7 @@
 
 require "danger/helpers/comments_helper"
 require "danger/request_sources/bitbucket_cloud_api"
+require "danger/danger_core/message_group"
 
 module Danger
   module RequestSources
@@ -12,6 +13,7 @@ module Danger
       def self.env_vars
         [
           "DANGER_BITBUCKETCLOUD_USERNAME",
+          "DANGER_BITBUCKETCLOUD_UUID",
           "DANGER_BITBUCKETCLOUD_PASSWORD"
         ]
       end
@@ -90,6 +92,50 @@ module Danger
         @api.post_comment(comment)
       end
 
+      def update_pr_by_line!(message_groups:,
+                             danger_id: "danger",
+                             new_comment: false,
+                             remove_previous_comments: false)
+        if !new_comment || remove_previous_comments
+          delete_old_comments(danger_id: danger_id)
+        end
+
+        summary_body = generate_description(warnings: message_groups.fake_warnings_array,
+                                            errors: message_groups.fake_errors_array,
+                                            template: "bitbucket_server")
+        summary_body += "\n\n"
+
+
+        # this isn't the most elegant thing in the world, but we need the group
+        # with file: nil, line: nil so we can combine its info in with the
+        # summary_body
+        summary_group = message_groups.first
+        if summary_group && summary_group.file.nil? && summary_group.line.nil?
+          # remove summary_group from message_groups so it doesn't get a
+          # duplicate comment posted in the message_groups loop below
+          message_groups.shift
+        else
+          summary_group = MessageGroup.new(file: nil, line: nil)
+        end
+
+        summary_body += generate_message_group_comment(
+          message_group: summary_group,
+          danger_id: danger_id,
+          template: "bitbucket_server_message_group"
+        )
+
+        @api.post_comment(summary_body)
+
+        message_groups.each do |message_group|
+          body = generate_message_group_comment(message_group: message_group,
+                                                danger_id: danger_id,
+                                                template: "bitbucket_server_message_group")
+          @api.post_comment(body,
+                            file: message_group.file,
+                            line: message_group.line)
+        end
+      end
+
       def update_inline_comments_for_kind!(kind, messages, danger_id: "danger")
         emoji = { warnings: "warning", errors: "no_entry_sign", messages: "book" }[kind]
 

data/lib/danger/request_sources/bitbucket_cloud_api.rb

@@ -6,8 +6,10 @@ module Danger
   module RequestSources
     class BitbucketCloudAPI
       attr_accessor :host, :project, :slug, :access_token, :pull_request_id
+      attr_reader :my_uuid
 
       def initialize(repo_slug, pull_request_id, branch_name, environment)
+        initialize_my_uuid(environment["DANGER_BITBUCKETCLOUD_UUID"])
         @username = environment["DANGER_BITBUCKETCLOUD_USERNAME"]
         @password = environment["DANGER_BITBUCKETCLOUD_PASSWORD"]
         self.project, self.slug = repo_slug.split("/")
@@ -16,6 +18,17 @@ module Danger
         self.host = "https://bitbucket.org/"
       end
 
+      def initialize_my_uuid(uuid)
+        return if uuid.nil?
+        return @my_uuid = uuid if uuid.empty?
+
+        if uuid.start_with?("{") && uuid.end_with?("}")
+          @my_uuid = uuid
+        else
+          @my_uuid = "{#{uuid}}"
+        end
+      end
+
       def inspect
         inspected = super
 
@@ -27,12 +40,9 @@ module Danger
       end
 
       def credentials_given?
-        @username && !@username.empty? && @password && !@password.empty?
-      end
-
-      def my_uuid
-        uri = URI("https://api.bitbucket.org/2.0/users/#{@username}")
-        @my_uuid ||= fetch_json(uri)[:uuid]
+        @my_uuid && !@my_uuid.empty? &&
+          @username && !@username.empty? &&
+          @password && !@password.empty?
       end
 
       def pull_request(*)
@@ -157,7 +167,9 @@ module Danger
       end
 
       def credentials_not_available
-        "Credentials not available. Provide DANGER_BITBUCKETCLOUD_USERNAME and DANGER_BITBUCKETCLOUD_PASSWORD as environment variables."
+        "Credentials not available. Provide DANGER_BITBUCKETCLOUD_USERNAME, " \
+        "DANGER_BITBUCKETCLOUD_UUID, and DANGER_BITBUCKETCLOUD_PASSWORD " \
+        "as environment variables."
       end
 
       def error_fetching_json(url, status_code)

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

@@ -170,7 +170,7 @@ module Danger
         rest_inline_violations = submit_inline_comments!({
           danger_id: danger_id,
           previous_violations: previous_violations
-        }.merge(inline_violations))
+        }.merge(**inline_violations))
 
         main_violations = merge_violations(
           regular_violations, rest_inline_violations
@@ -189,7 +189,7 @@ module Danger
             template: "github",
             danger_id: danger_id,
             previous_violations: previous_violations
-          }.merge(main_violations))
+          }.merge(**main_violations))
 
           comment_result =
             if should_create_new_comment

data/lib/danger/request_sources/gitlab.rb

@@ -50,7 +50,11 @@ module Danger
         includes_port = self.host.include? ":"
         raise "Port number included in `DANGER_GITLAB_HOST`, this will fail with GitLab CI Runners" if includes_port
 
-        super
+        # We don't call super because in some cases the Git remote doesn't match the GitLab instance host.
+        # In Danger::EnvironmentManager#initialize we still check that the request source is #validates_as_api_source?
+        # so that should be sufficient to validate GitLab as request source.
+        # See https://github.com/danger/danger/issues/1231 and https://gitlab.com/gitlab-com/gl-infra/infrastructure/-/issues/10069.
+        true
       end
 
       def validates_as_api_source?
@@ -302,6 +306,9 @@ module Danger
       def file_url(organisation: nil, repository: nil, branch: nil, path: nil)
         branch ||= 'master'
         token = @environment["DANGER_GITLAB_API_TOKEN"]
+        # According to GitLab Repositories API docs path and id(slug) should be encoded.
+        path = URI.encode_www_form_component(path)
+        repository = URI.encode_www_form_component(repository)
         "#{endpoint}/projects/#{repository}/repository/files/#{path}/raw?ref=#{branch}&private_token=#{token}"
       end
 

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "6.3.1".freeze
+  VERSION = "8.0.1".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: 6.3.1
+  version: 8.0.1
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: colored2
   requirement: !ruby/object:Gem::Requirement
@@ -71,16 +71,22 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: faraday-http-cache
   requirement: !ruby/object:Gem::Requirement
@@ -250,6 +256,7 @@ files:
 - lib/danger/commands/systems.rb
 - lib/danger/comment_generators/bitbucket_server.md.erb
 - lib/danger/comment_generators/bitbucket_server_inline.md.erb
+- lib/danger/comment_generators/bitbucket_server_message_group.md.erb
 - lib/danger/comment_generators/github.md.erb
 - lib/danger/comment_generators/github_inline.md.erb
 - lib/danger/comment_generators/gitlab.md.erb
@@ -262,6 +269,9 @@ files:
 - lib/danger/danger_core/dangerfile_generator.rb
 - lib/danger/danger_core/environment_manager.rb
 - lib/danger/danger_core/executor.rb
+- lib/danger/danger_core/message_aggregator.rb
+- lib/danger/danger_core/message_group.rb
+- lib/danger/danger_core/messages/base.rb
 - lib/danger/danger_core/messages/markdown.rb
 - lib/danger/danger_core/messages/violation.rb
 - lib/danger/danger_core/plugins/dangerfile_bitbucket_cloud_plugin.rb
@@ -280,6 +290,7 @@ files:
 - lib/danger/helpers/comments_parsing_helper.rb
 - lib/danger/helpers/emoji_mapper.rb
 - lib/danger/helpers/find_max_num_violations.rb
+- lib/danger/helpers/message_groups_array_helper.rb
 - lib/danger/plugin_support/gems_resolver.rb
 - lib/danger/plugin_support/plugin.rb
 - lib/danger/plugin_support/plugin_file_resolver.rb
@@ -314,7 +325,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="