appydave-tools 0.37.0 → 0.39.0

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'find'
-
 # rubocop:disable Style/FormatStringToken
 # Disabled: Using simple unannotated tokens (%s) for straightforward string formatting
 # Annotated tokens (%<foo>s) add unnecessary complexity for simple table formatting
@@ -69,7 +67,7 @@ module Appydave
           # Gather project data
           project_data = projects.map do |project|
             project_path = Config.project_path(brand_arg, project)
-            size = calculate_directory_size(project_path)
+            size = FileHelper.calculate_directory_size(project_path)
             modified = File.mtime(project_path)
 
             {
@@ -113,7 +111,7 @@ module Appydave
           # Gather project data
           project_data = matches.map do |project|
             project_path = Config.project_path(brand_arg, project)
-            size = calculate_directory_size(project_path)
+            size = FileHelper.calculate_directory_size(project_path)
             modified = File.mtime(project_path)
 
             {
@@ -146,23 +144,10 @@ module Appydave
         # Calculate total size of all projects in a brand
         def self.calculate_total_size(brand, projects)
           projects.sum do |project|
-            calculate_directory_size(Config.project_path(brand, project))
+            FileHelper.calculate_directory_size(Config.project_path(brand, project))
           end
         end
 
-        # Calculate size of a directory in bytes
-        def self.calculate_directory_size(path)
-          return 0 unless Dir.exist?(path)
-
-          total = 0
-          Find.find(path) do |file_path|
-            total += File.size(file_path) if File.file?(file_path)
-          rescue StandardError
-            # Skip files we can't read
-          end
-          total
-        end
-
         # Find the most recent modification time across all projects
         def self.find_last_modified(brand, projects)
           return Time.at(0) if projects.empty?
@@ -174,13 +159,7 @@ module Appydave
 
         # Format size in human-readable format
         def self.format_size(bytes)
-          return '0 B' if bytes.zero?
-
-          units = %w[B KB MB GB TB]
-          exp = (Math.log(bytes) / Math.log(1024)).to_i
-          exp = [exp, units.length - 1].min
-
-          format('%.1f %s', bytes.to_f / (1024**exp), units[exp])
+          FileHelper.format_size(bytes)
         end
 
         # Format date/time in readable format

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/dam/repo_push.rb

@@ -105,16 +105,11 @@ module Appydave
         end
 
         def uncommitted_changes?
-          output = `git -C "#{brand_path}" status --porcelain 2>/dev/null`.strip
-          !output.empty?
-        rescue StandardError
-          false
+          GitHelper.uncommitted_changes?(brand_path)
         end
 
         def commits_ahead
-          `git -C "#{brand_path}" rev-list --count @{upstream}..HEAD 2>/dev/null`.strip.to_i
-        rescue StandardError
-          0
+          GitHelper.commits_ahead(brand_path)
         end
 
         def show_push_summary(output)

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

@@ -107,49 +107,32 @@ module Appydave
         end
 
         def current_branch
-          `git -C "#{brand_path}" rev-parse --abbrev-ref HEAD 2>/dev/null`.strip
-        rescue StandardError
-          'unknown'
+          GitHelper.current_branch(brand_path)
         end
 
         def remote_url
-          result = `git -C "#{brand_path}" remote get-url origin 2>/dev/null`.strip
-          result.empty? ? nil : result
-        rescue StandardError
-          nil
+          GitHelper.remote_url(brand_path)
         end
 
         def modified_files_count
-          `git -C "#{brand_path}" status --porcelain 2>/dev/null | grep -E "^.M|^M" | wc -l`.strip.to_i
-        rescue StandardError
-          0
+          GitHelper.modified_files_count(brand_path)
         end
 
         def untracked_files_count
-          `git -C "#{brand_path}" status --porcelain 2>/dev/null | grep -E "^\\?\\?" | wc -l`.strip.to_i
-        rescue StandardError
-          0
+          GitHelper.untracked_files_count(brand_path)
         end
 
         def commits_ahead
-          `git -C "#{brand_path}" rev-list --count @{upstream}..HEAD 2>/dev/null`.strip.to_i
-        rescue StandardError
-          0
+          GitHelper.commits_ahead(brand_path)
         end
 
         def commits_behind
-          `git -C "#{brand_path}" rev-list --count HEAD..@{upstream} 2>/dev/null`.strip.to_i
-        rescue StandardError
-          0
+          GitHelper.commits_behind(brand_path)
         end
 
         # Check if repo has uncommitted changes (matches old script: git diff-index --quiet HEAD --)
         def uncommitted_changes?
-          # git diff-index returns 0 if clean, 1 if there are changes
-          system("git -C \"#{brand_path}\" diff-index --quiet HEAD -- 2>/dev/null")
-          !$CHILD_STATUS.success?
-        rescue StandardError
-          false
+          GitHelper.uncommitted_changes?(brand_path)
         end
 
         # Show file list using git status --short (matches old script)

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

@@ -768,11 +768,7 @@ module Appydave
 
         # Calculate total size of a directory
         def calculate_directory_size(dir_path)
-          total = 0
-          Dir.glob(File.join(dir_path, '**', '*'), File::FNM_DOTMATCH).each do |file|
-            total += File.size(file) if File.file?(file)
-          end
-          total
+          FileHelper.calculate_directory_size(dir_path)
         end
       end
     end

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

@@ -241,40 +241,27 @@ module Appydave
         end
 
         def current_branch
-          `git -C "#{brand_path}" rev-parse --abbrev-ref HEAD 2>/dev/null`.strip
-        rescue StandardError
-          'unknown'
+          GitHelper.current_branch(brand_path)
         end
 
         def remote_url
-          result = `git -C "#{brand_path}" remote get-url origin 2>/dev/null`.strip
-          result.empty? ? nil : result
-        rescue StandardError
-          nil
+          GitHelper.remote_url(brand_path)
         end
 
         def modified_files_count
-          `git -C "#{brand_path}" status --porcelain 2>/dev/null | grep -E "^.M|^M" | wc -l`.strip.to_i
-        rescue StandardError
-          0
+          GitHelper.modified_files_count(brand_path)
         end
 
         def untracked_files_count
-          `git -C "#{brand_path}" status --porcelain 2>/dev/null | grep -E "^\\?\\?" | wc -l`.strip.to_i
-        rescue StandardError
-          0
+          GitHelper.untracked_files_count(brand_path)
         end
 
         def commits_ahead
-          `git -C "#{brand_path}" rev-list --count @{upstream}..HEAD 2>/dev/null`.strip.to_i
-        rescue StandardError
-          0
+          GitHelper.commits_ahead(brand_path)
         end
 
         def commits_behind
-          `git -C "#{brand_path}" rev-list --count HEAD..@{upstream} 2>/dev/null`.strip.to_i
-        rescue StandardError
-          0
+          GitHelper.commits_behind(brand_path)
         end
       end
     end

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

@@ -268,13 +268,7 @@ module Appydave
 
         # Format bytes into human-readable format
         def format_bytes(bytes)
-          if bytes < 1024
-            "#{bytes}B"
-          elsif bytes < 1024 * 1024
-            "#{(bytes / 1024.0).round(1)}KB"
-          else
-            "#{(bytes / 1024.0 / 1024.0).round(1)}MB"
-          end
+          FileHelper.format_size(bytes)
         end
       end
     end

data/lib/appydave/tools/version.rb

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

data/lib/appydave/tools.rb

@@ -52,6 +52,10 @@ require 'appydave/tools/prompt_tools/prompt_completion'
 require 'appydave/tools/subtitle_processor/clean'
 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.37.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.37.0
+  version: 0.39.0
 platform: ruby
 authors:
 - David Cruwys
@@ -250,6 +250,9 @@ files:
 - docs/archive/test-coverage-quick-wins.md
 - docs/archive/tool-discovery.md
 - docs/archive/tool-documentation-analysis.md
+- docs/code-quality/README.md
+- docs/code-quality/implementation-plan.md
+- docs/code-quality/report-2025-01-21.md
 - docs/guides/configuration-setup.md
 - docs/guides/platforms/windows/README.md
 - docs/guides/platforms/windows/dam-testing-plan-windows-powershell.md
@@ -294,8 +297,12 @@ 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
+- lib/appydave/tools/dam/file_helper.rb
+- lib/appydave/tools/dam/git_helper.rb
 - lib/appydave/tools/dam/manifest_generator.rb
 - lib/appydave/tools/dam/project_listing.rb
 - lib/appydave/tools/dam/project_resolver.rb