duoops 0.2.1 → 0.2.2

package/dist/commands/init.js

@@ -21,27 +21,12 @@ const hasBinary = (command) => {
     }
 };
 const detectGlabToken = (host = 'gitlab.com') => {
-    const candidates = [
-        path.join(os.homedir(), '.config', 'glab-cli', 'config.yml'),
-        path.join(os.homedir(), 'Library', 'Application Support', 'glab-cli', 'config.yml'),
-    ];
-    for (const configPath of candidates) {
-        try {
-            if (!fs.existsSync(configPath))
-                continue;
-            const content = fs.readFileSync(configPath, 'utf8');
-            const hostSection = content.split(`${host}:`)[1];
-            if (!hostSection)
-                continue;
-            const isOauth = hostSection.match(/is_oauth2:\s*"?true"?/);
-            if (isOauth)
-                continue;
-            const tokenMatch = hostSection.match(/token:\s*(?:!!null\s+)?(\S+)/);
-            if (tokenMatch?.[1] && tokenMatch[1].startsWith('glpat-'))
-                return tokenMatch[1];
-        }
-        catch { /* ignore */ }
+    try {
+        const token = execSync(`glab config get token --host ${host}`, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] }).trim();
+        if (token)
+            return { source: 'glab CLI', token };
     }
+    catch { /* glab not installed or not authenticated */ }
 };
 const detectGitRemotePath = () => {
     try {
@@ -276,12 +261,12 @@ export default class Init extends Command {
             message: 'GitLab URL',
         });
         const { host } = new URL(gitlabUrl);
-        const glabToken = detectGlabToken(host);
+        const glabResult = detectGlabToken(host);
         const envToken = process.env.GITLAB_TOKEN || process.env.GL_TOKEN;
         let gitlabToken;
-        if (glabToken || envToken) {
-            const source = glabToken ? 'glab CLI' : 'environment';
-            const detected = glabToken || envToken;
+        if (glabResult || envToken) {
+            const source = glabResult ? glabResult.source : 'environment';
+            const detected = glabResult ? glabResult.token : envToken;
             const masked = detected.slice(0, 6) + '...' + detected.slice(-4);
             const useDetected = await confirm({
                 default: true,

package/oclif.manifest.json

@@ -669,5 +669,5 @@
       ]
     }
   },
-  "version": "0.2.1"
+  "version": "0.2.2"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "duoops",
   "description": "Toolset for Explainable and Sustainable CI on Gitlab.",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "author": "Younes Laaroussi",
   "bin": {
     "duoops": "./bin/run.js"