danger 6.3.2 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27b09c31a2f456489426bf90c66b907f7c7b620bc0019387c3c7dd89e14267b6
-  data.tar.gz: 7aeed8d94b83e5fb757ca0f319fe55e3c07a4fc641c93dd56408efc1aaeccf4a
+  metadata.gz: bac82d5de5c00b56576cd95681444543eb4b540f6bb6767ac1d407fb13150fbc
+  data.tar.gz: 032b2993f97a2c8c56b4d8f69690c7bbd7bbf6738e3631af54a0ea657811939f
 SHA512:
-  metadata.gz: 267bc39cef40d450ec1be77ddeb0c279ef6b5b7f5cd8a3dd2afdb49f6a4b5fa32feb10622c84f0f2f85a3907b4fb05824ecfad0b517fcf4eacd0d4949423dc69
-  data.tar.gz: de72c74f898bdc9a3c70bf730158e2c642aa6b392935a3e89a6980a457262475c549f10380e0123e4a5b92c03ae9b27018bf7cb8aa919667256edd5639d70149
+  metadata.gz: 74fa60f6fc40846e32837a0b8234b119f6132ff4a629abd705480a8c4ebee1bbb78ed19ad940fc63d8d08b427e238bea3edb2d67286d23ceef48ac8a7c9e0dd3
+  data.tar.gz: 7072368e374403c31ea5240b8004942c9e28f00806f4acb1d65fafe850d291b8a893f06a3b1a294a325e374fc594e732c43343cd50c36ea99ee5d52ffe281c0a

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_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"
@@ -251,7 +252,10 @@ module Danger
       }
 
       if env.request_source.respond_to?(:update_pr_by_line!) && ENV["DANGER_MESSAGE_AGGREGATION"]
-        env.request_source.update_pr_by_line!(messages: MessageAggregator.aggregate(**report))
+        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,

data/lib/danger/danger_core/message_aggregator.rb

@@ -1,12 +1,49 @@
-class MessageAggregator
-  def self.aggregate(*args)
-    new(*args).aggregate
-  end
+# 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
 
-  def initialize(warnings: [],
-                 errors: [],
-                 messages: [],
-                 markdowns: [],
-                 danger_id: "danger")
+      @message_groups.extend(Helpers::MessageGroupsArrayHelper)
+    end
   end
 end

data/lib/danger/danger_core/message_group.rb

@@ -28,7 +28,18 @@ module Danger
     # @param message [Markdown, Violation] the message to add
     def <<(message)
       # TODO: insertion sort
-      messages << message if same_line?(message)
+      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
@@ -38,5 +49,20 @@ module Danger
     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/violation.rb

@@ -48,7 +48,7 @@ module Danger
       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/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: false, 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: [],
+                                       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/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "6.3.2".freeze
+  VERSION = "7.0.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: 6.3.2
+  version: 7.0.0
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2020-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -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
@@ -283,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