appydave-tools 0.39.0 → 0.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5c03f22b90ef02e4609a1d50bf1c1d06cf03b782a24cd9196463a746d91f33d
-  data.tar.gz: 61bc3604ae50ad6d9cc037c1df8be8c9d677a11aab23387c5fe74974e0bb3da4
+  metadata.gz: d87056ef6a0201fc1d722295aec17a46fa2c53a7581e9236db94369c8425ea9d
+  data.tar.gz: 24eadac450c656d2c4f0e38b36a0683a2fa096c02df913d97c580d6c7e109c34
 SHA512:
-  metadata.gz: 8c6ebbbce5cea68d4168d606521a57162e2dcee80d91dfd11b3785ca2e8fa722d1199553a64b51c9734c89869e725626e0cbcef6089e73e694c9b16b12079abb
-  data.tar.gz: b95e4edcd87705d08b2ebdf0c5b93884cf59386da8d169e21aea881119b5f8eb14d555c8f5c6b8c83ba236904b8f99d102fc3a192f9db4d06fc814d7405731c0
+  metadata.gz: 4390b2ec24eda2540a79fcb9dc0edea9c40d9d50e2cbf9720c56fa624071677a1e97f15be23f1cc63a7dbcb56c2a453bd28722154f0fbe0376689f6992110a79
+  data.tar.gz: fc43acf77aeb8c132cc1ed02172366b4eadfee12b50bcbe138694cfc4ff1e00fd6fbfb847a12046ee0b81576fdb9a18214a9a88d341e7fb05d65b95407d77517

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [0.40.0](https://github.com/appydave/appydave-tools/compare/v0.39.0...v0.40.0) (2025-11-21)
+
+
+### Features
+
+* add S3 overwrite warnings with timestamp comparison to prevent data loss ([e922891](https://github.com/appydave/appydave-tools/commit/e922891d9ae87328f5a7cffe5e827f08232c90cc))
+
+# [0.39.0](https://github.com/appydave/appydave-tools/compare/v0.38.0...v0.39.0) (2025-11-21)
+
+
+### Features
+
+* create BrandResolver class to centralize brand name resolution and eliminate ~30 lines of duplication from Config.expand_brand, fixing case-sensitivity bugs ([d6cce4b](https://github.com/appydave/appydave-tools/commit/d6cce4b0c1df6d7efcd40db52e80534c4014fdb5))
+
 # [0.38.0](https://github.com/appydave/appydave-tools/compare/v0.37.0...v0.38.0) (2025-11-21)
 
 

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

@@ -3,7 +3,33 @@
 module Appydave
   module Tools
     module Configuration
-      # Configuration class for handling multiple configurations
+      # Central configuration management for appydave-tools
+      #
+      # Thread-safe singleton pattern with memoization for registered configurations.
+      # Calling `Config.configure` multiple times is safe and idempotent.
+      #
+      # @example Basic usage
+      #   Config.configure  # Load default configuration (idempotent)
+      #   Config.settings.video_projects_root  # Access settings
+      #   Config.brands.get_brand('appydave')  # Access brands
+      #
+      # @example DAM module usage pattern
+      #   # Config.configure called once at module load time
+      #   # All subsequent calls within DAM classes are no-ops (memoized)
+      #   def some_method
+      #     Config.configure  # Safe to call - returns immediately if already configured
+      #     brand = Config.brands.get_brand('appydave')
+      #   end
+      #
+      # @example Registered configurations
+      #   Config.settings         # => SettingsConfig instance
+      #   Config.brands           # => BrandsConfig instance
+      #   Config.channels         # => ChannelsConfig instance
+      #   Config.youtube_automation  # => YoutubeAutomationConfig instance
+      #
+      # @note Configuration instances are created once on first registration and reused
+      #   for all subsequent accesses. This prevents unnecessary file I/O and ensures
+      #   consistent state across the application.
       class Config
         class << self
           include KLog::Logging
@@ -12,6 +38,25 @@ module Appydave
           attr_reader :configurations
           attr_reader :default_block
 
+          # Load configuration using either provided block or default configuration
+          #
+          # This method is idempotent and thread-safe. Calling it multiple times
+          # has no negative side effects - configurations are memoized on first call.
+          #
+          # @yield [Config] configuration object for manual setup
+          # @return [void]
+          # @raise [Error] if no block provided and no default_block set
+          #
+          # @example With block (manual configuration)
+          #   Config.configure do |config|
+          #     config.config_path = '/custom/path'
+          #     config.register(:settings, SettingsConfig)
+          #   end
+          #
+          # @example Without block (uses default_block)
+          #   Config.set_default { |config| config.register(:settings, SettingsConfig) }
+          #   Config.configure  # Uses default_block
+          #   Config.configure  # Safe to call again - no-op due to memoization
           def configure
             if block_given?
               yield self
@@ -23,6 +68,23 @@ module Appydave
             ensure_config_directory
           end
 
+          # Register a configuration class with memoization
+          #
+          # Creates a single instance of the configuration class on first call.
+          # Subsequent calls return the same instance (memoized). This prevents
+          # unnecessary file I/O and ensures consistent configuration state.
+          #
+          # @param key [Symbol] configuration identifier (e.g., :settings, :brands)
+          # @param klass [Class] configuration class to instantiate
+          # @return [Object] configuration instance
+          #
+          # @example
+          #   Config.register(:settings, SettingsConfig)
+          #   Config.settings  # => SettingsConfig instance (created on first access)
+          #   Config.settings  # => Same instance (memoized)
+          #
+          # @note This method implements lazy initialization - the configuration
+          #   instance is only created when first accessed, not at registration time.
           def register(key, klass)
             @configurations ||= {}
             # Only create new instance if not already registered (prevents multiple reloads)
@@ -30,10 +92,26 @@ module Appydave
           end
 
           # Reset all configurations (primarily for testing)
+          #
+          # Clears all memoized configuration instances. Use this in test teardown
+          # to ensure each test starts with a clean configuration state.
+          #
+          # @return [void]
+          #
+          # @example RSpec usage
+          #   after { Config.reset }
           def reset
             @configurations = nil
           end
 
+          # Dynamic accessor for registered configurations
+          #
+          # Provides method-style access to registered configuration instances.
+          # Called when accessing Config.settings, Config.brands, etc.
+          #
+          # @param method_name [Symbol] configuration key
+          # @return [Object] configuration instance
+          # @raise [Error] if configurations not registered or key not found
           def method_missing(method_name, *_args)
             raise Appydave::Tools::Error, 'Configuration has never been registered' if @configurations.nil?
             raise Appydave::Tools::Error, "Configuration not available: #{method_name}" unless @configurations.key?(method_name)
@@ -45,18 +123,27 @@ module Appydave
             @configurations.key?(method_name) || super
           end
 
+          # Save all registered configurations to their respective files
+          # @return [void]
           def save
             configurations.each_value(&:save)
           end
 
+          # Set default configuration block used when configure called without block
+          # @yield [Config] configuration block to execute by default
+          # @return [Proc] the stored block
           def set_default(&block)
             @default_block = block
           end
 
+          # Load all registered configurations from their respective files
+          # @return [void]
           def load
             configurations.each_value(&:load)
           end
 
+          # Open configuration directory in VS Code
+          # @return [void]
           def edit
             ensure_config_directory
             puts "Edit configuration: #{config_path}"
@@ -64,6 +151,8 @@ module Appydave
             Open3.capture3(open_vscode)
           end
 
+          # Debug output for all configurations
+          # @return [void]
           def debug
             log.kv 'Configuration Path', config_path
             configurations.each_value(&:debug)
@@ -74,6 +163,9 @@ module Appydave
           #   configurations.each_value(&:print)
           # end
 
+          # Print specific configurations or all if no keys provided
+          # @param keys [Array<String, Symbol>] configuration keys to print
+          # @return [void]
           def print(*keys)
             if keys.empty?
               keys = configurations.keys

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

@@ -150,7 +150,7 @@ module Appydave
 
         # Find the most recent modification time across all projects
         def self.find_last_modified(brand, projects)
-          return Time.at(0) if projects.empty?
+          return nil if projects.empty?
 
           projects.map do |project|
             File.mtime(Config.project_path(brand, project))

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

@@ -140,6 +140,7 @@ module Appydave
           skipped = 0
           failed = 0
 
+          # rubocop:disable Metrics/BlockLength
           files.each do |file|
             relative_path = file.sub("#{staging_dir}/", '')
 
@@ -158,12 +159,31 @@ module Appydave
             if local_md5 == s3_md5
               puts "  ⏭️  Skipped: #{relative_path} (unchanged)"
               skipped += 1
-            elsif upload_file(file, s3_path, dry_run: dry_run)
-              uploaded += 1
             else
-              failed += 1
+              # Warn if we're about to overwrite an existing S3 file
+              if s3_md5 && s3_md5 != local_md5
+                puts "  ⚠️  Warning: #{relative_path} exists in S3 with different content"
+
+                # Try to get S3 timestamp for comparison
+                s3_file_info = get_s3_file_info(s3_path)
+                if s3_file_info && s3_file_info['LastModified']
+                  s3_time = s3_file_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
+                end
+                puts '     Uploading will overwrite S3 version...'
+              end
+
+              if upload_file(file, s3_path, dry_run: dry_run)
+                uploaded += 1
+              else
+                failed += 1
+              end
             end
           end
+          # rubocop:enable Metrics/BlockLength
 
           puts ''
           puts '✅ Upload complete!'
@@ -207,13 +227,29 @@ module Appydave
             if local_md5 == s3_md5
               puts "  ⏭️  Skipped: #{relative_path} (unchanged)"
               skipped += 1
-            elsif download_file(key, local_file, dry_run: dry_run)
-              downloaded += 1
             else
-              failed += 1
+              # Warn if we're about to overwrite an existing local file
+              if local_md5 && local_md5 != s3_md5
+                puts "  ⚠️  Warning: #{relative_path} exists locally with different content"
+
+                # Compare timestamps
+                if s3_file['LastModified'] && File.exist?(local_file)
+                  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
           end
-
           puts ''
           puts '✅ Download complete!'
           puts "   Downloaded: #{downloaded}, Skipped: #{skipped}, Failed: #{failed}"
@@ -235,10 +271,21 @@ module Appydave
 
           if s3_files.empty? && local_files.empty?
             puts "❌ No files found in S3 or locally for #{brand}/#{project_id}"
+            puts '   This project has no heavy files in s3-staging/ or S3.'
+            puts "   Tip: Add files to #{File.basename(staging_dir)}/ folder, then run: dam s3-up"
             return
           end
 
           puts "📊 S3 Sync Status for #{brand}/#{project_id}"
+
+          # Show last sync time
+          if s3_files.any?
+            most_recent = s3_files.map { |f| f['LastModified'] }.compact.max
+            if most_recent
+              time_ago = format_time_ago(Time.now - most_recent)
+              puts "   Last synced: #{time_ago} ago (#{most_recent.strftime('%Y-%m-%d %H:%M')})"
+            end
+          end
           puts ''
 
           # Combine all file paths (S3 + local)
@@ -527,6 +574,28 @@ module Appydave
           end
         end
 
+        def format_time_ago(seconds)
+          return 'just now' if seconds < 60
+
+          minutes = seconds / 60
+          return "#{minutes.round} minute#{'s' if minutes > 1}" if minutes < 60
+
+          hours = minutes / 60
+          return "#{hours.round} hour#{'s' if hours > 1}" if hours < 24
+
+          days = hours / 24
+          return "#{days.round} day#{'s' if days > 1}" if days < 7
+
+          weeks = days / 7
+          return "#{weeks.round} week#{'s' if weeks > 1}" if weeks < 4
+
+          months = days / 30
+          return "#{months.round} month#{'s' if months > 1}" if months < 12
+
+          years = days / 365
+          "#{years.round} year#{'s' if years > 1}"
+        end
+
         def detect_content_type(filename)
           ext = File.extname(filename).downcase
           case ext
@@ -634,13 +703,31 @@ module Appydave
             {
               'Key' => obj.key,
               'Size' => obj.size,
-              'ETag' => obj.etag
+              'ETag' => obj.etag,
+              'LastModified' => obj.last_modified
             }
           end
         rescue Aws::S3::Errors::ServiceError
           []
         end
 
+        # Get full S3 file info including timestamp
+        def get_s3_file_info(s3_key)
+          response = s3_client.head_object(
+            bucket: brand_info.aws.s3_bucket,
+            key: s3_key
+          )
+
+          {
+            'Key' => s3_key,
+            'Size' => response.content_length,
+            'ETag' => response.etag,
+            'LastModified' => response.last_modified
+          }
+        rescue Aws::S3::Errors::NotFound, Aws::S3::Errors::ServiceError
+          nil
+        end
+
         # List local files in staging directory
         def list_local_files(staging_dir)
           return {} unless Dir.exist?(staging_dir)

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

@@ -60,15 +60,6 @@ module Appydave
           puts "📊 Brand Status: v-#{brand}"
           puts ''
 
-          # Show git remote (with self-healing)
-          remote = Config.git_remote(brand)
-          if remote
-            puts "📡 Git Remote: #{remote}"
-          else
-            puts '📡 Git Remote: Not configured (not a git repository)'
-          end
-          puts ''
-
           # Show git status
           if git_repo?
             show_brand_git_status
@@ -108,7 +99,7 @@ module Appydave
           local = project_entry[:storage][:local]
 
           if local[:exists]
-            puts "  📁 Local: ✓ exists (#{local[:structure]} structure)"
+            puts '  📁 Local: ✓ exists'
             puts "     Heavy files: #{local[:has_heavy_files] ? 'yes' : 'no'}"
             puts "     Light files: #{local[:has_light_files] ? 'yes' : 'no'}"
           else

data/lib/appydave/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Appydave
   module Tools
-    VERSION = '0.39.0'
+    VERSION = '0.41.0'
   end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appydave-tools",
-  "version": "0.39.0",
+  "version": "0.41.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.39.0
+  version: 0.41.0
 platform: ruby
 authors:
 - David Cruwys