danger 9.5.0 → 9.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67fd79bdc597c9e9f26f590ad3ca50c045cbd9a543225ac53d66ba174ba20ff5
-  data.tar.gz: 1ba194d96a1eb7a0b430270e2d129df3de3989e904833bba703e672f27973c91
+  metadata.gz: 17279e83964586e1eef46c40740b9c0fb839ea85a3c3d367a898c9b664767eca
+  data.tar.gz: 6afc0eb2cb97f22d988bf56cb0fe48063aa5eab060471cff2d95c0bc8435b3da
 SHA512:
-  metadata.gz: 4cd4fdc164a74ffd74b20cf9cbe1b0472d515f848ea6e0da9cfad60587d1aef1c09fe0bda83bbfa6d666fba51213f1c6613774597b9c1624b43facae2ff57200
-  data.tar.gz: f35871a565daf2296a1493ced5b9536d2b0aa385ac8acdfeff0301f247628424ba645c2c51b7ac2d2026307d07c7ae4da11ef6239a889175a85be21c0807ec6b
+  metadata.gz: ee7544abd31b5bd6320efdc79668169d0c5bfc0aa873b2d971bdfb043ab08bd3e05149ddc714cbcd98257c7bd0c815e4899afd573c33ff5d815626fdf01c1c01
+  data.tar.gz: fbe7c247fee1a41cb6e212141896f7282547f91f8ad0b59f36ae18bab2e32783e1b3ff22db1231e30e6bb5d3feaa98aea67099f114eaa9a45e30dc2478d562b0

data/lib/danger/ci_source/local_git_repo.rb

@@ -38,7 +38,8 @@ module Danger
         Danger::RequestSources::GitHub,
         Danger::RequestSources::BitbucketServer,
         Danger::RequestSources::BitbucketCloud,
-        Danger::RequestSources::VSTS
+        Danger::RequestSources::VSTS,
+        Danger::RequestSources::GitLab
       ]
     end
 
@@ -74,7 +75,8 @@ module Danger
 
     def find_remote_info(env)
       if given_pull_request_url?(env)
-        FindRepoInfoFromURL.new(env["LOCAL_GIT_PR_URL"]).call
+        pr_url = env["LOCAL_GIT_PR_URL"] || env["LOCAL_GIT_MR_URL"]
+        FindRepoInfoFromURL.new(pr_url).call
       else
         FindRepoInfoFromLogs.new(
           env["DANGER_GITHUB_HOST"] || "github.com",
@@ -85,15 +87,16 @@ module Danger
 
     def find_pull_request(env)
       if given_pull_request_url?(env)
+        remote_url = env["LOCAL_GIT_PR_URL"] || env["LOCAL_GIT_MR_URL"]
         PullRequestFinder.new(
           remote_info.id,
           remote_info.slug,
           remote: true,
-          remote_url: env["LOCAL_GIT_PR_URL"]
+          remote_url: remote_url
         ).call(env: env)
       else
         PullRequestFinder.new(
-          env.fetch("LOCAL_GIT_PR_ID") { "" },
+          env.fetch("LOCAL_GIT_PR_ID") { env.fetch("LOCAL_GIT_MR_ID") { "" } },
           remote_info.slug,
           remote: false,
           git_logs: run_git("log --oneline -1000000")
@@ -102,7 +105,8 @@ module Danger
     end
 
     def given_pull_request_url?(env)
-      env["LOCAL_GIT_PR_URL"] && !env["LOCAL_GIT_PR_URL"].empty?
+      (env["LOCAL_GIT_PR_URL"] && !env["LOCAL_GIT_PR_URL"].empty?) ||
+        (env["LOCAL_GIT_MR_URL"] && !env["LOCAL_GIT_MR_URL"].empty?)
     end
 
     def sha

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

@@ -31,7 +31,9 @@ module Danger
       else
         matched = url.match(REGEXP)
         if matched
-          RepoInfo.new(matched[:slug], matched[:id])
+          # Clean up the slug to remove any trailing dashes or slashes that might be part of the GitLab URL format
+          clean_slug = matched[:slug].gsub(%r{[-/]+$}, "")
+          RepoInfo.new(clean_slug, matched[:id])
         end
       end
     end

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

@@ -81,6 +81,12 @@ module Danger
           remote_pull_request.head.sha,
           remote_pull_request.base.sha
         )
+      when :gitlab
+        RemotePullRequest.new(
+          remote_pull_request.iid.to_s,
+          remote_pull_request.diff_refs.head_sha,
+          remote_pull_request.diff_refs.base_sha
+        )
       when :vsts
         RemotePullRequest.new(
           remote_pull_request[:pullRequestId].to_s,
@@ -93,7 +99,13 @@ module Danger
     end
 
     def find_remote_pull_request(env)
-      client(env).pull_request(repo_slug, specific_pull_request_id)
+      scm_provider = find_scm_provider(remote_url)
+
+      if scm_provider == :gitlab
+        client(env).merge_request(repo_slug, specific_pull_request_id)
+      else
+        client(env).pull_request(repo_slug, specific_pull_request_id)
+      end
     end
 
     def both_present?
@@ -138,35 +150,61 @@ module Danger
 
       case scm_provider
       when :bitbucket_cloud
-        require "danger/request_sources/bitbucket_cloud_api"
-        branch_name = ENV["DANGER_BITBUCKET_TARGET_BRANCH"] # Optional env variable (specifying the target branch) to help find the PR.
-        RequestSources::BitbucketCloudAPI.new(repo_slug, specific_pull_request_id, branch_name, env)
-
+        bitbucket_cloud_client(env)
       when :bitbucket_server
-        require "danger/request_sources/bitbucket_server_api"
-        project, slug = repo_slug.split("/")
-        RequestSources::BitbucketServerAPI.new(project, slug, specific_pull_request_id, env)
-
+        bitbucket_server_client(env)
       when :vsts
-        require "danger/request_sources/vsts_api"
-        RequestSources::VSTSAPI.new(repo_slug, specific_pull_request_id, env)
-
+        vsts_client(env)
+      when :gitlab
+        gitlab_client(env)
       when :github
-        require "octokit"
-        access_token = ENV["DANGER_GITHUB_API_TOKEN"]
-        bearer_token = ENV["DANGER_GITHUB_BEARER_TOKEN"]
-        if bearer_token && !bearer_token.empty?
-          Octokit::Client.new(bearer_token: bearer_token, api_endpoint: api_url)
-        elsif access_token && !access_token.empty?
-          Octokit::Client.new(access_token: access_token, api_endpoint: api_url)
-        else
-          raise "No API token given, please provide one using `DANGER_GITHUB_API_TOKEN` or `DANGER_GITHUB_BEARER_TOKEN`"
-        end
+        github_client(env)
       else
         raise "SCM provider not supported: #{scm_provider}"
       end
     end
 
+    def bitbucket_cloud_client(env)
+      require "danger/request_sources/bitbucket_cloud_api"
+      branch_name = ENV["DANGER_BITBUCKET_TARGET_BRANCH"] # Optional env variable (specifying the target branch) to help find the PR.
+      RequestSources::BitbucketCloudAPI.new(repo_slug, specific_pull_request_id, branch_name, env)
+    end
+
+    def bitbucket_server_client(env)
+      require "danger/request_sources/bitbucket_server_api"
+      project, slug = repo_slug.split("/")
+      RequestSources::BitbucketServerAPI.new(project, slug, specific_pull_request_id, env)
+    end
+
+    def vsts_client(env)
+      require "danger/request_sources/vsts_api"
+      RequestSources::VSTSAPI.new(repo_slug, specific_pull_request_id, env)
+    end
+
+    def gitlab_client(env)
+      require "gitlab"
+      token = env&.fetch("DANGER_GITLAB_API_TOKEN", nil) || ENV["DANGER_GITLAB_API_TOKEN"]
+      if token && !token.empty?
+        endpoint = env&.fetch("DANGER_GITLAB_API_BASE_URL", nil) || env&.fetch("CI_API_V4_URL", nil) || ENV["DANGER_GITLAB_API_BASE_URL"] || ENV.fetch("CI_API_V4_URL", "https://gitlab.com/api/v4")
+        Gitlab.client(endpoint: endpoint, private_token: token)
+      else
+        raise "No API token given, please provide one using `DANGER_GITLAB_API_TOKEN`"
+      end
+    end
+
+    def github_client(env)
+      require "octokit"
+      access_token = env&.fetch("DANGER_GITHUB_API_TOKEN", nil) || ENV["DANGER_GITHUB_API_TOKEN"]
+      bearer_token = env&.fetch("DANGER_GITHUB_BEARER_TOKEN", nil) || ENV["DANGER_GITHUB_BEARER_TOKEN"]
+      if bearer_token && !bearer_token.empty?
+        Octokit::Client.new(bearer_token: bearer_token, api_endpoint: api_url)
+      elsif access_token && !access_token.empty?
+        Octokit::Client.new(access_token: access_token, api_endpoint: api_url)
+      else
+        raise "No API token given, please provide one using `DANGER_GITHUB_API_TOKEN` or `DANGER_GITHUB_BEARER_TOKEN`"
+      end
+    end
+
     def api_url
       ENV.fetch("DANGER_GITHUB_API_HOST") do
         ENV.fetch("DANGER_GITHUB_API_BASE_URL") do
@@ -182,6 +220,8 @@ module Danger
         :bitbucket_server
       elsif remote_url =~ /\.visualstudio\.com/i || remote_url =~ /dev\.azure\.com/i
         :vsts
+      elsif remote_url =~ /gitlab\.com/ || remote_url =~ %r{-/merge_requests/}
+        :gitlab
       else
         :github
       end

data/lib/danger/commands/mr.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require "danger/commands/local_helpers/http_cache"
+require "danger/commands/local_helpers/pry_setup"
+require "faraday/http_cache"
+require "fileutils"
+require "gitlab"
+require "tmpdir"
+
+module Danger
+  class MR < Runner
+    self.summary = "Run the Dangerfile locally against GitLab Merge Requests. Does not post to the MR. Usage: danger mr <URL>"
+    self.command = "mr"
+
+    def self.options
+      [
+        ["--clear-http-cache", "Clear the local http cache before running Danger locally."],
+        ["--pry", "Drop into a Pry shell after evaluating the Dangerfile."],
+        ["--dangerfile=<path/to/dangerfile>", "The location of your Dangerfile"]
+      ]
+    end
+
+    def initialize(argv)
+      show_help = true if argv.arguments == ["-h"]
+
+      @mr_url = argv.shift_argument
+      @clear_http_cache = argv.flag?("clear-http-cache", false)
+      dangerfile = argv.option("dangerfile", "Dangerfile")
+
+      # Currently CLAide doesn't support short option like -h https://github.com/CocoaPods/CLAide/pull/60
+      # when user pass in -h, mimic the behavior of passing in --help.
+      argv = CLAide::ARGV.new ["--help"] if show_help
+
+      super
+
+      @dangerfile_path = dangerfile if File.exist?(dangerfile)
+
+      if argv.flag?("pry", false)
+        @dangerfile_path = PrySetup.new(cork).setup_pry(@dangerfile_path, MR.command)
+      end
+    end
+
+    def validate!
+      super
+      unless @dangerfile_path
+        help! "Could not find a Dangerfile."
+      end
+      unless @mr_url
+        help! "Could not find a merge-request. Usage: danger mr <URL>"
+      end
+    end
+
+    def run
+      ENV["DANGER_USE_LOCAL_GIT"] = "YES"
+      ENV["LOCAL_GIT_MR_URL"] = @mr_url if @mr_url
+
+      configure_gitlab(ENV["DANGER_TMPDIR"] || Dir.tmpdir)
+
+      env = EnvironmentManager.new(ENV, cork)
+      dm = Dangerfile.new(env, cork)
+
+      LocalSetup.new(dm, cork).setup(verbose: verbose) do
+        dm.run(
+          Danger::EnvironmentManager.danger_base_branch,
+          Danger::EnvironmentManager.danger_head_branch,
+          @dangerfile_path,
+          nil,
+          nil,
+          nil,
+          false
+        )
+      end
+    end
+
+    private
+
+    def configure_gitlab(cache_dir)
+      # setup caching for GitLab calls to avoid hitting the API rate limit too quickly
+      cache_file = File.join(cache_dir, "danger_local_gitlab_cache")
+      HTTPCache.new(cache_file, clear_cache: @clear_http_cache)
+
+      # Configure GitLab client
+      Gitlab.configure do |config|
+        config.endpoint = ENV["DANGER_GITLAB_API_BASE_URL"] || ENV.fetch("CI_API_V4_URL", "https://gitlab.com/api/v4")
+        config.private_token = ENV["DANGER_GITLAB_API_TOKEN"]
+      end
+    end
+  end
+end

data/lib/danger/commands/runner.rb

@@ -6,6 +6,7 @@ module Danger
     require "danger/commands/staging"
     require "danger/commands/systems"
     require "danger/commands/pr"
+    require "danger/commands/mr"
 
     # manually set claide plugins as a subcommand
     require "claide_plugin"

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

@@ -329,7 +329,7 @@ module Danger
         is_markdown_content = kind == :markdown
         emoji = { warning: "warning", error: "no_entry_sign", message: "book" }[kind]
 
-        messages.reject do |m|
+        messages.reject do |m| # rubocop:todo Metrics/BlockLength
           next false unless m.file && m.line
 
           position = find_position_in_diff diff_lines, m, kind

data/lib/danger/request_sources/gitlab.rb

@@ -395,7 +395,7 @@ module Danger
         is_markdown_content = kind == :markdown
         emoji = { warning: "warning", error: "no_entry_sign", message: "book" }[kind]
 
-        messages.reject do |m|
+        messages.reject do |m| # rubocop:todo Metrics/BlockLength
           next false unless m.file && m.line
           # Reject if it's out of range and in dismiss mode
           next true if dismiss_out_of_range_messages_for(kind) && is_out_of_range(mr_changes.changes, m)

data/lib/danger/request_sources/vsts.rb

@@ -185,7 +185,7 @@ module Danger
         is_markdown_content = kind == :markdown
         emoji = { warning: "warning", error: "no_entry_sign", message: "book" }[kind]
 
-        messages.reject do |m|
+        messages.reject do |m| # rubocop:todo Metrics/BlockLength
           next false unless m.file && m.line
 
           # Once we know we're gonna submit it, we format it

data/lib/danger/scm_source/git_repo.rb

@@ -144,13 +144,16 @@ module Danger
       return unless from_is_ref || to_is_ref
 
       depth = 0
-      (3..6).any? do |factor|
+      (3..6).each do |factor|
         depth += Math.exp(factor).to_i
 
         git_fetch_branch_to_depth(from, depth) if from_is_ref
         git_fetch_branch_to_depth(to, depth) if to_is_ref
-        possible_merge_base(repo, from, to)
+        merge_base = possible_merge_base(repo, from, to)
+        return merge_base if merge_base
       end
+
+      nil
     end
 
     def possible_merge_base(repo, from, to)

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "9.5.0".freeze
+  VERSION = "9.5.2".freeze
   DESCRIPTION = "Like Unit Tests, but for your Team Culture.".freeze
 end

metadata

@@ -1,16 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: danger
 version: !ruby/object:Gem::Version
-  version: 9.5.0
+  version: 9.5.2
 platform: ruby
 authors:
 - Orta Therox
 - Juanito Fatas
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-03 00:00:00.000000000 Z
+date: 2025-07-03 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -43,16 +56,22 @@ dependencies:
   name: colored2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: cork
   requirement: !ruby/object:Gem::Requirement
@@ -105,30 +124,42 @@ dependencies:
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.13'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.13'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.5.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: kramdown-parser-gfm
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +188,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: pstore
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +211,7 @@ dependencies:
         version: '1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -176,7 +221,7 @@ dependencies:
         version: '1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 description: Stop Saying 'You Forgot To…' in Code Review
 email:
 - orta.therox@gmail.com
@@ -243,6 +288,7 @@ files:
 - lib/danger/commands/local_helpers/http_cache.rb
 - lib/danger/commands/local_helpers/local_setup.rb
 - lib/danger/commands/local_helpers/pry_setup.rb
+- lib/danger/commands/mr.rb
 - lib/danger/commands/plugins/plugin_json.rb
 - lib/danger/commands/plugins/plugin_lint.rb
 - lib/danger/commands/plugins/plugin_readme.rb
@@ -315,7 +361,6 @@ homepage: https://github.com/danger/danger
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -330,8 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.14
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Like Unit Tests, but for your Team Culture.
 test_files: []