danger 8.4.2 → 9.2.0

data/lib/danger/danger_core/dangerfile.rb

@@ -60,7 +60,6 @@ module Danger
     # When an undefined method is called, we check to see if it's something
     # that the core DSLs have, then starts looking at plugins support.
 
-    # rubocop:disable Style/MethodMissing
     def method_missing(method_sym, *arguments, **keyword_arguments, &_block)
       @core_plugins.each do |plugin|
         if plugin.public_methods(false).include?(method_sym)
@@ -97,6 +96,7 @@ module Danger
       plugins = Plugin.all_plugins
       plugins.each do |klass|
         next if klass.respond_to?(:singleton_class?) && klass.singleton_class?
+
         plugin = klass.new(self)
         next if plugin.nil? || @plugins[klass]
 
@@ -115,7 +115,7 @@ module Danger
     end
 
     def external_dsl_attributes
-      plugins.values.reject { |plugin| @core_plugins.include? plugin } .map { |plugin| { plugin: plugin, methods: plugin.public_methods(false) } }
+      plugins.values.reject { |plugin| @core_plugins.include? plugin }.map { |plugin| { plugin: plugin, methods: plugin.public_methods(false) } }
     end
 
     def method_values_for_plugin_hashes(plugin_hashes)
@@ -200,12 +200,12 @@ module Danger
       self.defined_in_file = path
       instance_eval do
         # rubocop:disable Lint/RescueException
-        begin
-          eval_file(contents, path)
-        rescue Exception => e
-          message = "Invalid `#{path.basename}` file: #{e.message}"
-          raise DSLError.new(message, path, e.backtrace, contents)
-        end
+
+        eval_file(contents, path)
+      rescue Exception => e
+        message = "Invalid `#{path.basename}` file: #{e.message}"
+        raise DSLError.new(message, path, e.backtrace, contents)
+
         # rubocop:enable Lint/RescueException
       end
     end
@@ -257,9 +257,9 @@ module Danger
 
       if env.request_source.respond_to?(:update_pr_by_line!) && ENV["DANGER_MESSAGE_AGGREGATION"]
         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])
+                                              new_comment: new_comment,
+                                              remove_previous_comments: remove_previous_comments,
+                                              danger_id: report[:danger_id])
       else
         env.request_source.update_pull_request!(
           **report,
@@ -274,7 +274,7 @@ module Danger
       env.scm.diff_for_folder(".".freeze, from: base_branch, to: head_branch, lookup_top_level: true)
     end
 
-    def run(base_branch, head_branch, dangerfile_path, danger_id, new_comment, remove_previous_comments)
+    def run(base_branch, head_branch, dangerfile_path, danger_id, new_comment, remove_previous_comments, report_results = true)
       # Setup internal state
       init_plugins
       env.fill_environment_vars
@@ -289,13 +289,13 @@ module Danger
         # Push results to the API
         # Pass along the details of the run to the request source
         # to send back to the code review site.
-        post_results(danger_id, new_comment, remove_previous_comments) unless danger_id.nil?
+        post_results(danger_id, new_comment, remove_previous_comments) if report_results
 
         # Print results in the terminal
         print_results
-      rescue DSLError => ex
+      rescue DSLError => e
         # Push exception to the API and re-raise
-        post_exception(ex, danger_id, new_comment) unless danger_id.nil?
+        post_exception(e, danger_id, new_comment) unless danger_id.nil?
         raise
       ensure
         # Makes sure that Danger specific git branches are cleaned
@@ -308,7 +308,7 @@ module Danger
     private
 
     def eval_file(contents, path)
-      eval(contents, nil, path.to_s) # rubocop:disable Eval
+      eval(contents, nil, path.to_s) # rubocop:disable Security/Eval
     end
 
     def print_list(title, rows)
@@ -335,6 +335,9 @@ module Danger
     end
 
     def post_exception(ex, danger_id, new_comment)
+      return if ENV["DANGER_DO_NOT_POST_INVALID_DANGERFILE_ERROR"]
+      return if danger_id.nil?
+
       env.request_source.update_pull_request!(
         danger_id: danger_id,
         new_comment: new_comment,

data/lib/danger/danger_core/environment_manager.rb

@@ -37,6 +37,7 @@ module Danger
         request_source = klass.new(self.ci_source, env)
         next unless request_source.validates_as_ci?
         next unless request_source.validates_as_api_source?
+
         self.request_source = request_source
       end
 
@@ -90,7 +91,7 @@ module Danger
         RequestSources::GitLab
       elsif repo_url =~ /bitbucket\.(org|com)/i
         RequestSources::BitbucketCloud
-      elsif repo_url =~ /dev\.azure\.com/i
+      elsif repo_url =~ /\.visualstudio\.com/i || repo_url =~ /dev\.azure\.com/i
         RequestSources::VSTS
       end
     end

data/lib/danger/danger_core/executor.rb

@@ -25,16 +25,14 @@ module Danger
       env ||= EnvironmentManager.new(system_env, cork, danger_id)
       dm ||= Dangerfile.new(env, cork)
 
-      ran_status = begin
-        dm.run(
-          base_branch(base),
-          head_branch(head),
-          dangerfile_path,
-          danger_id,
-          new_comment,
-          remove_previous_comments
-        )
-      end
+      ran_status = dm.run(
+        base_branch(base),
+        head_branch(head),
+        dangerfile_path,
+        danger_id,
+        new_comment,
+        remove_previous_comments
+      )
 
       # By default Danger will use the status API to fail a build,
       # allowing execution to continue, this behavior isn't always
@@ -85,7 +83,8 @@ module Danger
     end
 
     def commit_request(ci_name)
-      return "Merge Request" if ci_name == 'GitLabCI'
+      return "Merge Request" if ci_name == "GitLabCI"
+
       return "Pull Request"
     end
   end

data/lib/danger/danger_core/message_aggregator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "danger/danger_core/message_group"
 require "danger/helpers/message_groups_array_helper"
 

data/lib/danger/danger_core/messages/base.rb

@@ -21,6 +21,7 @@ module Danger
 
       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

data/lib/danger/danger_core/messages/markdown.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
+
 require "danger/danger_core/messages/base"
 
 module Danger
   class Markdown < BaseMessage
-
     def initialize(message, file = nil, line = nil)
       super(type: :markdown, message: message, file: file, line: line)
     end
@@ -21,8 +21,7 @@ module Danger
       h = 1
       h = h * 31 + message.hash
       h = h * 17 + file.hash
-      h = h * 17 + line.hash
-      h
+      h * 17 + line.hash
     end
 
     def to_s
@@ -30,7 +29,7 @@ module Danger
       extra << "file: #{file}" unless file
       extra << "line: #{line}" unless line
 
-      "Markdown #{message} { #{extra.join ', '.freeze} }"
+      "Markdown #{message} { #{extra.join ', '} }"
     end
 
     def <=>(other)

data/lib/danger/danger_core/messages/violation.rb

@@ -29,8 +29,7 @@ module Danger
       h = h * 31 + message.hash
       h = h * 13 + sticky.hash
       h = h * 17 + file.hash
-      h = h * 17 + line.hash
-      h
+      h * 17 + line.hash
     end
 
     def <=>(other)

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

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 require "danger/plugin_support/plugin"
 
 module Danger
@@ -52,6 +50,7 @@ module Danger
     # So that this init can fail.
     def self.new(dangerfile)
       return nil if dangerfile.env.request_source.class != Danger::RequestSources::BitbucketCloud
+
       super
     end
 
@@ -139,6 +138,5 @@ module Danger
     def head_commit
       @bs.pr_json[:source][:commit][:hash]
     end
-
   end
 end

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

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 require "danger/plugin_support/plugin"
 
 module Danger
@@ -52,6 +50,7 @@ module Danger
     # So that this init can fail.
     def self.new(dangerfile)
       return nil if dangerfile.env.request_source.class != Danger::RequestSources::BitbucketServer
+
       super
     end
 
@@ -169,7 +168,7 @@ module Danger
     def markdown_link(paths, full_path: true)
       create_link(paths, full_path) { |href, text| create_markdown_link(href, text) }
     end
-    
+
     # @!group Bitbucket Server Misc
     # Updates the PR with build status and build server job link.
     # @param    [String] status
@@ -181,7 +180,7 @@ module Danger
     # @return   [String]
     #
     def update_pr_build_status(status, build_job_link, description)
-        @bs.update_pr_build_status(status, build_job_link, description)
+      @bs.update_pr_build_status(status, build_job_link, description)
     end
 
     private
@@ -201,6 +200,7 @@ module Danger
       end
 
       return paths.first if paths.count < 2
+
       paths.first(paths.count - 1).join(", ") + " & " + paths.last
     end
 

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

@@ -74,6 +74,8 @@ module Danger
     # @option opts [String] :github GitHub repo
     # @option opts [String] :gitlab GitLab repo
     # @option opts [String] :gem Gem name
+    # @option opts [String] :ref The name of branch, tag or commit
+    # @option opts [String] :branch Alias of :ref
     # @option opts [String] :path Path to Dangerfile
     # @return   [void]
     def import_dangerfile(opts)
@@ -82,9 +84,9 @@ module Danger
         import_dangerfile_from_github(opts)
       elsif opts.kind_of?(Hash)
         if opts.key?(:github)
-          import_dangerfile_from_github(opts[:github], opts[:branch], opts[:path])
+          import_dangerfile_from_github(opts[:github], opts[:ref] || opts[:branch], opts[:path])
         elsif opts.key?(:gitlab)
-          import_dangerfile_from_gitlab(opts[:gitlab], opts[:branch], opts[:path])
+          import_dangerfile_from_gitlab(opts[:gitlab], opts[:ref] || opts[:branch], opts[:path])
         elsif opts.key?(:path)
           import_dangerfile_from_path(opts[:path])
         elsif opts.key?(:gem)
@@ -132,7 +134,8 @@ 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
 
@@ -145,6 +148,7 @@ module Danger
     #
     def import_dangerfile_from_gem(name)
       raise "`import_dangerfile_from_gem` requires a string" unless name.kind_of?(String)
+
       spec = Gem::Specification.find_by_name(name)
       import_dangerfile_from_path(spec.gem_dir)
     rescue Gem::MissingSpecError
@@ -164,6 +168,7 @@ module Danger
     #
     def import_dangerfile_from_github(slug, branch = nil, path = nil)
       raise "`import_dangerfile_from_github` requires a string" unless slug.kind_of?(String)
+
       org, repo = slug.split("/")
       download_url = env.request_source.file_url(organisation: org, repository: repo, branch: branch, path: path || "Dangerfile")
       local_path = download(download_url)
@@ -196,6 +201,7 @@ module Danger
     #
     def import_dangerfile_from_url(url)
       raise "`import_dangerfile_from_url` requires a string" unless url.kind_of?(String)
+
       local_path = download(url)
       @dangerfile.parse(Pathname.new(local_path))
     end

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

@@ -22,7 +22,7 @@ module Danger
   #
   # @example Warn when there are merge commits in the diff
   #
-  #          if git.commits.any? { |c| c.message =~ /^Merge branch 'master'/ }
+  #          if git.commits.any? { |c| c.parents.count > 1 }
   #            warn 'Please rebase to get rid of the merge commits in this PR'
   #          end
   #
@@ -46,7 +46,7 @@ module Danger
 
     def initialize(dangerfile)
       super(dangerfile)
-      raise unless dangerfile.env.scm.class == Danger::GitRepo
+      raise unless dangerfile.env.scm.class == Danger::GitRepo # rubocop:disable Style/ClassEqualityComparison
 
       @git = dangerfile.env.scm
     end
@@ -128,7 +128,7 @@ module Danger
     # @return [Git::Diff::DiffFile] from the gem `git`
     #
     def diff_for_file(file)
-      (added_files + modified_files).include?(file) ? @git.diff[file] : nil
+      (added_files + modified_files + deleted_files).include?(file) ? @git.diff[file] : nil
     end
 
     # @!group Git Metadata
@@ -137,6 +137,7 @@ module Danger
     #
     def info_for_file(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]
       {

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

@@ -76,6 +76,7 @@ module Danger
     # So that this init can fail.
     def self.new(dangerfile)
       return nil if dangerfile.env.request_source.class != Danger::RequestSources::GitHub
+
       super
     end
 
@@ -148,7 +149,7 @@ module Danger
     # @return [Boolean]
     #
     def pr_draft?
-      pr_json["mergeable_state"] == "draft"
+      pr_json["draft"] == true
     end
 
     # @!group PR Commit Metadata
@@ -229,6 +230,7 @@ module Danger
       end
 
       return paths.first if paths.count < 2
+
       paths.first(paths.count - 1).join(", ") + " & " + paths.last
     end
 

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

@@ -65,7 +65,7 @@ module Danger
   #           message "Reviewer roulete rolled for: #{reviewer.to_hash['name']} (@#{reviewer.to_hash['username']})"
   #           gitlab.api.update_merge_request(project_id, mr_id, { assignee_id: reviewer.to_hash["id"] })
   #         end
-  # 
+  #
   #
   # @see  danger/danger
   # @tags core, gitlab
@@ -74,6 +74,7 @@ module Danger
     # So that this init can fail.
     def self.new(dangerfile)
       return nil if dangerfile.env.request_source.class != Danger::RequestSources::GitLab
+
       super
     end
 
@@ -240,6 +241,7 @@ module Danger
       end
 
       return paths.first if paths.count < 2
+
       paths.first(paths.count - 1).join(", ") + " & " + paths.last
     end
 

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

@@ -3,15 +3,15 @@ require "danger/plugin_support/plugin"
 # Danger
 module Danger
   # Handles interacting with local only plugin inside a Dangerfile.
-  # It is support pluggin for dry_run command and does not expose any methods.
+  # It is support plugin for dry_run command and does not expose any methods.
   # But you can still use other plugins like git
   #
-  # @example Check that added lines contains agreed form of words 
+  # @example Check that added lines contains agreed form of words
   #
   #       git.diff.each do |chunk|
   #         chunk.patch.lines.grep(/^\+/).each do |added_line|
   #           if added_line.gsub!(/(?<cancel>cancel)(?<rest>[^l[[:space:]][[:punct:]]]+)/i, '>>\k<cancel>-l-\k<rest><<')
-  #             fail "Single 'L' for cancellation-alike words in '#{added_line}'" 
+  #             fail "Single 'L' for cancellation-alike words in '#{added_line}'"
   #           end
   #         end
   #       end
@@ -23,6 +23,7 @@ module Danger
     # So that this init can fail.
     def self.new(dangerfile)
       return nil if dangerfile.env.request_source.class != Danger::RequestSources::LocalOnly
+
       super
     end
 

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

@@ -149,6 +149,7 @@ module Danger
 
       warnings.flatten.each do |warning|
         next if should_ignore_violation(warning)
+
         @warnings << Violation.new(warning, sticky, file, line, type: :warning) if warning
       end
     end
@@ -174,11 +175,12 @@ module Danger
 
       failures.flatten.each do |failure|
         next if should_ignore_violation(failure)
+
         @errors << Violation.new(failure, sticky, file, line, type: :error) if failure
       end
     end
 
-    alias_method :failure, :fail
+    alias failure fail
 
     # @!group Reporting
     # A list of all messages passed to Danger, including

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/array_subclass.rb

@@ -19,8 +19,8 @@ module Danger
         respond_to_method(name, *args, &block)
       end
 
-      def respond_to_missing?(name)
-        __array__.respond_to?(name) || super
+      def respond_to_missing?(name, include_all)
+        __array__.respond_to?(name, include_all) || super
       end
 
       def to_a

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
@@ -24,7 +24,9 @@ module Danger
       # @param [Bool] Should hide any generated link created
       #
       # @return [String] The Markdown compatible link
-      def markdown_link_to_message(message, _)
+      def markdown_link_to_message(message, hide_link)
+        return "" if hide_link
+
         "#{message.file}#L#{message.line}"
       end
 
@@ -86,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")
@@ -117,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,
@@ -147,8 +148,8 @@ module Danger
 
       def generate_description(warnings: nil, errors: nil, template: "github")
         emoji_mapper = EmojiMapper.new(template)
-        if errors.empty? && warnings.empty?
-          return ENV['DANGER_SUCCESS_MESSAGE'] || "All green. #{random_compliment}"
+        if (errors.nil? || errors.empty?) && (warnings.nil? || warnings.empty?)
+          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"
@@ -24,7 +22,6 @@ module Danger
 
       def initialize(ci_source, environment)
         self.ci_source = ci_source
-        self.environment = environment
 
         @api = BitbucketCloudAPI.new(ci_source.repo_slug, ci_source.pull_request_id, nil, environment)
       end
@@ -105,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
@@ -146,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,
@@ -163,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