danger 8.1.0 → 8.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58ac1ecdfec8029d0fee2f4d6e0b63e975c56f1ced271f24fd8cf094f3e7e647
-  data.tar.gz: 65ef72507496b5c6d9d34da8473d5ba6006eba4338d84618a22bd95dd928b115
+  metadata.gz: 78727e10312d96889e8e0fe3dcf38c1ec9137932972eb2538f9d39e0c114ef1c
+  data.tar.gz: 57bbfff9bf004e91e3e900b87a80d34c3aebb749cc473e3a9496be8fd61652b2
 SHA512:
-  metadata.gz: 8717fee5c49cc4cb0835a7ce4d68755a3981f2e4e18529da14c49a7433b5a250a16097930b0ad342fbed6b0d020219b79795cb46da22b871f1d69b4aaaf3484e
-  data.tar.gz: 0b128cb7f4b2f6749a6e1f5c58dce9c17bf992f71660e86b3771f5b3797e1165fe4187d58cfb9eb4f343314ef4035c5fbc04936abaf2af32389c9a0522809887
+  metadata.gz: 7be9c56ed729037d9b2c557e9a349e4ba091226c2ff4caa2b37c8432bdf2c515f7343ce9cf744797d79681b8cbdf50e03584d91551da03aa82509884f151c461
+  data.tar.gz: dcfd5b78ad9d722a040737f7b0c64718d55297821ebf1d0bb3e78bddb46939d9331bc772b2cd398b00cadf33daff49e69001d1618fb2ece3e167185282e3a379

data/README.md

@@ -51,7 +51,7 @@ Some quick links: [Guides Index](https://danger.systems/guides.html), [DSL Refer
 
 Brilliant. So, let's get you set up.
 
-``` sh
+```sh
 git clone https://github.com/danger/danger.git
 cd danger
 bundle install

data/lib/danger/ci_source/appcenter.rb

@@ -7,7 +7,7 @@ module Danger
   #
   # Add a script step to your appcenter-post-build.sh:
   #
-  # ``` shell
+  # ```shell
   #   #!/usr/bin/env bash
   #   bundle install
   #   bundle exec danger

data/lib/danger/ci_source/appveyor.rb

@@ -3,6 +3,7 @@ module Danger
   # ### CI Setup
   #
   # Install dependencies and add a danger step to your `appveyor.yml`.
+  #
   # ```yaml
   # install:
   # - cmd: >-
@@ -19,6 +20,7 @@ module Danger
   # For public repositories, add your plain token to environment variables in `appveyor.yml`.
   # Encrypted environment variables will not be decrypted on PR builds.
   # see here: https://www.appveyor.com/docs/build-configuration/#secure-variables
+  #
   # ```yaml
   # environment:
   #   DANGER_GITHUB_API_TOKEN: <YOUR_TOKEN_HERE>
@@ -26,6 +28,7 @@ module Danger
   #
   # For private repositories, enter your token in `Settings>Environment>Environment variables>Add variable` and turn on `variable encryption`.
   # You will see encrypted variable text in `Settings>Export YAML` so just copy to your `appveyor.yml`.
+  #
   # ```yaml
   # environment:
   #   DANGER_GITHUB_API_TOKEN:

data/lib/danger/ci_source/azure_pipelines.rb

@@ -7,7 +7,7 @@ module Danger
   #
   # Add a script step:
   #
-  # ``` shell
+  # ```shell
   #   #!/usr/bin/env bash
   #   bundle install
   #   bundle exec danger
@@ -19,7 +19,7 @@ module Danger
   #
   class AzurePipelines < CI
     def self.validates_as_ci?(env)
-      env.key? "AGENT_ID"
+      env.key?("AGENT_ID") && env["BUILD_REPOSITORY_PROVIDER"] != "TfsGit"
     end
 
     def self.validates_as_pr?(env)

data/lib/danger/ci_source/bitbucket_pipelines.rb

@@ -2,6 +2,7 @@ module Danger
   # ### CI Setup
   #
   # Install dependencies and add a danger step to your `bitbucket-pipelines.yml`.
+  #
   # ```yaml
   #   script:
   #     - bundle exec danger --verbose

data/lib/danger/ci_source/buildkite.rb

@@ -9,7 +9,7 @@ module Danger
   # With BuildKite you run the server yourself, so you will want to run  it as a part of your build process.
   # It is common to have build steps, so we would recommend adding this to your scrip:
   #
-  #  ``` shell
+  #  ```shell
   #   echo "--- Running Danger"
   #   bundle exec danger
   #  ```

data/lib/danger/ci_source/circle.rb

@@ -19,7 +19,7 @@ module Danger
   #
   # e.g.
   #
-  #  ``` yaml
+  #  ```yaml
   #  - run: bundle exec danger --verbose
   #  ```
   #

data/lib/danger/ci_source/codemagic.rb

@@ -0,0 +1,58 @@
+# https://docs.codemagic.io/building/environment-variables/
+
+module Danger
+  # ### CI Setup
+  #
+  # Add a script step to your workflow:
+  #
+  # ```
+  # - name: Running Danger
+  #   script: |
+  #     bundle install
+  #     bundle exec danger
+  # ```
+  #
+  # ### Token Setup
+  #
+  # Add the following environment variables to your workflow's environment configuration.
+  # https://docs.codemagic.io/getting-started/yaml/
+  #
+  # #### GitHub
+  # Add the `DANGER_GITHUB_API_TOKEN` to your build user's ENV.
+  #
+  # #### GitLab
+  # Add the `DANGER_GITLAB_API_TOKEN` to your build user's ENV.
+  #
+  # #### Bitbucket Cloud
+  # Add the `DANGER_BITBUCKETSERVER_USERNAME`, `DANGER_BITBUCKETSERVER_PASSWORD`
+  # to your build user's ENV.
+  #
+  # #### Bitbucket server
+  # Add the `DANGER_BITBUCKETSERVER_USERNAME`, `DANGER_BITBUCKETSERVER_PASSWORD`
+  # and `DANGER_BITBUCKETSERVER_HOST` to your build user's ENV.
+  #
+  class Codemagic < CI
+    def self.validates_as_ci?(env)
+      env.key? "FCI_PROJECT_ID"
+    end
+
+    def self.validates_as_pr?(env)
+      return !env["FCI_PULL_REQUEST_NUMBER"].to_s.empty?
+    end
+
+    def supported_request_sources
+      @supported_request_sources ||= [
+        Danger::RequestSources::GitHub,
+        Danger::RequestSources::GitLab,
+        Danger::RequestSources::BitbucketServer,
+        Danger::RequestSources::BitbucketCloud
+      ]
+    end
+
+    def initialize(env)
+      self.pull_request_id = env["FCI_PULL_REQUEST_NUMBER"]
+      self.repo_slug = env["FCI_REPO_SLUG"]
+      self.repo_url = GitRepo.new.origins # Codemagic doesn't provide a repo url env variable for n
+    end
+  end
+end

data/lib/danger/ci_source/concourse.rb

@@ -0,0 +1,61 @@
+require "git"
+require "danger/request_sources/local_only"
+
+module Danger
+# 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.
+  #
+  #   ```shell
+  #    build:
+  #      image: golang
+  #        commands:
+  #          - ...
+  #          - yarn danger ci
+  #   ```
+  #
+  # ### Environment Variable Setup
+  #
+  # As this is self-hosted, you will need to add the `CONCOURSE` environment variable `export CONCOURSE=true` to your build environment,
+  # as well as setting environment variables for `PULL_REQUEST_ID` and `REPO_SLUG`. Assuming you are using the github pull request resource
+  # https://github.com/jtarchie/github-pullrequest-resource the id of the PR can be accessed from `git config --get pullrequest.id`.
+  #
+  # ### Token Setup
+  #
+  # Once again as this is self-hosted, you will need to add `DANGER_GITHUB_API_TOKEN` environment variable to the build environment.
+  # The suggested method of storing the token is within the vault - https://concourse-ci.org/creds.html
+
+  class Concourse < CI
+    def self.validates_as_ci?(env)
+      env.key? "CONCOURSE"
+    end
+
+    def self.validates_as_pr?(env)
+      exists = ["PULL_REQUEST_ID", "REPO_SLUG"].all? { |x| env[x] && !env[x].empty? }
+      exists && env["PULL_REQUEST_ID"].to_i > 0
+    end
+
+    def supported_request_sources
+      @supported_request_sources ||= [
+        Danger::RequestSources::GitHub,
+        Danger::RequestSources::GitLab,
+        Danger::RequestSources::BitbucketServer,
+        Danger::RequestSources::BitbucketCloud
+      ]
+    end
+
+    def initialize(env)
+      self.repo_slug = env["REPO_SLUG"]
+
+      if env["PULL_REQUEST_ID"].to_i > 0
+        self.pull_request_id = env["PULL_REQUEST_ID"]
+      end
+      self.repo_url = GitRepo.new.origins
+    end
+
+  end
+end

data/lib/danger/ci_source/drone.rb

@@ -8,7 +8,7 @@ module Danger
   # With Drone you run the docker images yourself, so you will want to add `bundle exec danger` at the end of
   # your `.drone.yml`.
   #
-  #  ``` shell
+  #  ```shell
   #   build:
   #     image: golang
   #     commands:
@@ -24,7 +24,7 @@ module Danger
   # Drone secrets: http://readme.drone.io/usage/secret-guide/
   # NOTE: This is a new syntax in DroneCI 0.6+
   #
-  # ```
+  # ```yml
   #   build:
   #     image: golang
   #     secrets:

data/lib/danger/ci_source/github_actions.rb

@@ -6,7 +6,7 @@ module Danger
   # You can use `danger/danger` Action in your `.github/workflows/xxx.yml`.
   # And so, you can use GITHUB_TOKEN secret as `DANGER_GITHUB_API_TOKEN` environment variable.
   #
-  #  ```
+  #  ```yml
   #  ...
   #    steps:
   #      - uses: actions/checkout@v1
@@ -21,7 +21,8 @@ module Danger
     end
 
     def self.validates_as_pr?(env)
-      env["GITHUB_EVENT_NAME"] == "pull_request"
+      value = env["GITHUB_EVENT_NAME"]
+      value == "pull_request" || value == "pull_request_target"
     end
 
     def supported_request_sources

data/lib/danger/ci_source/gitlab_ci.rb

@@ -7,6 +7,7 @@ module Danger
   # ### CI Setup
   #
   # Install dependencies and add a danger step to your .gitlab-ci.yml:
+  #
   # ```yml
   # before_script:
   #  - bundle install
@@ -14,6 +15,7 @@ module Danger
   #   script:
   #    - bundle exec danger
   # ```
+  #
   # ### Token Setup
   #
   # Add the `DANGER_GITLAB_API_TOKEN` to your pipeline env variables if you
@@ -44,10 +46,17 @@ module Danger
       base_commit = env["CI_COMMIT_SHA"]
       client = RequestSources::GitLab.new(nil, env).client
 
-      if (Gem::Version.new(client.version.version) >= Gem::Version.new("10.7"))
+      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
         # (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"))
+          # 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?
+          return 0 unless merge_request.state == "opened"
+        end
       else
         merge_requests = client.merge_requests(project_path, state: :opened)
         merge_request = merge_requests.auto_paginate.find do |mr|

data/lib/danger/ci_source/jenkins.rb

@@ -133,7 +133,7 @@ module Danger
           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]+})
+          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]+})

data/lib/danger/ci_source/screwdriver.rb

@@ -6,7 +6,8 @@ module Danger
   # ### CI Setup
   #
   # Install dependencies and add a danger step to your screwdriver.yaml:
-  # ``` yml
+  #
+  # ```yml
   # jobs:
   #   danger:
   #     requires: [~pr, ~commit]

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

@@ -1,17 +1,19 @@
-class Commits
-  def initialize(base_head)
-    @base_head = base_head.strip.split(" ".freeze)
-  end
+module Danger
+  class Commits
+    def initialize(base_head)
+      @base_head = base_head.strip.split(" ".freeze)
+    end
 
-  def base
-    base_head.first
-  end
+    def base
+      base_head.first
+    end
 
-  def head
-    base_head.last
-  end
+    def head
+      base_head.last
+    end
 
-  private
+    private
 
-  attr_reader :base_head
+    attr_reader :base_head
+  end
 end

data/lib/danger/ci_source/teamcity.rb

@@ -27,6 +27,7 @@ module Danger
   # branch="%teamcity.build.branch%"
   # export GITHUB_PULL_REQUEST_ID=(${branch//\// })
   # ```
+  #
   # Or if you are using the pull request feature you can set an environment parameter called `GITHUB_PULL_REQUEST_ID`
   # to the value of: `%teamcity.pullRequest.number`
   #
@@ -59,6 +60,7 @@ module Danger
   #
   # You will also need to set the `BITBUCKET_BRANCH_NAME` environment variable.
   # TeamCity provides `%teamcity.build.branch%`, which you can use at the top of your Simple Command Runner:
+  #
   # ```sh
   # export BITBUCKET_BRANCH_NAME="%teamcity.build.branch%"
   # ```

data/lib/danger/commands/dangerfile/init.rb

@@ -4,7 +4,7 @@ require "danger/danger_core/dangerfile_generator"
 
 module Danger
   class DangerfileCommand < Runner
-    self.summary = "Easily create you Dangerfiles."
+    self.summary = "Easily create your Dangerfiles."
     self.command = "dangerfile"
 
     self.abstract_command = true

data/lib/danger/commands/dry_run.rb

@@ -22,7 +22,7 @@ module Danger
       super
 
       if argv.flag?("pry", false)
-        @dangerfile_path = PrySetup.new(cork).setup_pry(@dangerfile_path)
+        @dangerfile_path = PrySetup.new(cork).setup_pry(@dangerfile_path, DryRun.command)
       end
     end
 

data/lib/danger/commands/init.rb

@@ -277,7 +277,7 @@ module Danger
       ui.say "- You can look at the following Dangerfiles to get some more ideas:"
       ui.pause 0.6
       ui.link "https://github.com/danger/danger/blob/master/Dangerfile"
-      ui.link "https://github.com/artsy/eigen/blob/master/Dangerfile"
+      ui.link "https://github.com/artsy/eigen/blob/master/dangerfile.ts"
       ui.pause 1
     end
 

data/lib/danger/commands/local.rb

@@ -32,7 +32,7 @@ module Danger
       super
 
       if argv.flag?("pry", false)
-        @dangerfile_path = PrySetup.new(cork).setup_pry(@dangerfile_path)
+        @dangerfile_path = PrySetup.new(cork).setup_pry(@dangerfile_path, Local.command)
       end
     end
 

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

@@ -4,9 +4,9 @@ module Danger
       @cork = cork
     end
 
-    def setup_pry(dangerfile_path)
+    def setup_pry(dangerfile_path, command)
       return dangerfile_path if dangerfile_path.empty?
-      validate_pry_available
+      validate_pry_available(command)
       FileUtils.cp dangerfile_path, DANGERFILE_COPY
       File.open(DANGERFILE_COPY, "a") do |f|
         f.write("\nbinding.pry; File.delete(\"#{DANGERFILE_COPY}\")")
@@ -20,10 +20,10 @@ module Danger
 
     DANGERFILE_COPY = "_Dangerfile.tmp".freeze
 
-    def validate_pry_available
+    def validate_pry_available(command)
       Kernel.require "pry"
     rescue LoadError
-      cork.warn "Pry was not found, and is required for 'danger pr --pry'."
+      cork.warn "Pry was not found, and is required for 'danger #{command} --pry'."
       cork.print_warnings
       abort
     end

data/lib/danger/commands/pr.rb

@@ -37,7 +37,7 @@ module Danger
       @dangerfile_path = dangerfile if File.exist?(dangerfile)
 
       if argv.flag?("pry", false)
-        @dangerfile_path = PrySetup.new(cork).setup_pry(@dangerfile_path)
+        @dangerfile_path = PrySetup.new(cork).setup_pry(@dangerfile_path, PR.command)
       end
     end
 

data/lib/danger/commands/staging.rb

@@ -23,7 +23,7 @@ module Danger
       super
 
       if argv.flag?("pry", false)
-        @dangerfile_path = PrySetup.new(cork).setup_pry(@dangerfile_path)
+        @dangerfile_path = PrySetup.new(cork).setup_pry(@dangerfile_path, Staging.command)
       end
     end
 

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

@@ -17,10 +17,5 @@
 <%= current %>
 <%# the previous line has to be aligned far to the left, otherwise markdown can break easily %>
 <%- end -%>
-<%# We need to add the generated_by_ to identify comments from danger. But with inlines %>
-<%# it might be a little annoying, so we set on the table, but if we have markdown we add the footer anyway %>
-<%- if @markdowns.count > 0 -%>
-<p align="right" data-meta="generated_by_<%= @danger_id %>">
-  Generated by :no_entry_sign: <a href="http://danger.systems/">Danger</a>
-</p>
-<%- end -%>
+<%# Add the generated_by_ as a html coment to identify comments from danger. %>
+<!-- "generated_by_<%= @danger_id %>" -->

data/lib/danger/danger_core/dangerfile.rb

@@ -49,22 +49,26 @@ module Danger
     # However, as we're using using them in the DSL, they won't
     # get method_missing called correctly without overriding them.
 
-    def warn(*args, &blk)
-      method_missing(:warn, *args, &blk)
+    def warn(*args, **kargs, &blk)
+      method_missing(:warn, *args, **kargs, &blk)
     end
 
-    def fail(*args, &blk)
-      method_missing(:fail, *args, &blk)
+    def fail(*args, **kargs, &blk)
+      method_missing(:fail, *args, **kargs, &blk)
     end
 
     # 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, &_block)
+    def method_missing(method_sym, *arguments, **keyword_arguments, &_block)
       @core_plugins.each do |plugin|
         if plugin.public_methods(false).include?(method_sym)
-          return plugin.send(method_sym, *arguments)
+          if keyword_arguments.empty?
+            return plugin.send(method_sym, *arguments)
+          else
+            return plugin.send(method_sym, *arguments, **keyword_arguments)
+          end
         end
       end
       super

data/lib/danger/danger_core/environment_manager.rb

@@ -90,6 +90,8 @@ module Danger
         RequestSources::GitLab
       elsif repo_url =~ /bitbucket\.(org|com)/i
         RequestSources::BitbucketCloud
+      elsif repo_url =~ /dev\.azure\.com/i
+        RequestSources::VSTS
       end
     end
 

data/lib/danger/danger_core/plugins/dangerfile_bitbucket_cloud_plugin.rb

@@ -97,7 +97,7 @@ module Danger
     # @return [String]
     #
     def pr_author
-      @bs.pr_json[:author][:username]
+      @bs.pr_json[:author][:nickname]
     end
 
     # @!group PR Commit Metadata

data/lib/danger/danger_core/plugins/dangerfile_danger_plugin.rb

@@ -33,6 +33,11 @@ module Danger
   #
   #          danger.import_dangerfile(github: "ruby-grape/danger", branch: "custom", path: "path/to/Dangerfile")
   #
+  # @example Import a plugin available over HTTP
+  #
+  #          custom_url = "https://custom.bitbucket.com/project-name/Dangerfile?raw"
+  #          danger.import_dangerfile(url: custom_url)
+  #
   # @see  danger/danger
   # @tags core, plugins
 
@@ -84,8 +89,10 @@ module Danger
           import_dangerfile_from_path(opts[:path])
         elsif opts.key?(:gem)
           import_dangerfile_from_gem(opts[:gem])
+        elsif opts.key?(:url)
+          import_dangerfile_from_url(opts[:url])
         else
-          raise "`import` requires a Hash with either :github, :gitlab, :gem, or :path"
+          raise "`import` requires a Hash with either :github, :gitlab, :gem, :path or :url"
         end
       else
         raise "`import` requires a Hash"
@@ -180,6 +187,19 @@ module Danger
       @dangerfile.parse(Pathname.new(local_path))
     end
 
+    # @!group Danger
+    # Download and execute a remote Dangerfile.
+    #
+    # @param    [String] url
+    #           A https url where the Dangerfile is.
+    # @return   [void]
+    #
+    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
+
     # @!group Plugins
     # Download a local or remote plugin or Dangerfile.
     # This method will not import the file for you, use plugin.import instead

data/lib/danger/danger_core/plugins/dangerfile_github_plugin.rb

@@ -143,6 +143,14 @@ module Danger
       @github.issue_json["labels"].map { |l| l[:name] }
     end
 
+    # @!group PR Metadata
+    # Whether the PR is a Draft.
+    # @return [Boolean]
+    #
+    def pr_draft?
+      pr_json["mergeable_state"] == "draft"
+    end
+
     # @!group PR Commit Metadata
     # The branch to which the PR is going to be merged into.
     # @return [String]

data/lib/danger/danger_core/plugins/dangerfile_gitlab_plugin.rb

@@ -131,6 +131,14 @@ module Danger
       @gitlab.mr_diff
     end
 
+    # @!group MR Changes
+    # The array of changes
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    #
+    def mr_changes
+      @gitlab.mr_changes.changes
+    end
+
     # @!group MR Commit Metadata
     # The branch to which the MR is going to be merged into
     # @deprecated Please use {#branch_for_base} instead

data/lib/danger/plugin_support/plugin.rb

@@ -19,8 +19,12 @@ module Danger
     # We need to redirect the self calls to the Dangerfile
 
     # rubocop:disable Style/MethodMissing
-    def method_missing(method_sym, *arguments, &block)
-      @dangerfile.send(method_sym, *arguments, &block)
+    def method_missing(method_sym, *arguments, **keyword_arguments, &block)
+      if keyword_arguments.empty?
+        @dangerfile.send(method_sym, *arguments, &block)
+      else
+        @dangerfile.send(method_sym, *arguments, **keyword_arguments, &block)
+      end
     end
 
     def self.all_plugins

data/lib/danger/request_sources/bitbucket_cloud_api.rb

@@ -57,7 +57,8 @@ module Danger
       def fetch_comments
         values = []
         # TODO: use a url parts encoder to encode the query
-        uri = "#{pr_api_endpoint}/comments?pagelen=100&q=deleted+%7E+false+AND+user.username+%7E+%22#{@username}%22"
+        corrected_uuid = @my_uuid[1...-1] if !@my_uuid.nil? # Endpoint doesnt support curly brackets for this, so remove them for this
+        uri = "#{pr_api_endpoint}/comments?pagelen=100&q=deleted+%7E+false+AND+user.uuid+%7E+%22#{corrected_uuid}%22"
 
         while uri
           json = fetch_json(URI(uri))
@@ -94,12 +95,13 @@ module Danger
         "#{base_url(2)}/#{pull_request_id}"
       end
 
-      def prs_api_endpoint(branch_name)
-        "#{base_url(2)}?q=source.branch.name=\"#{branch_name}\""
+      def prs_api_url(branch_name)
+        encoded_branch_name = URI.encode_www_form_component(branch_name)
+        "#{base_url(2)}?q=source.branch.name=\"#{encoded_branch_name}\""
       end
 
       def fetch_pr_from_branch(branch_name)
-        uri = URI(URI.escape(prs_api_endpoint(branch_name)))
+        uri = URI(prs_api_url(branch_name))
         fetch_json(uri)[:values][0][:id]
       end
 

data/lib/danger/request_sources/gitlab.rb

@@ -85,7 +85,7 @@ module Danger
           if supports_inline_comments
             @raw_comments = mr_discussions
               .auto_paginate
-              .flat_map { |discussion| discussion.notes.map { |note| note.merge({"discussion_id" => discussion.id}) } }
+              .flat_map { |discussion| discussion.notes.map { |note| note.to_h.merge({"discussion_id" => discussion.id}) } }
             @raw_comments
               .map { |comment| Comment.from_gitlab(comment) }
           else
@@ -206,10 +206,10 @@ module Danger
           markdowns: markdowns
         )
 
-        rest_inline_violations = submit_inline_comments!({
+        rest_inline_violations = submit_inline_comments!(**{
           danger_id: danger_id,
           previous_violations: previous_violations
-        }.merge(**inline_violations))
+        }.merge(inline_violations))
 
         main_violations = merge_violations(
           regular_violations, rest_inline_violations
@@ -224,11 +224,11 @@ module Danger
 
         # If there are still violations to show
         if main_violations_sum.any?
-          body = generate_comment({
+          body = generate_comment(**{
             template: "gitlab",
             danger_id: danger_id,
             previous_violations: previous_violations
-          }.merge(**main_violations))
+          }.merge(main_violations))
 
           comment_result =
             if should_create_new_comment
@@ -359,7 +359,7 @@ module Danger
       def submit_inline_comments!(warnings: [], errors: [], messages: [], markdowns: [], previous_violations: [], danger_id: "danger")
         comments = mr_discussions
           .auto_paginate
-          .flat_map { |discussion| discussion.notes.map { |note| note.merge({"discussion_id" => discussion.id}) } }
+          .flat_map { |discussion| discussion.notes.map { |note| note.to_h.merge({"discussion_id" => discussion.id}) } }
           .select { |comment| Comment.from_gitlab(comment).inline? }
 
         danger_comments = comments.select { |comment| Comment.from_gitlab(comment).generated_by_danger?(danger_id) }
@@ -410,7 +410,7 @@ module Danger
           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)
-          
+
           # Once we know we're gonna submit it, we format it
           if is_markdown_content
             body = generate_inline_markdown_body(m, danger_id: danger_id, template: "gitlab")
@@ -531,10 +531,10 @@ module Danger
       end
 
       def is_out_of_range(changes, message)
-        change = changes.find { |c| c["new_path"] == message.file }  
+        change = changes.find { |c| c["new_path"] == message.file }
         # If there is no changes or rename only or deleted, return out of range.
         return true if change.nil? || change["diff"].empty? || change["deleted_file"]
-        
+
         # If new file then return in range
         return false if change["new_file"]
 
@@ -544,7 +544,7 @@ module Danger
         return true
       end
 
-      def generate_addition_lines(diff) 
+      def generate_addition_lines(diff)
         range_header_regexp = /@@ -(?<old>[0-9]+)(,([0-9]+))? \+(?<new>[0-9]+)(,([0-9]+))? @@.*/
         addition_lines = []
         line_number = 0

data/lib/danger/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: danger
 version: !ruby/object:Gem::Version
-  version: 8.1.0
+  version: 8.3.1
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-17 00:00:00.000000000 Z
+date: 2021-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -147,16 +147,22 @@ dependencies:
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: cork
   requirement: !ruby/object:Gem::Requirement
@@ -213,7 +219,9 @@ files:
 - lib/danger/ci_source/cirrus.rb
 - lib/danger/ci_source/code_build.rb
 - lib/danger/ci_source/codefresh.rb
+- lib/danger/ci_source/codemagic.rb
 - lib/danger/ci_source/codeship.rb
+- lib/danger/ci_source/concourse.rb
 - lib/danger/ci_source/dotci.rb
 - lib/danger/ci_source/drone.rb
 - lib/danger/ci_source/github_actions.rb