Merge pull request #114 from Financial-Times/support-dot-in-repo-name

Support a dot in repo names.
Financial-Times · Jan 20, 2020 · e25fc5e · e25fc5e
2 parents 1023ae3 + 8cf1fed
commit e25fc5e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/lib/github-helpers.js b/lib/github-helpers.js
@@ -1,19 +1,19 @@
-const GITHUB_REPO_REGEX = /^(?:\S*github\.com(?:\/|:))?([\w-]+)\/([\w-]+)/;
+const GITHUB_REPO_REGEX = /^(?:\S*github\.com(?:\/|:))?([\w-]+)\/([\w-\.]+)/;
 
 /**
  * Array of repo string patterns supported by `extractOwnerAndRepo`.
  *
  * @type {Array<string>}
  */
 const SUPPORTED_REPO_STRING_PATTERNS = [
-	'github-organization/github-repo-name',
-	'github.com/github-organization/github-repo-name',
-	'subdomain.github.com/github-organization/github-repo-name',
-	'https://github.com/github-organization/github-repo-name',
-	'https://github.com/github-organization/github-repo-name/blob/master',
-	'https://github.com/github-organization/github-repo-name.git',
-	'git+https://github.com/github-organization/github-repo-name.git',
-	'[email protected]:github-organization/github-repo-name.git'
+	'github-organization/github-repo.name',
+	'github.com/github-organization/github-repo.name',
+	'subdomain.github.com/github-organization/github-repo.name',
+	'https://github.com/github-organization/github-repo.name',
+	'https://github.com/github-organization/github-repo.name/blob/master',
+	'https://github.com/github-organization/github-repo.name.git',
+	'git+https://github.com/github-organization/github-repo.name.git',
+	'[email protected]:github-organization/github-repo.name.git'
 ];
 
 /**
@@ -24,6 +24,9 @@ const SUPPORTED_REPO_STRING_PATTERNS = [
  * @returns {object} - Properties: owner, repo
  */
 function extractOwnerAndRepo(githubRepoString) {
+	// Remove trailing .git extension
+	githubRepoString = githubRepoString.replace(/.git$/, '');
+	// Match owner and repo
 	const matches = GITHUB_REPO_REGEX.exec(githubRepoString);
 
 	if (matches === null) {

diff --git a/test/lib/github-helpers.test.js b/test/lib/github-helpers.test.js
@@ -4,7 +4,7 @@ const {
 } = require('../../lib/github-helpers');
 
 const expectedOwner = 'github-organization';
-const expectedRepo = 'github-repo-name';
+const expectedRepo = 'github-repo.name';
 
 const supportedRepoStrings = SUPPORTED_REPO_STRING_PATTERNS;