appydave-tools 0.29.0 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76cae4ca64c8ad4d198bb5de8811c6f00fb75001cd85570dd8de70a693b0f1e5
-  data.tar.gz: 14aa751842fa98ebccfd996d36ca941b3cf0a61101f60990eff617f2cc96680c
+  metadata.gz: 59166b27664a8c4643a3d5e523f54d30a58b041014dd9e22bf7e8fe5bc120991
+  data.tar.gz: 0a7ad00b2efd8076a16b61583ec09865013df2ed220da575a33593da571c6c81
 SHA512:
-  metadata.gz: d11e5479bdca80a75562dd8f228367fd5085efb1f53f72c0fad6da3f12384e035892eb56a25dfd1933055bf8334e1ead7e8fe12454dfc769a069f748cf3d75c0
-  data.tar.gz: a508233c8fd6963ada3e79a6b4ef8a21de6ff5e07728fe62d5b763a73d1ff1d2f39acc6c642c2b075baa0fc9989941cfff625bb8c91bb60212fd7cdbc14e2b1c
+  metadata.gz: c7b247b7916f728f0903cdc563da3dce0b2f0f1378dc6afe860d2d22de8c3dddbe5489ed09af1857c518686553f64bbc1cc9202e085ff4770bdfd4becaacd863
+  data.tar.gz: d088f0367d0b3105cd9e69a0c02fa9b58163920c75cabb25bae56be18a01294900c7c5522bcff2bfb2ac2cb1600e7903fa9d7a732946f053d175392f130ab63a

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+# [0.30.0](https://github.com/appydave/appydave-tools/compare/v0.29.0...v0.30.0) (2025-11-21)
+
+
+### Features
+
+* add Config.project_path utility method for DRY principle - update all DAM files to use centralized path resolution ([acd9b9a](https://github.com/appydave/appydave-tools/commit/acd9b9afb0b03af0bb980ab1208aacf9ed422267))
+
+# [0.29.0](https://github.com/appydave/appydave-tools/compare/v0.28.0...v0.29.0) (2025-11-20)
+
+
+### Features
+
+* add comprehensive unit tests for recent S3 features - Zone.Identifier exclusion, download timing, project directory creation, and excluded_path helper ([2a2f35a](https://github.com/appydave/appydave-tools/commit/2a2f35acb1e3674c15860120f0cf60a3fe0fe6b2))
+* add unit tests for projects_subfolder feature in S3Operations ([7b47ee2](https://github.com/appydave/appydave-tools/commit/7b47ee20e1f4326446833ccd87fbb441cbabba45))
+
 # [0.28.0](https://github.com/appydave/appydave-tools/compare/v0.27.0...v0.28.0) (2025-11-20)
 
 

data/bin/dam

@@ -1179,10 +1179,18 @@ class VatCLI
     # Write updated manifest
     File.write(manifest_path, JSON.pretty_generate(manifest))
 
+    total_manifest_projects = manifest[:projects].size
+
     puts ''
     puts "✅ Updated manifest with S3 data: #{manifest_path}"
-    puts "   Scanned #{results.size} projects in S3"
+    puts "   Projects in S3: #{results.size}"
+    puts "   Projects in manifest: #{total_manifest_projects}"
     puts "   Updated #{updated_count} projects in manifest"
+    if results.size != total_manifest_projects
+      puts ''
+      puts "   ⚠️  Mismatch: #{results.size} S3 projects vs #{total_manifest_projects} local projects"
+      puts "   This may indicate projects exist locally but haven't been uploaded to S3 yet"
+    end
     puts ''
   end
   # rubocop:enable Metrics/MethodLength

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

@@ -43,6 +43,22 @@ module Appydave
             path
           end
 
+          # Get the full path to a project directory, respecting brand's projects_subfolder setting
+          # @param brand_key [String] Brand key (e.g., 'appydave', 'supportsignal')
+          # @param project_id [String] Project ID (e.g., 'b64-bmad-claude-sdk', 'a01-shocking-stat-v1')
+          # @return [String] Absolute path to project directory
+          def project_path(brand_key, project_id)
+            Appydave::Tools::Configuration::Config.configure
+            brand_info = Appydave::Tools::Configuration::Config.brands.get_brand(brand_key)
+            brand_dir = brand_path(brand_key)
+
+            if brand_info.settings.projects_subfolder && !brand_info.settings.projects_subfolder.empty?
+              File.join(brand_dir, brand_info.settings.projects_subfolder, project_id)
+            else
+              File.join(brand_dir, project_id)
+            end
+          end
+
           # Get git remote URL for a brand (with self-healing)
           # @param brand_key [String] Brand key (e.g., 'appydave', 'voz')
           # @return [String, nil] Git remote URL or nil if not a git repo

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

@@ -107,11 +107,13 @@ module Appydave
           end
 
           # Scan local flat structure (active projects only)
-          # Check both brand root and projects subfolder if configured
-          scan_paths = [brand_path]
+          # If projects_subfolder is configured, scan only that subfolder
+          # Otherwise, scan brand root (for flat structure like AppyDave)
           if brand_info.settings.projects_subfolder && !brand_info.settings.projects_subfolder.empty?
             projects_folder = File.join(brand_path, brand_info.settings.projects_subfolder)
-            scan_paths << projects_folder if Dir.exist?(projects_folder)
+            scan_paths = Dir.exist?(projects_folder) ? [projects_folder] : []
+          else
+            scan_paths = [brand_path]
           end
 
           scan_paths.each do |scan_path|

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

@@ -24,8 +24,8 @@ module Appydave
           brand_data = brands.map do |brand|
             brand_path = Config.brand_path(brand)
             projects = ProjectResolver.list_projects(brand)
-            total_size = calculate_total_size(brand_path, projects)
-            last_modified = find_last_modified(brand_path, projects)
+            total_size = calculate_total_size(brand, projects)
+            last_modified = find_last_modified(brand, projects)
 
             {
               name: brand,
@@ -63,11 +63,9 @@ module Appydave
             return
           end
 
-          brand_path = Config.brand_path(brand)
-
           # Gather project data
           project_data = projects.map do |project|
-            project_path = File.join(brand_path, project)
+            project_path = Config.project_path(brand, project)
             size = calculate_directory_size(project_path)
             modified = File.mtime(project_path)
 
@@ -109,7 +107,7 @@ module Appydave
 
           # Gather project data
           project_data = matches.map do |project|
-            project_path = File.join(brand_path, project)
+            project_path = Config.project_path(brand, project)
             size = calculate_directory_size(project_path)
             modified = File.mtime(project_path)
 
@@ -141,9 +139,9 @@ module Appydave
         # Helper methods
 
         # Calculate total size of all projects in a brand
-        def self.calculate_total_size(brand_path, projects)
+        def self.calculate_total_size(brand, projects)
           projects.sum do |project|
-            calculate_directory_size(File.join(brand_path, project))
+            calculate_directory_size(Config.project_path(brand, project))
           end
         end
 
@@ -161,11 +159,11 @@ module Appydave
         end
 
         # Find the most recent modification time across all projects
-        def self.find_last_modified(brand_path, projects)
+        def self.find_last_modified(brand, projects)
           return Time.at(0) if projects.empty?
 
           projects.map do |project|
-            File.mtime(File.join(brand_path, project))
+            File.mtime(Config.project_path(brand, project))
           end.max
         end
 

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

@@ -16,18 +16,17 @@ module Appydave
           # @param project_hint [String] Project name or pattern (e.g., 'b65', 'boy-baker', 'b6*')
           # @return [String, Array<String>] Full project name or array of names for patterns
           def resolve(brand, project_hint)
-            brand_path = Config.brand_path(brand)
-
             # Check for pattern (wildcard)
-            return resolve_pattern(brand_path, project_hint) if project_hint.include?('*')
+            return resolve_pattern(brand, project_hint) if project_hint.include?('*')
 
-            # Exact match first
-            full_path = File.join(brand_path, project_hint)
+            # Exact match first - use Config.project_path to respect projects_subfolder
+            full_path = Config.project_path(brand, project_hint)
             return project_hint if Dir.exist?(full_path)
 
             # FliVideo pattern: b65 → b65-*
             if project_hint =~ /^[a-z]\d+$/
-              matches = Dir.glob("#{brand_path}/#{project_hint}-*")
+              projects_dir = projects_directory(brand)
+              matches = Dir.glob("#{projects_dir}/#{project_hint}-*")
                            .select { |path| File.directory?(path) }
                            .map { |path| File.basename(path) }
 
@@ -55,17 +54,18 @@ module Appydave
           end
 
           # Resolve pattern to list of matching projects
-          # @param brand_path [String] Full path to brand directory
+          # @param brand [String] Brand shortcut or full name
           # @param pattern [String] Pattern with wildcards (e.g., 'b6*')
           # @return [Array<String>] List of matching project names
-          def resolve_pattern(brand_path, pattern)
-            matches = Dir.glob("#{brand_path}/#{pattern}")
+          def resolve_pattern(brand, pattern)
+            projects_dir = projects_directory(brand)
+            matches = Dir.glob("#{projects_dir}/#{pattern}")
                          .select { |path| File.directory?(path) }
                          .select { |path| valid_project?(path) }
                          .map { |path| File.basename(path) }
                          .sort
 
-            raise "❌ No projects found matching pattern '#{pattern}' in #{brand_path}" if matches.empty?
+            raise "❌ No projects found matching pattern '#{pattern}' in #{projects_dir}" if matches.empty?
 
             matches
           end
@@ -75,10 +75,10 @@ module Appydave
           # @param pattern [String, nil] Optional filter pattern
           # @return [Array<String>] List of project names
           def list_projects(brand, pattern = nil)
-            brand_path = Config.brand_path(brand)
+            projects_dir = projects_directory(brand)
 
             glob_pattern = pattern || '*'
-            Dir.glob("#{brand_path}/#{glob_pattern}")
+            Dir.glob("#{projects_dir}/#{glob_pattern}")
                .select { |path| File.directory?(path) }
                .select { |path| valid_project?(path) }
                .map { |path| File.basename(path) }
@@ -121,10 +121,27 @@ module Appydave
           # @param project [String] Project name
           # @return [Boolean] true if project directory exists
           def project_exists?(brand, project)
-            projects_root = Config.projects_root
-            project_path = File.join(projects_root, brand, project)
+            project_path = Config.project_path(brand, project)
             Dir.exist?(project_path)
           end
+
+          private
+
+          # Get the directory where projects are stored for a brand
+          # Respects projects_subfolder setting
+          # @param brand [String] Brand shortcut or full name
+          # @return [String] Path to directory containing projects
+          def projects_directory(brand)
+            Appydave::Tools::Configuration::Config.configure
+            brand_info = Appydave::Tools::Configuration::Config.brands.get_brand(brand)
+            brand_path = Config.brand_path(brand)
+
+            if brand_info.settings.projects_subfolder && !brand_info.settings.projects_subfolder.empty?
+              File.join(brand_path, brand_info.settings.projects_subfolder)
+            else
+              brand_path
+            end
+          end
         end
       end
     end

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

@@ -36,7 +36,7 @@ module Appydave
         def resolve_project_path(project_id)
           # Resolve short name if needed (b65 -> b65-full-name)
           resolved = ProjectResolver.resolve(brand, project_id)
-          File.join(brand_path, resolved)
+          Config.project_path(brand, resolved)
         end
 
         def show_project_status

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

@@ -165,8 +165,8 @@ module Appydave
 
           return { skipped: 1, files: 0, bytes: 0, reason: 'SSD path not found' } unless Dir.exist?(ssd_path)
 
-          # Check for flat folder conflict (stale manifest)
-          flat_path = File.join(brand_path, project_id)
+          # Check for flat folder conflict (stale manifest) - use Config.project_path to respect projects_subfolder
+          flat_path = Config.project_path(brand, project_id)
           return { skipped: 1, files: 0, bytes: 0, reason: 'Flat folder exists (stale manifest?)' } if Dir.exist?(flat_path)
 
           # Determine local destination path (archived structure)

data/lib/appydave/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Appydave
   module Tools
-    VERSION = '0.29.0'
+    VERSION = '0.31.0'
   end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appydave-tools",
-  "version": "0.29.0",
+  "version": "0.31.0",
   "description": "AppyDave YouTube Automation Tools",
   "scripts": {
     "release": "semantic-release"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appydave-tools
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.31.0
 platform: ruby
 authors:
 - David Cruwys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-20 00:00:00.000000000 Z
+date: 2025-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel