fix: accept hyphen in reponame regexp (#19)

Author: oljekechoro

src/main/ts/chunks/git.ts

@@ -25,7 +25,7 @@ export const getGitInfo: TVcsInfoCreator = (cwd = process.cwd()) => {
     : readFileToString(`${gitFolder}${sep}` + rev.slice('ref: '.length)).trim()
 
   const repoUrlRegexp = /\turl = (.+)$/
-  const repoNameRegexp = /\turl =.+[/:](\w+\/\w+).*$/
+  const repoNameRegexp = /\turl =.+[/:]([\w-]+\/[\w-]+).*$/
 
   const origin = readFileToString(`${gitFolder}${sep}config`)
     .split('\n')

src/test/ts/chunks/git.ts

@@ -40,6 +40,22 @@ const testCases: TGitInfoTestCase[] = [
     repoUrl: /^undefined$/,
     commitId: '1234567890abcdef1234567890abcdef12345678',
   },
+  {
+    description: 'config contains gerrit url',
+    head: 'rev: 1234567890abcdef1234567890abcdef12345678',
+    config: '\turl = ssh://[email protected]:4242/foo/bar-baz-bat',
+    repoName: 'foo/bar-baz-bat',
+    repoUrl: /^ssh:\/\/d.abramov@gerrit.foo.ru:4242\/foo\/bar-baz-bat$/,
+    commitId: '1234567890abcdef1234567890abcdef12345678',
+  },
+  {
+    description: 'config contains url with kebab-named org',
+    head: 'rev: 1234567890abcdef1234567890abcdef12345678',
+    config: '\turl = ssh://[email protected]:4242/foo-qux/bar-baz-bat',
+    repoName: 'foo-qux/bar-baz-bat',
+    repoUrl: /^ssh:\/\/d.abramov@gerrit.foo.ru:4242\/foo-qux\/bar-baz-bat$/,
+    commitId: '1234567890abcdef1234567890abcdef12345678',
+  },
 ]
 
 afterAll(() => {

yarn.lock

@@ -6031,9 +6031,9 @@ npm-run-path@^4.0.0:
     path-key "^3.0.0"
 
 npm-user-validate@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.0.tgz#8ceca0f5cea04d4e93519ef72d0557a75122e951"
-  integrity sha1-jOyg9c6gTU6TUZ73LQVXp1Ei6VE=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz#31428fc5475fe8416023f178c0ab47935ad8c561"
+  integrity sha512-uQwcd/tY+h1jnEaze6cdX/LrhWhoBxfSknxentoqmIuStxUExxjWd3ULMLFPiFUrZKbOVMowH6Jq2FRWfmhcEw==
 
 npm@^6.13.0:
   version "6.14.8"
@@ -6866,9 +6866,9 @@ query-string@^4.1.0:
     strict-uri-encode "^1.0.0"
 
 query-string@^6.8.2:
-  version "6.13.2"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.13.2.tgz#3585aa9412c957cbd358fd5eaca7466f05586dda"
-  integrity sha512-BMmDaUiLDFU1hlM38jTFcRt7HYiGP/zt1sRzrIWm5zpeEuO1rkbPS0ELI3uehoLuuhHDCS8u8lhFN3fEN4JzPQ==
+  version "6.13.6"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.13.6.tgz#e5ac7c74f2a5da43fbca0b883b4f0bafba439966"
+  integrity sha512-/WWZ7d9na6s2wMEGdVCVgKWE9Rt7nYyNIf7k8xmHXcesPMlEzicWo3lbYwHyA4wBktI2KrXxxZeACLbE84hvSQ==
   dependencies:
     decode-uri-component "^0.2.0"
     split-on-first "^1.0.0"
@@ -8381,9 +8381,9 @@ typescript@^3.4:
   integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
 
 uglify-js@^3.1.4:
-  version "3.10.4"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.10.4.tgz#dd680f5687bc0d7a93b14a3482d16db6eba2bfbb"
-  integrity sha512-kBFT3U4Dcj4/pJ52vfjCSfyLyvG9VYYuGYPmrPvAxRw/i7xHiT4VvCev+uiEMcEEiu6UNB6KgWmGtSUYIWScbw==
+  version "3.11.3"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.11.3.tgz#b2f8c87826344f091ba48c417c499d6cba5d5786"
+  integrity sha512-wDRziHG94mNj2n3R864CvYw/+pc9y/RNImiTyrrf8BzgWn75JgFSwYvXrtZQMnMnOp/4UTrf3iCSQxSStPiByA==
 
 [email protected]:
   version "0.0.6"
@@ -8541,9 +8541,9 @@ uuid@^3.3.2, uuid@^3.3.3:
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
 uuid@^8.3.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.0.tgz#ab738085ca22dc9a8c92725e459b1d507df5d6ea"
-  integrity sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==
+  version "8.3.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31"
+  integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==
 
 v8-compile-cache@^2.0.3:
   version "2.1.1"