danger 9.1.0 → 9.2.0

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

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 require "danger/plugin_support/plugin"
 
 module Danger
@@ -58,6 +56,7 @@ module Danger
     # So that this init can fail.
     def self.new(dangerfile)
       return nil if dangerfile.env.request_source.class != Danger::RequestSources::VSTS
+
       super
     end
 
@@ -174,6 +173,7 @@ module Danger
       end
 
       return paths.first if paths.count < 2
+
       paths.first(paths.count - 1).join(", ") + " & " + paths.last
     end
 
@@ -184,7 +184,7 @@ module Danger
     end
 
     def branch_name(key)
-      repo_matches = @source.pr_json[key].to_s.match(%r{refs\/heads\/(.*)})
+      repo_matches = @source.pr_json[key].to_s.match(%r{refs/heads/(.*)})
       repo_matches[1] unless repo_matches.nil?
     end
   end

data/lib/danger/danger_core/standard_error.rb

@@ -37,9 +37,7 @@ module Danger
     #         be raised.
     #
     def contents
-      @contents ||= begin
-        dsl_path && File.exist?(dsl_path) && File.read(dsl_path)
-      end
+      @contents ||= dsl_path && File.exist?(dsl_path) && File.read(dsl_path)
     end
 
     # The message of the exception reports the content of podspec for the
@@ -104,6 +102,7 @@ module Danger
 
       trace_line = backtrace.find { |l| l.include?(dsl_path.to_s) } || trace_line
       return result unless trace_line
+
       line_numer = trace_line.split(":")[1].to_i - 1
       return result unless line_numer
 

data/lib/danger/helpers/comments_helper.rb

@@ -11,7 +11,7 @@ module Danger
       include Danger::Helpers::CommentsParsingHelper
 
       def markdown_parser(text)
-        Kramdown::Document.new(text, input: "GFM", smart_quotes: %w[apos apos quot quot])
+        Kramdown::Document.new(text, input: "GFM", smart_quotes: %w(apos apos quot quot))
       end
 
       # !@group Extension points
@@ -26,6 +26,7 @@ module Danger
       # @return [String] The Markdown compatible link
       def markdown_link_to_message(message, hide_link)
         return "" if hide_link
+
         "#{message.file}#L#{message.line}"
       end
 
@@ -87,9 +88,9 @@ module Danger
         @tables = tables
         @markdowns = markdowns.map(&:message)
         @danger_id = danger_id
-        @emoji_mapper = EmojiMapper.new(request_source.sub("_inline",""))
+        @emoji_mapper = EmojiMapper.new(request_source.sub("_inline", ""))
 
-        return ERB.new(File.read(md_template), 0, "-").result(binding)
+        return ERB.new(File.read(md_template), trim_mode: "-").result(binding)
       end
 
       def generate_comment(warnings: [], errors: [], messages: [], markdowns: [], previous_violations: {}, danger_id: "danger", template: "github")
@@ -118,7 +119,6 @@ module Danger
         @resolved = resolved
         request_source_name = template.sub("_message_group", "")
 
-
         apply_template(danger_id: danger_id,
                        markdowns: message_group.markdowns,
                        template: template,
@@ -149,7 +149,7 @@ module Danger
       def generate_description(warnings: nil, errors: nil, template: "github")
         emoji_mapper = EmojiMapper.new(template)
         if (errors.nil? || errors.empty?) && (warnings.nil? || warnings.empty?)
-          return ENV['DANGER_SUCCESS_MESSAGE'] || "All green. #{random_compliment}"
+          return ENV["DANGER_SUCCESS_MESSAGE"] || "All green. #{random_compliment}"
         else
           message = "#{emoji_mapper.map('warning')} "
           message += "#{'Error'.danger_pluralize(errors.count)}. " unless errors.empty?

data/lib/danger/helpers/comments_parsing_helper.rb

@@ -29,6 +29,7 @@ module Danger
         tables.each do |table|
           match = danger_table?(table)
           next unless match
+
           title = match[1]
           kind = table_kind_from_title(title)
           next unless kind
@@ -51,8 +52,8 @@ module Danger
 
       private
 
-      GITHUB_OLD_REGEX = %r{<th width="100%"(.*?)</th>}im
-      NEW_REGEX = %r{<th.*data-danger-table="true"(.*?)</th>}im
+      GITHUB_OLD_REGEX = %r{<th width="100%"(.*?)</th>}im.freeze
+      NEW_REGEX = %r{<th.*data-danger-table="true"(.*?)</th>}im.freeze
 
       def danger_table?(table)
         # The old GitHub specific method relied on

data/lib/danger/helpers/emoji_mapper.rb

@@ -18,7 +18,7 @@ module Danger
     TYPE_TO_EMOJI = {
       error: "no_entry_sign",
       warning: "warning",
-      message: "book",
+      message: "book"
     }.freeze
 
     def initialize(template)

data/lib/danger/plugin_support/plugin.rb

@@ -18,7 +18,6 @@ module Danger
     # Since we have a reference to the Dangerfile containing all the information
     # We need to redirect the self calls to the Dangerfile
 
-    # rubocop:disable Style/MethodMissing
     def method_missing(method_sym, *arguments, **keyword_arguments, &block)
       if keyword_arguments.empty?
         @dangerfile.send(method_sym, *arguments, &block)

data/lib/danger/plugin_support/plugin_linter.rb

@@ -146,6 +146,7 @@ module Danger
     def apply_rules(json, type, rules)
       rules.each do |rule|
         next unless rule.function.call(json)
+
         rule.metadata = json
         rule.type = type
 

data/lib/danger/request_sources/bitbucket_cloud.rb

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 require "danger/helpers/comments_helper"
 require "danger/request_sources/bitbucket_cloud_api"
 require "danger/danger_core/message_group"
@@ -104,7 +102,6 @@ module Danger
                                             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
@@ -145,8 +142,8 @@ module Danger
 
           if kind == :markdown
             body = generate_inline_markdown_body(message,
-                                                danger_id: danger_id,
-                                                template: "bitbucket_server")
+                                                 danger_id: danger_id,
+                                                 template: "bitbucket_server")
           else
             body = generate_inline_comment_body(emoji, message,
                                                 danger_id: danger_id,
@@ -162,6 +159,7 @@ module Danger
       def delete_old_comments(danger_id: "danger")
         @api.fetch_comments.each do |c|
           next if c[:user][:uuid] != @api.my_uuid
+
           @api.delete_comment(c[:id]) if c[:content][:raw] =~ /generated_by_#{danger_id}/
         end
       end

data/lib/danger/request_sources/bitbucket_cloud_api.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# coding: utf-8
 
 require "danger/helpers/comments_helper"
 
@@ -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"
@@ -32,7 +30,7 @@ module Danger
 
       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'
+        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)
@@ -164,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
 
@@ -188,26 +187,24 @@ module Danger
       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 => []}
+        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
+        @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.flatten
-        end
+          end
+        end.flatten
       end
-
     end
   end
 end

data/lib/danger/request_sources/bitbucket_server_api.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# coding: utf-8
 
 require "openssl"
 require "danger/helpers/comments_helper"
@@ -65,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
@@ -118,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,5 +1,4 @@
 # frozen_string_literal: true
-# coding: utf-8
 
 module Danger
   module RequestSources
@@ -38,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)
@@ -50,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)
@@ -64,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)
@@ -103,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
 
@@ -140,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"
@@ -65,6 +63,7 @@ module Danger
 
       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 }
@@ -83,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) }
@@ -133,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
@@ -224,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
@@ -248,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
@@ -456,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
 
@@ -473,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
 
@@ -512,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