@akash-chowdhury-24/deployhub 1.0.8 → 1.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akash-chowdhury-24/deployhub",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Zero-configuration deployment and artifact manager",
   "type": "module",
   "main": "./src/cli/index.js",

package/src/commands/init.js

@@ -17,6 +17,8 @@ import {
   generateEnvExampleContent,
   guessCliGithubRepo,
   addDeployhubToPackageJson,
+  isGithubCliSource,
+  normalizeGithubCliSource,
 } from '../utils/github-actions.js';
 import {
   promptPlatformQuestions,
@@ -452,6 +454,7 @@ export function registerInitCommand(program) {
           message:
             'DeployHub CLI source for GitHub Actions (github:user/repo or npm:@akash-chowdhury-24/deployhub):',
           default: defaultCliRepo,
+          filter: (value) => normalizeGithubCliSource(value),
         },
       ]);
 
@@ -781,7 +784,17 @@ export function registerInitCommand(program) {
       console.log('  • .env.example');
       console.log('');
       console.log(chalk.bold('Next steps:'));
-      console.log('  1. Push the DeployHub CLI repo to GitHub (if using github: source)');
+      if (isGithubCliSource(answers.cliSource)) {
+        console.log(
+          '  1. For a private DeployHub CLI repo, create a GitHub PAT with repo read access'
+        );
+        console.log(
+          `     and add it as ${chalk.cyan('DEPLOYHUB_GITHUB_TOKEN')} in your demo project secrets`
+        );
+        console.log('     (public CLI repos can skip this — HTTPS is used automatically)');
+      } else {
+        console.log('  1. Push the DeployHub CLI repo to GitHub (if using github: source)');
+      }
       console.log('  2. Copy .env.example to .env and fill in credentials');
       if (secrets.length > 0) {
         console.log('  3. Add these secrets to GitHub (Settings → Secrets):');

package/src/utils/github-actions.js

@@ -61,6 +61,44 @@ const ENV_VAR_DEFAULTS = {
 
 const NPM_PACKAGE = '@akash-chowdhury-24/deployhub';
 const DEFAULT_NPM_CLI_SOURCE = `npm:${NPM_PACKAGE}`;
+export const GITHUB_CLI_TOKEN_SECRET = 'DEPLOYHUB_GITHUB_TOKEN';
+
+/**
+ * @param {string} [cliSource]
+ * @returns {boolean}
+ */
+export function isGithubCliSource(cliSource) {
+  const normalized = normalizeCliSource(cliSource);
+  return normalized.startsWith('github:');
+}
+
+/**
+ * Normalizes common GitHub remote formats to github:user/repo.
+ * @param {string} cliSource
+ * @returns {string}
+ */
+export function normalizeGithubCliSource(cliSource) {
+  if (!cliSource) return cliSource;
+
+  const trimmed = cliSource.trim();
+  const httpsMatch = trimmed.match(
+    /^https?:\/\/github\.com\/([^/]+)\/([^/#?]+?)(?:\.git)?(?:[/?#].*)?$/
+  );
+  if (httpsMatch) {
+    return `github:${httpsMatch[1]}/${httpsMatch[2]}`;
+  }
+
+  const sshMatch = trimmed.match(/^git@github\.com:([^/]+)\/([^/#?]+?)(?:\.git)?$/);
+  if (sshMatch) {
+    return `github:${sshMatch[1]}/${sshMatch[2]}`;
+  }
+
+  if (trimmed.startsWith('github:')) {
+    return trimmed.replace(/^github:/, 'github:').replace(/\.git$/, '');
+  }
+
+  return trimmed;
+}
 
 /** @param {string} [cliSource] */
 function normalizeCliSource(cliSource) {
@@ -68,7 +106,7 @@ function normalizeCliSource(cliSource) {
   if (/^npm:(deployhub-cli|deploy-hub-cli|deployhub)$/.test(cliSource)) {
     return DEFAULT_NPM_CLI_SOURCE;
   }
-  return cliSource;
+  return normalizeGithubCliSource(cliSource);
 }
 
 /**
@@ -89,6 +127,34 @@ export function getCliInstallSpec(cliSource) {
   return normalized;
 }
 
+/**
+ * npm/npx command to run deployhub build using the installed scoped package.
+ * @returns {string}
+ */
+export function getCliBuildCommand() {
+  return `npx --no-install ${NPM_PACKAGE} build`;
+}
+
+/**
+ * @returns {string}
+ */
+function getGithubGitConfigStep() {
+  return `      - name: Configure GitHub access for DeployHub CLI
+        env:
+          ${GITHUB_CLI_TOKEN_SECRET}: \${{ secrets.${GITHUB_CLI_TOKEN_SECRET} }}
+          GITHUB_TOKEN: \${{ github.token }}
+        run: |
+          TOKEN="\${${GITHUB_CLI_TOKEN_SECRET}:-$GITHUB_TOKEN}"
+          if [ -n "$TOKEN" ]; then
+            git config --global url."https://oauth2:\${TOKEN}@github.com/".insteadOf "https://github.com/"
+            git config --global url."https://oauth2:\${TOKEN}@github.com/".insteadOf "git@github.com:"
+            git config --global url."https://oauth2:\${TOKEN}@github.com/".insteadOf "ssh://git@github.com/"
+          else
+            git config --global url."https://github.com/".insteadOf "ssh://git@github.com/"
+            git config --global url."https://github.com/".insteadOf "git@github.com:"
+          fi`;
+}
+
 /**
  * @param {import('../core/config.js').DeployHubConfig} [config]
  * @returns {string[]}
@@ -246,6 +312,9 @@ export function generateWorkflowYaml(
   const installSpec = getCliInstallSpec(cliSource);
   const backendSteps = getBackendSetupSteps(config);
   const uniqueBackendSteps = [...new Set(backendSteps)].join('\n');
+  const githubGitConfigStep = isGithubCliSource(cliSource)
+    ? `${getGithubGitConfigStep()}\n`
+    : '';
 
   const envList = deployEnvironments
     .map((name) => environments[name])
@@ -270,11 +339,11 @@ jobs:
 ${uniqueBackendSteps ? `${uniqueBackendSteps}\n` : ''}      - uses: actions/setup-node@v4
         with:
           node-version: '20'
-      - name: Install project dependencies
+${githubGitConfigStep}      - name: Install project dependencies
         run: ${installDepsCommand}
 ${platformSteps ? `${platformSteps}\n` : ''}      - name: Install DeployHub CLI
         run: npm install ${installSpec} --no-save
-      - run: npx deployhub build
+      - run: ${getCliBuildCommand()}
         env:
 ${envBlock}
 `;
@@ -391,11 +460,17 @@ export function getRequiredSecrets(
   storageProviders,
   deployEnvironments,
   environments,
-  config = null
+  config = null,
+  cliSource = null
 ) {
   /** @type {Set<string>} */
   const secrets = new Set();
 
+  const resolvedCliSource = cliSource || config?.cli?.source;
+  if (isGithubCliSource(resolvedCliSource)) {
+    secrets.add(GITHUB_CLI_TOKEN_SECRET);
+  }
+
   for (const provider of storageProviders) {
     const keys = PROVIDER_ENV_MAP[provider] || [];
     keys.forEach((k) => secrets.add(k));