@hraza01/skyhook 1.0.0 → 1.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hraza01/skyhook",
-    "version": "1.0.0",
+    "version": "1.1.2",
     "description": "Interactive CLI for Cloud Composer DAG deployment",
     "main": "src/index.js",
     "bin": {
@@ -28,6 +28,8 @@
         "@clack/prompts": "^1.0.0",
         "chalk": "^5.6.2",
         "execa": "^9.6.1",
+        "figlet": "^1.10.0",
+        "ora": "^9.3.0",
         "terminal-link": "^5.0.0"
     },
     "engines": {

package/shell/deploy_core.sh

@@ -20,8 +20,20 @@ fi
 echo "Syncing $SOURCE_PATH to $DEST_PATH..."
 
 # Calculate file count (informational)
-FILE_COUNT=$(find "$SOURCE_PATH" -type f -not -path '*/.git/*' -not -path '*/__pycache__/*' | wc -l | tr -d ' ')
+FILE_COUNT=$(find "$SOURCE_PATH" -type f \
+    -not -path '*/.git/*' \
+    -not -path '*/__pycache__/*' \
+    -not -path '*/tests/*' \
+    -not -path '*/.github/*' \
+    -not -name 'pyproject.toml' \
+    -not -name 'README.md' \
+    -not -name 'Makefile' \
+    -not -name '.gitignore' \
+    -not -name '.pre-commit-config.yaml' \
+    | wc -l | tr -d ' ')
 echo "Uploading $FILE_COUNT files..."
 
 # Perform Sync
-gsutil -m rsync -r -x "\.git/.*|__pycache__/.*" "$SOURCE_PATH" "$DEST_PATH"
+# Excludes: .git, __pycache__, tests, .github, and specific project files
+EXCLUDE_REGEX="\.git/.*|__pycache__/.*|tests/.*|\.github/.*|pyproject\.toml$|README\.md$|Makefile$|\.gitignore$|\.pre-commit-config\.yaml$"
+gsutil -m rsync -r -x "$EXCLUDE_REGEX" "$SOURCE_PATH" "$DEST_PATH"

package/src/cli.js

@@ -1,11 +1,24 @@
+import fs from "fs"
+import path from "path"
+import { fileURLToPath } from "url"
 import chalk from "chalk"
-import { intro, spinner } from "@clack/prompts"
+import { intro } from "@clack/prompts"
+import ora from "ora"
+import terminalLink from "terminal-link"
+import figlet from "figlet"
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+const packageJson = JSON.parse(
+    fs.readFileSync(path.join(__dirname, "../package.json"), "utf-8"),
+)
+const { version } = packageJson
 
 /**
  * Display version information
  */
 export function showVersionInfo() {
-    console.log("skyhook v1.0.0")
+    console.log(`skyhook v${version}`)
     process.exit(0)
 }
 
@@ -13,6 +26,12 @@ export function showVersionInfo() {
  * Display help information
  */
 export function showHelpInfo() {
+    const gitLink = terminalLink(
+        chalk.cyan.underline("@hraza01/skyhook"),
+        "https://github.com/hraza01/skyhook",
+    )
+
+    console.clear()
     console.log(
         chalk.cyan.bold("\nSkyhook - Cloud Composer DAG Deployment Utility\n"),
     )
@@ -20,13 +39,16 @@ export function showHelpInfo() {
     console.log("  skyhook [options] [path]\n")
     console.log("Options:")
     console.log("  -h, --help     Show this help message")
-    console.log("  --version      Show version number")
-    console.log("  -v, --verbose  Enable verbose logging\n")
+    console.log("  -v, --version  Show version number")
+    console.log("  --verbose      Enable verbose logging\n")
     console.log("Environment Variables (Required):")
-    console.log("  GCS_BUCKET_NAME    Your Composer GCS bucket name")
-    console.log("  COMPOSER_URL_BASE  Your Composer webserver base URL\n")
-    console.log("For more information, visit:")
-    console.log("  https://github.com/hraza01/skyhook\n")
+    console.log(
+        `  ${chalk.red("GCS_BUCKET_NAME")}    Your Composer GCS bucket name`,
+    )
+    console.log(
+        `  ${chalk.red("COMPOSER_URL_BASE")}  Your Composer webserver base URL\n`,
+    )
+    console.log(`For more information, visit: ${gitLink}`)
     process.exit(0)
 }
 
@@ -34,20 +56,49 @@ export function showHelpInfo() {
  * Display the intro banner
  */
 export function showIntro() {
-    intro(
-        chalk.bgCyan(
-            chalk.black("  Skyhook / Cloud Composer Deployment Utility  "),
+    console.clear()
+    console.log(
+        chalk.cyan(
+            figlet.textSync("Skyhook", {
+                font: "Slant",
+                horizontalLayout: "default",
+                verticalLayout: "default",
+            }),
         ),
     )
+    console.log("")
+    intro(chalk.bgCyan.black(" Cloud Composer DAG Deployment Utility "))
 }
 
 /**
- * Create and return a configured spinner with cyan color
+ * Create and return a configured spinner using ora
+ * Wraps ora to match the interface used by the rest of the app:
+ * - start(msg)
+ * - stop(msg, code)
+ * - message(msg)
  */
 export function createSpinner() {
-    return spinner({
-        frames: ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"].map(
-            (frame) => chalk.cyan(frame),
-        ),
+    const spinner = ora({
+        color: "cyan",
+        spinner: "dots",
     })
+
+    return {
+        start(msg) {
+            spinner.start(` ${msg}`)
+        },
+        stop(msg, code = 0) {
+            if (code === 0) {
+                spinner.succeed(` ${msg}`)
+            } else {
+                spinner.fail(` ${msg}`)
+            }
+        },
+        message(msg) {
+            spinner.text = ` ${msg}`
+        },
+        clear() {
+            spinner.stop()
+        },
+    }
 }

package/src/config.js

@@ -6,15 +6,18 @@ const { values, positionals } = parseArgs({
     options: {
         verbose: {
             type: "boolean",
-            short: "v",
         },
         version: {
             type: "boolean",
+            short: "v",
         },
         help: {
             type: "boolean",
             short: "h",
         },
+        "no-git": {
+            type: "boolean",
+        },
     },
     allowPositionals: true,
 })
@@ -22,6 +25,7 @@ const { values, positionals } = parseArgs({
 export const verbose = values.verbose
 export const showVersion = values.version
 export const showHelp = values.help
+export const skipGit = values["no-git"]
 
 // Helper to get root dir based on arg or CWD
 export const ROOT_DIR = positionals[0]
@@ -30,6 +34,9 @@ export const ROOT_DIR = positionals[0]
 export const DAGS_DIR = path.join(ROOT_DIR, "dags")
 
 export function validateEnv() {
+    // Skip validation if we are just showing help or version
+    if (showVersion || showHelp) return
+
     if (!process.env.GCS_BUCKET_NAME || !process.env.COMPOSER_URL_BASE) {
         throw new ConfigError(
             "Missing GCS_BUCKET_NAME or COMPOSER_URL_BASE environment variables.",

package/src/dag_selection.js

@@ -1,32 +1,36 @@
 import fs from "fs"
 import path from "path"
-import { select, isCancel } from "@clack/prompts"
+import { select, isCancel, log } from "@clack/prompts"
 import { logger } from "./logger.js"
 import { UserCancellationError } from "./errors.js"
+import chalk from "chalk"
 
 export function scanDags(dagsDir, s) {
-    logger.info("SCAN", `Scanning directory: ${dagsDir}`)
-    s.start(`Looking for DAGs in: ${path.relative(process.cwd(), dagsDir)}`)
+    s.start("Scanning for DAGs...")
 
     if (!fs.existsSync(dagsDir)) {
-        s.stop(`Directory '${dagsDir}' not found.`, 1)
-        throw new UserCancellationError("Operation cancelled.")
+        s.stop("No DAGs directory found.", 1)
+        throw new Error(`DAGs directory not found: ${dagsDir}`)
     }
 
-    const folders = fs.readdirSync(dagsDir).filter((file) => {
+    const items = fs.readdirSync(dagsDir)
+    const folders = items.filter((item) => {
+        const fullPath = path.join(dagsDir, item)
         return (
-            fs.statSync(path.join(dagsDir, file)).isDirectory() &&
-            !file.startsWith(".")
+            fs.statSync(fullPath).isDirectory() &&
+            !item.startsWith(".") &&
+            !item.startsWith("__")
         )
     })
 
     if (folders.length === 0) {
-        s.stop(`No folders found in ${dagsDir}`, 1)
-        throw new UserCancellationError("Operation cancelled.")
+        s.stop("No DAG folders found.", 1)
+        throw new Error("No DAG folders found in dags/ directory.")
     }
 
-    s.stop(`Found ${folders.length} Airflow DAGs.`)
-    logger.info("SCAN", `Found ${folders.length} valid DAG folders.`)
+    s.clear() // Stop spinner and clear line
+    log.success(`Found ${folders.length} Airflow DAGs.`)
+
     return folders
 }
 

package/src/deploy.js

@@ -1,7 +1,7 @@
 import { execa } from "execa"
 import chalk from "chalk"
 import path from "path"
-import { cancel, outro } from "@clack/prompts"
+import { cancel, outro, log } from "@clack/prompts"
 import terminalLink from "terminal-link"
 import { fileURLToPath } from "url"
 import { countFiles } from "./utils.js"
@@ -86,7 +86,8 @@ export async function deployDag(selectedFolder, sourcePath, s, verbose) {
         })
 
         await subprocess
-        s.stop("GCS sync complete.")
+        s.clear()
+        log.success("GCS sync complete.")
 
         // Show Summary
         const fileCount = countFiles(sourcePath)
@@ -101,43 +102,44 @@ export async function deployDag(selectedFolder, sourcePath, s, verbose) {
             productionUrl,
         )
 
-        console.log("")
-        console.log(chalk.green("Deployment Summary"))
-        console.log("")
+        // Using console.log for body items to avoid clack's extra spacing
+        // Adding a small indentation to align visually
+        const indent = `${chalk.gray("│")}   `
+
+        log.success(chalk.bold.bgGreen(" Deployment Summary "))
+        console.log(indent)
 
         console.log(
-            `${chalk.dim(pad("Source", labelWidth))} ${chalk.reset(
+            `${indent}${chalk.dim(pad("Source", labelWidth))} ${chalk.reset(
                 `dags/${selectedFolder}`,
             )}`,
         )
         console.log(
-            `${chalk.dim(pad("Destination", labelWidth))} ${chalk.reset(
+            `${indent}${chalk.dim(pad("Destination", labelWidth))} ${chalk.reset(
                 `${BUCKET_URL}/${selectedFolder}`,
             )}`,
         )
         console.log(
-            `${chalk.dim(pad("Files Synced", labelWidth))} ${chalk.reset(
+            `${indent}${chalk.dim(pad("Files Synced", labelWidth))} ${chalk.reset(
                 `${fileCount} files`,
             )}`,
         )
-
-        console.log("")
         console.log(
+            `${indent}${chalk.dim(pad("Composer URL", labelWidth))} ${link}`,
+        )
+
+        log.info(
             chalk.white(
                 `${chalk.bold(
                     selectedFolder,
                 )} is now in sync with git + Cloud Composer.`,
             ),
         )
-        console.log("")
-
-        // Print URL in original location but single line
-        console.log(chalk.dim(pad("Composer URL", labelWidth)) + link)
-        console.log("")
 
-        outro(chalk.green.bold("Deployment Successful!"))
+        outro(chalk.green.bold("Deployment Successful."))
         logger.info("DEPLOY", "Deployment steps completed successfully.")
     } catch (error) {
+        // ... (rest of catch block) ...
         logger.error("DEPLOY", `Deployment failed: ${error.message}`)
         s.stop("Deployment Failed ❌", 1)
         console.log(chalk.red("\nError Logs:"))

package/src/git_validation.js

@@ -1,38 +1,65 @@
 import { execa } from "execa"
 import chalk from "chalk"
 import { ValidationError } from "./errors.js"
+import { log } from "@clack/prompts"
 
 export async function validateGit(sourcePath, s) {
+    console.log(chalk.gray("│"))
     s.start("Validating Git status...")
 
-    // A. Check if valid git repo
+    // A. Check if it is a connected git repo
     try {
-        await execa("git", [
+        await execa("git", ["-C", sourcePath, "status"])
+    } catch (e) {
+        s.stop("Validation Failed", 1)
+        throw new ValidationError("Directory is not a Git repository.")
+    }
+
+    // B. Check Branch Name
+    let branch
+    try {
+        const { stdout } = await execa("git", [
             "-C",
             sourcePath,
             "rev-parse",
-            "--is-inside-work-tree",
+            "--abbrev-ref",
+            "HEAD",
         ])
+        branch = stdout.trim()
     } catch (e) {
-        s.stop("Validation Failed: Not a git repository.", 1)
-        throw new ValidationError("The DAG folder must be version controlled.")
+        // Handle "ambiguous argument 'HEAD'" which happens in a fresh repo with no commits
+        if (e.message.includes("ambiguous argument 'HEAD'")) {
+            s.stop(
+                "Validation Failed: No commits found. Please commit your changes.",
+                1,
+            )
+            throw new ValidationError("Git repository has no commits.")
+        }
+        throw e
     }
 
-    // B. Check Branch Name
-    const { stdout: branch } = await execa("git", [
+    if (branch !== "main") {
+        s.stop("Validation Failed", 1)
+        throw new ValidationError(
+            `You are on branch "${branch}". Please switch to "main".`,
+        )
+    }
+
+    // C. Check for Uncommitted Changes
+    const { stdout: statusOutput } = await execa("git", [
         "-C",
         sourcePath,
-        "rev-parse",
-        "--abbrev-ref",
-        "HEAD",
+        "status",
+        "--porcelain",
     ])
-    if (branch.trim() !== "main") {
-        s.stop(`Validation Failed: You are on branch '${branch.trim()}'.`, 1)
-        throw new ValidationError("You must be on the 'main' branch to deploy.")
+    if (statusOutput.trim() !== "") {
+        s.stop("Validation Failed", 1)
+        throw new ValidationError(
+            "You have uncommitted changes. Please commit or stash them.",
+        )
     }
 
-    // C. Check Sync Status
-    s.message("Checking remote sync status...")
+    // D. Check Sync Status (Pull/Push)
     await execa("git", ["-C", sourcePath, "fetch", "origin", "main"])
 
     const { stdout: localHash } = await execa("git", [
@@ -49,7 +76,8 @@ export async function validateGit(sourcePath, s) {
     ])
 
     if (localHash.trim() !== remoteHash.trim()) {
-        s.stop("Validation Failed: Branch is out of sync with origin/main.", 1)
+        s.stop()
+        log.error("Validation Failed: Branch is out of sync with origin/main.")
 
         // Optional: Show ahead/behind info
         try {
@@ -71,5 +99,6 @@ export async function validateGit(sourcePath, s) {
         throw new ValidationError("Please pull/push changes before deploying.")
     }
 
-    s.stop("Git validation passed (main branch, in sync).")
+    s.clear()
+    log.success("Git validation passed (main branch, in sync).")
 }

package/src/index.js

@@ -1,13 +1,14 @@
 #!/usr/bin/env node
 
 import chalk from "chalk"
-import { cancel } from "@clack/prompts"
+import { cancel, log } from "@clack/prompts"
 import {
     validateEnv,
     DAGS_DIR,
     verbose,
     showVersion,
     showHelp,
+    skipGit,
 } from "./config.js"
 import {
     showVersionInfo,
@@ -24,7 +25,6 @@ import path from "path"
 
 async function main() {
     try {
-        console.clear()
         initLogger(verbose)
         logger.info("INIT", "Skyhook started")
 
@@ -37,25 +37,28 @@ async function main() {
         validateEnv()
         showIntro()
 
+        log.info("Looking for DAGs in:")
+        console.log(`${chalk.gray("│")}  ${chalk.dim(DAGS_DIR)}`)
+        log.warn(chalk.dim("Press Ctrl+C to exit at any time."))
+
         const s = createSpinner()
 
-        // 1. Scan
         const folders = scanDags(DAGS_DIR, s)
 
-        // 2. Select
         const selectedFolder = await selectDag(folders)
         const sourcePath = path.join(DAGS_DIR, selectedFolder)
 
-        // 3. Validate
-        await validateGit(sourcePath, s)
+        if (skipGit) {
+            logger.info("GIT", "Skipping Git validation (--no-git)")
+        } else {
+            await validateGit(sourcePath, s)
+        }
 
-        // 4. Deploy
         await deployDag(selectedFolder, sourcePath, s, verbose)
 
-        // 5. Post-Deployment Polish
         const quote = await fetchQuote()
         if (quote) {
-            console.log(chalk.italic.dim(`\n${quote}\n`))
+            console.log(chalk.italic.dim(`${quote}\n`))
         }
     } catch (error) {
         if (error.name === "UserCancellationError") {

package/src/utils.js

@@ -8,11 +8,26 @@ export function countFiles(dir) {
         file = path.resolve(dir, file)
         const stat = fs.statSync(file)
         if (stat && stat.isDirectory()) {
-            if (!file.includes(".git") && !file.includes("__pycache__")) {
+            if (
+                !file.includes(".git") &&
+                !file.includes("__pycache__") &&
+                !file.includes("tests") &&
+                !file.includes(".github")
+            ) {
                 results += countFiles(file)
             }
         } else {
-            results += 1
+            const filename = path.basename(file)
+            const ignoredFiles = [
+                "pyproject.toml",
+                "README.md",
+                "Makefile",
+                ".gitignore",
+                ".pre-commit-config.yaml",
+            ]
+            if (!ignoredFiles.includes(filename)) {
+                results += 1
+            }
         }
     })
     return results