fix: correctly filter out urls for tarballs in gitlab

PR-URL: #69 Credit: @nlf Close: #69 Reviewed-by: @isaacs
npm · Oct 15, 2020 · eb5bd5a · eb5bd5a
1 parent d30f96e
commit eb5bd5a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/git-host-info.js b/git-host-info.js
@@ -25,7 +25,7 @@ var gitHosts = module.exports = {
     'bugstemplate': 'https://{domain}/{user}/{project}/issues',
     'httpstemplate': 'git+https://{auth@}{domain}/{user}/{projectPath}.git{#committish}',
     'tarballtemplate': 'https://{domain}/{user}/{project}/repository/archive.tar.gz?ref={committish}',
-    'pathmatch': /^[/]([^/]+)[/]((?!.*(\/-\/|\/repository\/archive\.tar\.gz\?=.*|\/repository\/[^/]+\/archive.tar.gz$)).*?)(?:[.]git|[/])?$/
+    'pathmatch': /^\/([^/]+)\/((?!.*(\/-\/|\/repository(\/[^/]+)?\/archive\.tar\.gz)).*?)(?:\.git|\/)?$/
   },
   gist: {
     'protocols': [ 'git', 'git+ssh', 'git+https', 'ssh', 'https' ],

diff --git a/test/fixtures/gitlab.js b/test/fixtures/gitlab.js
@@ -24,6 +24,16 @@ module.exports = [
     label: 'https.tar',
     isUndefined: true
   },
+  {
+    host: function (p) { return 'https://' + p.domain + '/' + p.owner + '/' + p.project + '/repository/archive.tar.gz?ref=' + p.branch },
+    label: 'https.tar',
+    isUndefined: true
+  },
+  {
+    host: function (p) { return 'https://' + p.domain + '/' + p.owner + '/' + p.project + '/repository/archive.tar.gz' },
+    label: 'https.tar',
+    isUndefined: true
+  },
   {
     host: function (p) { return 'git+https://' + p.domain + '/' + p.owner + '/' + p.project },
     label: 'git+https'

diff --git a/test/gitlab.js b/test/gitlab.js
@@ -17,7 +17,7 @@ var testFixtures = function (t, params, fixtures) {
         tt.is(hostinfo, undefined)
         tt.end()
       })
-      break
+      continue
     }
 
     t.test('hostinfo.https', function (tt) {