appydave-tools 0.76.5 → 0.76.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0531bc72c6c4aeac9830f72f552a4d683775d7efc61ee483069d882cdbbbf5af
-  data.tar.gz: 1c8e032ddc4e8dfc4c196452465abea40958107d2d68c5e4063c1ec2c36a3a9d
+  metadata.gz: f4172ac86ad4f32c89534b2129ffed582137abc47e21fe1fb2e1d18c5a56608e
+  data.tar.gz: ed067098e65634fce56abf446313a7f58657dbc7fc45499915cb34d6a9ae5afe
 SHA512:
-  metadata.gz: 1787f781bdf758fae98c3388cce0437aca330a3161937f5c214651885c80e05598682e64afc3adea1e2ffd3b2f70d09287a9acca12c8fada89077b7d48791a39
-  data.tar.gz: 6cadabed0aa0f0be9d993b4dbda2c304c9a34f717fcc7b86b8cc059777e7cb0a57a494ddc2c3e5432fd4d4d85990330a6d401aa75c89bb7b0be5f5207c68d12b
+  metadata.gz: 79f3caf203405a2cf7337da3129595433515c04e6b4f9f1203b70b5ef89e07caa07ac212d6e9bb85244185f5d5d3b8e20f175e01e7587fb1fe1920630dadf8e1
+  data.tar.gz: e42dfc787b1331d7fdfbd32c731f13e03f946bf5e2fa9d89f948f9cb59dc393a80e054b075b650d51d72eb7070f846f0253beef5e011cf3c632b8181b5b30f7f

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [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

@@ -1325,9 +1325,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 +1343,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,8 +9,8 @@
 
 ## 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**
+- [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.
+- [~] 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
 
 ## In Progress

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.6'
   end
 end

data/lib/appydave/tools.rb

@@ -79,6 +79,7 @@ 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/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.6",
   "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.6
 platform: ruby
 authors:
 - David Cruwys
@@ -362,6 +362,7 @@ files:
 - lib/appydave/tools/dam/repo_status.rb
 - lib/appydave/tools/dam/repo_sync.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