aws-lambda-layer-cli 1.4.1 → 2.0.2

package/scripts/{aws-lambda-layer → aws-lambda-layer-cli}

@@ -2,7 +2,7 @@
 
 # AWS Lambda Layer CLI Tool
 # Install: sudo ./scripts/install.sh
-# Usage: aws-lambda-layer zip --nodejs express,axios -n my-layer
+# Usage: aws-lambda-layer-cli zip --nodejs express,axios -n my-layer
 
 set -e
 set -u
@@ -26,7 +26,7 @@ STRIKETHROUGH='\033[9m'
 
 # Paths
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-INSTALL_DIR="/usr/local/lib/aws-lambda-layer"
+INSTALL_DIR="/usr/local/lib/aws-lambda-layer-cli"
 
 # Determine script locations (prefer relative to script, fallback to global install)
 if [ -f "$SCRIPT_DIR/create_nodejs_layer.sh" ]; then
@@ -54,16 +54,18 @@ show_help() {
     printf "${BLUE}${BOLD}AWS Lambda Layer CLI Tool - ${version}${NC}\n\n"
     
     printf "${BLUE}Usage:${NC}\n"
-    printf "  aws-lambda-layer ${GREEN}zip${NC} ${YELLOW}--nodejs${NC} <packages> [options]\n"
-    printf "  aws-lambda-layer ${GREEN}zip${NC} ${YELLOW}--python${NC} <packages> [options]\n"
-    printf "  aws-lambda-layer ${GREEN}publish${NC} ${YELLOW}--nodejs${NC} <packages> [options]\n"
-    printf "  aws-lambda-layer ${GREEN}publish${NC} ${YELLOW}--python${NC} <packages> [options]\n"
-    printf "  aws-lambda-layer ${GREEN}help${NC}\n"
-    printf "  aws-lambda-layer [options]\n\n"
+    printf "  aws-lambda-layer-cli ${GREEN}zip${NC} ${YELLOW}--nodejs${NC} <packages> [options]\n"
+    printf "  aws-lambda-layer-cli ${GREEN}zip${NC} ${YELLOW}--python${NC} <packages> [options]\n"
+    printf "  aws-lambda-layer-cli ${GREEN}publish${NC} ${YELLOW}--nodejs${NC} <packages> [options]\n"
+    printf "  aws-lambda-layer-cli ${GREEN}publish${NC} ${YELLOW}--python${NC} <packages> [options]\n"
+    printf "  aws-lambda-layer-cli ${GREEN}help${NC}\n"
+    printf "  aws-lambda-layer-cli [options]\n\n"
     
     printf "${BLUE}Commands:${NC}\n"
     printf "  ${GREEN}zip${NC}            Create and package a Lambda layer as zip file\n"
     printf "  ${GREEN}publish${NC}        Create and publish a Lambda layer to AWS (uses IAM credentials)\n"
+    printf "  ${GREEN}completion${NC}     Generate shell completion scripts\n"
+    printf "  ${GREEN}uninstall${NC}      Uninstall the tool and remove all files\n"
     printf "  ${GREEN}help${NC}           Show this help message\n\n"
     
     printf "${BLUE}Runtime Options:${NC}\n"
@@ -80,6 +82,7 @@ show_help() {
     printf "  ${YELLOW}--profile${NC}               AWS CLI profile to use (default: default profile)\n"
     printf "  ${YELLOW}--region${NC}                AWS region (e.g., us-east-1, ap-east-1)\n"
     printf "${BLUE}Other Options:${NC}\n"
+    printf "  ${YELLOW}--version, -v${NC}           Show tool version information\n"
     printf "  ${YELLOW}--node-version${NC}          Node.js version (default: 24)\n"
     printf "  ${YELLOW}--python-version${NC}        Python version (default: 3.14)\n"
     printf "  ${YELLOW}--no-uv${NC}                 Use pip/venv instead of uv\n\n"
@@ -89,12 +92,12 @@ show_help() {
     printf "  Python:     numpy==1.26.0, pandas>=2.1.0, requests~=2.31.0\n\n"
     
     printf "${MAGENTA}${UNDERLINE}Examples:${NC}\n"
-    printf "  aws-lambda-layer ${GREEN}zip${NC} ${YELLOW}--nodejs${NC} express,lodash\n"
-    printf "  aws-lambda-layer ${GREEN}zip${NC} ${YELLOW}--python${NC} \"numpy==1.26.0,pandas>=2.1.0\"\n"
-    printf "  aws-lambda-layer ${GREEN}publish${NC} ${YELLOW}--nodejs${NC} express@4.18.2 ${YELLOW}--description${NC} \"Express layer\"\n"
-    printf "  aws-lambda-layer ${GREEN}publish${NC} ${YELLOW}--python${NC} numpy==1.26.0 ${YELLOW}--description${NC} \"NumPy layer\"\n"
-    printf "  aws-lambda-layer ${GREEN}publish${NC} ${YELLOW}--nodejs${NC} date-fns,uuid ${YELLOW}--name${NC} utility-layer ${YELLOW}--description${NC} \"Utility packages\"\n"
-    printf "  aws-lambda-layer ${GREEN}publish${NC} ${YELLOW}--nodejs${NC} express@4.18.2 ${YELLOW}--profile${NC} production ${YELLOW}--region${NC} ap-east-1 ${YELLOW}--description${NC} \"Express layer\"\n\n"
+    printf "  aws-lambda-layer-cli ${GREEN}zip${NC} ${YELLOW}--nodejs${NC} express,lodash\n"
+    printf "  aws-lambda-layer-cli ${GREEN}zip${NC} ${YELLOW}--python${NC} \"numpy==1.26.0,pandas>=2.1.0\"\n"
+    printf "  aws-lambda-layer-cli ${GREEN}publish${NC} ${YELLOW}--nodejs${NC} express@4.18.2 ${YELLOW}--description${NC} \"Express layer\"\n"
+    printf "  aws-lambda-layer-cli ${GREEN}publish${NC} ${YELLOW}--python${NC} numpy==1.26.0 ${YELLOW}--description${NC} \"NumPy layer\"\n"
+    printf "  aws-lambda-layer-cli ${GREEN}publish${NC} ${YELLOW}--nodejs${NC} date-fns,uuid ${YELLOW}--name${NC} utility-layer ${YELLOW}--description${NC} \"Utility packages\"\n"
+    printf "  aws-lambda-layer-cli ${GREEN}publish${NC} ${YELLOW}--nodejs${NC} express@4.18.2 ${YELLOW}--profile${NC} production ${YELLOW}--region${NC} ap-east-1 ${YELLOW}--description${NC} \"Express layer\"\n\n"
     
     printf "${YELLOW}${BOLD}Requirements for publish command:${NC}\n"
     printf "  - AWS CLI installed and configured\n"
@@ -458,7 +461,12 @@ handle_publish() {
     done
     
     # Parse runtime flag from remaining arguments
-    set -- "${new_args[@]}"
+    if [ ${#new_args[@]} -eq 0 ]; then
+        set --
+    else
+        set -- "${new_args[@]}"
+    fi
+
     case "${1:-}" in
         --nodejs|--node|-n)
             runtime="nodejs"
@@ -753,6 +761,86 @@ handle_publish() {
     printf "📁 Zip file saved: ${CYAN}$output_dir/$zip_file${NC}\n"
 }
 
+# Handle completion command
+handle_completion() {
+    local shell=""
+    local show_help=false
+    
+    if [ $# -eq 0 ]; then
+        show_help=true
+    fi
+
+    while [[ $# -gt 0 ]]; do
+        case "$1" in
+            --zsh)
+                shell="zsh"
+                shift
+                ;;
+            --bash)
+                shell="bash"
+                shift
+                ;;
+            --help|-h)
+                show_help=true
+                shift
+                ;;
+            *)
+                shift
+                ;;
+        esac
+    done
+    
+    if [ "$show_help" = true ] || [ -z "$shell" ]; then
+        printf "${BLUE}Usage:${NC}\n"
+        printf "  aws-lambda-layer-cli ${GREEN}completion${NC} [options]\n\n"
+        printf "${BLUE}Options:${NC}\n"
+        printf "  ${YELLOW}--zsh${NC}     Output zsh completion script\n"
+        printf "  ${YELLOW}--bash${NC}    Output bash completion script\n\n"
+        printf "${MAGENTA}${UNDERLINE}Examples:${NC}\n"
+        printf "  # Load completion in current shell\n"
+        printf "  source <(aws-lambda-layer-cli ${GREEN}completion${NC} ${YELLOW}--bash${NC})\n\n"
+        printf "  # Add to .zshrc\n"
+        printf "  aws-lambda-layer-cli ${GREEN}completion${NC} ${YELLOW}--zsh${NC} >> ~/.zshrc\n"
+        return 0
+    fi
+    
+    # Find completion directory
+    # If running from source: ../completion
+    # If installed: $INSTALL_DIR/completion
+    local completion_dir=""
+    if [ -d "$SCRIPT_DIR/../completion" ]; then
+        completion_dir="$SCRIPT_DIR/../completion"
+    elif [ -d "$INSTALL_DIR/completion" ]; then
+        completion_dir="$INSTALL_DIR/completion"
+    else
+        printf "${RED}Error: Completion directory not found${NC}\n" >&2
+        return 1
+    fi
+    
+    if [ "$shell" = "zsh" ]; then
+        local file="$completion_dir/aws-lambda-layer-completion.zsh"
+        if [ -f "$file" ]; then
+            # Remove the auto-execution line if present
+            sed 's/_aws-lambda-layer "\$@"//g' "$file"
+            printf "\n# Register completion\n"
+            printf "if type compdef &>/dev/null; then\n"
+            printf "  compdef _aws-lambda-layer aws-lambda-layer\n"
+            printf "fi\n"
+        else
+            printf "${RED}Error: Completion script not found for zsh${NC}\n" >&2
+            return 1
+        fi
+    else
+        local file="$completion_dir/aws-lambda-layer-completion.bash"
+        if [ -f "$file" ]; then
+            cat "$file"
+        else
+            printf "${RED}Error: Completion script not found for bash${NC}\n" >&2
+            return 1
+        fi
+    fi
+}
+
 # Function to convert file paths for compatibility across environments
 convert_path() {
     local input_path="$1"
@@ -786,6 +874,25 @@ convert_path() {
     esac
 }
 
+# Handle uninstall
+handle_uninstall() {
+    local uninstall_script="$SCRIPT_DIR/uninstall.sh"
+    
+    # Check if uninstall script exists in script dir
+    if [ ! -f "$uninstall_script" ]; then
+        # Check install dir
+        uninstall_script="$INSTALL_DIR/uninstall.sh"
+    fi
+    
+    if [ -f "$uninstall_script" ]; then
+        exec "$uninstall_script" "$@"
+    else
+        printf "${RED}Error: Uninstall script not found${NC}\n" >&2
+        printf "Please run the uninstall script manually or remove the installation directory.\n" >&2
+        exit 1
+    fi
+}
+
 # Main command parsing
 main() {
     if [ $# -eq 0 ]; then
@@ -802,6 +909,14 @@ main() {
             shift
             handle_publish "$@"
             ;;
+        uninstall)
+            shift
+            handle_uninstall "$@"
+            ;;
+        completion)
+            shift
+            handle_completion "$@"
+            ;;
         help|--help|-h)
             show_help
             ;;
@@ -809,9 +924,9 @@ main() {
             show_version
             ;;
         *)
-            printf "${RED}Error: Unknown command '$1'${NC}\n"
-            printf "Available commands: zip, publish\n"
-            printf "Use --help for more information\n"
+            printf "${RED}Error: Unknown command '$1'${NC}\n" >&2
+            printf "Available commands: zip, publish\n" >&2
+            printf "Use --help for more information\n" >&2
             exit 1
             ;;
     esac

package/scripts/build_pypi.sh

@@ -5,6 +5,7 @@ set -e
 BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 BUILD_DIR="$BASE_DIR/aws_lambda_layer_cli"
 ASSETS_DIR="$BUILD_DIR/assets"
+COMPLETION_DIR="$BUILD_DIR/completion"
 
 echo "Preparing PyPI package structure..."
 
@@ -13,6 +14,7 @@ rm -rf "$BUILD_DIR" "$BASE_DIR/dist" "$BASE_DIR/build" "$BASE_DIR/aws_lambda_lay
 
 # Create package directories
 mkdir -p "$ASSETS_DIR"
+mkdir -p "$COMPLETION_DIR"
 
 # Copy Python package files
 cp "$BASE_DIR/scripts/pypi_resources/__init__.py" "$BUILD_DIR/"
@@ -20,18 +22,24 @@ cp "$BASE_DIR/scripts/pypi_resources/cli.py" "$BUILD_DIR/"
 cp "$BASE_DIR/VERSION.txt" "$BUILD_DIR/"
 
 # Copy assets (bash scripts)
-cp "$BASE_DIR/scripts/aws-lambda-layer" "$ASSETS_DIR/"
+cp "$BASE_DIR/scripts/aws-lambda-layer-cli" "$ASSETS_DIR/"
 cp "$BASE_DIR/scripts/create_nodejs_layer.sh" "$ASSETS_DIR/"
 cp "$BASE_DIR/scripts/create_python_layer.sh" "$ASSETS_DIR/"
+cp "$BASE_DIR/scripts/uninstall.sh" "$ASSETS_DIR/"
 
-# Create __init__.py for assets package
+# Copy completion files
+cp "$BASE_DIR/completion/aws-lambda-layer-completion.bash" "$COMPLETION_DIR/"
+cp "$BASE_DIR/completion/aws-lambda-layer-completion.zsh" "$COMPLETION_DIR/"
+
+# Create __init__.py for assets and completion packages
 touch "$ASSETS_DIR/__init__.py"
+touch "$COMPLETION_DIR/__init__.py"
 
 echo "Building PyPI package..."
 cd "$BASE_DIR"
 python3 -m build
 
 echo "Cleaning up temporary package files..."
-rm -rf "$BUILD_DIR" "$BASE_DIR/aws_lambda_layer_cli.egg-info" "$BASE_DIR/build"
+# rm -rf "$BUILD_DIR" "$BASE_DIR/aws_lambda_layer_cli.egg-info" "$BASE_DIR/build"
 
 echo "Build complete! Artifacts are in dist/"

package/scripts/install.js

@@ -3,32 +3,70 @@ const { execSync } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const readline = require('readline');
 
-try {
-  const isWindows = os.platform() === 'win32';
-  const scriptPath = isWindows ? path.join('scripts', 'install.ps1') : path.join('scripts', 'install.sh');
-  const fullPath = path.join(__dirname, '..', scriptPath);
+const isWindows = os.platform() === 'win32';
+const scriptPath = isWindows ? path.join('scripts', 'install.ps1') : path.join('scripts', 'install.sh');
+const fullPath = path.join(__dirname, '..', scriptPath);
 
-  if (!fs.existsSync(fullPath)) {
-    console.error(`Installation script not found: ${fullPath}`);
+if (!fs.existsSync(fullPath)) {
+  console.error(`Installation script not found: ${fullPath}`);
+  process.exit(1);
+}
+
+function runInstall(useSudo) {
+  try {
+    const cmd = useSudo ? `sudo bash "${fullPath}"` : `bash "${fullPath}"`;
+    execSync(cmd, { stdio: 'inherit' });
+    console.log('✓ Installation completed successfully');
+    process.exit(0);
+  } catch (error) {
+    console.error('✗ Installation failed:', error.message);
     process.exit(1);
   }
+}
 
-  if (isWindows) {
-    // Run PowerShell script with proper execution policy
+if (isWindows) {
+  try {
     execSync(`powershell -ExecutionPolicy Bypass -File "${fullPath}"`, {
       stdio: 'inherit',
       shell: true
     });
+    console.log('✓ Installation completed successfully');
+  } catch (error) {
+    console.error('✗ Installation failed:', error.message);
+    process.exit(1);
+  }
+} else {
+  const isRoot = process.getuid && process.getuid() === 0;
+
+  if (isRoot) {
+    console.log('Running installation with root privileges...');
+    runInstall(false);
   } else {
-    // Run bash script
-    execSync(`bash "${fullPath}"`, {
-      stdio: 'inherit'
+    console.log('Installation requires root privileges for system-wide components...');
+    // Check if interactive
+    if (!process.stdin.isTTY) {
+      console.log('Non-interactive environment detected. Skipping system-wide installation steps requiring sudo.');
+      process.exit(0);
+    }
+
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+
+    console.log('\nThis package includes optional system-wide components (shell completion, helper scripts).');
+    console.log('Installing them requires root privileges (sudo).');
+    
+    rl.question('Do you want to install these components? [y/N] ', (answer) => {
+      rl.close();
+      if (answer.toLowerCase() === 'y' || answer.toLowerCase() === 'yes') {
+        runInstall(true);
+      } else {
+        console.log('Skipping system-wide installation.');
+        process.exit(0);
+      }
     });
   }
-  
-  console.log('✓ Installation completed successfully');
-} catch (error) {
-  console.error('✗ Installation failed:', error.message);
-  process.exit(1);
 }