appydave-tools 0.38.0 → 0.39.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca0b626390693cf429dec2da61dca877811720aed92dd110849a826bbe53f3fe
-  data.tar.gz: fba4176a5c363b7578409d63a6119f495138d637c9e03f309830317fb351ba2a
+  metadata.gz: d5c03f22b90ef02e4609a1d50bf1c1d06cf03b782a24cd9196463a746d91f33d
+  data.tar.gz: 61bc3604ae50ad6d9cc037c1df8be8c9d677a11aab23387c5fe74974e0bb3da4
 SHA512:
-  metadata.gz: 7fac67c172b7153c59aee5d9a0d845c9bac1cc77040068472e125a850295435f625626addd49becded1b52e81db53d6d206269610c807e5a318a71e3647a0b08
-  data.tar.gz: 936903137cf045758a3d131a3254e6ff44eca468455b546e5c98b55eb516242a7d861139e20cc75331e41cee256a3ff34a233c9ba2d6d67833ac8f1a245d570a
+  metadata.gz: 8c6ebbbce5cea68d4168d606521a57162e2dcee80d91dfd11b3785ca2e8fa722d1199553a64b51c9734c89869e725626e0cbcef6089e73e694c9b16b12079abb
+  data.tar.gz: b95e4edcd87705d08b2ebdf0c5b93884cf59386da8d169e21aea881119b5f8eb14d555c8f5c6b8c83ba236904b8f99d102fc3a192f9db4d06fc814d7405731c0

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [0.38.0](https://github.com/appydave/appydave-tools/compare/v0.37.0...v0.38.0) (2025-11-21)
+
+
+### Bug Fixes
+
+* rename FileUtils to FileHelper to avoid Ruby stdlib conflict ([e441b43](https://github.com/appydave/appydave-tools/commit/e441b4356ec40a66f5562e9cf0ec74f562b449b2))
+
+
+### Features
+
+* add DAM exception hierarchy for consistent error handling ([c885590](https://github.com/appydave/appydave-tools/commit/c885590be721d2b2803fd6aaa7001afc8cdbd285))
+* extract FileUtils module to eliminate 40 lines of duplication ([643748e](https://github.com/appydave/appydave-tools/commit/643748ea583eba3605e1a6ce17e117db18f66c4c))
+* extract GitHelper module to eliminate ~90 lines of git operations duplication across status.rb, repo_status.rb, and repo_push.rb ([f32dc1d](https://github.com/appydave/appydave-tools/commit/f32dc1d54877a9a981878a6e7c203922e50004fe))
+
 # [0.37.0](https://github.com/appydave/appydave-tools/compare/v0.36.0...v0.37.0) (2025-11-21)
 
 

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

@@ -0,0 +1,118 @@
+# frozen_string_literal: true
+
+module Appydave
+  module Tools
+    module Dam
+      # Centralized brand name resolution and transformation
+      #
+      # Handles conversion between:
+      # - Shortcuts: 'appydave', 'ad', 'joy', 'ss'
+      # - Config keys: 'appydave', 'beauty-and-joy', 'supportsignal'
+      # - Display names: 'v-appydave', 'v-beauty-and-joy', 'v-supportsignal'
+      #
+      # @example
+      #   BrandResolver.expand('ad')          # => 'v-appydave'
+      #   BrandResolver.normalize('v-voz')    # => 'voz'
+      #   BrandResolver.to_config_key('ad')   # => 'appydave'
+      #   BrandResolver.to_display('voz')     # => 'v-voz'
+      class BrandResolver
+        class << self
+          # Expand shortcut or key to full display name
+          # @param shortcut [String] Brand shortcut or key
+          # @return [String] Full brand name with v- prefix
+          def expand(shortcut)
+            return shortcut.to_s if shortcut.to_s.start_with?('v-')
+
+            key = to_config_key(shortcut)
+            "v-#{key}"
+          end
+
+          # Normalize brand name to config key (strip v- prefix)
+          # @param brand [String] Brand name (with or without v-)
+          # @return [String] Config key without v- prefix
+          def normalize(brand)
+            brand.to_s.sub(/^v-/, '')
+          end
+
+          # Convert to config key (handles shortcuts)
+          # @param input [String] Shortcut, key, or display name
+          # @return [String] Config key
+          def to_config_key(input)
+            # Strip v- prefix first
+            normalized = normalize(input)
+
+            # Look up from brands.json
+            Appydave::Tools::Configuration::Config.configure
+            brands_config = Appydave::Tools::Configuration::Config.brands
+
+            # Check if matches brand key (case-insensitive)
+            brand = brands_config.brands.find { |b| b.key.downcase == normalized.downcase }
+            return brand.key if brand
+
+            # Check if matches shortcut (case-insensitive)
+            brand = brands_config.brands.find { |b| b.shortcut.downcase == normalized.downcase }
+            return brand.key if brand
+
+            # Fall back to hardcoded shortcuts (backward compatibility)
+            case normalized.downcase
+            when 'ad' then 'appydave'
+            when 'joy' then 'beauty-and-joy'
+            when 'ss' then 'supportsignal'
+            else
+              normalized.downcase
+            end
+          end
+
+          # Convert to display name (always v- prefix)
+          # @param input [String] Shortcut, key, or display name
+          # @return [String] Display name with v- prefix
+          def to_display(input)
+            expand(input)
+          end
+
+          # Validate brand exists in filesystem
+          # @param brand [String] Brand to validate
+          # @raise [BrandNotFoundError] if brand invalid
+          # @return [String] Config key if valid
+          def validate(brand)
+            key = to_config_key(brand)
+
+            # Build brand path (avoiding circular dependency with Config.brand_path)
+            Appydave::Tools::Configuration::Config.configure
+            brand_info = Appydave::Tools::Configuration::Config.brands.get_brand(key)
+
+            # If brand has configured video_projects path, use it
+            if brand_info.locations.video_projects && !brand_info.locations.video_projects.empty?
+              brand_path = brand_info.locations.video_projects
+            else
+              # Fall back to projects_root + expanded brand name
+              root = Config.projects_root
+              brand_path = File.join(root, expand(key))
+            end
+
+            unless Dir.exist?(brand_path)
+              available = Config.available_brands_display
+              raise BrandNotFoundError.new(brand, available)
+            end
+
+            key
+          rescue StandardError => e
+            raise BrandNotFoundError, e.message unless e.is_a?(BrandNotFoundError)
+
+            raise
+          end
+
+          # Check if brand exists (returns boolean instead of raising)
+          # @param brand [String] Brand to check
+          # @return [Boolean] true if brand exists
+          def exists?(brand)
+            validate(brand)
+            true
+          rescue BrandNotFoundError
+            false
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -85,34 +85,11 @@ module Appydave
           end
 
           # Expand brand shortcut to full brand name
-          # Reads from brands.json if available, falls back to hardcoded shortcuts
+          # Delegates to BrandResolver for centralized brand resolution
           # @param shortcut [String] Brand shortcut (e.g., 'appydave', 'ad', 'APPYDAVE')
           # @return [String] Full brand name (e.g., 'v-appydave')
           def expand_brand(shortcut)
-            shortcut_str = shortcut.to_s
-
-            return shortcut_str if shortcut_str.start_with?('v-')
-
-            # Try to read from brands.json
-            Appydave::Tools::Configuration::Config.configure
-            brands_config = Appydave::Tools::Configuration::Config.brands
-
-            # Check if input matches a brand key (case-insensitive)
-            brand = brands_config.brands.find { |b| b.key.downcase == shortcut_str.downcase }
-            return "v-#{brand.key}" if brand
-
-            # Check if input matches a brand shortcut (case-insensitive)
-            brand = brands_config.brands.find { |b| b.shortcut.downcase == shortcut_str.downcase }
-            return "v-#{brand.key}" if brand
-
-            # Fall back to hardcoded shortcuts for backwards compatibility
-            normalized = shortcut_str.downcase
-            case normalized
-            when 'joy' then 'v-beauty-and-joy'
-            when 'ss' then 'v-supportsignal'
-            else
-              "v-#{normalized}"
-            end
+            BrandResolver.expand(shortcut)
           end
 
           # Get list of available brands

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

@@ -116,9 +116,9 @@ module Appydave
             # Check if we're inside a v-* directory
             if current =~ %r{/(v-[^/]+)/([^/]+)/?}
               brand_with_prefix = ::Regexp.last_match(1)
-              project = ::Regexp.last_match(2) # Capture BEFORE .sub() which resets Regexp.last_match
+              project = ::Regexp.last_match(2) # Capture BEFORE normalize() which resets Regexp.last_match
               # Strip 'v-' prefix to get brand key (e.g., 'v-supportsignal' → 'supportsignal')
-              brand_key = brand_with_prefix.sub(/^v-/, '')
+              brand_key = BrandResolver.normalize(brand_with_prefix)
               return [brand_key, project] if project_exists?(brand_key, project)
             end
 

data/lib/appydave/tools/version.rb

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

data/lib/appydave/tools.rb

@@ -55,6 +55,7 @@ require 'appydave/tools/subtitle_processor/join'
 require 'appydave/tools/dam/errors'
 require 'appydave/tools/dam/file_helper'
 require 'appydave/tools/dam/git_helper'
+require 'appydave/tools/dam/brand_resolver'
 require 'appydave/tools/dam/config'
 require 'appydave/tools/dam/project_resolver'
 require 'appydave/tools/dam/config_loader'

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appydave-tools",
-  "version": "0.38.0",
+  "version": "0.39.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.38.0
+  version: 0.39.0
 platform: ruby
 authors:
 - David Cruwys
@@ -297,6 +297,7 @@ files:
 - lib/appydave/tools/configuration/models/settings_config.rb
 - lib/appydave/tools/configuration/models/youtube_automation_config.rb
 - lib/appydave/tools/configuration/openai.rb
+- lib/appydave/tools/dam/brand_resolver.rb
 - lib/appydave/tools/dam/config.rb
 - lib/appydave/tools/dam/config_loader.rb
 - lib/appydave/tools/dam/errors.rb