appydave-tools 0.32.5 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5ec68e10319c834195d1d532dde3905667346a9b6f47d1f1bc9a6c572dec7ee
-  data.tar.gz: f129cbf56dd364102c9e50b931a1004ddc207c53d5580b6205bf985e7d6dec20
+  metadata.gz: '0822e53f40e94e9d3c113babd747f20676c51706e0fcb8c7d4f73ab30dba1264'
+  data.tar.gz: fe3f9dc1576f199f0194e298e60330f56542ed235a65808c6edaacc6079a822e
 SHA512:
-  metadata.gz: 4f7a53af93d69177a6d070d9737011a0cfa92397275897264485aad59bdd036222d87e96ebda41b3267b25abac7caf4d5e6f6448675b8375ec16a83e85636263
-  data.tar.gz: e8d72b24314db79bd1120142f7cedd74d8ec9286dfd2ef537010d4ecfafefbaaff81a5897acdd3f769466c3c12704ead8f976015191a5305de328c754c6f8716
+  metadata.gz: 5ec28829f3743f5fae51f54d7a387c2c2e22a79674d94c7e9af8230f0c4f0e32bbb4cfeb7e668077a68c19cad310397d81144fb78d915641636894fef8af4e24
+  data.tar.gz: cad3a37461ad7158b6e44711dd3e8b3e2b34ddc70ae95b038c9e4794c072fd7326f8a9d7ee0c19e1c0ffbc6ec2f66e2a26cd3589f8cd01a0ac7f991c60824aa3

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [0.33.0](https://github.com/appydave/appydave-tools/compare/v0.32.5...v0.33.0) (2025-11-21)
+
+
+### Features
+
+* add orphaned S3 folder detection in s3-scan command - separates matched projects from orphaned folders with file count and size info for easier cleanup identification ([3aa03aa](https://github.com/appydave/appydave-tools/commit/3aa03aab5e57ca55015d226b39fcb4f3203d4ca4))
+
+## [0.32.5](https://github.com/appydave/appydave-tools/compare/v0.32.4...v0.32.5) (2025-11-21)
+
+
+### Bug Fixes
+
+* use original brand key in Config.project_path calls for projects_subfolder support - ensures correct path construction for brands with subfolder setting ([3966f16](https://github.com/appydave/appydave-tools/commit/3966f16a0465b9508bf899fa77a619ae6c0ea94a))
+
 ## [0.32.4](https://github.com/appydave/appydave-tools/compare/v0.32.3...v0.32.4) (2025-11-21)
 
 

data/bin/dam

@@ -1125,7 +1125,7 @@ class VatCLI
     exit 1
   end
 
-  # rubocop:disable Metrics/MethodLength
+  # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/AbcSize
   def scan_single_brand_s3(brand_arg)
     puts "🔄 Scanning S3 for #{brand_arg}..."
     puts ''
@@ -1133,11 +1133,30 @@ class VatCLI
     brand_key = brand_arg
     scanner = Appydave::Tools::Dam::S3Scanner.new(brand_key)
 
-    # Scan all projects
-    results = scanner.scan_all_projects
+    # 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 ''
       puts "⚠️  No projects found in S3 for #{brand_key}"
       puts '   This may indicate:'
       puts '   - No files uploaded to S3 yet'
@@ -1147,12 +1166,10 @@ class VatCLI
     end
 
     # Load existing manifest
-    Appydave::Tools::Configuration::Config.configure
     brand_path = Appydave::Tools::Dam::Config.brand_path(brand_key)
     manifest_path = File.join(brand_path, 'projects.json')
 
     unless File.exist?(manifest_path)
-      puts ''
       puts "❌ Manifest not found: #{manifest_path}"
       puts "   Run: dam manifest #{brand_key}"
       puts "   Then retry: dam s3-scan #{brand_key}"
@@ -1161,7 +1178,12 @@ class VatCLI
 
     manifest = JSON.parse(File.read(manifest_path), symbolize_names: true)
 
-    # Merge S3 scan data into manifest
+    # 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]
@@ -1179,23 +1201,68 @@ class VatCLI
     # Write updated manifest
     File.write(manifest_path, JSON.pretty_generate(manifest))
 
+    # 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 "✅ Updated manifest with S3 data: #{manifest_path}"
-    puts "   Projects in S3: #{results.size}"
-    puts "   Projects in manifest: #{total_manifest_projects}"
-    puts "   Updated #{updated_count} projects in manifest"
-    if results.size != total_manifest_projects
-      puts ''
-      puts "   ⚠️  Mismatch: #{results.size} S3 projects vs #{total_manifest_projects} local projects"
-      puts "   This may indicate projects exist locally but haven't been uploaded to S3 yet"
+    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, Metrics/AbcSize
+
+  # Display S3 scan results in table format
+  # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, 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        STATUS    LAST MODIFIED'
+    puts '-' * 80
+
+    # Display matched projects first (sorted alphabetically)
+    matched_projects.sort.each do |project_id, data|
+      files = data[:file_count].to_s.rjust(5)
+      size = format_bytes(data[:total_bytes]).rjust(10)
+      status = '✓'
+      modified = data[:last_modified] ? Time.parse(data[:last_modified]).strftime('%Y-%m-%d %H:%M') : 'N/A'
+
+      puts format('%-26s %5s %10s       %s       %s', project_id, files, size, status, modified)
+    end
+
+    # Display orphaned projects (sorted alphabetically)
+    return if orphaned_projects.empty?
+
+    puts '-' * 80
+    orphaned_projects.sort.each do |project_id, data|
+      files = data[:file_count].to_s.rjust(5)
+      size = format_bytes(data[:total_bytes]).rjust(10)
+      status = '❌'
+      modified = data[:last_modified] ? Time.parse(data[:last_modified]).strftime('%Y-%m-%d %H:%M') : 'N/A'
+
+      puts format('%-26s %5s %10s       %s       %s', project_id, files, size, 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
+  # rubocop:enable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Style/FormatStringToken
 
-  # rubocop:disable Metrics/MethodLength
+  # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
   def scan_all_brands_s3
     Appydave::Tools::Configuration::Config.configure
     brands_config = Appydave::Tools::Configuration::Config.brands
@@ -1236,7 +1303,20 @@ class VatCLI
     puts ''
     puts "Total brands scanned: #{successful.size}/#{results.size}"
   end
-  # rubocop:enable Metrics/MethodLength
+  # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+
+  # Format bytes in human-readable format
+  # rubocop:disable Style/FormatStringToken
+  def format_bytes(bytes)
+    return '0 B' if bytes.zero?
+
+    units = %w[B KB MB GB TB]
+    exp = (Math.log(bytes) / Math.log(1024)).to_i
+    exp = [exp, units.length - 1].min
+
+    format('%.1f %s', bytes.to_f / (1024**exp), units[exp])
+  end
+  # rubocop:enable Style/FormatStringToken
 end
 
 # Run CLI

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

@@ -17,12 +17,13 @@ module Appydave
 
         # Scan S3 for a specific project
         # @param project_id [String] Project ID (e.g., "b65-guy-monroe-marketing-plan")
+        # @param show_progress [Boolean] Whether to show progress output (default: true)
         # @return [Hash] S3 file data with :file_count, :total_bytes, :last_modified
-        def scan_project(project_id)
+        def scan_project(project_id, show_progress: true)
           bucket = @brand_info.aws.s3_bucket
           prefix = File.join(@brand_info.aws.s3_prefix, project_id, '')
 
-          puts "  🔍 Scanning #{project_id}..."
+          puts "  🔍 Scanning #{project_id}..." if show_progress
 
           files = list_s3_objects(bucket, prefix)
 
@@ -50,28 +51,23 @@ module Appydave
         end
 
         # Scan all projects in brand's S3 bucket
+        # @param show_progress [Boolean] Whether to show detailed progress (default: true)
         # @return [Hash] Map of project_id => scan result
-        def scan_all_projects
+        def scan_all_projects(show_progress: true, &progress_callback)
           bucket = @brand_info.aws.s3_bucket
           prefix = @brand_info.aws.s3_prefix
 
-          puts "🔍 Scanning all projects in S3: s3://#{bucket}/#{prefix}"
-          puts ''
-
           # List all "directories" (prefixes) under brand prefix
           project_prefixes = list_s3_prefixes(bucket, prefix)
 
-          if project_prefixes.empty?
-            puts '  📭 No projects found in S3'
-            return {}
-          end
-
-          puts "  Found #{project_prefixes.size} projects in S3"
-          puts ''
+          return {} if project_prefixes.empty?
 
           results = {}
-          project_prefixes.each do |project_id|
-            results[project_id] = scan_project(project_id)
+          project_prefixes.each_with_index do |project_id, index|
+            # Call progress callback if provided (for spinner)
+            progress_callback&.call(index + 1, project_prefixes.size)
+
+            results[project_id] = scan_project(project_id, show_progress: show_progress)
           end
 
           results

data/lib/appydave/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Appydave
   module Tools
-    VERSION = '0.32.5'
+    VERSION = '0.34.0'
   end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appydave-tools",
-  "version": "0.32.5",
+  "version": "0.34.0",
   "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.32.5
+  version: 0.34.0
 platform: ruby
 authors:
 - David Cruwys