danger 9.1.0 → 9.2.0

data/lib/danger/ci_source/teamcity.rb

@@ -155,7 +155,7 @@ module Danger
       repo_slug   = env["BITBUCKET_REPO_SLUG"]
       begin
         Danger::RequestSources::BitbucketCloudAPI.new(repo_slug, nil, branch_name, env).pull_request_id
-      rescue
+      rescue StandardError
         raise "Failed to find a pull request for branch \"#{branch_name}\" on Bitbucket."
       end
     end

data/lib/danger/ci_source/xcode_cloud.rb

@@ -1,16 +1,16 @@
 module Danger
   # ### CI Setup
   #
-  # In order to work with Xcode Cloud and Danger, you will need to add `bundle exec danger` to 
+  # In order to work with Xcode Cloud and Danger, you will need to add `bundle exec danger` to
   # the `ci_scripts/ci_post_xcodebuild.sh` (Xcode Cloud's expected filename for a post-action build script).
   # More details and documentation on Xcode Cloud configuration can be found [here](https://developer.apple.com/documentation/xcode/writing-custom-build-scripts).
-  # 
+  #
   # ### Token Setup
   #
-  # You will need to add the `DANGER_GITHUB_API_TOKEN` to your build environment. 
-  # If running on GitHub Enterprise, make sure you also set the expected values for 
+  # You will need to add the `DANGER_GITHUB_API_TOKEN` to your build environment.
+  # If running on GitHub Enterprise, make sure you also set the expected values for
   # both `DANGER_GITHUB_API_HOST` and `DANGER_GITHUB_HOST`.
-  #  
+  #
   class XcodeCloud < CI
     def self.validates_as_ci?(env)
       env.key? "CI_XCODEBUILD_ACTION"
@@ -23,8 +23,8 @@ module Danger
     def supported_request_sources
       @supported_request_sources ||= [
         Danger::RequestSources::GitHub,
-        Danger::RequestSources::GitLab, 
-        Danger::RequestSources::BitbucketCloud, 
+        Danger::RequestSources::GitLab,
+        Danger::RequestSources::BitbucketCloud,
         Danger::RequestSources::BitbucketServer
       ]
     end

data/lib/danger/commands/init.rb

@@ -145,7 +145,7 @@ module Danger
     def current_repo_slug
       git = GitRepo.new
 
-      author_repo_regexp = %r{(?:[\/:])([^\/]+\/[^\/]+)(?:.git)?$}
+      author_repo_regexp = %r{(?:[/:])([^/]+/[^/]+)(?:.git)?$}
       last_git_regexp = /.git$/
 
       matches = git.origins.match(author_repo_regexp)

data/lib/danger/commands/local.rb

@@ -66,7 +66,7 @@ module Danger
 
     private
 
-    # this method is a duplicate of Commands::PR#configure_octokit
+    #  this method is a duplicate of Commands::PR#configure_octokit
     # - worth a refactor sometime?
     def configure_octokit(cache_dir)
       # setup caching for Github calls to hitting the API rate limit too quickly

data/lib/danger/commands/local_helpers/http_cache.rb

@@ -3,6 +3,7 @@ require "pstore"
 module Danger
   class HTTPCache
     attr_reader :expires_in
+
     def initialize(cache_file = nil, options = {})
       File.delete(cache_file) if options[:clear_cache]
       @store = PStore.new(cache_file)
@@ -14,6 +15,7 @@ module Danger
         entry = @store[key]
         return nil unless entry
         return entry[:value] unless entry_has_expired(entry, @expires_in)
+
         @store.delete key
         return nil
       end

data/lib/danger/commands/local_helpers/local_setup.rb

@@ -22,6 +22,8 @@ module Danger
 
       if gh.instance_of? Danger::RequestSources::BitbucketServer
         cork.puts "Running your Dangerfile against this PR - #{gh.host}/projects/#{source.repo_slug.split('/').first}/repos/#{source.repo_slug.split('/').last}/pull-requests/#{source.pull_request_id}"
+      elsif gh.instance_of? Danger::RequestSources::VSTS
+        cork.puts "Running your Dangerfile against this PR - #{gh.client.pr_api_endpoint}"
       else
         cork.puts "Running your Dangerfile against this PR - https://#{gh.host}/#{source.repo_slug}/pull/#{source.pull_request_id}"
       end

data/lib/danger/commands/local_helpers/pry_setup.rb

@@ -6,6 +6,7 @@ module Danger
 
     def setup_pry(dangerfile_path, command)
       return dangerfile_path if dangerfile_path.empty?
+
       validate_pry_available(command)
       FileUtils.cp dangerfile_path, DANGERFILE_COPY
       File.open(DANGERFILE_COPY, "a") do |f|

data/lib/danger/commands/plugins/plugin_json.rb

@@ -3,7 +3,7 @@ require "danger/plugin_support/plugin_file_resolver"
 
 module Danger
   class PluginJSON < CLAide::Command::Plugins
-    self.summary = "Prints the JSON documentation representing a plugin"
+    self.summary = "Lint plugins from files, gems or the current folder. Outputs JSON array representation of Plugins on success."
     self.command = "json"
 
     attr_accessor :cork
@@ -15,8 +15,6 @@ module Danger
       super
     end
 
-    self.summary = "Lint plugins from files, gems or the current folder. Outputs JSON array representation of Plugins on success."
-
     self.description = <<-DESC
       Converts a collection of file paths of Danger plugins into a JSON format.
     DESC

data/lib/danger/commands/plugins/plugin_lint.rb

@@ -17,8 +17,6 @@ module Danger
       super
     end
 
-    self.summary = "Lint plugins from files, gems or the current folder. Outputs JSON array representation of Plugins on success."
-
     self.description = <<-DESC
       Converts a collection of file paths of Danger plugins into a JSON format.
       Note: Before 1.0, it will also parse the represented JSON to validate whether https://danger.systems would

data/lib/danger/commands/plugins/plugin_readme.rb

@@ -8,7 +8,7 @@ module Danger
     self.summary = "Generates a README from a set of plugins"
     self.command = "readme"
 
-    attr_accessor :cork, :json
+    attr_accessor :cork, :json, :markdown
 
     def initialize(argv)
       @refs = argv.arguments! unless argv.arguments.empty?
@@ -17,8 +17,6 @@ module Danger
       super
     end
 
-    self.summary = "Lint plugins from files, gems or the current folder. Outputs JSON array representation of Plugins on success."
-
     self.description = <<-DESC
       Converts a collection of file paths of Danger plugins into a format usable in a README.
       This is useful for Danger itself, but also for any plugins wanting to showcase their API.
@@ -28,7 +26,6 @@ module Danger
       CLAide::Argument.new("Paths, Gems or Nothing", false, true)
     ]
 
-    attr_accessor :json, :markdown
     def run
       file_resolver = PluginFileResolver.new(@refs)
       data = file_resolver.resolve
@@ -39,7 +36,7 @@ module Danger
       self.json = JSON.parse(parser.to_json_string)
 
       template = File.join(Danger.gem_path, "lib/danger/plugin_support/templates/readme_table.html.erb")
-      cork.puts ERB.new(File.read(template), 0, "-").result(binding)
+      cork.puts ERB.new(File.read(template), trim_mode: "-").result(binding)
     end
   end
 end

data/lib/danger/commands/runner.rb

@@ -51,7 +51,7 @@ module Danger
 
     def validate!
       super
-      if self.class == Runner && !@dangerfile_path
+      if self.instance_of?(Runner) && !@dangerfile_path
         help!("Could not find a Dangerfile.")
       end
     end

data/lib/danger/commands/staging.rb

@@ -9,7 +9,7 @@ module Danger
 
     def self.options
       [
-          ["--pry", "Drop into a Pry shell after evaluating the Dangerfile."]
+        ["--pry", "Drop into a Pry shell after evaluating the Dangerfile."]
       ]
     end
 
@@ -41,12 +41,12 @@ module Danger
       dm = Dangerfile.new(env, cork)
 
       dm.run(
-          Danger::EnvironmentManager.danger_base_branch,
-          Danger::EnvironmentManager.danger_head_branch,
-          @dangerfile_path,
-          nil,
-          nil,
-          nil
+        Danger::EnvironmentManager.danger_base_branch,
+        Danger::EnvironmentManager.danger_head_branch,
+        @dangerfile_path,
+        nil,
+        nil,
+        nil
       )
     end
   end

data/lib/danger/commands/systems.rb

@@ -16,12 +16,10 @@ module Danger
       require "yard"
       # Pull out all the Danger::CI subclasses docs
       registry = YARD::Registry.load(ci_source_paths, true)
-      ci_sources = begin
-        registry.all(:class)
-          .select { |klass| klass.inheritance_tree.map(&:name).include? :CI }
-          .reject { |source| source.name == :CI }
-          .reject { |source| source.name == :LocalGitRepo }
-      end
+      ci_sources = registry.all(:class)
+        .select { |klass| klass.inheritance_tree.map(&:name).include? :CI }
+        .reject { |source| source.name == :CI }
+        .reject { |source| source.name == :LocalGitRepo }
 
       # Fail if anything is added and not documented
       cis_without_docs = ci_sources.select { |source| source.base_docstring.empty? }

data/lib/danger/core_ext/file_list.rb

@@ -8,8 +8,8 @@ module Danger
     # e.g. "**/something.*" for any file called something with any extension
     def include?(pattern)
       self.each do |current|
-        unless current.nil?
-          return true if File.fnmatch(pattern, current, File::FNM_EXTGLOB) || pattern == current
+        if !current.nil? && (File.fnmatch(pattern, current, File::FNM_EXTGLOB) || pattern == current)
+          return true
         end
       end
       return false

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,
@@ -293,9 +293,9 @@ module Danger
 
         # 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

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,6 +134,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.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
@@ -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
 
@@ -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

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