appydave-tools 0.77.5 → 0.77.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a66f70a8ea85fce726ea3da189166f623c7fb1ca007f70b1b5fb75f3fd828077
-  data.tar.gz: 423a8d4309fb166084940efe6bcb7fbd3ab9d620094b006bf95194aef671719a
+  metadata.gz: 1ca0547c8abec9adcf7081ade94ffe5753c477e21288020bd0b43dd7609747bb
+  data.tar.gz: aa03c3205607e0394eaea6b75113a417b0edcf5fcafdba797de9f1372d34e4e9
 SHA512:
-  metadata.gz: d89bf4f8992c1ab8630a51af56dc97d9fbc651605593be1b70510cc5dd4837472dfc55514d12d9ff0542b439ec04d0c47752a3799136b7ca4cada342d49aa023
-  data.tar.gz: 6fc875fe4006e621674af60652e5ff1241d5404f4d4bdd6e3374314e1460212bce2ec8cfc4129feab3a55ec18ae01fb33f08dc55679ad55d1efde3ed209a5bb0
+  metadata.gz: 4ca27e6b5d96647c8c8eeed68c1d3ec502ac436052e8b5b12975b5beca581297d405895dc4c1585d2ca38db29f5f6f27b16d86ed76c38959668d3497ae4f7f7c
+  data.tar.gz: 837b4aab157a1e14845e7d572513d94ae8e4aef37784bc84f88a05894c329ce5c088aa5ade430f0dfb2a54984fe0efa9b1e84af5a8f170392bf980edcfd14c39

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.77.5](https://github.com/appydave/appydave-tools/compare/v0.77.4...v0.77.5) (2026-03-20)
+
+
+### Bug Fixes
+
+* extract S3StatusChecker from S3Operations; status/calculate_sync_status/sync_timestamps delegate to focused class ([6766897](https://github.com/appydave/appydave-tools/commit/6766897421e37c5b3695db7a3e11f3696a1b2f09))
+* remove redundant rubocop disable directives from S3StatusChecker (CI rubocop 1.85.1) ([9f15b34](https://github.com/appydave/appydave-tools/commit/9f15b34c7ab3e139d208d1a5692fc15a42bcfe1a))
+
 ## [0.77.4](https://github.com/appydave/appydave-tools/compare/v0.77.3...v0.77.4) (2026-03-20)
 
 

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

@@ -0,0 +1,258 @@
+# frozen_string_literal: true
+
+module Appydave
+  module Tools
+    module Dam
+      # Handles S3 cleanup and SSD archive operations.
+      # Inherits shared infrastructure and helpers from S3Base.
+      class S3Archiver < S3Base
+        # Cleanup S3 files
+        def cleanup(force: false, dry_run: false)
+          s3_files = list_s3_files
+
+          if s3_files.empty?
+            puts "❌ No files found in S3 for #{brand}/#{project_id}"
+            return
+          end
+
+          puts "🗑️  Found #{s3_files.size} file(s) in S3 for #{brand}/#{project_id}"
+          puts ''
+
+          unless force
+            puts '⚠️  This will DELETE all files from S3 for this project.'
+            puts 'Use --force to confirm deletion.'
+            return
+          end
+
+          deleted = 0
+          failed = 0
+
+          s3_files.each do |s3_file|
+            key = s3_file['Key']
+            relative_path = extract_relative_path(key)
+
+            if delete_s3_file(key, dry_run: dry_run)
+              puts "  ✓ Deleted: #{relative_path}"
+              deleted += 1
+            else
+              puts "  ✗ Failed: #{relative_path}"
+              failed += 1
+            end
+          end
+
+          puts ''
+          puts '✅ Cleanup complete!'
+          puts "   Deleted: #{deleted}, Failed: #{failed}"
+        end
+
+        # Cleanup local s3-staging files
+        def cleanup_local(force: false, dry_run: false)
+          project_dir = project_directory_path
+          staging_dir = File.join(project_dir, 's3-staging')
+
+          unless Dir.exist?(staging_dir)
+            puts "❌ No s3-staging directory found: #{staging_dir}"
+            return
+          end
+
+          files = Dir.glob("#{staging_dir}/**/*").select { |f| File.file?(f) }
+
+          if files.empty?
+            puts '❌ No files found in s3-staging/'
+            return
+          end
+
+          puts "🗑️  Found #{files.size} file(s) in local s3-staging/"
+          puts ''
+
+          unless force
+            puts '⚠️  This will DELETE all files from s3-staging/ for this project.'
+            puts 'Use --force to confirm deletion.'
+            return
+          end
+
+          deleted = 0
+          failed = 0
+
+          files.each do |file|
+            relative_path = file.sub("#{staging_dir}/", '')
+
+            if delete_local_file(file, dry_run: dry_run)
+              puts "  ✓ Deleted: #{relative_path}"
+              deleted += 1
+            else
+              puts "  ✗ Failed: #{relative_path}"
+              failed += 1
+            end
+          end
+
+          Dir.glob("#{staging_dir}/**/*").select { |d| File.directory?(d) }.sort.reverse.each do |dir|
+            Dir.rmdir(dir) if Dir.empty?(dir)
+          rescue StandardError
+            nil
+          end
+
+          puts ''
+          puts '✅ Local cleanup complete!'
+          puts "   Deleted: #{deleted}, Failed: #{failed}"
+        end
+
+        # Archive project to SSD
+        def archive(force: false, dry_run: false)
+          ssd_backup = brand_info.locations.ssd_backup
+
+          unless ssd_backup && !ssd_backup.empty?
+            puts "❌ SSD backup location not configured for brand '#{brand}'"
+            return
+          end
+
+          unless Dir.exist?(ssd_backup)
+            puts "❌ SSD not mounted at #{ssd_backup}"
+            puts '   Please connect the SSD before archiving.'
+            return
+          end
+
+          project_dir = project_directory_path
+
+          unless Dir.exist?(project_dir)
+            puts "❌ Project not found: #{project_dir}"
+            puts ''
+            puts "   Try: dam list #{brand}  # See available projects"
+            return
+          end
+
+          ssd_project_dir = File.join(ssd_backup, project_id)
+
+          puts "📦 Archive: #{brand}/#{project_id}"
+          puts ''
+
+          if copy_to_ssd(project_dir, ssd_project_dir, dry_run: dry_run)
+            if force
+              delete_local_project(project_dir, dry_run: dry_run)
+            else
+              puts ''
+              puts '⚠️  Project copied to SSD but NOT deleted locally.'
+              puts '   Use --force to delete local copy after archiving.'
+            end
+          end
+
+          puts ''
+          puts dry_run ? '✅ Archive dry-run complete!' : '✅ Archive complete!'
+        end
+
+        private
+
+        def delete_s3_file(s3_key, dry_run: false)
+          if dry_run
+            puts "  [DRY-RUN] Would delete: s3://#{brand_info.aws.s3_bucket}/#{s3_key}"
+            return true
+          end
+
+          s3_client.delete_object(
+            bucket: brand_info.aws.s3_bucket,
+            key: s3_key
+          )
+
+          true
+        rescue Aws::S3::Errors::ServiceError => e
+          puts "    Error: #{e.message}"
+          false
+        end
+
+        def delete_local_file(file_path, dry_run: false)
+          if dry_run
+            puts "  [DRY-RUN] Would delete: #{file_path}"
+            return true
+          end
+
+          File.delete(file_path)
+          true
+        rescue StandardError => e
+          puts "    Error: #{e.message}"
+          false
+        end
+
+        def copy_to_ssd(source_dir, dest_dir, dry_run: false)
+          if Dir.exist?(dest_dir)
+            puts '⚠️  Already exists on SSD'
+            puts "   Path: #{dest_dir}"
+            puts '   Skipping copy step'
+            return true
+          end
+
+          size = calculate_directory_size(source_dir)
+          puts '📋 Copy to SSD (excluding generated files):'
+          puts "   From: #{source_dir}"
+          puts "   To:   #{dest_dir}"
+          puts "   Size: #{file_size_human(size)}"
+          puts ''
+
+          if dry_run
+            puts '   [DRY-RUN] Would copy project to SSD (excluding node_modules, .git, etc.)'
+            return true
+          end
+
+          FileUtils.mkdir_p(dest_dir)
+          stats = copy_with_exclusions(source_dir, dest_dir)
+          puts "   ✅ Copied to SSD (#{stats[:files]} files, excluded #{stats[:excluded]} generated files)"
+
+          true
+        rescue StandardError => e
+          puts "   ✗ Failed to copy: #{e.message}"
+          false
+        end
+
+        def copy_with_exclusions(source_dir, dest_dir)
+          stats = { files: 0, excluded: 0 }
+
+          Dir.glob(File.join(source_dir, '**', '*'), File::FNM_DOTMATCH).each do |source_path|
+            next if File.directory?(source_path)
+            next if ['.', '..'].include?(File.basename(source_path))
+
+            relative_path = source_path.sub("#{source_dir}/", '')
+
+            if excluded_path?(relative_path)
+              stats[:excluded] += 1
+              next
+            end
+
+            dest_path = File.join(dest_dir, relative_path)
+            FileUtils.mkdir_p(File.dirname(dest_path))
+            FileUtils.cp(source_path, dest_path, preserve: true)
+            stats[:files] += 1
+          end
+
+          stats
+        end
+
+        def delete_local_project(project_dir, dry_run: false)
+          size = calculate_directory_size(project_dir)
+
+          puts ''
+          puts '🗑️  Delete local project:'
+          puts "   Path: #{project_dir}"
+          puts "   Size: #{file_size_human(size)}"
+          puts ''
+
+          if dry_run
+            puts '   [DRY-RUN] Would delete entire local folder'
+            return true
+          end
+
+          FileUtils.rm_rf(project_dir)
+          puts '   ✅ Deleted local folder'
+          puts "   💾 Freed: #{file_size_human(size)}"
+
+          true
+        rescue StandardError => e
+          puts "   ✗ Failed to delete: #{e.message}"
+          false
+        end
+
+        def calculate_directory_size(dir_path)
+          FileHelper.calculate_directory_size(dir_path)
+        end
+      end
+    end
+  end
+end

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

@@ -3,9 +3,9 @@
 module Appydave
   module Tools
     module Dam
-      # S3 operations for VAT (upload, download, status, cleanup).
+      # Thin delegation facade for S3 operations.
+      # Each method delegates to a focused class that handles one concern.
       # Inherits shared infrastructure and helpers from S3Base.
-      # Will become a thin delegation facade as focused classes are extracted (B020).
       class S3Operations < S3Base
         # Upload files from s3-staging/ to S3
         def upload(dry_run: false)
@@ -24,140 +24,17 @@ module Appydave
 
         # Cleanup S3 files
         def cleanup(force: false, dry_run: false)
-          s3_files = list_s3_files
-
-          if s3_files.empty?
-            puts "❌ No files found in S3 for #{brand}/#{project_id}"
-            return
-          end
-
-          puts "🗑️  Found #{s3_files.size} file(s) in S3 for #{brand}/#{project_id}"
-          puts ''
-
-          unless force
-            puts '⚠️  This will DELETE all files from S3 for this project.'
-            puts 'Use --force to confirm deletion.'
-            return
-          end
-
-          deleted = 0
-          failed = 0
-
-          s3_files.each do |s3_file|
-            key = s3_file['Key']
-            relative_path = extract_relative_path(key)
-
-            if delete_s3_file(key, dry_run: dry_run)
-              puts "  ✓ Deleted: #{relative_path}"
-              deleted += 1
-            else
-              puts "  ✗ Failed: #{relative_path}"
-              failed += 1
-            end
-          end
-
-          puts ''
-          puts '✅ Cleanup complete!'
-          puts "   Deleted: #{deleted}, Failed: #{failed}"
+          S3Archiver.new(brand, project_id, **delegated_opts).cleanup(force: force, dry_run: dry_run)
         end
 
         # Cleanup local s3-staging files
         def cleanup_local(force: false, dry_run: false)
-          project_dir = project_directory_path
-          staging_dir = File.join(project_dir, 's3-staging')
-
-          unless Dir.exist?(staging_dir)
-            puts "❌ No s3-staging directory found: #{staging_dir}"
-            return
-          end
-
-          files = Dir.glob("#{staging_dir}/**/*").select { |f| File.file?(f) }
-
-          if files.empty?
-            puts '❌ No files found in s3-staging/'
-            return
-          end
-
-          puts "🗑️  Found #{files.size} file(s) in local s3-staging/"
-          puts ''
-
-          unless force
-            puts '⚠️  This will DELETE all files from s3-staging/ for this project.'
-            puts 'Use --force to confirm deletion.'
-            return
-          end
-
-          deleted = 0
-          failed = 0
-
-          files.each do |file|
-            relative_path = file.sub("#{staging_dir}/", '')
-
-            if delete_local_file(file, dry_run: dry_run)
-              puts "  ✓ Deleted: #{relative_path}"
-              deleted += 1
-            else
-              puts "  ✗ Failed: #{relative_path}"
-              failed += 1
-            end
-          end
-
-          # Remove empty directories
-          Dir.glob("#{staging_dir}/**/*").select { |d| File.directory?(d) }.sort.reverse.each do |dir|
-            Dir.rmdir(dir) if Dir.empty?(dir)
-          rescue StandardError
-            nil
-          end
-
-          puts ''
-          puts '✅ Local cleanup complete!'
-          puts "   Deleted: #{deleted}, Failed: #{failed}"
+          S3Archiver.new(brand, project_id, **delegated_opts).cleanup_local(force: force, dry_run: dry_run)
         end
 
         # Archive project to SSD
         def archive(force: false, dry_run: false)
-          ssd_backup = brand_info.locations.ssd_backup
-
-          unless ssd_backup && !ssd_backup.empty?
-            puts "❌ SSD backup location not configured for brand '#{brand}'"
-            return
-          end
-
-          unless Dir.exist?(ssd_backup)
-            puts "❌ SSD not mounted at #{ssd_backup}"
-            puts '   Please connect the SSD before archiving.'
-            return
-          end
-
-          project_dir = project_directory_path
-
-          unless Dir.exist?(project_dir)
-            puts "❌ Project not found: #{project_dir}"
-            puts ''
-            puts "   Try: dam list #{brand}  # See available projects"
-            return
-          end
-
-          # Determine SSD destination path
-          ssd_project_dir = File.join(ssd_backup, project_id)
-
-          puts "📦 Archive: #{brand}/#{project_id}"
-          puts ''
-
-          # Step 1: Copy to SSD
-          if copy_to_ssd(project_dir, ssd_project_dir, dry_run: dry_run)
-            # Step 2: Delete local project (if force is true)
-            if force
-              delete_local_project(project_dir, dry_run: dry_run)
-            else
-              puts ''
-              puts '⚠️  Project copied to SSD but NOT deleted locally.'
-              puts '   Use --force to delete local copy after archiving.'
-            end
-          end
-
-          puts ''
-          puts dry_run ? '✅ Archive dry-run complete!' : '✅ Archive complete!'
+          S3Archiver.new(brand, project_id, **delegated_opts).archive(force: force, dry_run: dry_run)
         end
 
         # Calculate 3-state S3 sync status
@@ -177,126 +54,6 @@ module Appydave
         def delegated_opts
           { brand_info: brand_info, brand_path: brand_path, s3_client: @s3_client_override }
         end
-
-        # Delete file from S3
-        def delete_s3_file(s3_key, dry_run: false)
-          if dry_run
-            puts "  [DRY-RUN] Would delete: s3://#{brand_info.aws.s3_bucket}/#{s3_key}"
-            return true
-          end
-
-          s3_client.delete_object(
-            bucket: brand_info.aws.s3_bucket,
-            key: s3_key
-          )
-
-          true
-        rescue Aws::S3::Errors::ServiceError => e
-          puts "    Error: #{e.message}"
-          false
-        end
-
-        # Delete local file
-        def delete_local_file(file_path, dry_run: false)
-          if dry_run
-            puts "  [DRY-RUN] Would delete: #{file_path}"
-            return true
-          end
-
-          File.delete(file_path)
-          true
-        rescue StandardError => e
-          puts "    Error: #{e.message}"
-          false
-        end
-
-        # Copy project to SSD
-        def copy_to_ssd(source_dir, dest_dir, dry_run: false)
-          if Dir.exist?(dest_dir)
-            puts '⚠️  Already exists on SSD'
-            puts "   Path: #{dest_dir}"
-            puts '   Skipping copy step'
-            return true
-          end
-
-          size = calculate_directory_size(source_dir)
-          puts '📋 Copy to SSD (excluding generated files):'
-          puts "   From: #{source_dir}"
-          puts "   To:   #{dest_dir}"
-          puts "   Size: #{file_size_human(size)}"
-          puts ''
-
-          if dry_run
-            puts '   [DRY-RUN] Would copy project to SSD (excluding node_modules, .git, etc.)'
-            return true
-          end
-
-          FileUtils.mkdir_p(dest_dir)
-
-          # Copy files with exclusion filtering
-          stats = copy_with_exclusions(source_dir, dest_dir)
-
-          puts "   ✅ Copied to SSD (#{stats[:files]} files, excluded #{stats[:excluded]} generated files)"
-
-          true
-        rescue StandardError => e
-          puts "   ✗ Failed to copy: #{e.message}"
-          false
-        end
-
-        # Copy directory contents with exclusion filtering
-        def copy_with_exclusions(source_dir, dest_dir)
-          stats = { files: 0, excluded: 0 }
-
-          Dir.glob(File.join(source_dir, '**', '*'), File::FNM_DOTMATCH).each do |source_path|
-            next if File.directory?(source_path)
-            next if ['.', '..'].include?(File.basename(source_path))
-
-            relative_path = source_path.sub("#{source_dir}/", '')
-
-            if excluded_path?(relative_path)
-              stats[:excluded] += 1
-              next
-            end
-
-            dest_path = File.join(dest_dir, relative_path)
-            FileUtils.mkdir_p(File.dirname(dest_path))
-            FileUtils.cp(source_path, dest_path, preserve: true)
-            stats[:files] += 1
-          end
-
-          stats
-        end
-
-        # Delete local project directory
-        def delete_local_project(project_dir, dry_run: false)
-          size = calculate_directory_size(project_dir)
-
-          puts ''
-          puts '🗑️  Delete local project:'
-          puts "   Path: #{project_dir}"
-          puts "   Size: #{file_size_human(size)}"
-          puts ''
-
-          if dry_run
-            puts '   [DRY-RUN] Would delete entire local folder'
-            return true
-          end
-
-          FileUtils.rm_rf(project_dir)
-          puts '   ✅ Deleted local folder'
-          puts "   💾 Freed: #{file_size_human(size)}"
-
-          true
-        rescue StandardError => e
-          puts "   ✗ Failed to delete: #{e.message}"
-          false
-        end
-
-        # Calculate total size of a directory
-        def calculate_directory_size(dir_path)
-          FileHelper.calculate_directory_size(dir_path)
-        end
       end
     end
   end

data/lib/appydave/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Appydave
   module Tools
-    VERSION = '0.77.5'
+    VERSION = '0.77.6'
   end
 end

data/lib/appydave/tools.rb

@@ -71,6 +71,7 @@ require 'appydave/tools/dam/s3_base'
 require 'appydave/tools/dam/s3_uploader'
 require 'appydave/tools/dam/s3_downloader'
 require 'appydave/tools/dam/s3_status_checker'
+require 'appydave/tools/dam/s3_archiver'
 require 'appydave/tools/dam/s3_operations'
 require 'appydave/tools/dam/s3_scanner'
 require 'appydave/tools/dam/share_operations'

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appydave-tools",
-  "version": "0.77.5",
+  "version": "0.77.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.77.5
+  version: 0.77.6
 platform: ruby
 authors:
 - David Cruwys
@@ -373,6 +373,7 @@ 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_archiver.rb
 - lib/appydave/tools/dam/s3_arg_parser.rb
 - lib/appydave/tools/dam/s3_base.rb
 - lib/appydave/tools/dam/s3_downloader.rb