appydave-tools 0.76.5 → 0.76.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0531bc72c6c4aeac9830f72f552a4d683775d7efc61ee483069d882cdbbbf5af
-  data.tar.gz: 1c8e032ddc4e8dfc4c196452465abea40958107d2d68c5e4063c1ec2c36a3a9d
+  metadata.gz: 51ac1542f215f90d518a24c96b5185cf954b9db2beab4bbb93c8d43f3b106fb7
+  data.tar.gz: 11acb6d8817125846945e4f7ba3bfb77b305155093f507f346a21477c4102cdb
 SHA512:
-  metadata.gz: 1787f781bdf758fae98c3388cce0437aca330a3161937f5c214651885c80e05598682e64afc3adea1e2ffd3b2f70d09287a9acca12c8fada89077b7d48791a39
-  data.tar.gz: 6cadabed0aa0f0be9d993b4dbda2c304c9a34f717fcc7b86b8cc059777e7cb0a57a494ddc2c3e5432fd4d4d85990330a6d401aa75c89bb7b0be5f5207c68d12b
+  metadata.gz: 02a5b3623de62bbb09d343101c1edc48b711fc8682d9396689043afcdd134276c887de57d802e8a717db9adaeb34b48eb14dd6a199e085d64430a0525300cf1e
+  data.tar.gz: ce60ac62a7753a206768335c7cc51c8d4765223efd9dd34d4a490fc250f8af63aca11fd532f9918f15ac075be8e7698bd7613704040a16f66777a0455ca54c25

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## [0.76.6](https://github.com/appydave/appydave-tools/compare/v0.76.5...v0.76.6) (2026-03-19)
+
+
+### Bug Fixes
+
+* extract S3ScanCommand class from VatCLI; add smoke-test spec ([cd03606](https://github.com/appydave/appydave-tools/commit/cd03606e3307665c7f69391d6c160f50df1773ba))
+* remove redundant rubocop disable directives from S3ScanCommand (CI rubocop 1.85.1) ([4c9deb4](https://github.com/appydave/appydave-tools/commit/4c9deb4298d4577a99d0e82e7b72918a26275d40))
+
+## [0.76.5](https://github.com/appydave/appydave-tools/compare/v0.76.4...v0.76.5) (2026-03-19)
+
+
+### Bug Fixes
+
+* extract LocalSyncStatus module from VatCLI; add spec ([0672855](https://github.com/appydave/appydave-tools/commit/0672855a25ebcbb2df3f5eea6208f910aed74124))
+* remove redundant rubocop disable directives in LocalSyncStatus ([9050795](https://github.com/appydave/appydave-tools/commit/905079573caf7555771da02b2d9c6ebfc34d1c95))
+* replace format_bytes with FileHelper.format_size; remove duplicate method from VatCLI ([3cd362f](https://github.com/appydave/appydave-tools/commit/3cd362f79342578ddb7a750b9b404851cf4d1eb4))
+* restore youtube_automation_config require removed by micro-cleanup; fix spec brand dir setup ([a5779a7](https://github.com/appydave/appydave-tools/commit/a5779a7b5dab1697b2a21ca3bbece9c0bff340c2))
+
 ## [0.76.4](https://github.com/appydave/appydave-tools/compare/v0.76.3...v0.76.4) (2026-03-19)
 
 

data/bin/dam

@@ -154,7 +154,7 @@ class VatCLI
 
   # S3 Upload
   def s3_up_command(args)
-    options = parse_s3_args(args, 's3-up')
+    options = Appydave::Tools::Dam::S3ArgParser.parse_s3(args, 's3-up')
     s3_ops = Appydave::Tools::Dam::S3Operations.new(options[:brand], options[:project])
     s3_ops.upload(dry_run: options[:dry_run])
   rescue StandardError => e
@@ -164,7 +164,7 @@ class VatCLI
 
   # S3 Download
   def s3_down_command(args)
-    options = parse_s3_args(args, 's3-down')
+    options = Appydave::Tools::Dam::S3ArgParser.parse_s3(args, 's3-down')
     s3_ops = Appydave::Tools::Dam::S3Operations.new(options[:brand], options[:project])
     s3_ops.download(dry_run: options[:dry_run])
   rescue StandardError => e
@@ -174,7 +174,7 @@ class VatCLI
 
   # S3 Status
   def s3_status_command(args)
-    options = parse_s3_args(args, 's3-status')
+    options = Appydave::Tools::Dam::S3ArgParser.parse_s3(args, 's3-status')
     s3_ops = Appydave::Tools::Dam::S3Operations.new(options[:brand], options[:project])
     s3_ops.status
   rescue StandardError => e
@@ -184,7 +184,7 @@ class VatCLI
 
   # S3 Cleanup Remote
   def s3_cleanup_remote_command(args)
-    options = parse_s3_args(args, 's3-cleanup-remote')
+    options = Appydave::Tools::Dam::S3ArgParser.parse_s3(args, 's3-cleanup-remote')
     s3_ops = Appydave::Tools::Dam::S3Operations.new(options[:brand], options[:project])
     s3_ops.cleanup(force: options[:force], dry_run: options[:dry_run])
   rescue StandardError => e
@@ -194,7 +194,7 @@ class VatCLI
 
   # S3 Cleanup Local
   def s3_cleanup_local_command(args)
-    options = parse_s3_args(args, 's3-cleanup-local')
+    options = Appydave::Tools::Dam::S3ArgParser.parse_s3(args, 's3-cleanup-local')
     s3_ops = Appydave::Tools::Dam::S3Operations.new(options[:brand], options[:project])
     s3_ops.cleanup_local(force: options[:force], dry_run: options[:dry_run])
   rescue StandardError => e
@@ -204,7 +204,7 @@ class VatCLI
 
   # Share file via pre-signed URL
   def s3_share_command(args)
-    options = parse_share_args(args)
+    options = Appydave::Tools::Dam::S3ArgParser.parse_share(args)
 
     share_ops = Appydave::Tools::Dam::ShareOperations.new(options[:brand], options[:project])
     share_ops.generate_links(files: options[:file], expires: options[:expires], download: options[:download])
@@ -215,7 +215,7 @@ class VatCLI
 
   # Discover files in S3 for a project
   def s3_discover_command(args)
-    options = parse_discover_args(args)
+    options = Appydave::Tools::Dam::S3ArgParser.parse_discover(args)
     files = fetch_s3_files(options[:brand_key], options[:project_id])
 
     return if handle_empty_files?(files, options[:brand_key], options[:project_id])
@@ -228,7 +228,7 @@ class VatCLI
 
   # Archive project to SSD
   def archive_command(args)
-    options = parse_s3_args(args, 'archive')
+    options = Appydave::Tools::Dam::S3ArgParser.parse_s3(args, 'archive')
     s3_ops = Appydave::Tools::Dam::S3Operations.new(options[:brand], options[:project])
     s3_ops.archive(force: options[:force], dry_run: options[:dry_run])
   rescue StandardError => e
@@ -461,132 +461,6 @@ class VatCLI
     exit 1
   end
 
-  # Parse S3 command arguments
-  # rubocop:disable Metrics/MethodLength
-  def parse_s3_args(args, command)
-    dry_run = args.include?('--dry-run')
-    force = args.include?('--force')
-    args = args.reject { |arg| arg.start_with?('--') }
-
-    brand_arg = args[0]
-    project_arg = args[1]
-
-    if brand_arg.nil?
-      # Auto-detect from PWD
-      brand, project_id = Appydave::Tools::Dam::ProjectResolver.detect_from_pwd
-      if brand.nil? || project_id.nil?
-        puts '❌ Could not auto-detect brand/project from current directory'
-        puts "Usage: dam #{command} <brand> <project> [--dry-run]"
-        exit 1
-      end
-      brand_key = brand # Already detected, use as-is
-    else
-      # Validate brand exists before trying to resolve project
-      unless valid_brand?(brand_arg)
-        puts "❌ Invalid brand: '#{brand_arg}'"
-        puts ''
-        puts 'Valid brands:'
-        puts '  appydave  → v-appydave         (AppyDave brand)'
-        puts '  voz       → v-voz              (VOZ client)'
-        puts '  aitldr    → v-aitldr           (AITLDR brand)'
-        puts '  kiros     → v-kiros            (Kiros client)'
-        puts '  joy       → v-beauty-and-joy   (Beauty & Joy)'
-        puts '  ss        → v-supportsignal    (SupportSignal)'
-        puts ''
-        puts "Usage: dam #{command} <brand> <project> [--dry-run]"
-        exit 1
-      end
-
-      brand_key = brand_arg # Use the shortcut/key (e.g., 'appydave')
-      brand = Appydave::Tools::Dam::Config.expand_brand(brand_arg) # Expand for path resolution
-      project_id = Appydave::Tools::Dam::ProjectResolver.resolve(brand_arg, project_arg)
-    end
-
-    # Set ENV for compatibility with ConfigLoader
-    ENV['BRAND_PATH'] = Appydave::Tools::Dam::Config.brand_path(brand)
-
-    { brand: brand_key, project: project_id, dry_run: dry_run, force: force }
-  end
-  # rubocop:enable Metrics/MethodLength
-
-  def valid_brand?(brand_key)
-    Appydave::Tools::Configuration::Config.configure
-    brands = Appydave::Tools::Configuration::Config.brands
-    brands.key?(brand_key) || brands.shortcut?(brand_key)
-  end
-
-  def parse_share_args(args)
-    # Extract --expires flag
-    expires = '7d' # default
-    if (expires_index = args.index('--expires'))
-      expires = args[expires_index + 1]
-      args.delete_at(expires_index + 1)
-      args.delete_at(expires_index)
-    end
-
-    # Extract --download flag
-    download = args.include?('--download')
-
-    # Remove other flags
-    args = args.reject { |arg| arg.start_with?('--') }
-
-    brand_arg = args[0]
-    project_arg = args[1]
-    file_arg = args[2]
-
-    show_share_usage_and_exit if brand_arg.nil? || project_arg.nil? || file_arg.nil?
-
-    brand_key = brand_arg
-    brand = Appydave::Tools::Dam::Config.expand_brand(brand_arg)
-    project_id = Appydave::Tools::Dam::ProjectResolver.resolve(brand_arg, project_arg)
-
-    # Set ENV for compatibility with ConfigLoader
-    ENV['BRAND_PATH'] = Appydave::Tools::Dam::Config.brand_path(brand)
-
-    { brand: brand_key, project: project_id, file: file_arg, expires: expires, download: download }
-  end
-
-  def show_share_usage_and_exit
-    puts 'Usage: dam s3-share <brand> <project> <file> [--expires 7d] [--download]'
-    puts ''
-    puts 'Options:'
-    puts '  --expires TIME    Expiry time (default: 7d)'
-    puts '  --download        Force download instead of viewing in browser'
-    puts ''
-    puts 'Examples:'
-    puts '  dam s3-share appydave b70 video.mp4'
-    puts '  dam s3-share appydave b70 video.mp4 --expires 24h'
-    puts '  dam s3-share appydave b70 video.mp4 --download'
-    puts '  dam s3-share voz boy-baker final-edit.mov --expires 3d --download'
-    exit 1
-  end
-
-  def parse_discover_args(args)
-    shareable = args.include?('--shareable')
-    args = args.reject { |arg| arg.start_with?('--') }
-
-    brand_arg = args[0]
-    project_arg = args[1]
-
-    if brand_arg.nil? || project_arg.nil?
-      puts 'Usage: dam s3-discover <brand> <project> [--shareable]'
-      puts ''
-      puts 'Examples:'
-      puts '  dam s3-discover appydave b70              # List files'
-      puts '  dam s3-discover appydave b70 --shareable  # Generate share commands'
-      exit 1
-    end
-
-    brand_key = brand_arg
-    brand = Appydave::Tools::Dam::Config.expand_brand(brand_arg)
-    project_id = Appydave::Tools::Dam::ProjectResolver.resolve(brand_arg, project_arg)
-
-    # Set ENV for compatibility with ConfigLoader
-    ENV['BRAND_PATH'] = Appydave::Tools::Dam::Config.brand_path(brand)
-
-    { brand_key: brand_key, project_id: project_id, shareable: shareable }
-  end
-
   def fetch_s3_files(brand_key, project_id)
     s3_ops = Appydave::Tools::Dam::S3Operations.new(brand_key, project_id)
     s3_ops.list_s3_files
@@ -1325,9 +1199,9 @@ class VatCLI
     brand_arg = args[0]
 
     if all_brands
-      scan_all_brands_s3
+      Appydave::Tools::Dam::S3ScanCommand.new.scan_all
     elsif brand_arg
-      scan_single_brand_s3(brand_arg)
+      Appydave::Tools::Dam::S3ScanCommand.new.scan_single(brand_arg)
     else
       puts 'Usage: dam s3-scan <brand> [--all]'
       puts ''
@@ -1343,188 +1217,6 @@ class VatCLI
     puts e.backtrace.first(5).join("\n") if ENV['DEBUG']
     exit 1
   end
-
-  # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity
-  def scan_single_brand_s3(brand_arg)
-    puts "🔄 Scanning S3 for #{brand_arg}..."
-    puts ''
-
-    brand_key = brand_arg
-    scanner = Appydave::Tools::Dam::S3Scanner.new(brand_key)
-
-    # Get brand info for S3 path
-    Appydave::Tools::Configuration::Config.configure
-    brand_info = Appydave::Tools::Configuration::Config.brands.get_brand(brand_key)
-    bucket = brand_info.aws.s3_bucket
-    prefix = brand_info.aws.s3_prefix
-    region = brand_info.aws.region
-
-    # Spinner characters for progress
-    spinner_chars = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏']
-    spinner_index = 0
-
-    print "🔍 Scanning s3://#{bucket}/#{prefix}\n"
-    print '    Scanning projects... '
-
-    # Scan all projects with progress callback
-    results = scanner.scan_all_projects(show_progress: false) do |current, total|
-      print "\r    Scanning projects... #{spinner_chars[spinner_index]} (#{current}/#{total})"
-      spinner_index = (spinner_index + 1) % spinner_chars.length
-    end
-
-    print "\r    Scanning projects... ✓ (#{results.size} found)\n"
-    puts ''
-
-    if results.empty?
-      puts "⚠️  No projects found in S3 for #{brand_key}"
-      puts '   This may indicate:'
-      puts '   - No files uploaded to S3 yet'
-      puts '   - S3 bucket or prefix misconfigured'
-      puts '   - AWS credentials issue'
-      return
-    end
-
-    # Load existing manifest
-    brand_path = Appydave::Tools::Dam::Config.brand_path(brand_key)
-    manifest_path = File.join(brand_path, 'projects.json')
-
-    unless File.exist?(manifest_path)
-      puts "❌ Manifest not found: #{manifest_path}"
-      puts "   Run: dam manifest #{brand_key}"
-      puts "   Then retry: dam s3-scan #{brand_key}"
-      exit 1
-    end
-
-    manifest = JSON.parse(File.read(manifest_path), symbolize_names: true)
-
-    # Identify matched and orphaned S3 projects
-    local_project_ids = manifest[:projects].map { |p| p[:id] }
-    matched_projects = results.slice(*local_project_ids)
-    orphaned_projects = results.reject { |project_id, _| local_project_ids.include?(project_id) }
-
-    # Merge S3 scan data into manifest for matched projects
-    updated_count = 0
-    manifest[:projects].each do |project|
-      project_id = project[:id]
-      s3_data = results[project_id]
-      next unless s3_data
-
-      project[:storage][:s3] = s3_data
-      updated_count += 1
-    end
-
-    # Update timestamp and note
-    manifest[:config][:last_updated] = Time.now.utc.iso8601
-    manifest[:config][:note] = 'Auto-generated manifest with S3 scan data. Regenerate with: dam s3-scan'
-
-    # Write updated manifest
-    File.write(manifest_path, JSON.pretty_generate(manifest))
-
-    # Add local sync status to matched projects
-    Appydave::Tools::Dam::LocalSyncStatus.enrich!(matched_projects, brand_key)
-
-    # Display table
-    display_s3_scan_table(matched_projects, orphaned_projects, bucket, prefix, region)
-
-    # Summary
-    total_manifest_projects = manifest[:projects].size
-    missing_count = total_manifest_projects - matched_projects.size
-
-    puts ''
-    puts 'ℹ️  Summary:'
-    puts "   • Updated #{updated_count} projects in manifest"
-    puts "   • #{missing_count} local project(s) not yet uploaded to S3" if missing_count.positive?
-    puts "   • Manifest: #{manifest_path}"
-    puts ''
-  end
-  # rubocop:enable Metrics/MethodLength, Metrics/CyclomaticComplexity
-
-  # Display S3 scan results in table format
-  # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity, Style/FormatStringToken
-  def display_s3_scan_table(matched_projects, orphaned_projects, bucket, prefix, region)
-    puts '✅ S3 Projects Report'
-    puts ''
-    puts 'PROJECT                              FILES    SIZE        LOCAL      S3 MODIFIED'
-    puts '-' * 92
-
-    # Display matched projects first (sorted alphabetically)
-    matched_projects.sort.each do |project_id, data|
-      files = data[:file_count].to_s.rjust(5)
-      size = Appydave::Tools::Dam::FileHelper.format_size(data[:total_bytes]).rjust(10)
-      local_status = Appydave::Tools::Dam::LocalSyncStatus.format(data[:local_status], data[:local_file_count], data[:file_count])
-      modified = data[:last_modified] ? Time.parse(data[:last_modified]).strftime('%Y-%m-%d %H:%M') : 'N/A'
-
-      puts format('%-36s %5s %10s  %-9s  %s', project_id, files, size, local_status, modified)
-    end
-
-    # Display orphaned projects (sorted alphabetically)
-    return if orphaned_projects.empty?
-
-    puts '-' * 92
-    orphaned_projects.sort.each do |project_id, data|
-      files = data[:file_count].to_s.rjust(5)
-      size = Appydave::Tools::Dam::FileHelper.format_size(data[:total_bytes]).rjust(10)
-      local_status = 'N/A'
-      modified = data[:last_modified] ? Time.parse(data[:last_modified]).strftime('%Y-%m-%d %H:%M') : 'N/A'
-
-      puts format('%-36s %5s %10s  %-9s  %s', project_id, files, size, local_status, modified)
-    end
-
-    puts ''
-    folder_word = orphaned_projects.size > 1 ? 'folders' : 'folder'
-    puts "⚠️  #{orphaned_projects.size} orphaned #{folder_word} found (no local project)"
-
-    orphaned_projects.sort.each do |project_id, _data|
-      # Build AWS Console URL
-      project_prefix = "#{prefix}#{project_id}/"
-      console_url = "https://#{region}.console.aws.amazon.com/s3/buckets/#{bucket}?prefix=#{project_prefix}&region=#{region}"
-      puts "   → #{project_id}"
-      puts "     #{console_url}"
-    end
-  end
-  # rubocop:enable Metrics/MethodLength, Metrics/CyclomaticComplexity, Style/FormatStringToken
-
-  # rubocop:disable Metrics/MethodLength
-  def scan_all_brands_s3
-    Appydave::Tools::Configuration::Config.configure
-    brands_config = Appydave::Tools::Configuration::Config.brands
-
-    results = []
-    brands_config.brands.each do |brand_info|
-      brand_key = brand_info.key
-      puts ''
-      puts '=' * 60
-
-      begin
-        scan_single_brand_s3(brand_key)
-        results << { brand: brand_key, success: true }
-      rescue StandardError => e
-        puts "❌ Failed to scan #{brand_key}: #{e.message}"
-        results << { brand: brand_key, success: false, error: e.message }
-      end
-    end
-
-    puts ''
-    puts '=' * 60
-    puts '📋 Summary - S3 Scans:'
-    puts ''
-
-    successful, failed = results.partition { |r| r[:success] }
-
-    successful.each do |result|
-      brand_display = result[:brand].ljust(15)
-      puts "✅ #{brand_display} Scanned successfully"
-    end
-
-    failed.each do |result|
-      brand_display = result[:brand].ljust(15)
-      puts "❌ #{brand_display} #{result[:error]}"
-    end
-
-    puts ''
-    puts "Total brands scanned: #{successful.size}/#{results.size}"
-  end
-  # rubocop:enable Metrics/MethodLength
 end
 
 # Run CLI

data/docs/planning/extract-vat-cli/IMPLEMENTATION_PLAN.md

@@ -9,9 +9,9 @@
 
 ## Pending
 - [x] extract-format-bytes — Replaced 4 callers (plan said 3; orphaned-projects loop in display_s3_scan_table was a 4th). format_bytes deleted. rubocop 0 offenses. Commit: 3cd362f.
-- [~] extract-local-sync-status — Extract `add_local_sync_status!` + `format_local_status` → new `LocalSyncStatus` module; add spec; update callers in bin/dam
-- [ ] extract-s3-scan-command — Extract `scan_single_brand_s3` + `scan_all_brands_s3` + `display_s3_scan_table` → new `S3ScanCommand` class; add spec; **depends on extract-local-sync-status completing first**
-- [ ] extract-s3-arg-parser — Extract `parse_s3_args` + `valid_brand?` + `parse_share_args` + `show_share_usage_and_exit` + `parse_discover_args` → new `S3ArgParser` class; add spec
+- [x] extract-local-sync-status — LocalSyncStatus module created, 7 specs added (838 total), both methods gone from VatCLI. Side-fix: restored youtube_automation_config require incorrectly removed in prior commit. v0.76.5.
+- [x] extract-s3-scan-command — S3ScanCommand created, 2 smoke tests added (840 total), 3 methods gone from VatCLI. Note: rubocop-disable directives became redundant once methods left God class — needed 2nd kfix to remove them. v0.76.6.
+- [~] extract-s3-arg-parser — Extract `parse_s3_args` + `valid_brand?` + `parse_share_args` + `show_share_usage_and_exit` + `parse_discover_args` → new `S3ArgParser` class; add spec
 
 ## In Progress
 

data/lib/appydave/tools/dam/s3_arg_parser.rb

@@ -0,0 +1,136 @@
+# frozen_string_literal: true
+
+module Appydave
+  module Tools
+    module Dam
+      # Parses and validates CLI arguments for S3-related dam commands
+      # Handles brand resolution, project lookup, flag extraction, and ENV setup
+      module S3ArgParser
+        module_function
+
+        def parse_s3(args, command)
+          dry_run = args.include?('--dry-run')
+          force = args.include?('--force')
+          args = args.reject { |arg| arg.start_with?('--') }
+
+          brand_arg = args[0]
+          project_arg = args[1]
+
+          if brand_arg.nil?
+            # Auto-detect from PWD
+            brand, project_id = Appydave::Tools::Dam::ProjectResolver.detect_from_pwd
+            if brand.nil? || project_id.nil?
+              puts '❌ Could not auto-detect brand/project from current directory'
+              puts "Usage: dam #{command} <brand> <project> [--dry-run]"
+              exit 1
+            end
+            brand_key = brand # Already detected, use as-is
+          else
+            # Validate brand exists before trying to resolve project
+            unless valid_brand?(brand_arg)
+              puts "❌ Invalid brand: '#{brand_arg}'"
+              puts ''
+              puts 'Valid brands:'
+              puts '  appydave  → v-appydave         (AppyDave brand)'
+              puts '  voz       → v-voz              (VOZ client)'
+              puts '  aitldr    → v-aitldr           (AITLDR brand)'
+              puts '  kiros     → v-kiros            (Kiros client)'
+              puts '  joy       → v-beauty-and-joy   (Beauty & Joy)'
+              puts '  ss        → v-supportsignal    (SupportSignal)'
+              puts ''
+              puts "Usage: dam #{command} <brand> <project> [--dry-run]"
+              exit 1
+            end
+
+            brand_key = brand_arg # Use the shortcut/key (e.g., 'appydave')
+            brand = Appydave::Tools::Dam::Config.expand_brand(brand_arg) # Expand for path resolution
+            project_id = Appydave::Tools::Dam::ProjectResolver.resolve(brand_arg, project_arg)
+          end
+
+          # Set ENV for compatibility with ConfigLoader
+          ENV['BRAND_PATH'] = Appydave::Tools::Dam::Config.brand_path(brand)
+
+          { brand: brand_key, project: project_id, dry_run: dry_run, force: force }
+        end
+
+        def parse_share(args)
+          # Extract --expires flag
+          expires = '7d' # default
+          if (expires_index = args.index('--expires'))
+            expires = args[expires_index + 1]
+            args.delete_at(expires_index + 1)
+            args.delete_at(expires_index)
+          end
+
+          # Extract --download flag
+          download = args.include?('--download')
+
+          # Remove other flags
+          args = args.reject { |arg| arg.start_with?('--') }
+
+          brand_arg = args[0]
+          project_arg = args[1]
+          file_arg = args[2]
+
+          show_share_usage_and_exit if brand_arg.nil? || project_arg.nil? || file_arg.nil?
+
+          brand_key = brand_arg
+          brand = Appydave::Tools::Dam::Config.expand_brand(brand_arg)
+          project_id = Appydave::Tools::Dam::ProjectResolver.resolve(brand_arg, project_arg)
+
+          # Set ENV for compatibility with ConfigLoader
+          ENV['BRAND_PATH'] = Appydave::Tools::Dam::Config.brand_path(brand)
+
+          { brand: brand_key, project: project_id, file: file_arg, expires: expires, download: download }
+        end
+
+        def parse_discover(args)
+          shareable = args.include?('--shareable')
+          args = args.reject { |arg| arg.start_with?('--') }
+
+          brand_arg = args[0]
+          project_arg = args[1]
+
+          if brand_arg.nil? || project_arg.nil?
+            puts 'Usage: dam s3-discover <brand> <project> [--shareable]'
+            puts ''
+            puts 'Examples:'
+            puts '  dam s3-discover appydave b70              # List files'
+            puts '  dam s3-discover appydave b70 --shareable  # Generate share commands'
+            exit 1
+          end
+
+          brand_key = brand_arg
+          brand = Appydave::Tools::Dam::Config.expand_brand(brand_arg)
+          project_id = Appydave::Tools::Dam::ProjectResolver.resolve(brand_arg, project_arg)
+
+          # Set ENV for compatibility with ConfigLoader
+          ENV['BRAND_PATH'] = Appydave::Tools::Dam::Config.brand_path(brand)
+
+          { brand_key: brand_key, project_id: project_id, shareable: shareable }
+        end
+
+        def valid_brand?(brand_key)
+          Appydave::Tools::Configuration::Config.configure
+          brands = Appydave::Tools::Configuration::Config.brands
+          brands.key?(brand_key) || brands.shortcut?(brand_key)
+        end
+
+        def show_share_usage_and_exit
+          puts 'Usage: dam s3-share <brand> <project> <file> [--expires 7d] [--download]'
+          puts ''
+          puts 'Options:'
+          puts '  --expires TIME    Expiry time (default: 7d)'
+          puts '  --download        Force download instead of viewing in browser'
+          puts ''
+          puts 'Examples:'
+          puts '  dam s3-share appydave b70 video.mp4'
+          puts '  dam s3-share appydave b70 video.mp4 --expires 24h'
+          puts '  dam s3-share appydave b70 video.mp4 --download'
+          puts '  dam s3-share voz boy-baker final-edit.mov --expires 3d --download'
+          exit 1
+        end
+      end
+    end
+  end
+end

data/lib/appydave/tools/dam/s3_scan_command.rb

@@ -0,0 +1,191 @@
+# frozen_string_literal: true
+
+module Appydave
+  module Tools
+    module Dam
+      # Encapsulates S3 scan logic: single-brand and all-brands scanning
+      class S3ScanCommand
+        # Scan a single brand's S3 bucket and update its manifest
+        def scan_single(brand_key)
+          puts "🔄 Scanning S3 for #{brand_key}..."
+          puts ''
+
+          scanner = Appydave::Tools::Dam::S3Scanner.new(brand_key)
+
+          # Get brand info for S3 path
+          Appydave::Tools::Configuration::Config.configure
+          brand_info = Appydave::Tools::Configuration::Config.brands.get_brand(brand_key)
+          bucket = brand_info.aws.s3_bucket
+          prefix = brand_info.aws.s3_prefix
+          region = brand_info.aws.region
+
+          # Spinner characters for progress
+          spinner_chars = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏']
+          spinner_index = 0
+
+          print "🔍 Scanning s3://#{bucket}/#{prefix}\n"
+          print '    Scanning projects... '
+
+          # Scan all projects with progress callback
+          results = scanner.scan_all_projects(show_progress: false) do |current, total|
+            print "\r    Scanning projects... #{spinner_chars[spinner_index]} (#{current}/#{total})"
+            spinner_index = (spinner_index + 1) % spinner_chars.length
+          end
+
+          print "\r    Scanning projects... ✓ (#{results.size} found)\n"
+          puts ''
+
+          if results.empty?
+            puts "⚠️  No projects found in S3 for #{brand_key}"
+            puts '   This may indicate:'
+            puts '   - No files uploaded to S3 yet'
+            puts '   - S3 bucket or prefix misconfigured'
+            puts '   - AWS credentials issue'
+            return
+          end
+
+          # Load existing manifest
+          brand_path = Appydave::Tools::Dam::Config.brand_path(brand_key)
+          manifest_path = File.join(brand_path, 'projects.json')
+
+          unless File.exist?(manifest_path)
+            puts "❌ Manifest not found: #{manifest_path}"
+            puts "   Run: dam manifest #{brand_key}"
+            puts "   Then retry: dam s3-scan #{brand_key}"
+            exit 1
+          end
+
+          manifest = JSON.parse(File.read(manifest_path), symbolize_names: true)
+
+          # Identify matched and orphaned S3 projects
+          local_project_ids = manifest[:projects].map { |p| p[:id] }
+          matched_projects = results.slice(*local_project_ids)
+          orphaned_projects = results.reject { |project_id, _| local_project_ids.include?(project_id) }
+
+          # Merge S3 scan data into manifest for matched projects
+          updated_count = 0
+          manifest[:projects].each do |project|
+            project_id = project[:id]
+            s3_data = results[project_id]
+            next unless s3_data
+
+            project[:storage][:s3] = s3_data
+            updated_count += 1
+          end
+
+          # Update timestamp and note
+          manifest[:config][:last_updated] = Time.now.utc.iso8601
+          manifest[:config][:note] = 'Auto-generated manifest with S3 scan data. Regenerate with: dam s3-scan'
+
+          # Write updated manifest
+          File.write(manifest_path, JSON.pretty_generate(manifest))
+
+          # Add local sync status to matched projects
+          Appydave::Tools::Dam::LocalSyncStatus.enrich!(matched_projects, brand_key)
+
+          # Display table
+          display_table(matched_projects, orphaned_projects, bucket, prefix, region)
+
+          # Summary
+          total_manifest_projects = manifest[:projects].size
+          missing_count = total_manifest_projects - matched_projects.size
+
+          puts ''
+          puts 'ℹ️  Summary:'
+          puts "   • Updated #{updated_count} projects in manifest"
+          puts "   • #{missing_count} local project(s) not yet uploaded to S3" if missing_count.positive?
+          puts "   • Manifest: #{manifest_path}"
+          puts ''
+        end
+
+        # Scan all brands' S3 buckets
+        def scan_all
+          Appydave::Tools::Configuration::Config.configure
+          brands_config = Appydave::Tools::Configuration::Config.brands
+
+          results = []
+          brands_config.brands.each do |brand_info|
+            brand_key = brand_info.key
+            puts ''
+            puts '=' * 60
+
+            begin
+              scan_single(brand_key)
+              results << { brand: brand_key, success: true }
+            rescue StandardError => e
+              puts "❌ Failed to scan #{brand_key}: #{e.message}"
+              results << { brand: brand_key, success: false, error: e.message }
+            end
+          end
+
+          puts ''
+          puts '=' * 60
+          puts '📋 Summary - S3 Scans:'
+          puts ''
+
+          successful, failed = results.partition { |r| r[:success] }
+
+          successful.each do |result|
+            brand_display = result[:brand].ljust(15)
+            puts "✅ #{brand_display} Scanned successfully"
+          end
+
+          failed.each do |result|
+            brand_display = result[:brand].ljust(15)
+            puts "❌ #{brand_display} #{result[:error]}"
+          end
+
+          puts ''
+          puts "Total brands scanned: #{successful.size}/#{results.size}"
+        end
+
+        private
+
+        # Display S3 scan results in table format
+        # rubocop:disable Style/FormatStringToken
+        def display_table(matched_projects, orphaned_projects, bucket, prefix, region)
+          puts '✅ S3 Projects Report'
+          puts ''
+          puts 'PROJECT                              FILES    SIZE        LOCAL      S3 MODIFIED'
+          puts '-' * 92
+
+          # Display matched projects first (sorted alphabetically)
+          matched_projects.sort.each do |project_id, data|
+            files = data[:file_count].to_s.rjust(5)
+            size = Appydave::Tools::Dam::FileHelper.format_size(data[:total_bytes]).rjust(10)
+            local_status = Appydave::Tools::Dam::LocalSyncStatus.format(data[:local_status], data[:local_file_count], data[:file_count])
+            modified = data[:last_modified] ? Time.parse(data[:last_modified]).strftime('%Y-%m-%d %H:%M') : 'N/A'
+
+            puts format('%-36s %5s %10s  %-9s  %s', project_id, files, size, local_status, modified)
+          end
+
+          # Display orphaned projects (sorted alphabetically)
+          return if orphaned_projects.empty?
+
+          puts '-' * 92
+          orphaned_projects.sort.each do |project_id, data|
+            files = data[:file_count].to_s.rjust(5)
+            size = Appydave::Tools::Dam::FileHelper.format_size(data[:total_bytes]).rjust(10)
+            local_status = 'N/A'
+            modified = data[:last_modified] ? Time.parse(data[:last_modified]).strftime('%Y-%m-%d %H:%M') : 'N/A'
+
+            puts format('%-36s %5s %10s  %-9s  %s', project_id, files, size, local_status, modified)
+          end
+
+          puts ''
+          folder_word = orphaned_projects.size > 1 ? 'folders' : 'folder'
+          puts "⚠️  #{orphaned_projects.size} orphaned #{folder_word} found (no local project)"
+
+          orphaned_projects.sort.each do |project_id, _data|
+            # Build AWS Console URL
+            project_prefix = "#{prefix}#{project_id}/"
+            console_url = "https://#{region}.console.aws.amazon.com/s3/buckets/#{bucket}?prefix=#{project_prefix}&region=#{region}"
+            puts "   → #{project_id}"
+            puts "     #{console_url}"
+          end
+        end
+        # rubocop:enable Style/FormatStringToken
+      end
+    end
+  end
+end

data/lib/appydave/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Appydave
   module Tools
-    VERSION = '0.76.5'
+    VERSION = '0.76.7'
   end
 end

data/lib/appydave/tools.rb

@@ -79,6 +79,8 @@ require 'appydave/tools/dam/repo_status'
 require 'appydave/tools/dam/repo_sync'
 require 'appydave/tools/dam/repo_push'
 require 'appydave/tools/dam/local_sync_status'
+require 'appydave/tools/dam/s3_scan_command'
+require 'appydave/tools/dam/s3_arg_parser'
 
 require 'appydave/tools/jump/path_validator'
 require 'appydave/tools/jump/location'

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appydave-tools",
-  "version": "0.76.5",
+  "version": "0.76.7",
   "description": "AppyDave YouTube Automation Tools",
   "scripts": {
     "release": "semantic-release"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appydave-tools
 version: !ruby/object:Gem::Version
-  version: 0.76.5
+  version: 0.76.7
 platform: ruby
 authors:
 - David Cruwys
@@ -361,7 +361,9 @@ files:
 - lib/appydave/tools/dam/repo_push.rb
 - lib/appydave/tools/dam/repo_status.rb
 - lib/appydave/tools/dam/repo_sync.rb
+- lib/appydave/tools/dam/s3_arg_parser.rb
 - lib/appydave/tools/dam/s3_operations.rb
+- lib/appydave/tools/dam/s3_scan_command.rb
 - lib/appydave/tools/dam/s3_scanner.rb
 - lib/appydave/tools/dam/share_operations.rb
 - lib/appydave/tools/dam/ssd_status.rb