danger 9.5.2 → 9.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17279e83964586e1eef46c40740b9c0fb839ea85a3c3d367a898c9b664767eca
-  data.tar.gz: 6afc0eb2cb97f22d988bf56cb0fe48063aa5eab060471cff2d95c0bc8435b3da
+  metadata.gz: c1a29ac64cb5013e28a0e137ba85672f035a3116508c15815ff34e2e4c2efe71
+  data.tar.gz: ccd8f3bf454de07224648c91fcff6f4e63d8173b50215d769de44230b4621e16
 SHA512:
-  metadata.gz: ee7544abd31b5bd6320efdc79668169d0c5bfc0aa873b2d971bdfb043ab08bd3e05149ddc714cbcd98257c7bd0c815e4899afd573c33ff5d815626fdf01c1c01
-  data.tar.gz: fbe7c247fee1a41cb6e212141896f7282547f91f8ad0b59f36ae18bab2e32783e1b3ff22db1231e30e6bb5d3feaa98aea67099f114eaa9a45e30dc2478d562b0
+  metadata.gz: 11a8ad39bcfbddb55c4683e7a7852d79ac17f74f5da55dcfabc796ac4b83a5f4b45d2ad5de53cc8bfdb47034c0572d546ff225b021c4420a751c3d9e0cd9962e
+  data.tar.gz: 6dd015355fb17c8bf4a4f79eec81e4e755b1e6eb94268d55809f4146b41367ed474969ce08358e8ef2deb05998af89ec04414ae0caed6407ff28ef24c374452d

data/lib/danger/ci_source/local_git_repo.rb

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

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

@@ -31,9 +31,7 @@ module Danger
       else
         matched = url.match(REGEXP)
         if matched
-          # 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])
+          RepoInfo.new(matched[:slug], matched[:id])
         end
       end
     end

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

@@ -81,12 +81,6 @@ 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,
@@ -99,13 +93,7 @@ module Danger
     end
 
     def find_remote_pull_request(env)
-      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
+      client(env).pull_request(repo_slug, specific_pull_request_id)
     end
 
     def both_present?
@@ -150,61 +138,35 @@ module Danger
 
       case scm_provider
       when :bitbucket_cloud
-        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)
+
       when :bitbucket_server
-        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)
+
       when :vsts
-        vsts_client(env)
-      when :gitlab
-        gitlab_client(env)
+        require "danger/request_sources/vsts_api"
+        RequestSources::VSTSAPI.new(repo_slug, specific_pull_request_id, env)
+
       when :github
-        github_client(env)
+        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
       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
@@ -220,8 +182,6 @@ 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/runner.rb

@@ -6,7 +6,6 @@ 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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger
 version: !ruby/object:Gem::Version
-  version: 9.5.2
+  version: 9.5.3
 platform: ruby
 authors:
 - Orta Therox
 - Juanito Fatas
 bindir: bin
 cert_chain: []
-date: 2025-07-03 00:00:00.000000000 Z
+date: 2025-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -288,7 +288,6 @@ 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

data/lib/danger/commands/mr.rb

@@ -1,89 +0,0 @@
-# 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