danger 8.4.2 → 9.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 423862c4ae06fbd90dbc52ae126b171c3af53da1867f6051db5e1e00cd1cb09e
-  data.tar.gz: 45d13ff59705d33a756f8a221ef597f8c29f534511a9cd310241d2730b118e59
+  metadata.gz: 9ad61c252b1b62b1fb4e7aa07c2ef21727ada06dcfdd66e23ce70840ab37fcff
+  data.tar.gz: a1e98cfa27d937448822f2ece399fc157b5f30358ed675f976ccc7c20b7bfb5f
 SHA512:
-  metadata.gz: 3a1e23473e3012edb47a6860ca50a4e0e12512ade5c2796b79720c71ba049c034060893505a5264df3ee36439ae702dffe1cc9472da4e6357d2cef7ba81e24b8
-  data.tar.gz: 4e186a0412277f4d3add84821f39529900c9faec5439ccd62329bc24e6a753c19feafe68208f9ff3b7fe8b12e64ba8b31379b7af5273f24dfa230ec804f12648
+  metadata.gz: f4531b7f35bccbfdc0df07dedae51b009e1a9a0bcf00d566293d28c143c1a00e29f3ef8f7e47421a6ff32e48cd8b2b640866392aab161d0e95d16d9eff6ad1b6
+  data.tar.gz: fcce02992e6488c454ca914e4a81be0d397cbd19b9f3e63cf058c05068606376020281b552cb489b9d88bf8d0958b6a99b442093d62123a095c3d4418955a1c1

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019-present Orta, Felix Krause
+Copyright (c) 2015-present Orta, Felix Krause
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -76,7 +76,7 @@ I'd strongly recommend using `bundle exec guard` to run your tests as you work.
 
 #### Debugging
 
-Ruby is super dynamic. One of the best ways to debug Ruby code is by using [pry](http://pryrepl.org/). We include pry for developers: when you have a problem, copy these two lines just before your problem and follow the instructions from "[I Want To Be A Danger Wizard](https://danger.systems/guides/troubleshooting.html#i-want-to-be-a-danger-wizard)."
+Ruby is super dynamic. One of the best ways to debug Ruby code is by using [pry](https://pry.github.io/). We include pry for developers: when you have a problem, copy these two lines just before your problem and follow the instructions from "[I Want To Be A Danger Wizard](https://danger.systems/guides/troubleshooting.html#i-want-to-be-a-danger-wizard)."
 
 ```ruby
 require 'pry'

data/bin/danger

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-$LOAD_PATH.push File.expand_path("../../lib", __FILE__)
+$LOAD_PATH.push File.expand_path("../lib", __dir__)
 
 require "danger"
 Danger::Runner.run ARGV

data/lib/danger/ci_source/appcircle.rb

@@ -0,0 +1,83 @@
+# https://docs.appcircle.io/environment-variables/managing-variables
+# https://docs.appcircle.io/build/build-profile-configuration#environment-variables-configuration
+require "danger/request_sources/github/github"
+require "danger/request_sources/gitlab"
+module Danger
+  # ### CI Setup
+  #
+  # Add a Custom Script step to your workflow and set it as a bash:
+  #
+  # ```shell
+  #   cd $AC_REPOSITORY_DIR
+  #   bundle install
+  #   bundle exec danger
+  # ```
+  # ### Token Setup
+  #
+  # Login to Appcircle and select your build profile. Go to your *Config* and
+  # choose *Environment Variables*.
+  # https://docs.appcircle.io/environment-variables/managing-variables
+  #
+  # #### GitHub
+  # Add the `DANGER_GITHUB_API_TOKEN` to your profile's ENV.
+  #
+  # #### GitLab
+  # Add the `DANGER_GITLAB_API_TOKEN` to your profile's ENV.
+  #
+  # #### Bitbucket Cloud
+  # Add the `DANGER_BITBUCKETSERVER_USERNAME`, `DANGER_BITBUCKETSERVER_PASSWORD`
+  # to your profile's ENV.
+  #
+  # #### Bitbucket server
+  # Add the `DANGER_BITBUCKETSERVER_USERNAME`, `DANGER_BITBUCKETSERVER_PASSWORD`
+  # and `DANGER_BITBUCKETSERVER_HOST` to your profile's ENV.
+  #
+  class Appcircle < CI
+    def self.validates_as_ci?(env)
+      env.key? "AC_APPCIRCLE"
+    end
+
+    def self.validates_as_pr?(env)
+      return false unless env.key? "AC_PULL_NUMBER"
+
+      env["AC_PULL_NUMBER"].to_i > 0
+    end
+
+    def supported_request_sources
+      @supported_request_sources ||= [
+        Danger::RequestSources::GitHub,
+        Danger::RequestSources::BitbucketCloud,
+        Danger::RequestSources::BitbucketServer,
+        Danger::RequestSources::GitLab
+      ]
+    end
+
+    def initialize(env)
+      self.pull_request_id = env["AC_PULL_NUMBER"]
+      self.repo_url = env["AC_GIT_URL"]
+      self.repo_slug = repo_slug_from(self.repo_url)
+    end
+
+    def repo_slug_from(url)
+      if url =~ URI::DEFAULT_PARSER.make_regexp
+        # Try to parse the URL as a valid URI. This should cover the cases of http/https/ssh URLs.
+        begin
+          uri = URI.parse(url)
+          return uri.path.sub(%r{^(/)}, "").sub(/(.git)$/, "")
+        rescue URI::InvalidURIError
+          # In case URL could not be parsed fallback to git URL parsing.
+          repo_slug_asgiturl(url)
+        end
+      else
+        # In case URL could not be parsed fallback to git URL parsing. git@github.com:organization/repo.git
+        repo_slug_asgiturl(url)
+      end
+    end
+
+    def repo_slug_asgiturl(url)
+      matcher_url = url
+      repo_matches = matcher_url.match(%r{([/:])(([^/]+/)+[^/]+?)(\.git$|$)})[2]
+      return repo_matches unless repo_matches.nil?
+    end
+  end
+end

data/lib/danger/ci_source/appveyor.rb

@@ -42,6 +42,7 @@ module Danger
 
     def self.validates_as_pr?(env)
       return false unless env.key? "APPVEYOR_PULL_REQUEST_NUMBER"
+
       env["APPVEYOR_PULL_REQUEST_NUMBER"].to_i > 0
     end
 

data/lib/danger/ci_source/azure_pipelines.rb

@@ -1,6 +1,7 @@
 # https://docs.microsoft.com/en-us/azure/devops/pipelines/build/variables
 require "uri"
 require "danger/request_sources/github/github"
+require "danger/request_sources/vsts"
 
 module Danger
   # ### CI Setup
@@ -15,15 +16,28 @@ module Danger
   #
   # ### Token Setup
   #
-  # Add the `DANGER_GITHUB_API_TOKEN` to your environment variables.
+  # #### GitHub
+  #
+  # You need to add the `DANGER_GITHUB_API_TOKEN` environment variable, to do this, go to your build definition's variables tab.
+  #  #
+  # #### Azure Git
+  #
+  # You need to add the `DANGER_VSTS_API_TOKEN` and `DANGER_VSTS_HOST` environment variable, to do this,
+  # go to your build definition's variables tab. The `DANGER_VSTS_API_TOKEN` is your vsts personal access token.
+  # Instructions for creating a personal access token can be found [here](https://www.visualstudio.com/en-us/docs/setup-admin/team-services/use-personal-access-tokens-to-authenticate).
+  # For the `DANGER_VSTS_HOST` variable the suggested value is `$(System.TeamFoundationCollectionUri)$(System.TeamProject)`
+  # which will automatically get your vsts domain and your project name needed for the vsts api.
   #
   class AzurePipelines < CI
+
+
     def self.validates_as_ci?(env)
+      has_all_variables = ["AGENT_ID", "BUILD_SOURCEBRANCH", "BUILD_REPOSITORY_URI", "BUILD_REASON", "BUILD_REPOSITORY_NAME"].all? { |x| env[x] && !env[x].empty? }
+
       # AGENT_ID is being used by AppCenter as well, so checking here to make sure AppCenter CI doesn't get a false positive for AzurePipelines
       # Anyone working with AzurePipelines could provide a better/truly unique env key to avoid checking for AppCenter
-      !Danger::Appcenter::validates_as_ci?(env) &&
-      env.key?("AGENT_ID") &&
-      env["BUILD_REPOSITORY_PROVIDER"] != "TfsGit"
+      !Danger::Appcenter.validates_as_ci?(env) &&
+        has_all_variables
     end
 
     def self.validates_as_pr?(env)
@@ -35,7 +49,8 @@ module Danger
         Danger::RequestSources::GitHub,
         Danger::RequestSources::GitLab,
         Danger::RequestSources::BitbucketServer,
-        Danger::RequestSources::BitbucketCloud
+        Danger::RequestSources::BitbucketCloud,
+        Danger::RequestSources::VSTS
       ]
     end
 

data/lib/danger/ci_source/bamboo.rb

@@ -34,7 +34,7 @@ module Danger
     def initialize(env)
       self.repo_url = env["bamboo_planRepository_repositoryUrl"]
       self.pull_request_id = env["bamboo_repository_pr_key"]
-      repo_matches = self.repo_url.match(%r{([\/:])([^\/]+\/[^\/]+?)(\.git$|$)})
+      repo_matches = self.repo_url.match(%r{([/:])([^/]+/[^/]+?)(\.git$|$)})
       self.repo_slug = repo_matches[2] unless repo_matches.nil?
     end
   end

data/lib/danger/ci_source/bitbucket_pipelines.rb

@@ -16,7 +16,6 @@ module Danger
   # You can find them in Settings > Pipelines > Repository Variables
 
   class BitbucketPipelines < CI
-
     def self.validates_as_ci?(env)
       env.key? "BITBUCKET_BUILD_NUMBER"
     end
@@ -31,7 +30,7 @@ module Danger
 
     def initialize(env)
       self.repo_url = env["BITBUCKET_GIT_HTTP_ORIGIN"]
-      self.repo_slug = "#{env["BITBUCKET_REPO_OWNER"]}/#{env["BITBUCKET_REPO_SLUG"]}"
+      self.repo_slug = "#{env['BITBUCKET_REPO_OWNER']}/#{env['BITBUCKET_REPO_SLUG']}"
       self.pull_request_id = env["BITBUCKET_PR_ID"]
     end
   end

data/lib/danger/ci_source/bitrise.rb

@@ -19,13 +19,13 @@ module Danger
   #
   # Add the `DANGER_GITHUB_API_TOKEN` to your workflow's [Secret App Env Vars](https://blog.bitrise.io/anyone-even-prs-can-have-secrets).
   #
-  # ### bitbucket server and bitrsie
+  # ### bitbucket server and bitrise
   #
-  # Danger will read the environment variable GIT_REPOSITORY_URL to construct the Bitbucket Server API URL 
-  # finding the project and repo slug in the GIT_REPOSITORY_URL variable. This GIT_REPOSITORY_URL variable 
-  # comes from the App Settings tab for your Bitrsie App. If you are manually setting a repo URL in the 
-  # Git Clone Repo step, you may need to set adjust this propery in the settings tab, maybe even fake it.
-  # The patterns used are `(%r{\.com/(.*)})` and `(%r{\.com:(.*)})` and .split(/\.git$|$/) to remove ".git" if the URL contains it.  
+  # Danger will read the environment variable GIT_REPOSITORY_URL to construct the Bitbucket Server API URL
+  # finding the project and repo slug in the GIT_REPOSITORY_URL variable. This GIT_REPOSITORY_URL variable
+  # comes from the App Settings tab for your Bitrise App. If you are manually setting a repo URL in the
+  # Git Clone Repo step, you may need to set adjust this property in the settings tab, maybe even fake it.
+  # The patterns used are `(%r{\.com/(.*)})` and `(%r{\.com:(.*)})` and .split(/\.git$|$/) to remove ".git" if the URL contains it.
   #
   class Bitrise < CI
     def self.validates_as_ci?(env)
@@ -48,17 +48,17 @@ module Danger
     def initialize(env)
       self.pull_request_id = env["BITRISE_PULL_REQUEST"]
       self.repo_url = env["GIT_REPOSITORY_URL"]
-      
+
       matcher_url = self.repo_url
       self.repo_slug = repo_slug_from(self.repo_url)
     end
 
     def repo_slug_from(url)
-      if url =~ URI::regexp
+      if url =~ URI::DEFAULT_PARSER.make_regexp
         # Try to parse the URL as a valid URI. This should cover the cases of http/https/ssh URLs.
         begin
           uri = URI.parse(url)
-          return uri.path.sub(/^(\/)/,'').sub(/(.git)$/,'')
+          return uri.path.sub(%r{^(/)}, "").sub(/(.git)$/, "")
         rescue URI::InvalidURIError
           # In case URL could not be parsed fallback to git URL parsing.
           repo_slug_asgiturl(url)
@@ -71,7 +71,7 @@ module Danger
 
     def repo_slug_asgiturl(url)
       matcher_url = url
-      repo_matches = matcher_url.match(%r{([\/:])(([^\/]+\/)+[^\/]+?)(\.git$|$)})[2]
+      repo_matches = matcher_url.match(%r{([/:])(([^/]+/)+[^/]+?)(\.git$|$)})[2]
       return repo_matches unless repo_matches.nil?
     end
   end

data/lib/danger/ci_source/buildkite.rb

@@ -40,7 +40,7 @@ module Danger
       self.repo_url = env["BUILDKITE_REPO"]
       self.pull_request_id = env["BUILDKITE_PULL_REQUEST"]
 
-      repo_matches = self.repo_url.match(%r{([\/:])([^\/]+\/[^\/]+?)(\.git$|$)})
+      repo_matches = self.repo_url.match(%r{([/:])([^/]+/[^/]+?)(\.git$|$)})
       self.repo_slug = repo_matches[2] unless repo_matches.nil?
     end
 

data/lib/danger/ci_source/circle.rb

@@ -31,7 +31,7 @@ module Danger
   # to retrieve PR metadata, which will require an API token.
   #
   # 1. Go to your project > Settings > API Permissions. Create a token with scope "view-builds" and a label like "DANGER_CIRCLE_CI_API_TOKEN".
-  # 2. Settings > Environement Variables. Add the token as a CircleCI environment variable, which exposes it to the Danger process.
+  # 2. Settings > Environment Variables. Add the token as a CircleCI environment variable, which exposes it to the Danger process.
   #
   # There is no difference here for OSS vs Closed, both scenarios will need this environment variable.
   #

data/lib/danger/ci_source/circle_api.rb

@@ -36,6 +36,7 @@ module Danger
       build_json = fetch_build(repo_slug, build_number, token)
       pull_requests = build_json[:pull_requests]
       return nil unless pull_requests && pull_requests.first
+
       pull_requests.first[:url]
     end
 
@@ -44,8 +45,7 @@ module Danger
       url = "project/#{repo_slug}/#{build_number}"
       params = { "circle-token" => token }
       response = client.get url, params, accept: "application/json"
-      json = JSON.parse(response.body, symbolize_names: true)
-      json
+      JSON.parse(response.body, symbolize_names: true)
     end
   end
 end

data/lib/danger/ci_source/code_build.rb

@@ -5,6 +5,7 @@ module Danger
   # ### CI Setup
   #
   # In CodeBuild, make sure to correctly forward CODEBUILD_BUILD_ID, CODEBUILD_SOURCE_VERSION, CODEBUILD_SOURCE_REPO_URL and DANGER_GITHUB_API_TOKEN.
+  # In CodeBuild with batch builds, make sure to correctly forward CODEBUILD_BUILD_ID, CODEBUILD_WEBHOOK_TRIGGER, CODEBUILD_SOURCE_REPO_URL, CODEBUILD_BATCH_BUILD_IDENTIFIER and DANGER_GITHUB_API_TOKEN.
   #
   # ### Token Setup
   #
@@ -25,7 +26,11 @@ module Danger
 
     def initialize(env)
       self.repo_slug = self.class.extract_repo_slug(env)
-      self.pull_request_id = env["CODEBUILD_SOURCE_VERSION"].split("/")[1].to_i
+      if env["CODEBUILD_BATCH_BUILD_IDENTIFIER"]
+        self.pull_request_id = env["CODEBUILD_WEBHOOK_TRIGGER"].split("/")[1].to_i
+      else
+        self.pull_request_id = env["CODEBUILD_SOURCE_VERSION"].split("/")[1].to_i
+      end
       self.repo_url = self.class.extract_repo_url(env)
     end
 
@@ -34,7 +39,7 @@ module Danger
 
       gh_host = env["DANGER_GITHUB_HOST"] || "github.com"
 
-      env["CODEBUILD_SOURCE_REPO_URL"].gsub(%r{^.*?#{Regexp.escape(gh_host)}\/(.*?)(\.git)?$}, '\1')
+      env["CODEBUILD_SOURCE_REPO_URL"].gsub(%r{^.*?#{Regexp.escape(gh_host)}/(.*?)(\.git)?$}, '\1')
     end
 
     def self.extract_repo_url(env)
@@ -44,11 +49,20 @@ module Danger
     end
 
     def self.extract_pr_url(env)
-      return nil unless env.key? "CODEBUILD_SOURCE_VERSION"
-      return nil unless env.key? "CODEBUILD_SOURCE_REPO_URL"
-      return nil unless env["CODEBUILD_SOURCE_VERSION"].split("/").length == 2
+      if env["CODEBUILD_BATCH_BUILD_IDENTIFIER"]
+        return nil unless env.key? "CODEBUILD_WEBHOOK_TRIGGER"
+        return nil unless env.key? "CODEBUILD_SOURCE_REPO_URL"
+        return nil unless env["CODEBUILD_WEBHOOK_TRIGGER"].split("/").length == 2
+
+        event_type, pr_number = env["CODEBUILD_WEBHOOK_TRIGGER"].split("/")
+        return nil unless event_type == "pr"
+      else
+        return nil unless env.key? "CODEBUILD_SOURCE_VERSION"
+        return nil unless env.key? "CODEBUILD_SOURCE_REPO_URL"
+        return nil unless env["CODEBUILD_SOURCE_VERSION"].split("/").length == 2
 
-      _source_origin, pr_number = env["CODEBUILD_SOURCE_VERSION"].split("/")
+        _source_origin, pr_number = env["CODEBUILD_SOURCE_VERSION"].split("/")
+      end
       github_repo_url = env["CODEBUILD_SOURCE_REPO_URL"].gsub(/\.git$/, "")
 
       "#{github_repo_url}/pull/#{pr_number}"

data/lib/danger/ci_source/codefresh.rb

@@ -31,23 +31,17 @@ module Danger
       @supported_request_sources ||= [Danger::RequestSources::GitHub]
     end
 
-    def repo_slug
-      return "" if @env["CF_REPO_OWNER"].to_s.empty?
-      return "" if @env["CF_REPO_NAME"].to_s.empty?
-      "#{@env['CF_REPO_OWNER']}/#{@env['CF_REPO_NAME']}".downcase!
-    end
-
-    def repo_url
-      return "" if @env["CF_COMMIT_URL"].to_s.empty?
-      @env["CF_COMMIT_URL"].gsub(/\/commit.+$/, "")
-    end
+    def self.slug_from(env)
+      return "" if env["CF_REPO_OWNER"].to_s.empty?
+      return "" if env["CF_REPO_NAME"].to_s.empty?
 
-    def pull_request_id
-      @env["CF_PULL_REQUEST_NUMBER"]
+      "#{env['CF_REPO_OWNER']}/#{env['CF_REPO_NAME']}".downcase!
     end
 
     def initialize(env)
-      @env = env
+      self.repo_url = env["CF_COMMIT_URL"].to_s.gsub(%r{/commit.+$}, "")
+      self.repo_slug = self.class.slug_from(env)
+      self.pull_request_id = env["CF_PULL_REQUEST_NUMBER"]
     end
   end
 end

data/lib/danger/ci_source/concourse.rb

@@ -2,10 +2,10 @@ require "git"
 require "danger/request_sources/local_only"
 
 module Danger
-# Concourse CI Integration
-#
-# https://concourse-ci.org/
-#
+  # Concourse CI Integration
+  #
+  # https://concourse-ci.org/
+  #
   # ### CI Setup
   #
   # With Concourse, you run the docker images yourself, so you will want to add `yarn danger ci` within one of your build jobs.
@@ -56,6 +56,5 @@ module Danger
       end
       self.repo_url = GitRepo.new.origins
     end
-
   end
 end

data/lib/danger/ci_source/dotci.rb

@@ -21,17 +21,15 @@ module Danger
     end
 
     def supported_request_sources
-      @supported_request_sources ||= begin
-        [
-          Danger::RequestSources::GitHub
-        ]
-      end
+      @supported_request_sources ||= [
+        Danger::RequestSources::GitHub
+      ]
     end
 
     def initialize(env)
       self.repo_url = self.class.repo_url(env)
       self.pull_request_id = self.class.pull_request_id(env)
-      repo_matches = self.repo_url.match(%r{([\/:])([^\/]+\/[^\/]+)$})
+      repo_matches = self.repo_url.match(%r{([/:])([^/]+/[^/]+)$})
       self.repo_slug = repo_matches[2].gsub(/\.git$/, "") unless repo_matches.nil?
     end
 

data/lib/danger/ci_source/github_actions.rb

@@ -9,7 +9,7 @@ module Danger
   #  ```yml
   #  ...
   #    steps:
-  #      - uses: actions/checkout@v1
+  #      - uses: actions/checkout@v3
   #      - uses: danger/danger@master
   #        env:
   #          DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -22,7 +22,7 @@ module Danger
 
     def self.validates_as_pr?(env)
       value = env["GITHUB_EVENT_NAME"]
-      value == "pull_request" || value == "pull_request_target"
+      ["pull_request", "pull_request_target"].include?(value)
     end
 
     def supported_request_sources
@@ -32,12 +32,12 @@ module Danger
     def initialize(env)
       self.repo_slug = env["GITHUB_REPOSITORY"]
       pull_request_event = JSON.parse(File.read(env["GITHUB_EVENT_PATH"]))
-      self.pull_request_id = pull_request_event['number']
-      self.repo_url = pull_request_event['repository']['clone_url']
+      self.pull_request_id = pull_request_event["number"]
+      self.repo_url = pull_request_event["repository"]["clone_url"]
 
       # if environment variable DANGER_GITHUB_API_TOKEN is not set, use env GITHUB_TOKEN
-      if (env.key? "GITHUB_ACTION") && (!env.key? 'DANGER_GITHUB_API_TOKEN')
-        env['DANGER_GITHUB_API_TOKEN'] = env['GITHUB_TOKEN']
+      if (env.key? "GITHUB_ACTION") && (!env.key? "DANGER_GITHUB_API_TOKEN")
+        env["DANGER_GITHUB_API_TOKEN"] = env["GITHUB_TOKEN"]
       end
     end
   end

data/lib/danger/ci_source/gitlab_ci.rb

@@ -47,11 +47,11 @@ module Danger
       client = RequestSources::GitLab.new(nil, env).client
 
       client_version = Gem::Version.new(client.version.version)
-      if (client_version >= Gem::Version.new("10.7"))
-        #Use the 'list merge requests associated with a commit' API, for speeed
+      if client_version >= Gem::Version.new("10.7")
+        # Use the 'list merge requests associated with a commit' API, for speed
         # (GET /projects/:id/repository/commits/:sha/merge_requests) available for GitLab >= 10.7
         merge_request = client.commit_merge_requests(project_path, base_commit, state: :opened).first
-        if (client_version >= Gem::Version.new("13.8"))
+        if client_version >= Gem::Version.new("13.8")
           # Gitlab 13.8.0 started returning merge requests for merge commits and squashed commits
           # By checking for merge_request.state, we can ensure danger only comments on MRs which are open
           return 0 if merge_request.nil?
@@ -66,9 +66,17 @@ module Danger
       merge_request.nil? ? 0 : merge_request.iid
     end
 
+    def self.slug_from(env)
+      if env["DANGER_PROJECT_REPO_URL"]
+        env["DANGER_PROJECT_REPO_URL"].split("/").last(2).join("/")
+      else
+        env["CI_MERGE_REQUEST_PROJECT_PATH"] || env["CI_PROJECT_PATH"]
+      end
+    end
+
     def initialize(env)
-      @env = env
-      @repo_slug = slug_from(env)
+      self.repo_slug = self.class.slug_from(env)
+      self.pull_request_id = self.class.determine_pull_or_merge_request_id(env)
     end
 
     def supported_request_sources
@@ -77,19 +85,5 @@ module Danger
         Danger::RequestSources::GitLab
       ]
     end
-
-    def pull_request_id
-      @pull_request_id ||= self.class.determine_pull_or_merge_request_id(@env)
-    end
-
-    private
-
-    def slug_from(env)
-      if env["DANGER_PROJECT_REPO_URL"]
-        env["DANGER_PROJECT_REPO_URL"].split('/').last(2).join('/')
-      else
-        env["CI_MERGE_REQUEST_PROJECT_PATH"] || env["CI_PROJECT_PATH"]
-      end
-    end
   end
 end

data/lib/danger/ci_source/jenkins.rb

@@ -31,7 +31,7 @@ module Danger
   #
   # #### General
   #
-  # People occasionally see issues with Danger not classing your CI runs as a PR, to give you visibilty
+  # People occasionally see issues with Danger not classing your CI runs as a PR, to give you visibility
   # the Jenkins side of Danger expects to see one of these env vars:
   # - ghprbPullId
   # - CHANGE_ID
@@ -48,6 +48,7 @@ module Danger
   #
   class Jenkins < CI
     attr_accessor :project_url
+
     class EnvNotFound < StandardError
       def initialize
         super("ENV not found, please check your Jenkins. Related: https://stackoverflow.com/search?q=jenkins+env+null")
@@ -60,18 +61,16 @@ module Danger
 
     def self.validates_as_pr?(env)
       id = pull_request_id(env)
-      !id.nil? && !id.empty? && !!id.match(%r{^\d+$})
+      !id.nil? && !id.empty? && !!id.match(/^\d+$/)
     end
 
     def supported_request_sources
-      @supported_request_sources ||= begin
-        [
-          Danger::RequestSources::GitHub,
-          Danger::RequestSources::GitLab,
-          Danger::RequestSources::BitbucketServer,
-          Danger::RequestSources::BitbucketCloud
-        ]
-      end
+      @supported_request_sources ||= [
+        Danger::RequestSources::GitHub,
+        Danger::RequestSources::GitLab,
+        Danger::RequestSources::BitbucketServer,
+        Danger::RequestSources::BitbucketCloud
+      ]
     end
 
     def initialize(env)
@@ -85,29 +84,29 @@ module Danger
 
     def self.repo_slug(repo_url)
       slug = self.slug_ssh(repo_url)
-      slug = self.slug_http(repo_url) unless slug
-      slug = self.slug_bitbucket(repo_url) unless slug
-      slug = self.slug_fallback(repo_url) unless slug
+      slug ||= self.slug_http(repo_url)
+      slug ||= self.slug_bitbucket(repo_url)
+      slug ||= self.slug_fallback(repo_url)
       return slug.gsub(/\.git$/, "") unless slug.nil?
     end
 
     def self.slug_bitbucket(repo_url)
-      repo_matches = repo_url.match(%r{(?:[\/:])projects\/([^\/.]+)\/repos\/([^\/.]+)})
+      repo_matches = repo_url.match(%r{(?:[/:])projects/([^/.]+)/repos/([^/.]+)})
       return "#{repo_matches[1]}/#{repo_matches[2]}" if repo_matches
     end
 
     def self.slug_ssh(repo_url)
-      repo_matches = repo_url.match(%r{^git@.+:(.+)})
+      repo_matches = repo_url.match(/^git@.+:(.+)/)
       return repo_matches[1] if repo_matches
     end
 
     def self.slug_http(repo_url)
-      repo_matches = repo_url.match(%r{^https?.+(?>\.\w*\d*\/)(.+.git$)})
+      repo_matches = repo_url.match(%r{^https?.+(?>\.\w*\d*/)(.+.git$)})
       return repo_matches[1] if repo_matches
     end
 
     def self.slug_fallback(repo_url)
-      repo_matches = repo_url.match(%r{([\/:])([^\/]+\/[^\/]+)$})
+      repo_matches = repo_url.match(%r{([/:])([^/]+/[^/]+)$})
       return repo_matches[2]
     end
 
@@ -129,14 +128,14 @@ module Danger
       elsif env["CHANGE_URL"]
         change_url = env["CHANGE_URL"]
         case change_url
-        when %r{\/pull\/} # GitHub
-          matches = change_url.match(%r{(.+)\/pull\/[0-9]+})
+        when %r{/pull/} # GitHub
+          matches = change_url.match(%r{(.+)/pull/[0-9]+})
           matches[1] unless matches.nil?
-        when %r{\/merge_requests\/} # GitLab
-          matches = change_url.match(%r{(.+?)(\/-)?\/merge_requests\/[0-9]+})
+        when %r{/merge_requests/} # GitLab
+          matches = change_url.match(%r{(.+?)(/-)?/merge_requests/[0-9]+})
           matches[1] unless matches.nil?
-        when %r{\/pull-requests\/} # Bitbucket
-          matches = change_url.match(%r{(.+)\/pull-requests\/[0-9]+})
+        when %r{/pull-requests/} # Bitbucket
+          matches = change_url.match(%r{(.+)/pull-requests/[0-9]+})
           matches[1] unless matches.nil?
         else
           change_url