danger 8.0.0 → 8.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3b6f9601656ae8375f6d969a8373929c01cf775026265bb39d166ae14a7b0ca
-  data.tar.gz: 526db851e4c8e4c2e384ff7b7528e6af1940763e09e54be1f584d65d84e0457e
+  metadata.gz: f6ea9c4a38578c0c9cd6e762b689010bce9de3bc6479134cce2f6c45afdce925
+  data.tar.gz: 4f131339c436c4ee163660341e0471c0c456b0251da17c6a5f5511f2fc3ac708
 SHA512:
-  metadata.gz: c8d2ed37e5f92ecebf26e41b45ada5d05a14e4cacd829fce44a12761c836436174b4c937853c1a508959840fc97a89cf4c7c9a0fb7dda421b233fc09b4b2574b
-  data.tar.gz: 73cec59a753875a0af2984b8036733502ae552031afd7fbcd5ab485a65d75e76c0a764aa7108ceab5a141a42bb42ceb1fef89bdc7743acdb27988a424fa6ae59
+  metadata.gz: 93226e7a7fe9b4300efb93ac07e59932eda1b25cae739f1f48d132f0d77f9d5f6a861d226785981f6580587cfd11380db5ec4e0935adea7c3707f35a5dc2af3d
+  data.tar.gz: 7cca48807d7cb110180f88b62d1af13591ba83791f0f1528384dcd2c4c3247394fec2abfb9c1bc592e496659d3d14f6f46e1813af125570c967713b9d602251c

data/lib/danger/ci_source/bitrise.rb

@@ -50,16 +50,29 @@ module Danger
       self.repo_url = env["GIT_REPOSITORY_URL"]
       
       matcher_url = self.repo_url
+      self.repo_slug = repo_slug_from(self.repo_url)
+    end
 
-      #If the URL contains https:// as :// leads to inaccurate matching. So we remove it and proceed to match.
-      if repo_url.include? "https://"
-        matcher_url["https://"] = ''
+    def repo_slug_from(url)
+      if url =~ URI::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)$/,'')
+        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]
-
-      self.repo_slug = repo_matches unless repo_matches.nil?
-      
+      return repo_matches unless repo_matches.nil?
     end
   end
 end

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
 

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?
@@ -204,7 +208,7 @@ module Danger
         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
@@ -223,7 +227,7 @@ module Danger
             template: "gitlab",
             danger_id: danger_id,
             previous_violations: previous_violations
-          }.merge(main_violations))
+          }.merge(**main_violations))
 
           comment_result =
             if should_create_new_comment

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 = "8.0.0".freeze
+  VERSION = "8.0.5".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.0.0
+  version: 8.0.5
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -107,14 +107,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: kramdown-parser-gfm
   requirement: !ruby/object:Gem::Requirement