lib/danger/ci_source/bitrise.rb in danger-6.3.0 vs lib/danger/ci_source/bitrise.rb in danger-6.3.1
- old
+ new
@@ -23,11 +23,11 @@
#
# Danger will read the environemnt variable GIT_REPOSITORY_URL to construct the Bitbucket Server API URL
# finding the project and repo slug in the GIT_REPOSITORY_URL variable. This GIT_REPOSITORY_URL variable
# comes from the App Settings tab for your Bitrsie App. If you are manually setting a repo URL in the
# Git Clone Repo step, you may need to set adjust this propery in the settings tab, maybe even fake it.
- # The patterns used are `(%r{\.com/(.*)})` and `(%r{\.com:(.*)})` .
+ # The patterns used are `(%r{\.com/(.*)})` and `(%r{\.com:(.*)})` and .split(/\.git$|$/) to remove ".git" if the URL contains it.
#
class Bitrise < CI
def self.validates_as_ci?(env)
env.key? "BITRISE_IO"
end
@@ -48,12 +48,12 @@
def initialize(env)
self.pull_request_id = env["BITRISE_PULL_REQUEST"]
self.repo_url = env["GIT_REPOSITORY_URL"]
if repo_url.include? ".com/"
- repo_matches = self.repo_url.match(%r{\.com/(.*)})[1]
+ repo_matches = self.repo_url.match(%r{\.com/(.*)})[1].split(/\.git$|$/)[0]
elsif repo_url.include? ".com:"
- repo_matches = self.repo_url.match(%r{\.com:(.*)})[1]
+ repo_matches = self.repo_url.match(%r{\.com:(.*)})[1].split(/\.git$|$/)[0]
end
self.repo_slug = repo_matches unless repo_matches.nil?
end