appydave-tools 0.77.2 → 0.77.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b3fd2da88a61ae790fb8df1416e8bdf19d25db6631cfbe657741c44af57bfc6
-  data.tar.gz: 5bef21a3321a1fbbe97daf51725589a89ed7ddb2f54fb802ea575b506c1cc8cb
+  metadata.gz: b37b062c3680912049eb80e1cb4c40a213429d80e4a80fd5a9ea687e68bda536
+  data.tar.gz: a8ee199b0664434908e0178cc21956620a87455540f459ee6e1f85560cbe02f8
 SHA512:
-  metadata.gz: 449a8fe029e73b879a834c3f8ff806b272dfd1326f2beb9d8b4e1a1cd6f57cccc9f93b452eb8e629870a8fe10c82a42bc11e7b0db2fd8166ff8f2675650eb4c6
-  data.tar.gz: 516690c962d2f0ede9c04cfabe9417d99359d8ddd3f0945399f7a2b06f006062b5eaeeb52ce29635a029736a6fa462454edb3b1c18fb534e44e7931385d33932
+  metadata.gz: 1f7e6164d4e947be359dda0e27b61507b35bbe65e10073760e765b12ea755bfcb66d38784567e1404fe8474745dc34782fe61684c322e091697b4f7df94fccab
+  data.tar.gz: f12c43fe505fd799f991c6f158bc30a82df78b3676aceb6a77208d24bc443293f3e5ee32172fe18f70034d03f9ab6d4c0f5dbee6319e29e62569a6ac7847e4e2

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.77.3](https://github.com/appydave/appydave-tools/compare/v0.77.2...v0.77.3) (2026-03-20)
+
+
+### Bug Fixes
+
+* extract S3Uploader from S3Operations; upload delegates to focused class ([9e0dea9](https://github.com/appydave/appydave-tools/commit/9e0dea9e1437ed2b08ed64f016fe939edc164bc6))
+
+## [0.77.2](https://github.com/appydave/appydave-tools/compare/v0.77.1...v0.77.2) (2026-03-20)
+
+
+### Bug Fixes
+
+* extract S3Base with shared infrastructure and helpers from S3Operations ([e2c3f66](https://github.com/appydave/appydave-tools/commit/e2c3f66c96599170d987c308dd90e3524e6be4b6))
+
 ## [0.77.1](https://github.com/appydave/appydave-tools/compare/v0.77.0...v0.77.1) (2026-03-20)
 
 

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

@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+module Appydave
+  module Tools
+    module Dam
+      # Handles S3 download operations.
+      # Inherits shared infrastructure and helpers from S3Base.
+      class S3Downloader < S3Base
+        def download(dry_run: false)
+          project_dir = project_directory_path
+          staging_dir = File.join(project_dir, 's3-staging')
+
+          # Ensure project directory exists before download
+          unless Dir.exist?(project_dir)
+            puts "📁 Creating project directory: #{project_id}"
+            FileUtils.mkdir_p(project_dir) unless dry_run
+          end
+
+          s3_files = list_s3_files
+
+          if s3_files.empty?
+            puts "❌ No files found in S3 for #{brand}/#{project_id}"
+            return
+          end
+
+          total_size = s3_files.sum { |f| f['Size'] || 0 }
+          puts "📦 Downloading #{s3_files.size} file(s) (#{file_size_human(total_size)}) from S3 to #{project_id}/s3-staging/..."
+          puts ''
+
+          downloaded = 0
+          skipped = 0
+          failed = 0
+
+          # rubocop:disable Metrics/BlockLength
+          s3_files.each do |s3_file|
+            key = s3_file['Key']
+            relative_path = extract_relative_path(key)
+            local_file = File.join(staging_dir, relative_path)
+
+            # Check if file already exists and compare
+            s3_etag = s3_file['ETag'].gsub('"', '')
+            s3_size = s3_file['Size']
+
+            if File.exist?(local_file)
+              match_status = compare_files(local_file: local_file, s3_etag: s3_etag, s3_size: s3_size)
+
+              if match_status == :synced
+                comparison_method = multipart_etag?(s3_etag) ? 'size match' : 'unchanged'
+                puts "  ⏭️  Skipped: #{relative_path} (#{comparison_method})"
+                skipped += 1
+                next
+              end
+
+              # File exists but content differs - warn before overwriting
+              puts "  ⚠️  Warning: #{relative_path} exists locally with different content"
+              puts '     (multipart upload detected - comparing by size)' if multipart_etag?(s3_etag)
+
+              if s3_file['LastModified']
+                s3_time = s3_file['LastModified']
+                local_time = File.mtime(local_file)
+                puts "     S3: #{s3_time.strftime('%Y-%m-%d %H:%M')} | Local: #{local_time.strftime('%Y-%m-%d %H:%M')}"
+
+                puts '     ⚠️  Local file is NEWER than S3 - you may be overwriting recent changes!' if local_time > s3_time
+              end
+              puts '     Downloading will overwrite local version...'
+            end
+
+            if download_file(key, local_file, dry_run: dry_run)
+              downloaded += 1
+            else
+              failed += 1
+            end
+          end
+          # rubocop:enable Metrics/BlockLength
+          puts ''
+          puts '✅ Download complete!'
+          puts "   Downloaded: #{downloaded}, Skipped: #{skipped}, Failed: #{failed}"
+        end
+
+        private
+
+        def download_file(s3_key, local_file, dry_run: false)
+          if dry_run
+            puts "  [DRY-RUN] Would download: s3://#{brand_info.aws.s3_bucket}/#{s3_key} → #{local_file}"
+            return true
+          end
+
+          FileUtils.mkdir_p(File.dirname(local_file))
+
+          start_time = Time.now
+
+          s3_client.get_object(
+            bucket: brand_info.aws.s3_bucket,
+            key: s3_key,
+            response_target: local_file
+          )
+
+          elapsed = Time.now - start_time
+          elapsed_str = format_duration(elapsed)
+          file_size = File.size(local_file)
+          puts "  ✓ Downloaded: #{File.basename(local_file)} (#{file_size_human(file_size)}) in #{elapsed_str}"
+          true
+        rescue Aws::S3::Errors::ServiceError => e
+          puts "  ✗ Failed: #{File.basename(local_file)}"
+          puts "    Error: #{e.message}"
+          false
+        end
+      end
+    end
+  end
+end

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

@@ -9,151 +9,12 @@ module Appydave
       class S3Operations < S3Base
         # Upload files from s3-staging/ to S3
         def upload(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}"
-            puts 'Nothing to upload.'
-            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 "📦 Uploading #{files.size} file(s) from #{project_id}/s3-staging/ to S3..."
-          puts ''
-
-          uploaded = 0
-          skipped = 0
-          failed = 0
-
-          # rubocop:disable Metrics/BlockLength
-          files.each do |file|
-            relative_path = file.sub("#{staging_dir}/", '')
-
-            # Skip excluded files (e.g., Windows Zone.Identifier, .DS_Store)
-            if excluded_path?(relative_path)
-              skipped += 1
-              next
-            end
-
-            s3_path = build_s3_key(relative_path)
-
-            # Check if file already exists in S3 and compare
-            s3_info = get_s3_file_info(s3_path)
-
-            if s3_info
-              s3_etag = s3_info['ETag'].gsub('"', '')
-              s3_size = s3_info['Size']
-              match_status = compare_files(local_file: file, s3_etag: s3_etag, s3_size: s3_size)
-
-              if match_status == :synced
-                comparison_method = multipart_etag?(s3_etag) ? 'size match' : 'unchanged'
-                puts "  ⏭️  Skipped: #{relative_path} (#{comparison_method})"
-                skipped += 1
-                next
-              end
-
-              # File exists but content differs - warn before overwriting
-              puts "  ⚠️  Warning: #{relative_path} exists in S3 with different content"
-              puts '     (multipart upload detected - comparing by size)' if multipart_etag?(s3_etag)
-
-              s3_time = s3_info['LastModified']
-              local_time = File.mtime(file)
-              puts "     S3: #{s3_time.strftime('%Y-%m-%d %H:%M')} | Local: #{local_time.strftime('%Y-%m-%d %H:%M')}"
-
-              puts '     ⚠️  S3 file is NEWER than local - you may be overwriting recent changes!' if s3_time > local_time
-              puts '     Uploading will overwrite S3 version...'
-            end
-
-            if upload_file(file, s3_path, dry_run: dry_run)
-              uploaded += 1
-            else
-              failed += 1
-            end
-          end
-          # rubocop:enable Metrics/BlockLength
-
-          puts ''
-          puts '✅ Upload complete!'
-          puts "   Uploaded: #{uploaded}, Skipped: #{skipped}, Failed: #{failed}"
+          S3Uploader.new(brand, project_id, **delegated_opts).upload(dry_run: dry_run)
         end
 
         # Download files from S3 to s3-staging/
         def download(dry_run: false)
-          project_dir = project_directory_path
-          staging_dir = File.join(project_dir, 's3-staging')
-
-          # Ensure project directory exists before download
-          unless Dir.exist?(project_dir)
-            puts "📁 Creating project directory: #{project_id}"
-            FileUtils.mkdir_p(project_dir) unless dry_run
-          end
-
-          s3_files = list_s3_files
-
-          if s3_files.empty?
-            puts "❌ No files found in S3 for #{brand}/#{project_id}"
-            return
-          end
-
-          total_size = s3_files.sum { |f| f['Size'] || 0 }
-          puts "📦 Downloading #{s3_files.size} file(s) (#{file_size_human(total_size)}) from S3 to #{project_id}/s3-staging/..."
-          puts ''
-
-          downloaded = 0
-          skipped = 0
-          failed = 0
-
-          # rubocop:disable Metrics/BlockLength
-          s3_files.each do |s3_file|
-            key = s3_file['Key']
-            relative_path = extract_relative_path(key)
-            local_file = File.join(staging_dir, relative_path)
-
-            # Check if file already exists and compare
-            s3_etag = s3_file['ETag'].gsub('"', '')
-            s3_size = s3_file['Size']
-
-            if File.exist?(local_file)
-              match_status = compare_files(local_file: local_file, s3_etag: s3_etag, s3_size: s3_size)
-
-              if match_status == :synced
-                comparison_method = multipart_etag?(s3_etag) ? 'size match' : 'unchanged'
-                puts "  ⏭️  Skipped: #{relative_path} (#{comparison_method})"
-                skipped += 1
-                next
-              end
-
-              # File exists but content differs - warn before overwriting
-              puts "  ⚠️  Warning: #{relative_path} exists locally with different content"
-              puts '     (multipart upload detected - comparing by size)' if multipart_etag?(s3_etag)
-
-              if s3_file['LastModified']
-                s3_time = s3_file['LastModified']
-                local_time = File.mtime(local_file)
-                puts "     S3: #{s3_time.strftime('%Y-%m-%d %H:%M')} | Local: #{local_time.strftime('%Y-%m-%d %H:%M')}"
-
-                puts '     ⚠️  Local file is NEWER than S3 - you may be overwriting recent changes!' if local_time > s3_time
-              end
-              puts '     Downloading will overwrite local version...'
-            end
-
-            if download_file(key, local_file, dry_run: dry_run)
-              downloaded += 1
-            else
-              failed += 1
-            end
-          end
-          # rubocop:enable Metrics/BlockLength
-          puts ''
-          puts '✅ Download complete!'
-          puts "   Downloaded: #{downloaded}, Skipped: #{skipped}, Failed: #{failed}"
+          S3Downloader.new(brand, project_id, **delegated_opts).download(dry_run: dry_run)
         end
 
         # Show sync status
@@ -486,115 +347,8 @@ module Appydave
 
         private
 
-        # Upload file to S3
-        def upload_file(local_file, s3_path, dry_run: false)
-          if dry_run
-            puts "  [DRY-RUN] Would upload: #{local_file} → s3://#{brand_info.aws.s3_bucket}/#{s3_path}"
-            return true
-          end
-
-          # Detect MIME type for proper browser handling
-          content_type = detect_content_type(local_file)
-
-          # For large files, use TransferManager for managed uploads (supports multipart)
-          file_size = File.size(local_file)
-          start_time = Time.now
-
-          if file_size > 100 * 1024 * 1024 # > 100MB
-            puts "  📤 Uploading large file (#{file_size_human(file_size)})..."
-
-            # Use TransferManager for multipart upload (modern AWS SDK approach)
-            transfer_manager = Aws::S3::TransferManager.new(client: s3_client)
-            transfer_manager.upload_file(
-              local_file,
-              bucket: brand_info.aws.s3_bucket,
-              key: s3_path,
-              content_type: content_type
-            )
-          else
-            # For smaller files, use direct put_object
-            File.open(local_file, 'rb') do |file|
-              s3_client.put_object(
-                bucket: brand_info.aws.s3_bucket,
-                key: s3_path,
-                body: file,
-                content_type: content_type
-              )
-            end
-          end
-
-          elapsed = Time.now - start_time
-          elapsed_str = format_duration(elapsed)
-          puts "  ✓ Uploaded: #{File.basename(local_file)} (#{file_size_human(file_size)}) in #{elapsed_str}"
-          true
-        rescue Aws::S3::Errors::ServiceError => e
-          puts "  ✗ Failed: #{File.basename(local_file)}"
-          puts "    Error: #{e.message}"
-          false
-        rescue StandardError => e
-          puts "  ✗ Failed: #{File.basename(local_file)}"
-          puts "    Error: #{e.class} - #{e.message}"
-          false
-        end
-
-        def detect_content_type(filename)
-          ext = File.extname(filename).downcase
-          case ext
-          when '.mp4'
-            'video/mp4'
-          when '.mov'
-            'video/quicktime'
-          when '.avi'
-            'video/x-msvideo'
-          when '.mkv'
-            'video/x-matroska'
-          when '.webm'
-            'video/webm'
-          when '.m4v'
-            'video/x-m4v'
-          when '.jpg', '.jpeg'
-            'image/jpeg'
-          when '.png'
-            'image/png'
-          when '.gif'
-            'image/gif'
-          when '.pdf'
-            'application/pdf'
-          when '.json'
-            'application/json'
-          when '.srt', '.vtt', '.txt', '.md'
-            'text/plain'
-          else
-            'application/octet-stream'
-          end
-        end
-
-        # Download file from S3
-        def download_file(s3_key, local_file, dry_run: false)
-          if dry_run
-            puts "  [DRY-RUN] Would download: s3://#{brand_info.aws.s3_bucket}/#{s3_key} → #{local_file}"
-            return true
-          end
-
-          FileUtils.mkdir_p(File.dirname(local_file))
-
-          start_time = Time.now
-
-          s3_client.get_object(
-            bucket: brand_info.aws.s3_bucket,
-            key: s3_key,
-            response_target: local_file
-          )
-
-          elapsed = Time.now - start_time
-          elapsed_str = format_duration(elapsed)
-          file_size = File.size(local_file)
-          puts "  ✓ Downloaded: #{File.basename(local_file)} (#{file_size_human(file_size)}) in #{elapsed_str}"
-          true
-        rescue Aws::S3::Errors::ServiceError => e
-          puts "  ✗ Failed: #{File.basename(local_file)}"
-          puts "    Error: #{e.message}"
-          false
+        def delegated_opts
+          { brand_info: brand_info, brand_path: brand_path, s3_client: @s3_client_override }
         end
 
         # Delete file from S3

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

@@ -0,0 +1,171 @@
+# frozen_string_literal: true
+
+module Appydave
+  module Tools
+    module Dam
+      # Handles S3 upload operations.
+      # Inherits shared infrastructure and helpers from S3Base.
+      class S3Uploader < S3Base
+        def upload(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}"
+            puts 'Nothing to upload.'
+            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 "📦 Uploading #{files.size} file(s) from #{project_id}/s3-staging/ to S3..."
+          puts ''
+
+          uploaded = 0
+          skipped = 0
+          failed = 0
+
+          # rubocop:disable Metrics/BlockLength
+          files.each do |file|
+            relative_path = file.sub("#{staging_dir}/", '')
+
+            # Skip excluded files (e.g., Windows Zone.Identifier, .DS_Store)
+            if excluded_path?(relative_path)
+              skipped += 1
+              next
+            end
+
+            s3_path = build_s3_key(relative_path)
+
+            # Check if file already exists in S3 and compare
+            s3_info = get_s3_file_info(s3_path)
+
+            if s3_info
+              s3_etag = s3_info['ETag'].gsub('"', '')
+              s3_size = s3_info['Size']
+              match_status = compare_files(local_file: file, s3_etag: s3_etag, s3_size: s3_size)
+
+              if match_status == :synced
+                comparison_method = multipart_etag?(s3_etag) ? 'size match' : 'unchanged'
+                puts "  ⏭️  Skipped: #{relative_path} (#{comparison_method})"
+                skipped += 1
+                next
+              end
+
+              # File exists but content differs - warn before overwriting
+              puts "  ⚠️  Warning: #{relative_path} exists in S3 with different content"
+              puts '     (multipart upload detected - comparing by size)' if multipart_etag?(s3_etag)
+
+              s3_time = s3_info['LastModified']
+              local_time = File.mtime(file)
+              puts "     S3: #{s3_time.strftime('%Y-%m-%d %H:%M')} | Local: #{local_time.strftime('%Y-%m-%d %H:%M')}"
+
+              puts '     ⚠️  S3 file is NEWER than local - you may be overwriting recent changes!' if s3_time > local_time
+              puts '     Uploading will overwrite S3 version...'
+            end
+
+            if upload_file(file, s3_path, dry_run: dry_run)
+              uploaded += 1
+            else
+              failed += 1
+            end
+          end
+          # rubocop:enable Metrics/BlockLength
+
+          puts ''
+          puts '✅ Upload complete!'
+          puts "   Uploaded: #{uploaded}, Skipped: #{skipped}, Failed: #{failed}"
+        end
+
+        private
+
+        def upload_file(local_file, s3_path, dry_run: false)
+          if dry_run
+            puts "  [DRY-RUN] Would upload: #{local_file} → s3://#{brand_info.aws.s3_bucket}/#{s3_path}"
+            return true
+          end
+
+          # Detect MIME type for proper browser handling
+          content_type = detect_content_type(local_file)
+
+          # For large files, use TransferManager for managed uploads (supports multipart)
+          file_size = File.size(local_file)
+          start_time = Time.now
+
+          if file_size > 100 * 1024 * 1024 # > 100MB
+            puts "  📤 Uploading large file (#{file_size_human(file_size)})..."
+
+            # Use TransferManager for multipart upload (modern AWS SDK approach)
+            transfer_manager = Aws::S3::TransferManager.new(client: s3_client)
+            transfer_manager.upload_file(
+              local_file,
+              bucket: brand_info.aws.s3_bucket,
+              key: s3_path,
+              content_type: content_type
+            )
+          else
+            # For smaller files, use direct put_object
+            File.open(local_file, 'rb') do |file|
+              s3_client.put_object(
+                bucket: brand_info.aws.s3_bucket,
+                key: s3_path,
+                body: file,
+                content_type: content_type
+              )
+            end
+          end
+
+          elapsed = Time.now - start_time
+          elapsed_str = format_duration(elapsed)
+          puts "  ✓ Uploaded: #{File.basename(local_file)} (#{file_size_human(file_size)}) in #{elapsed_str}"
+          true
+        rescue Aws::S3::Errors::ServiceError => e
+          puts "  ✗ Failed: #{File.basename(local_file)}"
+          puts "    Error: #{e.message}"
+          false
+        rescue StandardError => e
+          puts "  ✗ Failed: #{File.basename(local_file)}"
+          puts "    Error: #{e.class} - #{e.message}"
+          false
+        end
+
+        def detect_content_type(filename)
+          ext = File.extname(filename).downcase
+          case ext
+          when '.mp4'
+            'video/mp4'
+          when '.mov'
+            'video/quicktime'
+          when '.avi'
+            'video/x-msvideo'
+          when '.mkv'
+            'video/x-matroska'
+          when '.webm'
+            'video/webm'
+          when '.m4v'
+            'video/x-m4v'
+          when '.jpg', '.jpeg'
+            'image/jpeg'
+          when '.png'
+            'image/png'
+          when '.gif'
+            'image/gif'
+          when '.pdf'
+            'application/pdf'
+          when '.json'
+            'application/json'
+          when '.srt', '.vtt', '.txt', '.md'
+            'text/plain'
+          else
+            'application/octet-stream'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/appydave/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Appydave
   module Tools
-    VERSION = '0.77.2'
+    VERSION = '0.77.4'
   end
 end

data/lib/appydave/tools.rb

@@ -68,6 +68,8 @@ require 'appydave/tools/dam/config'
 require 'appydave/tools/dam/project_resolver'
 require 'appydave/tools/dam/config_loader'
 require 'appydave/tools/dam/s3_base'
+require 'appydave/tools/dam/s3_uploader'
+require 'appydave/tools/dam/s3_downloader'
 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.2",
+  "version": "0.77.4",
   "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.2
+  version: 0.77.4
 platform: ruby
 authors:
 - David Cruwys
@@ -375,9 +375,11 @@ files:
 - lib/appydave/tools/dam/repo_sync.rb
 - lib/appydave/tools/dam/s3_arg_parser.rb
 - lib/appydave/tools/dam/s3_base.rb
+- lib/appydave/tools/dam/s3_downloader.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/s3_uploader.rb
 - lib/appydave/tools/dam/share_operations.rb
 - lib/appydave/tools/dam/ssd_status.rb
 - lib/appydave/tools/dam/status.rb