@toptal/davinci-cli-shared 2.1.1-alpha-temp-debug-logs-ddc5a51f.2 → 2.1.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 2.1.1
+
+### Patch Changes
+
+- [#1880](https://github.com/toptal/davinci/pull/1880) [`de1d21ca`](https://github.com/toptal/davinci/commit/de1d21cac8b6a4ee63bdbb38924d26b75735f88a) Thanks [@augustobmoura](https://github.com/augustobmoura)! - ---
+
+  - add missing support for git repos with remotes that don't end on the .git extension
+
 ## 2.1.0
 
 ### Minor Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toptal/davinci-cli-shared",
-  "version": "2.1.1-alpha-temp-debug-logs-ddc5a51f.2+ddc5a51f",
+  "version": "2.1.1",
   "description": "Shared CLI code and CLI engine for davinci",
   "publishConfig": {
     "access": "public"
@@ -36,6 +36,5 @@
   },
   "devDependencies": {
     "@jest/globals": "28.1.0"
-  },
-  "gitHead": "ddc5a51f7f07bdd37f8a69075e8df1508e9da704"
+  }
 }

package/src/utils/metrics/sidecar.process.js

@@ -8,8 +8,6 @@ import { gatherUsageData } from './usage-data.js'
 const sendMetrics = async (startTime, metadata) => {
   const executionTimeNs = Number(process.hrtime.bigint() - startTime)
 
-  console.log('[DEBUG] pwd: %s', process.cwd())
-
   const { commandIdentifier, davinciCommand } = metadata
 
   try {

package/src/utils/metrics/usage-data.js

@@ -10,29 +10,33 @@ import { isCi } from '../ci.js'
 const TOPTAL_SSH_REPO_URL_REGEX =
   /^git@github\.com:\/?toptal\/([A-Za-z0-9_.-]+)\.git$/
 
-const TOPTAL_HTTPS_REPO_URL_REGEX =
-  /^https:\/\/github\.com\/toptal\/([A-Za-z0-9_.-]+)\.git$/
-
 const UNKNOWN = '<unknown>'
 
 const getProjectName = async () => {
   const gitProcess = await execa('git', ['remote', 'get-url', 'origin'])
-  const repoOriginUrl = gitProcess.stdout
-
-  console.log('[DEBUG] origin: %s', repoOriginUrl)
+  const repoOriginUrl = gitProcess.stdout ?? ''
 
-  // Not matching with a pattern means that either:
+  // We try matching the url with the ssh protocol, or parsing it as an URL
+  // Failing both of the checks means:
   // 1. Project is not from toptal, so not relevant information
   // 2. Project is not on github, unlikely for toptal
   // 3. User is using an ssh alias, in this case we cannot catch it in a sane way otherwise
-  const toptalRepoFound = [
-    TOPTAL_SSH_REPO_URL_REGEX,
-    TOPTAL_HTTPS_REPO_URL_REGEX,
-  ]
-    .map(pattern => repoOriginUrl?.match(pattern))
-    .find(Boolean)
-
-  return toptalRepoFound?.[1] ?? UNKNOWN
+  const sshMatch = repoOriginUrl.match(TOPTAL_SSH_REPO_URL_REGEX)
+
+  if (sshMatch) {
+    return sshMatch[1]
+  }
+
+  if (repoOriginUrl.startsWith('https://')) {
+    const url = new URL(repoOriginUrl)
+    const { dir, name } = path.parse(url.pathname)
+
+    if (url.hostname === 'github.com' && dir === '/toptal') {
+      return name
+    }
+  }
+
+  return UNKNOWN
 }
 
 const getGitBranch = async () => {