appydave-tools 0.26.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bab210dc9c8c8c367a1a24c6b7c3d6b732e1c4e3085ee98b311c34c1d057aac
-  data.tar.gz: 03f95635fce24ae1b0fddcb948584eab86ceadbc6738f65a8c049de85d960cb5
+  metadata.gz: 29a9ba93d0e44519b784206a951f92fedd912e228dc953f9bbc08605bdcefe11
+  data.tar.gz: 69c9b978075248c3881edcf642f484c42831c4d5c54c50e8504c5cd57262fa08
 SHA512:
-  metadata.gz: eb775da047c00b412065c4fa9bf6f17963cac598dab05e4e9f357e111580ea5aca38047ab9e390f7799f4c7d8a8f3b28facf8d30e05059696df83db9975c4c1f
-  data.tar.gz: a92bb5b8673726762216a9b03a2816cda499c8f00be0e896ed65fe85205fde1a13cc5dffd97ab52830a2c7692d01380eff724a1a4326db060765452dee437cd2
+  metadata.gz: 4488bd01a962aa0445a3b3b9699cf584b86380c8288ac5a77f0f905472747962e3ad855a526b27e5ce78516b08c46581c3b139ce2838f7faf4fac5ddf9968115
+  data.tar.gz: 68ca3cc94ca4c5f837de4f2dc0df6c320f6351440b9e27e16faeb3f57a1e9639405da4185c211c95da50790ec7d7e63885eaa2fbf463c938793149f669da9b7c

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [0.27.0](https://github.com/appydave/appydave-tools/compare/v0.26.0...v0.27.0) (2025-11-19)
+
+
+### Features
+
+* add comprehensive unit tests for recent S3 features - Zone.Identifier exclusion, download timing, project directory creation, and excluded_path helper ([70f1950](https://github.com/appydave/appydave-tools/commit/70f19502cdd6f7a5a95a6421850d5b5e4a17b79b))
+
+# [0.26.0](https://github.com/appydave/appydave-tools/compare/v0.25.0...v0.26.0) (2025-11-19)
+
+
+### Features
+
+* exclude Windows Zone.Identifier files from upload and archive ([e018b6d](https://github.com/appydave/appydave-tools/commit/e018b6d9750394e38877421d49a9dd7d4319315c))
+
 # [0.25.0](https://github.com/appydave/appydave-tools/compare/v0.24.0...v0.25.0) (2025-11-19)
 
 

data/lib/appydave/tools/configuration/models/brands_config.rb

@@ -215,15 +215,17 @@ module Appydave
 
           # Type-safe class to access brand settings
           class BrandSettings
-            attr_accessor :s3_cleanup_days
+            attr_accessor :s3_cleanup_days, :projects_subfolder
 
             def initialize(data)
               @s3_cleanup_days = data['s3_cleanup_days'] || 90
+              @projects_subfolder = data['projects_subfolder'] || ''
             end
 
             def to_h
               {
-                's3_cleanup_days' => @s3_cleanup_days
+                's3_cleanup_days' => @s3_cleanup_days,
+                'projects_subfolder' => @projects_subfolder
               }
             end
           end

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

@@ -76,6 +76,15 @@ module Appydave
           Appydave::Tools::Configuration::Config.brands.get_brand(brand)
         end
 
+        # Build project directory path respecting brand's projects_subfolder setting
+        def project_directory_path(project_id)
+          if brand_info.settings.projects_subfolder && !brand_info.settings.projects_subfolder.empty?
+            File.join(brand_path, brand_info.settings.projects_subfolder, project_id)
+          else
+            File.join(brand_path, project_id)
+          end
+        end
+
         def collect_project_ids(ssd_backup, ssd_available)
           all_project_ids = []
 
@@ -98,13 +107,22 @@ module Appydave
           end
 
           # Scan local flat structure (active projects only)
-          Dir.glob(File.join(brand_path, '*/')).each do |path|
-            basename = File.basename(path)
-            # Skip hidden and special directories
-            next if basename.start_with?('.', '_')
-            next if %w[s3-staging archived final].include?(basename)
+          # Check both brand root and projects subfolder if configured
+          scan_paths = [brand_path]
+          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)
+          end
+
+          scan_paths.each do |scan_path|
+            Dir.glob(File.join(scan_path, '*/')).each do |path|
+              basename = File.basename(path)
+              # Skip hidden and special directories
+              next if basename.start_with?('.', '_')
+              next if %w[s3-staging archived final].include?(basename)
 
-            all_project_ids << basename if valid_project_folder?(path)
+              all_project_ids << basename if valid_project_folder?(path)
+            end
           end
 
           # Scan archived structure (restored/archived projects)
@@ -129,7 +147,7 @@ module Appydave
 
         def build_project_entry(project_id, ssd_backup, ssd_available)
           # Check flat structure (active projects)
-          flat_path = File.join(brand_path, project_id)
+          flat_path = project_directory_path(project_id)
           flat_exists = Dir.exist?(flat_path)
 
           # Check archived structure (restored/archived projects)
@@ -197,7 +215,7 @@ module Appydave
           projects.each do |project|
             if project[:storage][:local][:exists]
               # Try flat structure first, then archived structure
-              flat_path = File.join(brand_path, project[:id])
+              flat_path = project_directory_path(project[:id])
               if Dir.exist?(flat_path)
                 local_bytes += calculate_directory_size(flat_path)
               else

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

@@ -51,6 +51,15 @@ module Appydave
           Appydave::Tools::Configuration::Config.brands.get_brand(brand)
         end
 
+        # Build project directory path respecting brand's projects_subfolder setting
+        def project_directory_path
+          if brand_info.settings.projects_subfolder && !brand_info.settings.projects_subfolder.empty?
+            File.join(brand_path, brand_info.settings.projects_subfolder, project_id)
+          else
+            File.join(brand_path, project_id)
+          end
+        end
+
         # Determine which AWS profile to use based on current user
         # Priority: current user's default_aws_profile > brand's aws.profile
         def determine_aws_profile(brand_info)
@@ -108,7 +117,7 @@ module Appydave
 
         # Upload files from s3-staging/ to S3
         def upload(dry_run: false)
-          project_dir = File.join(brand_path, project_id)
+          project_dir = project_directory_path
           staging_dir = File.join(project_dir, 's3-staging')
 
           unless Dir.exist?(staging_dir)
@@ -163,7 +172,7 @@ module Appydave
 
         # Download files from S3 to s3-staging/
         def download(dry_run: false)
-          project_dir = File.join(brand_path, project_id)
+          project_dir = project_directory_path
           staging_dir = File.join(project_dir, 's3-staging')
 
           # Ensure project directory exists before download
@@ -212,7 +221,7 @@ module Appydave
 
         # Show sync status
         def status
-          project_dir = File.join(brand_path, project_id)
+          project_dir = project_directory_path
           staging_dir = File.join(project_dir, 's3-staging')
 
           s3_files = list_s3_files
@@ -316,7 +325,7 @@ module Appydave
 
         # Cleanup local s3-staging files
         def cleanup_local(force: false, dry_run: false)
-          project_dir = File.join(brand_path, project_id)
+          project_dir = project_directory_path
           staging_dir = File.join(project_dir, 's3-staging')
 
           unless Dir.exist?(staging_dir)
@@ -384,7 +393,7 @@ module Appydave
             return
           end
 
-          project_dir = File.join(brand_path, project_id)
+          project_dir = project_directory_path
 
           unless Dir.exist?(project_dir)
             puts "❌ Project not found: #{project_dir}"

data/lib/appydave/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Appydave
   module Tools
-    VERSION = '0.26.0'
+    VERSION = '0.28.0'
   end
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appydave-tools",
-  "version": "0.26.0",
+  "version": "0.28.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.26.0
+  version: 0.28.0
 platform: ruby
 authors:
 - David Cruwys
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-19 00:00:00.000000000 Z
+date: 2025-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel