danger 8.4.2 → 9.2.0

data/lib/danger/ci_source/local_git_repo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # For more info see: https://github.com/schacon/ruby-git
 
 require "git"
@@ -33,12 +35,17 @@ module Danger
     end
 
     def supported_request_sources
-      @supported_request_sources ||= [Danger::RequestSources::GitHub, Danger::RequestSources::BitbucketServer, Danger::RequestSources::BitbucketCloud]
+      @supported_request_sources ||= [
+        Danger::RequestSources::GitHub,
+        Danger::RequestSources::BitbucketServer,
+        Danger::RequestSources::BitbucketCloud,
+        Danger::RequestSources::VSTS
+      ]
     end
 
     def initialize(env = {})
-      @env = env
-
+      @remote_info = find_remote_info(env)
+      @found_pull_request = find_pull_request(env)
       self.repo_slug = remote_info.slug
       raise_error_for_missing_remote if remote_info.kind_of?(NoRepoInfo)
 
@@ -55,7 +62,7 @@ module Danger
 
     private
 
-    attr_reader :env
+    attr_reader :remote_info, :found_pull_request
 
     def raise_error_for_missing_remote
       raise missing_remote_error_message
@@ -66,45 +73,36 @@ module Danger
       "And the repository must host on GitHub.com or GitHub Enterprise."
     end
 
-    def remote_info
-      @_remote_info ||= begin
-        remote_info = begin
-          if given_pull_request_url?
-            FindRepoInfoFromURL.new(env["LOCAL_GIT_PR_URL"]).call
-          else
-            FindRepoInfoFromLogs.new(
-              env["DANGER_GITHUB_HOST"] || "github.com".freeze,
-              run_git("remote show origin -n".freeze)
-            ).call
-          end
-        end
-
-        remote_info || NoRepoInfo.new
-      end
+    def find_remote_info(env)
+      if given_pull_request_url?(env)
+        FindRepoInfoFromURL.new(env["LOCAL_GIT_PR_URL"]).call
+      else
+        FindRepoInfoFromLogs.new(
+          env["DANGER_GITHUB_HOST"] || "github.com",
+          run_git("remote show origin -n")
+        ).call
+      end || NoRepoInfo.new
     end
 
-    def found_pull_request
-      @_found_pull_request ||= begin
-        if given_pull_request_url?
-          PullRequestFinder.new(
-            remote_info.id,
-            remote_info.slug,
-            remote: true,
-            remote_url: env["LOCAL_GIT_PR_URL"],
-            env: env
-          ).call
-        else
-          PullRequestFinder.new(
-            env.fetch("LOCAL_GIT_PR_ID") { "".freeze },
-            remote_info.slug,
-            remote: false,
-            git_logs: run_git("log --oneline -1000000".freeze)
-          ).call
-        end
+    def find_pull_request(env)
+      if given_pull_request_url?(env)
+        PullRequestFinder.new(
+          remote_info.id,
+          remote_info.slug,
+          remote: true,
+          remote_url: env["LOCAL_GIT_PR_URL"]
+        ).call(env: env)
+      else
+        PullRequestFinder.new(
+          env.fetch("LOCAL_GIT_PR_ID") { "" },
+          remote_info.slug,
+          remote: false,
+          git_logs: run_git("log --oneline -1000000")
+        ).call(env: env)
       end
     end
 
-    def given_pull_request_url?
+    def given_pull_request_url?(env)
       env["LOCAL_GIT_PR_URL"] && !env["LOCAL_GIT_PR_URL"].empty?
     end
 

data/lib/danger/ci_source/local_only_git_repo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "git"
 require "danger/request_sources/local_only"
 
@@ -9,8 +11,9 @@ module Danger
   #
   class LocalOnlyGitRepo < CI
     attr_accessor :base_commit, :head_commit
-    HEAD_VAR = "DANGER_LOCAL_HEAD".freeze
-    BASE_VAR = "DANGER_LOCAL_BASE".freeze
+
+    HEAD_VAR = "DANGER_LOCAL_HEAD"
+    BASE_VAR = "DANGER_LOCAL_BASE"
 
     def self.validates_as_ci?(env)
       env.key? "DANGER_USE_LOCAL_ONLY_GIT"
@@ -33,15 +36,9 @@ module Danger
     end
 
     def initialize(env = {})
-      @env = env
-
       # expects --base/--head specified OR origin/master to be base and HEAD head
       self.base_commit = env[BASE_VAR] || run_git("rev-parse --abbrev-ref origin/master")
       self.head_commit = env[HEAD_VAR] || run_git("rev-parse --abbrev-ref HEAD")
     end
-
-    private
-
-    attr_reader :env
   end
 end

data/lib/danger/ci_source/support/find_repo_info_from_url.rb

@@ -4,19 +4,20 @@ module Danger
   class FindRepoInfoFromURL
     REGEXP = %r{
       ://[^/]+/
-      (?<slug>[^/]+(/[^/]+){1,2})
-      (/(pull|merge_requests|pull-requests)/)
+      (([^/]+/){1,2}_git/)?
+      (?<slug>[^/]+(/[^/]+){0,2})
+      (/(pull|pullrequest|merge_requests|pull-requests)/)
       (?<id>\d+)
-    }x
-    
+    }x.freeze
+
     # Regex used to extract info from Bitbucket server URLs, as they use a quite different format
     REGEXPBB = %r{
-      (?:[\/:])projects
-      \/([^\/.]+)
-      \/repos\/([^\/.]+)
-      \/pull-requests
-      \/(\d+)
-    }x
+      (?:[/:])projects
+      /([^/.]+)
+      /repos/([^/.]+)
+      /pull-requests
+      /(\d+)
+    }x.freeze
 
     def initialize(url)
       @url = url

data/lib/danger/ci_source/support/pull_request_finder.rb

@@ -1,67 +1,65 @@
+# frozen_string_literal: true
+
 require "danger/ci_source/support/local_pull_request"
 require "danger/ci_source/support/remote_pull_request"
 require "danger/ci_source/support/no_pull_request"
 
 module Danger
   class PullRequestFinder
-    def initialize(specific_pull_request_id, repo_slug = nil, remote: false, git_logs: "", remote_url: "", env: nil)
+    def initialize(specific_pull_request_id, repo_slug = nil, remote: false, git_logs: "", remote_url: "")
       @specific_pull_request_id = specific_pull_request_id
       @git_logs = git_logs
       @repo_slug = repo_slug
       @remote = to_boolean(remote)
       @remote_url = remote_url
-      @env = env
     end
 
-    def call
-      check_if_any_pull_request!
-
-      pull_request
+    def call(env: nil)
+      find_pull_request(env).tap do |pull_request|
+        raise_pull_request_not_found!(pull_request) unless pull_request.valid?
+      end
     end
 
     private
 
-    attr_reader :specific_pull_request_id, :git_logs, :repo_slug, :remote, :remote_url, :env
+    attr_reader :specific_pull_request_id, :git_logs, :repo_slug, :remote, :remote_url
 
     def to_boolean(maybe_string)
       ["true", "1", "yes", "y", true].include?(maybe_string)
     end
 
-    def check_if_any_pull_request!
-      unless pull_request.valid?
-        if !specific_pull_request_id.empty?
-          raise "Could not find the Pull Request (#{specific_pull_request_id}) inside the git history for this repo."
-        else
-          raise "No recent Pull Requests found for this repo, danger requires at least one Pull Request for the local mode.".freeze
-        end
+    def raise_pull_request_not_found!(_pull_request)
+      if specific_pull_request_id.empty?
+        raise "No recent Pull Requests found for this repo, danger requires at least one Pull Request for the local mode."
+      else
+        raise "Could not find the Pull Request (#{specific_pull_request_id}) inside the git history for this repo."
       end
     end
 
     # @return [String] Log line of most recent merged Pull Request
-    def pull_request
-      @pull_request ||= begin
-        return if pull_request_ref.empty?
-
-        if both_present?
-          LocalPullRequest.new(pick_the_most_recent_one_from_two_matches)
-        elsif only_merged_pull_request_present?
-          LocalPullRequest.new(most_recent_merged_pull_request)
-        elsif only_squash_and_merged_pull_request_present?
-          LocalPullRequest.new(most_recent_squash_and_merged_pull_request)
-        elsif remote && remote_pull_request
-          generate_remote_pull_request
-        else
-          NoPullRequest.new
-        end
+    def find_pull_request(env)
+      return if pull_request_ref.empty?
+
+      if both_present?
+        LocalPullRequest.new(pick_the_most_recent_one_from_two_matches)
+      elsif only_merged_pull_request_present?
+        LocalPullRequest.new(most_recent_merged_pull_request)
+      elsif only_squash_and_merged_pull_request_present?
+        LocalPullRequest.new(most_recent_squash_and_merged_pull_request)
+      elsif remote
+        remote_pull_request = find_remote_pull_request(env)
+        remote_pull_request ? generate_remote_pull_request(remote_pull_request) : NoPullRequest.new
+      else
+        NoPullRequest.new
       end
     end
 
     # @return [String] "#42"
     def pull_request_ref
-      !specific_pull_request_id.empty? ? "##{specific_pull_request_id}" : "#\\d+".freeze
+      !specific_pull_request_id.empty? ? "##{specific_pull_request_id}" : "#\\d+"
     end
 
-    def generate_remote_pull_request
+    def generate_remote_pull_request(remote_pull_request)
       scm_provider = find_scm_provider(remote_url)
 
       case scm_provider
@@ -83,15 +81,19 @@ module Danger
           remote_pull_request.head.sha,
           remote_pull_request.base.sha
         )
+      when :vsts
+        RemotePullRequest.new(
+          remote_pull_request[:pullRequestId].to_s,
+          remote_pull_request[:lastMergeSourceCommit][:commitId],
+          remote_pull_request[:lastMergeTargetCommit][:commitId]
+        )
       else
         raise "SCM provider not supported: #{scm_provider}"
       end
     end
 
-    def remote_pull_request
-      @_remote_pull_request ||= begin
-        client.pull_request(repo_slug, specific_pull_request_id)
-      end
+    def find_remote_pull_request(env)
+      client(env).pull_request(repo_slug, specific_pull_request_id)
     end
 
     def both_present?
@@ -100,16 +102,12 @@ module Danger
 
     # @return [String] Log line of format: "Merge pull request #42"
     def most_recent_merged_pull_request
-      @most_recent_merged_pull_request ||= begin
-        git_logs.lines.grep(/Merge pull request #{pull_request_ref} from/)[0]
-      end
+      @most_recent_merged_pull_request ||= git_logs.lines.grep(/Merge pull request #{pull_request_ref} from/)[0]
     end
 
     # @return [String] Log line of format: "description (#42)"
     def most_recent_squash_and_merged_pull_request
-      @most_recent_squash_and_merged_pull_request ||= begin
-        git_logs.lines.grep(/\(#{pull_request_ref}\)/)[0]
-      end
+      @most_recent_squash_and_merged_pull_request ||= git_logs.lines.grep(/\(#{pull_request_ref}\)/)[0]
     end
 
     def pick_the_most_recent_one_from_two_matches
@@ -135,7 +133,7 @@ module Danger
       !most_recent_squash_and_merged_pull_request.nil? && !most_recent_squash_and_merged_pull_request.empty?
     end
 
-    def client
+    def client(env)
       scm_provider = find_scm_provider(remote_url)
 
       case scm_provider
@@ -148,6 +146,10 @@ module Danger
         require "danger/request_sources/bitbucket_server_api"
         project, slug = repo_slug.split("/")
         RequestSources::BitbucketServerAPI.new(project, slug, specific_pull_request_id, env)
+      
+      when :vsts
+        require "danger/request_sources/vsts_api"
+        RequestSources::VSTSAPI.new(repo_slug, specific_pull_request_id, env)
 
       when :github
         require "octokit"
@@ -168,7 +170,7 @@ module Danger
     def api_url
       ENV.fetch("DANGER_GITHUB_API_HOST") do
         ENV.fetch("DANGER_GITHUB_API_BASE_URL") do
-          "https://api.github.com/".freeze
+          "https://api.github.com/"
         end
       end
     end
@@ -178,6 +180,8 @@ module Danger
         :bitbucket_cloud
       elsif remote_url =~ %r{/pull-requests/}
         :bitbucket_server
+      elsif remote_url =~ /\.visualstudio\.com/i || remote_url =~ /dev\.azure\.com/i
+        :vsts 
       else
         :github
       end

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

@@ -67,7 +67,8 @@ module Danger
           @dangerfile_path,
           nil,
           nil,
-          nil
+          nil,
+          false
         )
       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/comment_generators/gitlab_inline.md.erb

@@ -17,5 +17,5 @@
 <%= current %>
 <%# the previous line has to be aligned far to the left, otherwise markdown can break easily %>
 <%- end -%>
-<%# Add the generated_by_ as a html coment to identify comments from danger. %>
+<%# Add the generated_by_ as a html comment to identify comments from danger. %>
 <!-- "generated_by_<%= @danger_id %>" -->

data/lib/danger/comment_generators/vsts_inline.md.erb

@@ -0,0 +1,17 @@
+<%- @tables.each do |table| -%>
+  <%- if table[:content].any? || table[:resolved].any? -%>
+| | |
+|---|---|
+    <%- table[:content].each do |violation| -%>
+| <%= @emoji_mapper.map(table[:emoji]) %> | <%= "~~" if table[:resolved] %><%= violation.message %><%= "~~" if table[:resolved] %> |
+    <%- end -%>
+
+  <%- end -%>
+<%- end -%>
+
+<%- @markdowns.each do |current| -%>
+<%= current %>
+<%# the previous line has to be aligned far to the left, otherwise markdown can break easily %>
+<%- end -%>
+
+Generated by :no_entry_sign: [Danger](https://danger.systems/ "generated_by_<%= @danger_id %>")

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