danger 5.10.1 → 5.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 634667961b9759c0b6fa27c7c2744d2271c7ac9c12114b58471f382d0d9470f1
-  data.tar.gz: 6f45d872e8584dbfa8729d781179e82a9336e45a9e27227cbbd33e114d5a5611
+  metadata.gz: f0965f3f24397615223b0f7902793a060291402040a1cce4842d8415b5cbf21c
+  data.tar.gz: f92dc1a2fa9b0a42e07f8da9fe82a81c9492b77044edb897f6fa967fbf5794b6
 SHA512:
-  metadata.gz: ec23d0bf3eb2df53f43f634d0c8724e8c9bc52859f4b0ba55f197926771672701ad0398f9ee6c79b2271fe72f265c4c589d57fabd52cd44aee8812d62ccf72ec
-  data.tar.gz: b03f42a03b130cbb475a6ab9b9d7938750823310a602ec89a554df0ab44fe241e63e5ac3252d0dfd66a41baf56dc892e11b3d37f496fd40d0709e6950eaed50d
+  metadata.gz: da63efdd814dab639212e648968b6a88f8e845901e0ed25412e6b7fe7420137909ea67543abb6e017c32663f415f08ac9c53cc23ef7be9418c288b973d69a457
+  data.tar.gz: b8b180acc53aa2fe5e3458c54d51de47af0813f38e0589469904117d9d19bfec7bf2240c35e7c5b791e2261fc774b7898b79b72b178ec0afe182d78a0911365a

data/lib/danger/ci_source/jenkins.rb

@@ -78,14 +78,35 @@ module Danger
 
       self.repo_url = self.class.repo_url(env)
       self.pull_request_id = self.class.pull_request_id(env)
+      self.repo_slug = self.class.repo_slug(self.repo_url)
+    end
 
-      repo_matches = self.repo_url.match(%r{(?:[\/:])projects\/([^\/.]+)\/repos\/([^\/.]+)}) # Bitbucket Server
-      if repo_matches
-        self.repo_slug = "#{repo_matches[1]}/#{repo_matches[2]}"
-      else
-        repo_matches = self.repo_url.match(%r{([\/:])([^\/]+\/[^\/]+)$})
-        self.repo_slug = repo_matches[2].gsub(/\.git$/, "") unless repo_matches.nil?
-      end
+    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
+      return slug.gsub(/\.git$/, "") unless slug.nil?
+    end
+
+    def self.slug_bitbucket(repo_url)
+      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@.+:(.+)})
+      return repo_matches[1] if repo_matches
+    end
+
+    def self.slug_http(repo_url)
+      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{([\/:])([^\/]+\/[^\/]+)$})
+      return repo_matches[2]
     end
 
     def self.pull_request_id(env)

data/lib/danger/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "5.10.1".freeze
+  VERSION = "5.10.2".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: 5.10.1
+  version: 5.10.2
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2018-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide