appydave-tools 0.67.0 → 0.69.0

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

@@ -91,8 +91,14 @@ module Appydave
             end
 
             unless Dir.exist?(brand_path)
+              # Get available brands for error message
               available = Config.available_brands_display
-              raise BrandNotFoundError.new(brand, available)
+
+              # Use fuzzy matching to suggest similar brands
+              available_list = Config.available_brands
+              suggestions = FuzzyMatcher.find_matches(brand, available_list, threshold: 3)
+
+              raise BrandNotFoundError.new(brand, available, suggestions)
             end
 
             key

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

@@ -37,7 +37,12 @@ module Appydave
 
             unless Dir.exist?(path)
               brands_list = available_brands_display
-              raise "Brand directory not found: #{path}\nAvailable brands:\n#{brands_list}"
+              # Use fuzzy matching to suggest similar brands (check both shortcuts and keys)
+              Appydave::Tools::Configuration::Config.configure
+              brands_config = Appydave::Tools::Configuration::Config.brands
+              all_brand_identifiers = brands_config.brands.flat_map { |b| [b.shortcut, b.key] }.uniq
+              suggestions = FuzzyMatcher.find_matches(brand_key, all_brand_identifiers, threshold: 3)
+              raise BrandNotFoundError.new(path, brands_list, suggestions)
             end
 
             path

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

@@ -8,8 +8,16 @@ module Appydave
 
       # Raised when brand directory not found
       class BrandNotFoundError < DamError
-        def initialize(brand, available_brands = nil)
+        def initialize(brand, available_brands = nil, suggestions = nil)
           message = "Brand directory not found: #{brand}"
+
+          # Add fuzzy match suggestions if provided
+          if suggestions && !suggestions.empty?
+            message += "\n\nDid you mean?"
+            suggestions.each { |s| message += "\n  - #{s}" }
+          end
+
+          # Add full list of available brands
           message += "\n\nAvailable brands:\n#{available_brands}" if available_brands && !available_brands.empty?
           super(message)
         end

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

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module Appydave
+  module Tools
+    module Dam
+      # Fuzzy matching for brand names using Levenshtein distance
+      class FuzzyMatcher
+        class << self
+          # Find closest matches to input string
+          # @param input [String] Input string to match
+          # @param candidates [Array<String>] List of valid options
+          # @param threshold [Integer] Maximum distance to consider a match (default: 3)
+          # @return [Array<String>] Sorted list of closest matches
+          def find_matches(input, candidates, threshold: 3)
+            return [] if input.nil? || input.empty? || candidates.empty?
+
+            # Calculate distances and filter by threshold
+            matches = candidates.map do |candidate|
+              distance = levenshtein_distance(input.downcase, candidate.downcase)
+              { candidate: candidate, distance: distance }
+            end
+
+            # Filter by threshold
+            matches = matches.select { |m| m[:distance] <= threshold }
+
+            # Sort by distance (closest first)
+            matches.sort_by { |m| m[:distance] }.map { |m| m[:candidate] }
+          end
+
+          # Calculate Levenshtein distance between two strings
+          # @param str1 [String] First string
+          # @param str2 [String] Second string
+          # @return [Integer] Edit distance
+          def levenshtein_distance(str1, str2)
+            return str2.length if str1.empty?
+            return str1.length if str2.empty?
+
+            # Create distance matrix
+            matrix = Array.new(str1.length + 1) { Array.new(str2.length + 1) }
+
+            # Initialize first row and column
+            (0..str1.length).each { |i| matrix[i][0] = i }
+            (0..str2.length).each { |j| matrix[0][j] = j }
+
+            # Calculate distances
+            (1..str1.length).each do |i|
+              (1..str2.length).each do |j|
+                cost = str1[i - 1] == str2[j - 1] ? 0 : 1
+                matrix[i][j] = [
+                  matrix[i - 1][j] + 1,      # deletion
+                  matrix[i][j - 1] + 1,      # insertion
+                  matrix[i - 1][j - 1] + cost # substitution
+                ].min
+              end
+            end
+
+            matrix[str1.length][str2.length]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -49,15 +49,26 @@ module Appydave
               )
             end
           else
-            # Default view
-            puts 'BRAND                              KEY          PROJECTS         SIZE        LAST MODIFIED    GIT              S3 SYNC'
-            puts '-' * 130
+            # Default view - use same format for header and data
+            # rubocop:disable Style/RedundantFormat
+            puts format(
+              '%-30s %-15s %10s %12s %20s    %-15s  %-10s',
+              'BRAND',
+              'KEY',
+              'PROJECTS',
+              'SIZE',
+              'LAST MODIFIED',
+              'GIT',
+              'S3 SYNC'
+            )
+            # rubocop:enable Style/RedundantFormat
+            puts '-' * 133
 
             brand_data.each do |data|
               brand_display = "#{data[:shortcut]} - #{data[:name]}"
 
               puts format(
-                '%-30s %-12s %10d %12s %20s    %-15s  %-10s',
+                '%-30s %-15s %10d %12s %20s    %-15s  %-10s',
                 brand_display,
                 data[:key],
                 data[:count],
@@ -119,16 +130,32 @@ module Appydave
           puts ''
 
           if detailed
-            # Detailed view with additional columns
-            header = 'PROJECT                                               SIZE             AGE              GIT              S3           ' \
-                     'PATH                                      HEAVY FILES         LIGHT FILES         SSD BACKUP'
-            puts header
-            puts '-' * 200
+            # Detailed view with additional columns - use same format for header and data
+            # rubocop:disable Style/RedundantFormat
+            puts format(
+              '%-45s %12s %15s  %-15s  %-12s  %-65s  %-18s  %-18s  %-30s  %-15s  %-15s',
+              'PROJECT',
+              'SIZE',
+              'AGE',
+              'GIT',
+              'S3',
+              'PATH',
+              'HEAVY FILES',
+              'LIGHT FILES',
+              'SSD BACKUP',
+              'S3 ↑ UPLOAD',
+              'S3 ↓ DOWNLOAD'
+            )
+            # rubocop:enable Style/RedundantFormat
+            puts '-' * 280
 
             project_data.each do |data|
               age_display = data[:stale] ? "#{data[:age]} ⚠️" : data[:age]
+              s3_upload = data[:s3_last_upload] ? format_age(data[:s3_last_upload]) : 'N/A'
+              s3_download = data[:s3_last_download] ? format_age(data[:s3_last_download]) : 'N/A'
+
               puts format(
-                '%-45s %12s %15s  %-15s  %-10s  %-35s  %-18s  %-18s  %-30s',
+                '%-45s %12s %15s  %-15s  %-12s  %-65s  %-18s  %-18s  %-30s  %-15s  %-15s',
                 data[:name],
                 format_size(data[:size]),
                 age_display,
@@ -137,18 +164,29 @@ module Appydave
                 shorten_path(data[:path]),
                 data[:heavy_files] || 'N/A',
                 data[:light_files] || 'N/A',
-                data[:ssd_backup] || 'N/A'
+                data[:ssd_backup] || 'N/A',
+                s3_upload,
+                s3_download
               )
             end
           else
-            # Default view
-            puts 'PROJECT                                               SIZE             AGE              GIT              S3'
+            # Default view - use same format for header and data
+            # rubocop:disable Style/RedundantFormat
+            puts format(
+              '%-45s %12s %15s  %-15s  %-12s',
+              'PROJECT',
+              'SIZE',
+              'AGE',
+              'GIT',
+              'S3'
+            )
+            # rubocop:enable Style/RedundantFormat
             puts '-' * 130
 
             project_data.each do |data|
               age_display = data[:stale] ? "#{data[:age]} ⚠️" : data[:age]
               puts format(
-                '%-45s %12s %15s  %-15s  %-10s',
+                '%-45s %12s %15s  %-15s  %-12s',
                 data[:name],
                 format_size(data[:size]),
                 age_display,
@@ -377,6 +415,38 @@ module Appydave
           end
         end
 
+        # Calculate 3-state S3 sync status for a project
+        def self.calculate_project_s3_sync_status(brand_arg, brand_info, project)
+          # Check if S3 is configured
+          s3_bucket = brand_info.aws.s3_bucket
+          return 'N/A' if s3_bucket.nil? || s3_bucket.empty? || s3_bucket == 'NOT-SET'
+
+          # Use S3Operations to calculate sync status
+          begin
+            s3_ops = S3Operations.new(brand_arg, project, brand_info: brand_info)
+            s3_ops.calculate_sync_status
+          rescue StandardError
+            # S3 not accessible or other error
+            'N/A'
+          end
+        end
+
+        # Calculate S3 sync timestamps for a project
+        def self.calculate_s3_timestamps(brand_arg, brand_info, project)
+          # Check if S3 is configured
+          s3_bucket = brand_info.aws.s3_bucket
+          return { last_upload: nil, last_download: nil } if s3_bucket.nil? || s3_bucket.empty? || s3_bucket == 'NOT-SET'
+
+          # Use S3Operations to get timestamps
+          begin
+            s3_ops = S3Operations.new(brand_arg, project, brand_info: brand_info)
+            s3_ops.sync_timestamps
+          rescue StandardError
+            # S3 not accessible or other error
+            { last_upload: nil, last_download: nil }
+          end
+        end
+
         # Collect project data for display
         # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/ParameterLists
         def self.collect_project_data(brand_arg, brand_path, brand_info, project, is_git_repo, detailed: false)
@@ -391,12 +461,8 @@ module Appydave
                          'N/A'
                        end
 
-          # Check if project has s3-staging folder
-          s3_sync = if Dir.exist?(File.join(project_path, 's3-staging'))
-                      '✓ staged'
-                    else
-                      'none'
-                    end
+          # Calculate 3-state S3 sync status
+          s3_sync = calculate_project_s3_sync_status(brand_arg, brand_info, project)
 
           result = {
             name: project,
@@ -434,10 +500,15 @@ module Appydave
                          File.exist?(ssd_project_path) ? shorten_path(ssd_project_path) : nil
                        end
 
+            # S3 timestamps (last upload/download)
+            s3_timestamps = calculate_s3_timestamps(brand_arg, brand_info, project)
+
             result.merge!(
               heavy_files: "#{heavy_count} (#{format_size(heavy_size)})",
               light_files: "#{light_count} (#{format_size(light_size)})",
-              ssd_backup: ssd_path
+              ssd_backup: ssd_path,
+              s3_last_upload: s3_timestamps[:last_upload],
+              s3_last_download: s3_timestamps[:last_download]
             )
           end
 

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

@@ -488,6 +488,101 @@ module Appydave
           puts dry_run ? '✅ Archive dry-run complete!' : '✅ Archive complete!'
         end
 
+        # Calculate 3-state S3 sync status
+        # @return [String] One of: '↑ upload', '↓ download', '✓ synced', 'none'
+        def calculate_sync_status
+          project_dir = project_directory_path
+          staging_dir = File.join(project_dir, 's3-staging')
+
+          # No s3-staging directory means no S3 intent
+          return 'none' unless Dir.exist?(staging_dir)
+
+          # Get S3 files (if S3 configured)
+          begin
+            s3_files = list_s3_files
+          rescue StandardError
+            # S3 not configured or not accessible
+            return 'none'
+          end
+
+          local_files = list_local_files(staging_dir)
+
+          # No files anywhere
+          return 'none' if s3_files.empty? && local_files.empty?
+
+          # Build S3 files map
+          s3_files_map = s3_files.each_with_object({}) do |file, hash|
+            relative_path = extract_relative_path(file['Key'])
+            hash[relative_path] = file
+          end
+
+          # Check for differences
+          needs_upload = false
+          needs_download = false
+
+          # Check all local files
+          local_files.each_key do |relative_path|
+            local_file = File.join(staging_dir, relative_path)
+            s3_file = s3_files_map[relative_path]
+
+            if s3_file
+              # Compare MD5
+              local_md5 = file_md5(local_file)
+              s3_md5 = s3_file['ETag'].gsub('"', '')
+              needs_upload = true if local_md5 != s3_md5
+            else
+              # Local file not in S3
+              needs_upload = true
+            end
+          end
+
+          # Check for S3-only files
+          s3_files_map.each_key do |relative_path|
+            local_file = File.join(staging_dir, relative_path)
+            needs_download = true unless File.exist?(local_file)
+          end
+
+          # Return status based on what's needed
+          if needs_upload && needs_download
+            '⚠️ both'
+          elsif needs_upload
+            '↑ upload'
+          elsif needs_download
+            '↓ download'
+          else
+            '✓ synced'
+          end
+        end
+
+        # Calculate S3 sync timestamps (last upload/download times)
+        # @return [Hash] { last_upload: Time|nil, last_download: Time|nil }
+        def sync_timestamps
+          project_dir = project_directory_path
+          staging_dir = File.join(project_dir, 's3-staging')
+
+          # No s3-staging directory means no S3 intent
+          return { last_upload: nil, last_download: nil } unless Dir.exist?(staging_dir)
+
+          # Get S3 files (if S3 configured)
+          begin
+            s3_files = list_s3_files
+          rescue StandardError
+            # S3 not configured or not accessible
+            return { last_upload: nil, last_download: nil }
+          end
+
+          # Last upload time = most recent S3 file LastModified
+          last_upload = s3_files.map { |f| f['LastModified'] }.compact.max if s3_files.any?
+
+          # Last download time = most recent local file mtime (in s3-staging)
+          last_download = if Dir.exist?(staging_dir)
+                            local_files = Dir.glob(File.join(staging_dir, '**/*')).select { |f| File.file?(f) }
+                            local_files.map { |f| File.mtime(f) }.max if local_files.any?
+                          end
+
+          { last_upload: last_upload, last_download: last_download }
+        end
+
         # Build S3 key for a file
         def build_s3_key(relative_path)
           "#{brand_info.aws.s3_prefix}#{project_id}/#{relative_path}"

data/lib/appydave/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Appydave
   module Tools
-    VERSION = '0.67.0'
+    VERSION = '0.69.0'
   end
 end

data/lib/appydave/tools.rb

@@ -55,6 +55,7 @@ require 'appydave/tools/subtitle_processor/join'
 require 'appydave/tools/dam/errors'
 require 'appydave/tools/dam/file_helper'
 require 'appydave/tools/dam/git_helper'
+require 'appydave/tools/dam/fuzzy_matcher'
 require 'appydave/tools/dam/brand_resolver'
 require 'appydave/tools/dam/config'
 require 'appydave/tools/dam/project_resolver'

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appydave-tools",
-  "version": "0.67.0",
+  "version": "0.69.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.67.0
+  version: 0.69.0
 platform: ruby
 authors:
 - David Cruwys
@@ -228,6 +228,7 @@ files:
 - bin/youtube_automation.rb
 - bin/youtube_manager.rb
 - docs/README.md
+- docs/ai-instructions/behavioral-regression-audit.md
 - docs/ai-instructions/code-quality-retrospective.md
 - docs/ai-instructions/defensive-logging-audit.md
 - docs/architecture/cli/cli-pattern-comparison.md
@@ -251,8 +252,11 @@ files:
 - docs/archive/tool-discovery.md
 - docs/archive/tool-documentation-analysis.md
 - docs/code-quality/README.md
+- docs/code-quality/behavioral-audit-2025-01-22.md
 - docs/code-quality/implementation-plan.md
 - docs/code-quality/report-2025-01-21.md
+- docs/code-quality/uat-plan-2025-01-22.md
+- docs/code-quality/uat-report-2025-01-22.md
 - docs/guides/configuration-setup.md
 - docs/guides/platforms/windows/README.md
 - docs/guides/platforms/windows/dam-testing-plan-windows-powershell.md
@@ -302,6 +306,7 @@ files:
 - lib/appydave/tools/dam/config_loader.rb
 - lib/appydave/tools/dam/errors.rb
 - lib/appydave/tools/dam/file_helper.rb
+- lib/appydave/tools/dam/fuzzy_matcher.rb
 - lib/appydave/tools/dam/git_helper.rb
 - lib/appydave/tools/dam/manifest_generator.rb
 - lib/appydave/tools/dam/project_listing.rb