danger 8.4.2 → 9.2.0

data/lib/danger/request_sources/bitbucket_cloud_api.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require "danger/helpers/comments_helper"
 
@@ -32,9 +32,8 @@ module Danger
       def inspect
         inspected = super
 
-        if @password
-          inspected = inspected.sub! @password, "********".freeze
-        end
+        inspected.gsub!(@password, "********") if @password
+        inspected.gsub!(@access_token, "********") if @access_token
 
         inspected
       end
@@ -57,7 +56,7 @@ module Danger
       def fetch_comments
         values = []
         # TODO: use a url parts encoder to encode the query
-        corrected_uuid = @my_uuid[1...-1] if !@my_uuid.nil? # Endpoint doesnt support curly brackets for this, so remove them for this
+        corrected_uuid = @my_uuid[1...-1] unless @my_uuid.nil? # Endpoint doesnt support curly brackets for this, so remove them for this
         uri = "#{pr_api_endpoint}/comments?pagelen=100&q=deleted+%7E+false+AND+user.uuid+%7E+%22#{corrected_uuid}%22"
 
         while uri
@@ -114,7 +113,7 @@ module Danger
         uri = URI.parse("https://bitbucket.org/site/oauth2/access_token")
         req = Net::HTTP::Post.new(uri.request_uri, { "Content-Type" => "application/json" })
         req.basic_auth oauth_key, oauth_secret
-        req.set_form_data({'grant_type' => 'client_credentials'})
+        req.set_form_data({ "grant_type" => "client_credentials" })
         res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: true) do |http|
           http.request(req)
         end
@@ -177,7 +176,6 @@ module Danger
       def error_fetching_json(url, status_code)
         "Error fetching json for: #{url}, status code: #{status_code}"
       end
-
     end
   end
 end

data/lib/danger/request_sources/bitbucket_server.rb

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 require "danger/helpers/comments_helper"
 require "danger/request_sources/bitbucket_server_api"
 require "danger/request_sources/code_insights_api"
@@ -9,7 +7,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,13 +23,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.environment = environment
+        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)
@@ -59,6 +58,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]
@@ -135,12 +138,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: [])
@@ -149,6 +162,7 @@ module Danger
           next 1 unless b.file && b.line
 
           next a.line <=> b.line if a.file == b.file
+
           next a.file <=> b.file
         end
 
@@ -169,6 +183,28 @@ 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] ||= 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

data/lib/danger/request_sources/bitbucket_server_api.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 require "openssl"
 require "danger/helpers/comments_helper"
@@ -12,7 +12,7 @@ module Danger
         @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
+        self.verify_ssl = environment["DANGER_BITBUCKETSERVER_VERIFY_SSL"] != "false"
         if self.host && !(self.host.include? "http://") && !(self.host.include? "https://")
           self.host = "https://" + self.host
         end
@@ -24,9 +24,7 @@ module Danger
       def inspect
         inspected = super
 
-        if @password
-          inspected = inspected.sub! @password, "********".freeze
-        end
+        inspected.gsub!(@password, "********") if @password
 
         inspected
       end
@@ -44,6 +42,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] }
@@ -61,9 +64,9 @@ module Danger
       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)
-         post(uri, body)
+        uri = URI("#{self.host}/rest/build-status/1.0/commits/#{changeset}")
+        body = build_status_body(status, build_job_link, description)
+        post(uri, body)
       end
 
       private
@@ -114,12 +117,12 @@ module Danger
       end
 
       def build_status_body(status, build_job_link, description)
-          body = Hash.new
-          body["state"] = status
-          body["key"] = self.key
-          body["url"] = build_job_link
-          body["description"] = description if description
-          return body.to_json
+        body = {}
+        body["state"] = status
+        body["key"] = self.key
+        body["url"] = build_job_link
+        body["description"] = description if description
+        return body.to_json
       end
     end
   end

data/lib/danger/request_sources/code_insights_api.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 module Danger
   module RequestSources
@@ -26,9 +26,7 @@ module Danger
       def inspect
         inspected = super
 
-        if @password
-          inspected = inspected.sub! @password, "********".freeze
-        end
+        inspected.gsub!(@password, "********") if @password
 
         inspected
       end
@@ -39,7 +37,7 @@ module Danger
 
       def delete_report(commit)
         uri = URI(report_endpoint_at_commit(commit))
-        request = Net::HTTP::Delete.new(uri.request_uri, {"Content-Type" => "application/json"})
+        request = Net::HTTP::Delete.new(uri.request_uri, { "Content-Type" => "application/json" })
         request.basic_auth @username, @password
         response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: use_ssl) do |http|
           http.request(request)
@@ -51,7 +49,6 @@ module Danger
           # HTTP 4xx - 5xx
           abort "\nError deleting report from Code Insights API: #{response.code} (#{response.message}) - #{response.body}\n\n"
         end
-
       end
 
       def send_report(commit, inline_warnings, inline_errors, inline_messages)
@@ -65,15 +62,14 @@ module Danger
 
       def put_report(commit, inline_errors_count)
         uri = URI(report_endpoint_at_commit(commit))
-        request = Net::HTTP::Put.new(uri.request_uri, {"Content-Type" => "application/json"})
+        request = Net::HTTP::Put.new(uri.request_uri, { "Content-Type" => "application/json" })
         request.basic_auth @username, @password
-        request.body = {"title": @report_title,
+        request.body = { "title": @report_title,
                         "details": @report_description,
-                        "result": (inline_errors_count > 0) ? "FAIL" : "PASS",
+                        "result": inline_errors_count > 0 ? "FAIL" : "PASS",
                         "reporter": @username,
                         "link": "https://github.com/danger/danger",
-                        "logoURL": @logo_url
-        }.to_json
+                        "logoURL": @logo_url }.to_json
 
         response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: use_ssl) do |http|
           http.request(request)
@@ -104,8 +100,8 @@ module Danger
           annotations << violation_hash_with_severity(violation, "HIGH")
         end
 
-        body = {annotations: annotations}.to_json
-        request = Net::HTTP::Post.new(uri.request_uri, {"Content-Type" => "application/json"})
+        body = { annotations: annotations }.to_json
+        request = Net::HTTP::Post.new(uri.request_uri, { "Content-Type" => "application/json" })
         request.basic_auth @username, @password
         request.body = body
 
@@ -141,7 +137,6 @@ module Danger
       def use_ssl
         @host.include? "https://"
       end
-
     end
   end
 end

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

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 # rubocop:disable Metrics/ClassLength
 
 require "octokit"
@@ -14,7 +12,7 @@ module Danger
     class GitHub < RequestSource
       include Danger::Helpers::CommentsHelper
 
-      attr_accessor :pr_json, :issue_json, :support_tokenless_auth, :dismiss_out_of_range_messages
+      attr_accessor :pr_json, :issue_json, :use_local_git, :support_tokenless_auth, :dismiss_out_of_range_messages, :host, :api_url, :verify_ssl
 
       def self.env_vars
         ["DANGER_GITHUB_API_TOKEN", "DANGER_GITHUB_BEARER_TOKEN"]
@@ -26,12 +24,22 @@ module Danger
 
       def initialize(ci_source, environment)
         self.ci_source = ci_source
-        self.environment = environment
+        self.use_local_git = environment["DANGER_USE_LOCAL_GIT"]
         self.support_tokenless_auth = false
         self.dismiss_out_of_range_messages = false
+        self.host = environment.fetch("DANGER_GITHUB_HOST", "github.com")
+        # `DANGER_GITHUB_API_HOST` is the old name kept for legacy reasons and
+        # backwards compatibility. `DANGER_GITHUB_API_BASE_URL` is the new
+        # correctly named variable.
+        self.api_url = environment.fetch("DANGER_GITHUB_API_HOST") do
+          environment.fetch("DANGER_GITHUB_API_BASE_URL") do
+            "https://api.github.com/".freeze
+          end
+        end
+        self.verify_ssl = environment["DANGER_OCTOKIT_VERIFY_SSL"] != "false"
 
-        @access_token = @environment["DANGER_GITHUB_API_TOKEN"]
-        @bearer_token = @environment["DANGER_GITHUB_BEARER_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)
@@ -46,34 +54,16 @@ module Danger
       end
 
       def validates_as_api_source?
-        valid_bearer_token? || valid_access_token? || self.environment["DANGER_USE_LOCAL_GIT"]
+        valid_bearer_token? || valid_access_token? || use_local_git
       end
 
       def scm
         @scm ||= GitRepo.new
       end
 
-      def host
-        @host = @environment["DANGER_GITHUB_HOST"] || "github.com"
-      end
-
-      def verify_ssl
-        @environment["DANGER_OCTOKIT_VERIFY_SSL"] == "false" ? false : true
-      end
-
-      # `DANGER_GITHUB_API_HOST` is the old name kept for legacy reasons and
-      # backwards compatibility. `DANGER_GITHUB_API_BASE_URL` is the new
-      # correctly named variable.
-      def api_url
-        @environment.fetch("DANGER_GITHUB_API_HOST") do
-          @environment.fetch("DANGER_GITHUB_API_BASE_URL") do
-            "https://api.github.com/".freeze
-          end
-        end
-      end
-
       def client
         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 }
@@ -92,6 +82,7 @@ module Danger
 
       def review
         return @review unless @review.nil?
+
         begin
           @review = client.pull_request_reviews(ci_source.repo_slug, ci_source.pull_request_id)
             .map { |review_json| Danger::RequestSources::GitHubSource::Review.new(client, ci_source, review_json) }
@@ -142,10 +133,8 @@ module Danger
       end
 
       def issue_comments
-        @comments ||= begin
-          client.issue_comments(ci_source.repo_slug, ci_source.pull_request_id)
-            .map { |comment| Comment.from_github(comment) }
-        end
+        @comments ||= client.issue_comments(ci_source.repo_slug, ci_source.pull_request_id)
+          .map { |comment| Comment.from_github(comment) }
       end
 
       # Sending data to GitHub
@@ -233,7 +222,7 @@ module Danger
             context: "danger/#{danger_id}",
             target_url: details_url
           })
-        rescue
+        rescue StandardError
           # This usually means the user has no commit access to this repo
           # That's always the case for open source projects where you can only
           # use a read-only GitHub account
@@ -257,6 +246,7 @@ module Danger
         issue_comments.each do |comment|
           next unless comment.generated_by_danger?(danger_id)
           next if comment.id == except
+
           client.delete_comment(ci_source.repo_slug, comment.id)
         end
       end
@@ -465,9 +455,9 @@ module Danger
 
       # @return [String] The organisation name, is nil if it can't be detected
       def organisation
-        matched = self.issue_json["repository_url"].match(%r{repos\/(.*)\/})
+        matched = self.issue_json["repository_url"].match(%r{repos/(.*)/})
         return matched[1] if matched && matched[1]
-      rescue
+      rescue StandardError
         nil
       end
 
@@ -482,17 +472,18 @@ module Danger
       end
 
       # @return [String] A URL to the specific file, ready to be downloaded
-      def file_url(organisation: nil, repository: nil, branch: nil, path: nil)
+      def file_url(organisation: nil, repository: nil, ref: nil, branch: nil, path: nil)
         organisation ||= self.organisation
+        ref ||= branch
 
         begin
-          # Retrieve the download URL (default branch on nil param)
-          contents = client.contents("#{organisation}/#{repository}", path: path, ref: branch)
+          # Retrieve the download URL (default ref on nil param)
+          contents = client.contents("#{organisation}/#{repository}", path: path, ref: ref)
           @download_url = contents["download_url"]
         rescue Octokit::ClientError
           # Fallback to github.com
-          branch ||= "master"
-          @download_url = "https://raw.githubusercontent.com/#{organisation}/#{repository}/#{branch}/#{path}"
+          ref ||= "master"
+          @download_url = "https://raw.githubusercontent.com/#{organisation}/#{repository}/#{ref}/#{path}"
         end
       end
 
@@ -521,6 +512,7 @@ module Danger
           next 1 unless b.file && b.line
 
           next a.line <=> b.line if a.file == b.file
+
           next a.file <=> b.file
         end
 

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

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 require "octokit"
 require "danger/ci_source/ci_source"
 require "danger/request_sources/github/github_review_resolver"
@@ -35,16 +33,19 @@ module Danger
 
         def id
           return nil unless self.review_json
+
           self.review_json["id"]
         end
 
         def body
           return "" unless self.review_json
+
           self.review_json["body"]
         end
 
         def status
           return STATUS_PENDING if self.review_json.nil?
+
           return self.review_json["state"]
         end
 

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

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 require "danger/request_sources/github/github_review"
 
 module Danger

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

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 module Danger
   module RequestSources
     module GitHubSource