danger 8.6.1 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 691f7a26ea0a29f107e6f848bdf7450d2043dc15f5c385c136c1a9d818120c3f
-  data.tar.gz: d5f84a85ec8419dbbfbdcb742ffb15b5fe075d3bf1f676859152a0bb7b466633
+  metadata.gz: 613bfd46794c42423189f27277eb745250ebae6a3bed733c9ba499d7507c1671
+  data.tar.gz: 309007d0119085c78e8a18dec65d5fe8f2c46d67a9267b8e7ddd7fe8f284e31a
 SHA512:
-  metadata.gz: b712f8566113397b952ebd93e33d1d42b38d1b1a9d04e678971c35feb46a5bfb057236b0ccffc250560df6b1da001fe31f848024de318850c93ecb6af6eb0994
-  data.tar.gz: c89ab31d3afe5d668046629643d65858d6eeeea3d5f67006170af38e9a8c31673789de472501d37ff923c41fb538193cce767ae9567ef4a9a474aca96cf4aad4
+  metadata.gz: d934930d7677f61ec2c549c2418396f6bbb8c625fd1bc03f51952d9b5a6c4384b0e6a72fa496a0296bc1c6a524dbef8712f0bf73bbc25ff11897889896b928e4
+  data.tar.gz: c6d450cf48ed09ca021849ff8166e102bc85ab970cefa3a715f5047e807b9f6dc8b2eaa3aa59b0e965e31efbde97b70d3b5efcc9cf5ddb50b51789b1385de25f

data/lib/danger/ci_source/code_build.rb

@@ -5,6 +5,7 @@ module Danger
   # ### CI Setup
   #
   # In CodeBuild, make sure to correctly forward CODEBUILD_BUILD_ID, CODEBUILD_SOURCE_VERSION, CODEBUILD_SOURCE_REPO_URL and DANGER_GITHUB_API_TOKEN.
+  # In CodeBuild with batch builds, make sure to correctly forward CODEBUILD_BUILD_ID, CODEBUILD_WEBHOOK_TRIGGER, CODEBUILD_SOURCE_REPO_URL, CODEBUILD_BATCH_BUILD_IDENTIFIER and DANGER_GITHUB_API_TOKEN.
   #
   # ### Token Setup
   #
@@ -25,7 +26,11 @@ module Danger
 
     def initialize(env)
       self.repo_slug = self.class.extract_repo_slug(env)
-      self.pull_request_id = env["CODEBUILD_SOURCE_VERSION"].split("/")[1].to_i
+      if env["CODEBUILD_BATCH_BUILD_IDENTIFIER"]
+        self.pull_request_id = env["CODEBUILD_WEBHOOK_TRIGGER"].split("/")[1].to_i
+      else
+        self.pull_request_id = env["CODEBUILD_SOURCE_VERSION"].split("/")[1].to_i
+      end
       self.repo_url = self.class.extract_repo_url(env)
     end
 
@@ -44,11 +49,20 @@ module Danger
     end
 
     def self.extract_pr_url(env)
-      return nil unless env.key? "CODEBUILD_SOURCE_VERSION"
-      return nil unless env.key? "CODEBUILD_SOURCE_REPO_URL"
-      return nil unless env["CODEBUILD_SOURCE_VERSION"].split("/").length == 2
+      if env["CODEBUILD_BATCH_BUILD_IDENTIFIER"]
+        return nil unless env.key? "CODEBUILD_WEBHOOK_TRIGGER"
+        return nil unless env.key? "CODEBUILD_SOURCE_REPO_URL"
+        return nil unless env["CODEBUILD_WEBHOOK_TRIGGER"].split("/").length == 2
+
+        event_type, pr_number = env["CODEBUILD_WEBHOOK_TRIGGER"].split("/")
+        return nil unless event_type == "pr"
+      else
+        return nil unless env.key? "CODEBUILD_SOURCE_VERSION"
+        return nil unless env.key? "CODEBUILD_SOURCE_REPO_URL"
+        return nil unless env["CODEBUILD_SOURCE_VERSION"].split("/").length == 2
 
-      _source_origin, pr_number = env["CODEBUILD_SOURCE_VERSION"].split("/")
+        _source_origin, pr_number = env["CODEBUILD_SOURCE_VERSION"].split("/")
+      end
       github_repo_url = env["CODEBUILD_SOURCE_REPO_URL"].gsub(/\.git$/, "")
 
       "#{github_repo_url}/pull/#{pr_number}"

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

@@ -132,7 +132,7 @@ module Danger
     #
     def import_dangerfile_from_path(path)
       raise "`import_dangerfile_from_path` requires a string" unless path.kind_of?(String)
-      local_path = File.join(path, "Dangerfile")
+      local_path = File.file?(path) ? path : File.join(path, "Dangerfile")
       @dangerfile.parse(Pathname.new(local_path))
     end
 

data/lib/danger/request_sources/bitbucket_server.rb

@@ -9,7 +9,7 @@ module Danger
   module RequestSources
     class BitbucketServer < RequestSource
       include Danger::Helpers::CommentsHelper
-      attr_accessor :pr_json
+      attr_accessor :pr_json, :dismiss_out_of_range_messages
 
       def self.env_vars
         [
@@ -25,12 +25,14 @@ module Danger
           "DANGER_BITBUCKETSERVER_CODE_INSIGHTS_REPORT_TITLE",
           "DANGER_BITBUCKETSERVER_CODE_INSIGHTS_REPORT_DESCRIPTION",
           "DANGER_BITBUCKETSERVER_CODE_INSIGHTS_REPORT_LOGO_URL",
-          "DANGER_BITBUCKETSERVER_VERIFY_SSL"
+          "DANGER_BITBUCKETSERVER_VERIFY_SSL",
+          "DANGER_BITBUCKETSERVER_DISMISS_OUT_OF_RANGE_MESSAGES"
         ]
       end
 
       def initialize(ci_source, environment)
         self.ci_source = ci_source
+        self.dismiss_out_of_range_messages = environment["DANGER_BITBUCKETSERVER_DISMISS_OUT_OF_RANGE_MESSAGES"] == 'true'
 
         project, slug = ci_source.repo_slug.split("/")
         @api = BitbucketServerAPI.new(project, slug, ci_source.pull_request_id, environment)
@@ -58,6 +60,10 @@ module Danger
         self.pr_json = @api.fetch_pr_json
       end
 
+      def pr_diff
+        @pr_diff ||= @api.fetch_pr_diff
+      end
+
       def setup_danger_branches
         base_branch = self.pr_json[:toRef][:id].sub("refs/heads/", "")
         base_commit = self.pr_json[:toRef][:latestCommit]
@@ -134,12 +140,22 @@ module Danger
       end
 
       def main_violations_group(warnings: [], errors: [], messages: [], markdowns: [])
-        {
-          warnings: warnings.reject(&:inline?),
-          errors: errors.reject(&:inline?),
-          messages: messages.reject(&:inline?),
-          markdowns: markdowns.reject(&:inline?)
-        }
+        if dismiss_out_of_range_messages
+          {
+            warnings: warnings.reject(&:inline?),
+            errors: errors.reject(&:inline?),
+            messages: messages.reject(&:inline?),
+            markdowns: markdowns.reject(&:inline?)
+          }
+        else
+          in_diff = proc { |a| find_position_in_diff?(a.file, a.line) }
+          {
+            warnings: warnings.reject(&in_diff),
+            errors: errors.reject(&in_diff),
+            messages: messages.reject(&in_diff),
+            markdowns: markdowns.reject(&in_diff)
+          }
+        end
       end
 
       def inline_violations_group(warnings: [], errors: [], messages: [], markdowns: [])
@@ -168,6 +184,30 @@ module Danger
         puts self.pr_json.to_json
         @api.update_pr_build_status(status, changeset, build_job_link, description)
       end
+
+      def find_position_in_diff?(file, line)
+        return nil if file.nil? || line.nil?
+        return nil if file.empty?
+        added_lines(file).include?(line)
+      end
+
+      def file_diff(file)
+        self.pr_diff[:diffs].find{|diff| diff[:destination] && diff[:destination][:toString] == file } || {:hunks => []}
+      end
+
+      def added_lines(file)
+        @added_lines ||= {}
+        @added_lines[file] ||= begin
+          file_diff(file)[:hunks].map do |hunk|
+            hunk[:segments].select{|segment| segment[:type] == 'ADDED' }.map do |segment|
+              segment[:lines].map do |line|
+                line[:destination]
+              end
+            end
+          end.flatten
+        end
+      end
+
     end
   end
 end

data/lib/danger/request_sources/bitbucket_server_api.rb

@@ -43,6 +43,11 @@ module Danger
         fetch_json(uri)
       end
 
+      def fetch_pr_diff
+        uri = URI("#{pr_api_endpoint}/diff?withComments=false")
+        fetch_json(uri)
+      end
+
       def fetch_last_comments
         uri = URI("#{pr_api_endpoint}/activities?limit=1000")
         fetch_json(uri)[:values].select { |v| v[:action] == "COMMENTED" }.map { |v| v[:comment] }

data/lib/danger/request_sources/vsts.rb

@@ -195,7 +195,7 @@ module Danger
             body = generate_inline_markdown_body(m, danger_id: danger_id, template: "vsts")
           else
             # Hide the inline link behind a span
-            m.message.gsub!("\n", "<br />")
+            m.message = m.message.gsub("\n", "<br />")
             m = process_markdown(m, true)
             body = generate_inline_comment_body(emoji, m, danger_id: danger_id, template: "vsts")
             # A comment might be in previous_violations because only now it's part of the unified diff

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "8.6.1".freeze
+  VERSION = "9.0.0".freeze
   DESCRIPTION = "Like Unit Tests, but for your Team Culture.".freeze
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: danger
 version: !ruby/object:Gem::Version
-  version: 8.6.1
+  version: 9.0.0
 platform: ruby
 authors:
 - Orta Therox
 - Juanito Fatas
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-22 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -135,14 +135,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -328,7 +328,7 @@ homepage: https://github.com/danger/danger
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -336,15 +336,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Like Unit Tests, but for your Team Culture.
 test_files: []