danger 8.0.4 → 8.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24f1ad8fc490aea6b75f155f5acb47d5b126c23b7bab8392080557dca1bee597
-  data.tar.gz: 88c387703dcb3efc9fed05f38fa03ec2ba2b46a69cc287a9d368750b48d155ca
+  metadata.gz: f6ea9c4a38578c0c9cd6e762b689010bce9de3bc6479134cce2f6c45afdce925
+  data.tar.gz: 4f131339c436c4ee163660341e0471c0c456b0251da17c6a5f5511f2fc3ac708
 SHA512:
-  metadata.gz: 17bbad4f7cc06de57c08ff9360dd591084959c3f23d40ed58481f8bc5aa82036a04d3376cf5fdc8f50400e0733e18bc85e0db0631a8da0cb3ea27b692697c105
-  data.tar.gz: 1da0fe48081c9fa19acc9bb7df3df1ae2efe4b919f38656503e52f52ed6142ea17499a5928bc47ba5fb352370bbb2152e4cf969c44b87dbef0d6250526349ee6
+  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/request_sources/gitlab.rb

@@ -208,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
@@ -227,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/version.rb

@@ -1,4 +1,4 @@
 module Danger
-  VERSION = "8.0.4".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.4
+  version: 8.0.5
 platform: ruby
 authors:
 - Orta Therox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-21 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