danger 6.3.1 → 6.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c582d1189749d620a69040b53f7fc73c581efd772c39ab7931cd7ed886522fe8
-  data.tar.gz: 59a22185cdd2cd993ceef9f01934e7757fa6f4f4cd4229e76634bca4b13dd5b1
+  metadata.gz: 27b09c31a2f456489426bf90c66b907f7c7b620bc0019387c3c7dd89e14267b6
+  data.tar.gz: 7aeed8d94b83e5fb757ca0f319fe55e3c07a4fc641c93dd56408efc1aaeccf4a
 SHA512:
-  metadata.gz: 9e6f93dae26ee18d328f10d1287c4dc0127b3199e8b055992795d4440180625010b7ecb5d229241b4d415918846cdecd9d46d214fc51b66ed43c399203ce0490
-  data.tar.gz: f0ea9446eadaa3705337982b51bf1abd49ca96e9ddecf14b888c69b48cad6ceec7ff5d59cd48f18061d8128c6c12c3cc9be12d8149461eedc8d6388f65e17179
+  metadata.gz: 267bc39cef40d450ec1be77ddeb0c279ef6b5b7f5cd8a3dd2afdb49f6a4b5fa32feb10622c84f0f2f85a3907b4fb05824ecfad0b517fcf4eacd0d4949423dc69
+  data.tar.gz: de72c74f898bdc9a3c70bf730158e2c642aa6b392935a3e89a6980a457262475c549f10380e0123e4a5b92c03ae9b27018bf7cb8aa919667256edd5639d70149

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/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/danger_core/dangerfile.rb

@@ -60,7 +60,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 +242,23 @@ 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!(messages: MessageAggregator.aggregate(**report))
+      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/message_aggregator.rb

@@ -0,0 +1,12 @@
+class MessageAggregator
+  def self.aggregate(*args)
+    new(*args).aggregate
+  end
+
+  def initialize(warnings: [],
+                 errors: [],
+                 messages: [],
+                 markdowns: [],
+                 danger_id: "danger")
+  end
+end

data/lib/danger/danger_core/message_group.rb

@@ -0,0 +1,42 @@
+# 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
+      messages << message if same_line?(message)
+    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
+  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,6 +46,7 @@ module Danger
       extra << "sticky: #{sticky}"
       extra << "file: #{file}" if file
       extra << "line: #{line}" if line
+      extra << "type: #{type}"
 
       "Violation #{message} { #{extra.join ', '.freeze} }"
     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

@@ -104,7 +104,7 @@ module Danger
         )
       end
 
-      def generate_inline_comment_body(emoji, message, danger_id: "danger", resolved: [], template: "github")
+      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/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "6.3.1".freeze
+  VERSION = "6.3.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: 6.3.1
+  version: 6.3.2
 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-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -262,6 +262,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