ultimate-jekyll-manager 0.0.203 → 0.0.204

package/dist/cli.js

@@ -2,6 +2,9 @@
 const path = require('path');
 const jetpack = require('fs-jetpack');
 
+// Load .env file from current working directory (project root)
+require('dotenv').config({ path: path.join(process.cwd(), '.env') });
+
 // Command Aliases
 const DEFAULT = 'setup';
 const ALIASES = {

package/dist/gulp/tasks/utils/detect-github-repo.js

@@ -6,6 +6,7 @@ const { execute } = require('node-powertools');
 
 /**
  * Detects and sets GITHUB_REPOSITORY environment variable if not already set
+ * Uses GitHub API to verify/correct the owner in case repo was transferred
  * @param {Object} logger - Logger instance for output
  * @returns {Promise<string|null>} - Repository in format "owner/repo" or null if detection fails
  */
@@ -20,16 +21,54 @@ async function detectGitHubRepository(logger = console) {
 
     // Parse GitHub repository from remote URL
     // Supports: https://github.com/owner/repo.git, git@github.com:owner/repo.git
-    const match = result.match(/github\.com[:/]([^/]+\/[^.\s]+)/);
+    const match = result.match(/github\.com[:/]([^/]+)\/([^.\s]+)/);
 
-    if (match) {
-      process.env.GITHUB_REPOSITORY = match[1];
-      logger.log(`Auto-detected repository from git remote: ${process.env.GITHUB_REPOSITORY}`);
-      return process.env.GITHUB_REPOSITORY;
-    } else {
+    if (!match) {
       logger.warn(`⚠️ Could not parse GitHub repository from git remote URL: ${result}`);
       return null;
     }
+
+    let owner = match[1];
+    let repo = match[2];
+
+    // If GH_TOKEN is available, verify the current owner via GitHub API
+    // This handles cases where repos were transferred to a different owner
+    if (process.env.GH_TOKEN) {
+      try {
+        const { Octokit } = require('@octokit/rest');
+        const octokit = new Octokit({ auth: process.env.GH_TOKEN });
+
+        // GitHub API automatically redirects to the current location of transferred repos
+        const { data } = await octokit.repos.get({ owner, repo });
+
+        // Check if the repo was transferred (owner changed)
+        if (data.owner.login !== owner) {
+          logger.log(`🔄 Repository was transferred: ${owner}/${repo} → ${data.owner.login}/${repo}`);
+
+          // Update the local git remote to the new owner
+          const newOwner = data.owner.login;
+          const newUrl = result.includes('git@')
+            ? `git@github.com:${newOwner}/${repo}.git`
+            : `https://github.com/${newOwner}/${repo}.git`;
+
+          try {
+            await execute(`git remote set-url origin ${newUrl}`, { log: false });
+            logger.log(`✅ Updated git remote origin to: ${newUrl}`);
+          } catch (remoteError) {
+            logger.warn(`⚠️ Could not update git remote: ${remoteError.message}`);
+          }
+
+          owner = newOwner;
+        }
+      } catch (apiError) {
+        // If API call fails, fall back to git remote value
+        logger.warn(`⚠️ Could not verify repository owner via GitHub API: ${apiError.message}`);
+      }
+    }
+
+    process.env.GITHUB_REPOSITORY = `${owner}/${repo}`;
+    logger.log(`Auto-detected repository from git remote: ${process.env.GITHUB_REPOSITORY}`);
+    return process.env.GITHUB_REPOSITORY;
   } catch (e) {
     // Ignore errors from git command (e.g., not a git repo, no remote)
     if (logger.warn) {

package/dist/gulp/tasks/utils/github-cache.js

@@ -101,6 +101,9 @@ class GitHubCache {
     this.logger.log(`📦 Zip file: ${zipFileName}`);
     this.logger.log(`📂 Extract directory: ${extractDir}`);
     this.logger.log(`📁 Directory contents: ${JSON.stringify(dirContents)}`);
+    this.logger.log(`🔍 Debug - this.owner: ${this.owner}, this.repo: ${this.repo}`);
+    this.logger.log(`🔍 Debug - GITHUB_REPOSITORY env: ${process.env.GITHUB_REPOSITORY}`);
+    this.logger.log(`🔍 Debug - Pattern being used: ^${this.owner}-${this.repo}-[a-f0-9]+$`);
 
     // GitHub zipball format: {owner}-{repo}-{sha}
     // Match this pattern to avoid picking up other cache directories (like imagemin, translation)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-jekyll-manager",
-  "version": "0.0.203",
+  "version": "0.0.204",
   "description": "Ultimate Jekyll dependency manager",
   "main": "dist/index.js",
   "exports": {