danger 7.0.1 → 8.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63dbe2ade63bf454f001702c2f0c3f478edd5a8cb060d2f417992da1f989ecdb
-  data.tar.gz: a2dd9e0b5aacf4e28d03249721ed60f9dd1db93aca597e6eb6aaf087fe9dea0a
+  metadata.gz: 24f1ad8fc490aea6b75f155f5acb47d5b126c23b7bab8392080557dca1bee597
+  data.tar.gz: 88c387703dcb3efc9fed05f38fa03ec2ba2b46a69cc287a9d368750b48d155ca
 SHA512:
-  metadata.gz: d3205f7b0a508ff32fe0fac7b24b3a6b54aac5f272ff80b3594175a79e3eaa0967a05cd697c190883c759a2518e06c745b7e9089453dbb16b7b23848e531906c
-  data.tar.gz: dc10f9b37711f33c1e92c128796f0da53b5d9f03f0d68e089d00360143fa552d96dbf30cf35285323d93d8c8b1e936d2b9429579d358cb28f5057eef77aeb94c
+  metadata.gz: 17bbad4f7cc06de57c08ff9360dd591084959c3f23d40ed58481f8bc5aa82036a04d3376cf5fdc8f50400e0733e18bc85e0db0631a8da0cb3ea27b692697c105
+  data.tar.gz: 1da0fe48081c9fa19acc9bb7df3df1ae2efe4b919f38656503e52f52ed6142ea17499a5928bc47ba5fb352370bbb2152e4cf969c44b87dbef0d6250526349ee6

data/lib/danger/ci_source/gitlab_ci.rb

@@ -1,5 +1,6 @@
 # http://docs.gitlab.com/ce/ci/variables/README.html
 require "uri"
+require "danger/request_sources/github/github"
 require "danger/request_sources/gitlab"
 
 module Danger
@@ -15,10 +16,13 @@ module Danger
   # ```
   # ### Token Setup
   #
-  # Add the `DANGER_GITLAB_API_TOKEN` to your pipeline env variables.
-  class GitLabCI < CI
-    attr_reader :project_url
+  # Add the `DANGER_GITLAB_API_TOKEN` to your pipeline env variables if you
+  # are hosting your code on GitLab. If you are using GitLab as a mirror
+  # for the purpose of CI/CD, while hosting your repo on GitHub, set the
+  # `DANGER_GITHUB_API_TOKEN` as well as the project repo URL to
+  # `DANGER_PROJECT_REPO_URL`.
 
+  class GitLabCI < CI
     def self.validates_as_ci?(env)
       env.key? "GITLAB_CI"
     end
@@ -28,11 +32,12 @@ module Danger
         "GITLAB_CI", "CI_PROJECT_PATH"
       ].all? { |x| env[x] }
 
-      exists && determine_merge_request_id(env).to_i > 0
+      exists && determine_pull_or_merge_request_id(env).to_i > 0
     end
 
-    def self.determine_merge_request_id(env)
+    def self.determine_pull_or_merge_request_id(env)
       return env["CI_MERGE_REQUEST_IID"] if env["CI_MERGE_REQUEST_IID"]
+      return env["CI_EXTERNAL_PULL_REQUEST_IID"] if env["CI_EXTERNAL_PULL_REQUEST_IID"]
       return 0 unless env["CI_COMMIT_SHA"]
 
       project_path = env["CI_MERGE_REQUEST_PROJECT_PATH"] || env["CI_PROJECT_PATH"]
@@ -54,16 +59,28 @@ module Danger
 
     def initialize(env)
       @env = env
-      @repo_slug = env["CI_MERGE_REQUEST_PROJECT_PATH"] || env["CI_PROJECT_PATH"]
-      @project_url = env["CI_MERGE_REQUEST_PROJECT_URL"] || env["CI_PROJECT_URL"]
+      @repo_slug = slug_from(env)
     end
 
     def supported_request_sources
-      @supported_request_sources ||= [Danger::RequestSources::GitLab]
+      @supported_request_sources ||= [
+        Danger::RequestSources::GitHub,
+        Danger::RequestSources::GitLab
+      ]
     end
 
     def pull_request_id
-      @pull_request_id ||= self.class.determine_merge_request_id(@env)
+      @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/teamcity.rb

@@ -27,6 +27,8 @@ 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`
   #
   # #### GitLab
   #

data/lib/danger/helpers/comments_helper.rb

@@ -49,8 +49,8 @@ module Danger
         message = "#{markdown_link_to_message(violation, hide_link)}#{message}" if violation.file && violation.line
 
         html = markdown_parser(message).to_html
-        # Remove the outer `<p>`, the -5 represents a newline + `</p>`
-        html = html[3...-5] if html.start_with? "<p>"
+        # Remove the outer `<p>` and `</p>`.
+        html = html.strip.sub(%r{\A<p>(.*)</p>\z}m, '\1')
         Violation.new(html, violation.sticky, violation.file, violation.line)
       end
 
@@ -128,7 +128,7 @@ module Danger
       def generate_inline_comment_body(emoji,
                                        message,
                                        danger_id: "danger",
-                                       resolved: [],
+                                       resolved: false,
                                        template: "github")
         apply_template(
           tables: [{ content: [message], resolved: resolved, emoji: emoji }],

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

@@ -40,6 +40,10 @@ module Danger
         end
       end
 
+      def validates_as_ci?
+        true
+      end
+
       def validates_as_api_source?
         (@token && !@token.empty?) || self.environment["DANGER_USE_LOCAL_GIT"]
       end

data/lib/danger/request_sources/gitlab.rb

@@ -50,7 +50,11 @@ module Danger
         includes_port = self.host.include? ":"
         raise "Port number included in `DANGER_GITLAB_HOST`, this will fail with GitLab CI Runners" if includes_port
 
-        super
+        # We don't call super because in some cases the Git remote doesn't match the GitLab instance host.
+        # In Danger::EnvironmentManager#initialize we still check that the request source is #validates_as_api_source?
+        # so that should be sufficient to validate GitLab as request source.
+        # See https://github.com/danger/danger/issues/1231 and https://gitlab.com/gitlab-com/gl-infra/infrastructure/-/issues/10069.
+        true
       end
 
       def validates_as_api_source?

data/lib/danger/scm_source/git_repo.rb

@@ -135,7 +135,7 @@ module Danger
       git_in_depth_fetch
       possible_merge_base = possible_merge_base(repo, from, to)
 
-      raise "Cannot find a merge base between #{from} and #{to}." unless possible_merge_base
+      raise "Cannot find a merge base between #{from} and #{to}. If you are using shallow clone/fetch, try increasing the --depth" unless possible_merge_base
 
       possible_merge_base
     end

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "7.0.1".freeze
+  VERSION = "8.0.4".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: 7.0.1
+  version: 8.0.4
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -325,7 +325,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="