appydave-tools 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1d9c19286530b337db5170902dce174c889b50a7c2425f6e209efec097a0a81
-  data.tar.gz: 220392dd2eec9910e3c57e7c7de4a372303ab261d01a2db9d6c64769368bf71e
+  metadata.gz: fa0d28f2da43b19537700a122baaea2401ea5c7b545d687a1bff64150d1c7d88
+  data.tar.gz: 98b8575d8af3b09e0dbc025b076d9b221d0d5b28705ee714a2483f74022c73c6
 SHA512:
-  metadata.gz: 33dd5ec557282ce787d457cfaa6e4b996fae6d82b2b4ac4aa5e531ac17f1c310f000fd905428ce3fb969b35635aea9122347a7760e73f0c6282425ffce6e65e9
-  data.tar.gz: 5be8054544c85a36ef280ed6aa85096f386243df5e66c48f911728fe943350d66c69863b0005424df97e20697bc75126a37e1c4ce84cd8265728ca017e58a4e0
+  metadata.gz: 2f3c69c161ac3b1ca8642db8d1f6a15317510956ffe396635d6bf2f49e1be6bc6b22c4b5b9e9694b9b40ffbb9214da8487979078740a68a0b2dcec7c07a42ba1
+  data.tar.gz: de05f01bba2420b7c287cd28ac499ca56af5b7277c88522d867280e27be99d821baf2cb9d389beefe0c3e6573b6eee6095c0eafdd1a2806f1e49ec782f0de54f

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [0.19.0](https://github.com/appydave/appydave-tools/compare/v0.18.5...v0.19.0) (2025-11-10)
+
+
+### Features
+
+* Phase 1: add git_remote, S3 tracking, and hasStorylineJson to manifest ([4622271](https://github.com/appydave/appydave-tools/commit/4622271a9e1a01a7145981db4837ed9b69e8f721))
+
 ## [0.18.5](https://github.com/appydave/appydave-tools/compare/v0.18.4...v0.18.5) (2025-11-10)
 
 

data/bin/dam

@@ -13,6 +13,7 @@ class VatCLI
     @commands = {
       'help' => method(:help_command),
       'list' => method(:list_command),
+      'status' => method(:status_command),
       's3-up' => method(:s3_up_command),
       's3-down' => method(:s3_down_command),
       's3-status' => method(:s3_status_command),
@@ -21,6 +22,9 @@ class VatCLI
       'archive' => method(:archive_command),
       'manifest' => method(:manifest_command),
       'sync-ssd' => method(:sync_ssd_command),
+      'repo-status' => method(:repo_status_command),
+      'repo-sync' => method(:repo_sync_command),
+      'repo-push' => method(:repo_push_command),
       # Deprecated aliases (for backward compatibility)
       's3-cleanup' => method(:s3_cleanup_remote_command),
       'cleanup-local' => method(:s3_cleanup_local_command)
@@ -262,6 +266,112 @@ class VatCLI
     exit 1
   end
 
+  # Show unified status (local/S3/SSD/git)
+  def status_command(args)
+    args = args.reject { |arg| arg.start_with?('--') }
+    brand_arg = args[0]
+    project_arg = args[1]
+
+    if brand_arg.nil?
+      # Auto-detect from PWD
+      brand, project_id = Appydave::Tools::Dam::ProjectResolver.detect_from_pwd
+      if brand.nil?
+        puts '❌ Could not auto-detect brand from current directory'
+        puts 'Usage: dam status <brand> [project]'
+        exit 1
+      end
+      brand_key = brand
+    else
+      brand_key = brand_arg
+      project_id = project_arg ? Appydave::Tools::Dam::ProjectResolver.resolve(brand_arg, project_arg) : nil
+    end
+
+    status = Appydave::Tools::Dam::Status.new(brand_key, project_id)
+    status.show
+  rescue StandardError => e
+    puts "❌ Error: #{e.message}"
+    exit 1
+  end
+
+  # Show git status for brand repositories
+  def repo_status_command(args)
+    all = args.include?('--all')
+    args = args.reject { |arg| arg.start_with?('--') }
+    brand_arg = args[0]
+
+    if all
+      # Show status for all brands
+      Appydave::Tools::Dam::RepoStatus.new.show_all
+    elsif brand_arg
+      # Show status for specific brand
+      Appydave::Tools::Dam::RepoStatus.new(brand_arg).show
+    else
+      puts 'Usage: dam repo-status <brand> [--all]'
+      puts ''
+      puts 'Check git status for brand repositories.'
+      puts ''
+      puts 'Examples:'
+      puts '  dam repo-status appydave    # Show git status for AppyDave brand'
+      puts '  dam repo-status --all       # Show git status for all brands'
+      exit 1
+    end
+  rescue StandardError => e
+    puts "❌ Error: #{e.message}"
+    exit 1
+  end
+
+  # Sync (pull) brand repositories
+  def repo_sync_command(args)
+    all = args.include?('--all')
+    args = args.reject { |arg| arg.start_with?('--') }
+    brand_arg = args[0]
+
+    if all
+      # Sync all brands
+      Appydave::Tools::Dam::RepoSync.new.sync_all
+    elsif brand_arg
+      # Sync specific brand
+      Appydave::Tools::Dam::RepoSync.new(brand_arg).sync
+    else
+      puts 'Usage: dam repo-sync <brand> [--all]'
+      puts ''
+      puts 'Pull updates for brand repositories.'
+      puts ''
+      puts 'Examples:'
+      puts '  dam repo-sync appydave    # Pull updates for AppyDave brand'
+      puts '  dam repo-sync --all       # Pull updates for all brands'
+      exit 1
+    end
+  rescue StandardError => e
+    puts "❌ Error: #{e.message}"
+    exit 1
+  end
+
+  # Push brand repository changes
+  def repo_push_command(args)
+    args = args.reject { |arg| arg.start_with?('--') }
+    brand_arg = args[0]
+    project_arg = args[1]
+
+    if brand_arg.nil?
+      puts 'Usage: dam repo-push <brand> [project]'
+      puts ''
+      puts 'Push changes for brand repository.'
+      puts ''
+      puts 'Examples:'
+      puts '  dam repo-push appydave       # Push all changes for AppyDave brand'
+      puts '  dam repo-push appydave b65   # Validate project exists before push'
+      exit 1
+    end
+
+    project_id = project_arg ? Appydave::Tools::Dam::ProjectResolver.resolve(brand_arg, project_arg) : nil
+
+    Appydave::Tools::Dam::RepoPush.new(brand_arg, project_id).push
+  rescue StandardError => e
+    puts "❌ Error: #{e.message}"
+    exit 1
+  end
+
   # Parse S3 command arguments
   def parse_s3_args(args, command)
     dry_run = args.include?('--dry-run')

data/docs/dam/usage.md

@@ -154,6 +154,143 @@ dam list appydave 'b6*'
 # Output: Lists b60, b61, b62...b69 projects
 ```
 
+### Status & Monitoring
+
+#### `dam status [brand] [project]`
+Show unified status for project or brand (local, S3, SSD, git).
+
+**Brand status:**
+```bash
+dam status appydave
+```
+
+**Output:**
+```
+📊 Brand Status: v-appydave
+📡 Git Remote: git@github.com:klueless-io/v-appydave.git
+
+🌿 Branch: main
+📡 Remote: git@github.com:klueless-io/v-appydave.git
+✓ Working directory clean
+✓ Up to date with remote
+
+📋 Manifest Summary:
+   Total projects: 114
+   Local: 74
+   S3 staging: 12
+   SSD backup: 67
+
+   Storyline projects: 3
+   FliVideo projects: 111
+```
+
+**Project status:**
+```bash
+dam status appydave b65
+```
+
+**Output:**
+```
+📊 Status: v-appydave/b65-guy-monroe-marketing-plan
+
+Storage:
+  📁 Local: ✓ exists (flat structure)
+     Heavy files: no
+     Light files: yes
+
+  ☁️  S3 Staging: ✓ exists
+     Local staging files: 3
+
+  💾 SSD Backup: ✓ exists
+     Path: b65-guy-monroe-marketing-plan
+
+Git:
+  🌿 Branch: main
+  📡 Remote: git@github.com:klueless-io/v-appydave.git
+  ↕️  Status: Clean working directory
+  🔄 Sync: Up to date
+```
+
+**Auto-detect from PWD:**
+```bash
+cd ~/dev/video-projects/v-appydave/b65-project
+dam status
+```
+
+### Git Repository Commands
+
+#### `dam repo-status [brand] [--all]`
+Check git status for brand repositories.
+
+```bash
+# Single brand
+dam repo-status appydave
+
+# All brands
+dam repo-status --all
+```
+
+**Output:**
+```
+🔍 Git Status: v-appydave
+
+🌿 Branch: main
+📡 Remote: git@github.com:klueless-io/v-appydave.git
+✓ Working directory clean
+✓ Up to date with remote
+```
+
+#### `dam repo-sync [brand] [--all]`
+Pull updates for brand repositories.
+
+```bash
+# Single brand
+dam repo-sync appydave
+
+# All brands
+dam repo-sync --all
+```
+
+**Output:**
+```
+🔄 Syncing: v-appydave
+
+✓ Already up to date
+```
+
+**Safety features:**
+- Skips brands with uncommitted changes (prevents conflicts)
+- Shows summary when syncing multiple brands
+
+#### `dam repo-push [brand] [project]`
+Push changes for brand repository.
+
+```bash
+# Push all changes
+dam repo-push appydave
+
+# Validate project exists before push
+dam repo-push appydave b65
+```
+
+**Output:**
+```
+📤 Pushing: v-appydave
+
+✓ Project validated: b65-guy-monroe-marketing-plan
+
+📤 Pushing 2 commit(s)...
+
+✓ Push successful
+
+  main -> main
+```
+
+**Safety features:**
+- Warns if uncommitted changes detected
+- Optional project validation against manifest
+- Shows push summary
+
 ### S3 Sync Commands
 
 #### `dam s3-up [brand] [project] [--dry-run]`
@@ -649,4 +786,4 @@ dam s3-up appydave b65
 
 ---
 
-**Last Updated:** 2025-11-08
+**Last Updated:** 2025-11-10

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

@@ -0,0 +1,131 @@
+# frozen_string_literal: true
+
+module Appydave
+  module Tools
+    module Dam
+      # Push brand repository changes
+      class RepoPush
+        attr_reader :brand, :project_id, :brand_info, :brand_path
+
+        def initialize(brand, project_id = nil)
+          @brand_info = load_brand_info(brand)
+          @brand = @brand_info.key
+          @brand_path = Config.brand_path(@brand)
+          @project_id = project_id
+        end
+
+        # Push changes
+        def push
+          puts "📤 Pushing: v-#{brand}"
+          puts ''
+
+          unless git_repo?
+            puts "❌ Not a git repository: #{brand_path}"
+            return
+          end
+
+          # If project specified, validate it exists in manifest
+          validate_project if project_id
+
+          perform_push
+        end
+
+        private
+
+        def load_brand_info(brand)
+          Appydave::Tools::Configuration::Config.configure
+          Appydave::Tools::Configuration::Config.brands.get_brand(brand)
+        end
+
+        def git_repo?
+          git_dir = File.join(brand_path, '.git')
+          Dir.exist?(git_dir)
+        end
+
+        def validate_project
+          manifest = load_manifest
+          unless manifest
+            puts '⚠️  Warning: Manifest not found'
+            puts '   Continuing with push (manifest is optional for validation)'
+            return
+          end
+
+          # Resolve short name if needed (b65 -> b65-full-name)
+          resolved = ProjectResolver.new.resolve(brand, project_id)
+
+          project_entry = manifest[:projects].find { |p| p[:id] == resolved }
+          if project_entry
+            puts "✓ Project validated: #{resolved}"
+          else
+            puts "⚠️  Warning: Project '#{resolved}' not found in manifest"
+            puts '   Continuing with push (manifest may be outdated)'
+          end
+          puts ''
+        end
+
+        def load_manifest
+          manifest_path = File.join(brand_path, 'projects.json')
+          return nil unless File.exist?(manifest_path)
+
+          JSON.parse(File.read(manifest_path), symbolize_names: true)
+        rescue JSON::ParserError
+          nil
+        end
+
+        def perform_push
+          # Check for uncommitted changes
+          if uncommitted_changes?
+            puts '⚠️  Warning: Uncommitted changes detected'
+            puts ''
+          end
+
+          # Check if ahead of remote
+          ahead = commits_ahead
+          if ahead.zero?
+            puts '✓ Nothing to push (up to date with remote)'
+            return
+          end
+
+          puts "📤 Pushing #{ahead} commit(s)..."
+          puts ''
+
+          # Perform git push
+          output = `git -C "#{brand_path}" push 2>&1`
+          exit_code = $CHILD_STATUS.exitstatus
+
+          if exit_code.zero?
+            puts '✓ Push successful'
+            puts ''
+            show_push_summary(output)
+          else
+            puts '❌ Push failed:'
+            puts output
+            exit 1
+          end
+        end
+
+        def uncommitted_changes?
+          output = `git -C "#{brand_path}" status --porcelain 2>/dev/null`.strip
+          !output.empty?
+        rescue StandardError
+          false
+        end
+
+        def commits_ahead
+          `git -C "#{brand_path}" rev-list --count @{upstream}..HEAD 2>/dev/null`.strip.to_i
+        rescue StandardError
+          0
+        end
+
+        def show_push_summary(output)
+          # Extract useful info from git push output
+          lines = output.lines.map(&:strip).reject(&:empty?)
+
+          lines.each do |line|
+            puts "  #{line}" if line.include?('->') || line.include?('branch')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,140 @@
+# frozen_string_literal: true
+
+module Appydave
+  module Tools
+    module Dam
+      # Show git status for brand repositories
+      class RepoStatus
+        attr_reader :brand, :brand_info, :brand_path
+
+        def initialize(brand = nil)
+          return unless brand
+
+          @brand_info = load_brand_info(brand)
+          @brand = @brand_info.key
+          @brand_path = Config.brand_path(@brand)
+        end
+
+        # Show status for single brand
+        def show
+          puts "🔍 Git Status: v-#{brand}"
+          puts ''
+
+          unless git_repo?
+            puts "❌ Not a git repository: #{brand_path}"
+            return
+          end
+
+          show_git_info
+        end
+
+        # Show status for all brands
+        def show_all
+          puts '🔍 Git Status - All Brands'
+          puts ''
+
+          Appydave::Tools::Configuration::Config.configure
+          brands_config = Appydave::Tools::Configuration::Config.brands
+
+          brands_config.brands.each do |brand_info|
+            @brand_info = brand_info
+            @brand = brand_info.key
+            @brand_path = Config.brand_path(@brand)
+
+            next unless git_repo?
+
+            puts "📦 v-#{brand}"
+            show_git_info(indent: '  ')
+            puts ''
+          end
+        end
+
+        private
+
+        def load_brand_info(brand)
+          Appydave::Tools::Configuration::Config.configure
+          Appydave::Tools::Configuration::Config.brands.get_brand(brand)
+        end
+
+        def git_repo?
+          git_dir = File.join(brand_path, '.git')
+          Dir.exist?(git_dir)
+        end
+
+        def show_git_info(indent: '')
+          status = git_status_info
+
+          puts "#{indent}🌿 Branch: #{status[:branch]}"
+          puts "#{indent}📡 Remote: #{status[:remote]}" if status[:remote]
+
+          if status[:modified_count].positive? || status[:untracked_count].positive?
+            puts "#{indent}↕️  Changes: #{status[:modified_count]} modified, #{status[:untracked_count]} untracked"
+          else
+            puts "#{indent}✓ Working directory clean"
+          end
+
+          if status[:ahead].positive? || status[:behind].positive?
+            puts "#{indent}🔄 Sync: #{sync_status_text(status[:ahead], status[:behind])}"
+          else
+            puts "#{indent}✓ Up to date with remote"
+          end
+        end
+
+        def sync_status_text(ahead, behind)
+          parts = []
+          parts << "#{ahead} ahead" if ahead.positive?
+          parts << "#{behind} behind" if behind.positive?
+          parts.join(', ')
+        end
+
+        def git_status_info
+          {
+            branch: current_branch,
+            remote: remote_url,
+            modified_count: modified_files_count,
+            untracked_count: untracked_files_count,
+            ahead: commits_ahead,
+            behind: commits_behind
+          }
+        end
+
+        def current_branch
+          `git -C "#{brand_path}" rev-parse --abbrev-ref HEAD 2>/dev/null`.strip
+        rescue StandardError
+          'unknown'
+        end
+
+        def remote_url
+          result = `git -C "#{brand_path}" remote get-url origin 2>/dev/null`.strip
+          result.empty? ? nil : result
+        rescue StandardError
+          nil
+        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
+        end
+
+        def untracked_files_count
+          `git -C "#{brand_path}" status --porcelain 2>/dev/null | grep -E "^\\?\\?" | wc -l`.strip.to_i
+        rescue StandardError
+          0
+        end
+
+        def commits_ahead
+          `git -C "#{brand_path}" rev-list --count @{upstream}..HEAD 2>/dev/null`.strip.to_i
+        rescue StandardError
+          0
+        end
+
+        def commits_behind
+          `git -C "#{brand_path}" rev-list --count HEAD..@{upstream} 2>/dev/null`.strip.to_i
+        rescue StandardError
+          0
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,122 @@
+# frozen_string_literal: true
+
+module Appydave
+  module Tools
+    module Dam
+      # Sync (git pull) brand repositories
+      class RepoSync
+        attr_reader :brand, :brand_info, :brand_path
+
+        def initialize(brand = nil)
+          return unless brand
+
+          @brand_info = load_brand_info(brand)
+          @brand = @brand_info.key
+          @brand_path = Config.brand_path(@brand)
+        end
+
+        # Sync single brand
+        def sync
+          puts "🔄 Syncing: v-#{brand}"
+          puts ''
+
+          unless git_repo?
+            puts "❌ Not a git repository: #{brand_path}"
+            return
+          end
+
+          perform_sync
+        end
+
+        # Sync all brands
+        def sync_all
+          puts '🔄 Syncing All Brands'
+          puts ''
+
+          Appydave::Tools::Configuration::Config.configure
+          brands_config = Appydave::Tools::Configuration::Config.brands
+
+          results = []
+
+          brands_config.brands.each do |brand_info|
+            @brand_info = brand_info
+            @brand = brand_info.key
+            @brand_path = Config.brand_path(@brand)
+
+            next unless git_repo?
+
+            puts "📦 v-#{brand}"
+            result = perform_sync(indent: '  ')
+            results << result
+            puts ''
+          end
+
+          show_summary(results)
+        end
+
+        private
+
+        def load_brand_info(brand)
+          Appydave::Tools::Configuration::Config.configure
+          Appydave::Tools::Configuration::Config.brands.get_brand(brand)
+        end
+
+        def git_repo?
+          git_dir = File.join(brand_path, '.git')
+          Dir.exist?(git_dir)
+        end
+
+        def perform_sync(indent: '')
+          # Check for uncommitted changes
+          if uncommitted_changes?
+            puts "#{indent}⚠️  Uncommitted changes detected"
+            puts "#{indent}   Skipping pull (would cause conflicts)"
+            return { brand: brand, status: 'skipped', reason: 'uncommitted changes' }
+          end
+
+          # Perform git pull
+          output = `git -C "#{brand_path}" pull 2>&1`
+          exit_code = $CHILD_STATUS.exitstatus
+
+          if exit_code.zero?
+            if output.include?('Already up to date')
+              puts "#{indent}✓ Already up to date"
+              { brand: brand, status: 'current' }
+            else
+              puts "#{indent}✓ Updated successfully"
+              puts "#{indent}  #{output.lines.first.strip}" if output.lines.any?
+              { brand: brand, status: 'updated' }
+            end
+          else
+            puts "#{indent}❌ Pull failed: #{output.strip}"
+            { brand: brand, status: 'error', reason: output.strip }
+          end
+        end
+
+        def uncommitted_changes?
+          output = `git -C "#{brand_path}" status --porcelain 2>/dev/null`.strip
+          !output.empty?
+        rescue StandardError
+          false
+        end
+
+        def show_summary(results)
+          puts '=' * 60
+          puts '📊 Sync Summary:'
+          puts ''
+
+          updated = results.count { |r| r[:status] == 'updated' }
+          current = results.count { |r| r[:status] == 'current' }
+          skipped = results.count { |r| r[:status] == 'skipped' }
+          errors = results.count { |r| r[:status] == 'error' }
+
+          puts "  Total repos checked: #{results.size}"
+          puts "  Updated: #{updated}"
+          puts "  Already current: #{current}"
+          puts "  Skipped: #{skipped}" if skipped.positive?
+          puts "  Errors: #{errors}" if errors.positive?
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,278 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module Appydave
+  module Tools
+    module Dam
+      # Show unified status for video project (local, S3, SSD, git)
+      class Status
+        attr_reader :brand, :project_id, :brand_info, :brand_path, :project_path
+
+        def initialize(brand, project_id = nil)
+          @brand_info = load_brand_info(brand)
+          @brand = @brand_info.key
+          @brand_path = Config.brand_path(@brand)
+          @project_id = project_id
+          @project_path = project_id ? resolve_project_path(project_id) : nil
+        end
+
+        # Show status for project or brand
+        def show
+          if project_id
+            show_project_status
+          else
+            show_brand_status
+          end
+        end
+
+        private
+
+        def load_brand_info(brand)
+          Appydave::Tools::Configuration::Config.configure
+          Appydave::Tools::Configuration::Config.brands.get_brand(brand)
+        end
+
+        def resolve_project_path(project_id)
+          # Resolve short name if needed (b65 -> b65-full-name)
+          resolved = ProjectResolver.new.resolve(brand, project_id)
+          File.join(brand_path, resolved)
+        end
+
+        def show_project_status
+          puts "📊 Status: v-#{brand}/#{File.basename(project_path)}"
+          puts ''
+
+          manifest = load_manifest
+          project_entry = find_project_in_manifest(manifest)
+
+          unless project_entry
+            puts '❌ Project not found in manifest'
+            puts "   Run: dam manifest #{brand}"
+            return
+          end
+
+          show_storage_status(project_entry)
+          show_git_status if git_repo?
+        end
+
+        def show_brand_status
+          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
+          else
+            puts 'Git: Not a git repository'
+          end
+          puts ''
+
+          # Show manifest summary
+          manifest = load_manifest
+          if manifest
+            show_manifest_summary(manifest)
+          else
+            puts '❌ Manifest not found'
+            puts "   Run: dam manifest #{brand}"
+          end
+        end
+
+        def show_storage_status(project_entry)
+          puts 'Storage:'
+
+          # Local storage
+          show_local_status(project_entry)
+
+          # S3 staging (inferred - only show if exists)
+          show_s3_status(project_entry) if project_entry[:storage][:s3][:exists]
+
+          # SSD backup (inferred - only show if configured and exists)
+          show_ssd_status(project_entry) if brand_info.locations.ssd_backup &&
+                                            brand_info.locations.ssd_backup != 'NOT-SET' &&
+                                            project_entry[:storage][:ssd][:exists]
+
+          puts ''
+        end
+
+        def show_local_status(project_entry)
+          local = project_entry[:storage][:local]
+
+          if local[:exists]
+            puts "  📁 Local: ✓ exists (#{local[:structure]} structure)"
+            puts "     Heavy files: #{local[:has_heavy_files] ? 'yes' : 'no'}"
+            puts "     Light files: #{local[:has_light_files] ? 'yes' : 'no'}"
+          else
+            puts '  📁 Local: ✗ does not exist'
+          end
+          puts ''
+        end
+
+        def show_s3_status(_project_entry)
+          puts '  ☁️  S3 Staging: ✓ exists'
+
+          # TODO: Query S3 for detailed status (files needing sync)
+          # For now, just show that s3-staging folder exists locally
+          s3_staging_path = File.join(project_path, 's3-staging')
+          if Dir.exist?(s3_staging_path)
+            file_count = Dir.glob(File.join(s3_staging_path, '*')).count
+            puts "     Local staging files: #{file_count}"
+          end
+          puts ''
+        end
+
+        def show_ssd_status(project_entry)
+          puts '  💾 SSD Backup: ✓ exists'
+          puts "     Path: #{project_entry[:storage][:ssd][:path]}"
+          puts ''
+        end
+
+        def show_git_status
+          puts 'Git:'
+
+          status = git_status_info
+
+          puts "  🌿 Branch: #{status[:branch]}"
+          puts "  📡 Remote: #{status[:remote]}" if status[:remote]
+
+          if status[:modified_count].positive? || status[:untracked_count].positive?
+            puts "  ↕️  Status: #{status[:modified_count]} modified, #{status[:untracked_count]} untracked"
+          else
+            puts '  ↕️  Status: Clean working directory'
+          end
+
+          if status[:ahead].positive? || status[:behind].positive?
+            puts "  🔄 Sync: #{sync_status_text(status[:ahead], status[:behind])}"
+          else
+            puts '  🔄 Sync: Up to date'
+          end
+
+          puts ''
+        end
+
+        def show_brand_git_status
+          status = git_status_info
+
+          puts "🌿 Branch: #{status[:branch]}"
+          puts "📡 Remote: #{status[:remote]}" if status[:remote]
+
+          if status[:modified_count].positive? || status[:untracked_count].positive?
+            puts "↕️  Changes: #{status[:modified_count]} modified, #{status[:untracked_count]} untracked"
+          else
+            puts '✓ Working directory clean'
+          end
+
+          if status[:ahead].positive? || status[:behind].positive?
+            puts "🔄 Sync: #{sync_status_text(status[:ahead], status[:behind])}"
+          else
+            puts '✓ Up to date with remote'
+          end
+        end
+
+        def show_manifest_summary(manifest)
+          puts '📋 Manifest Summary:'
+          puts "   Total projects: #{manifest[:projects].size}"
+
+          local_count = manifest[:projects].count { |p| p[:storage][:local][:exists] }
+          s3_count = manifest[:projects].count { |p| p[:storage][:s3][:exists] }
+          ssd_count = manifest[:projects].count { |p| p[:storage][:ssd][:exists] }
+
+          puts "   Local: #{local_count}"
+          puts "   S3 staging: #{s3_count}"
+          puts "   SSD backup: #{ssd_count}"
+
+          # Project types
+          storyline_count = manifest[:projects].count { |p| p[:hasStorylineJson] }
+          puts ''
+          puts "   Storyline projects: #{storyline_count}"
+          puts "   FliVideo projects: #{manifest[:projects].size - storyline_count}"
+        end
+
+        def sync_status_text(ahead, behind)
+          parts = []
+          parts << "#{ahead} ahead" if ahead.positive?
+          parts << "#{behind} behind" if behind.positive?
+          parts.join(', ')
+        end
+
+        def load_manifest
+          manifest_path = File.join(brand_path, 'projects.json')
+          return nil unless File.exist?(manifest_path)
+
+          JSON.parse(File.read(manifest_path), symbolize_names: true)
+        rescue JSON::ParserError
+          nil
+        end
+
+        def find_project_in_manifest(manifest)
+          return nil unless manifest
+
+          project_name = File.basename(project_path)
+          manifest[:projects].find { |p| p[:id] == project_name }
+        end
+
+        def git_repo?
+          git_dir = File.join(brand_path, '.git')
+          Dir.exist?(git_dir)
+        end
+
+        def git_status_info
+          {
+            branch: current_branch,
+            remote: remote_url,
+            modified_count: modified_files_count,
+            untracked_count: untracked_files_count,
+            ahead: commits_ahead,
+            behind: commits_behind
+          }
+        end
+
+        def current_branch
+          `git -C "#{brand_path}" rev-parse --abbrev-ref HEAD 2>/dev/null`.strip
+        rescue StandardError
+          'unknown'
+        end
+
+        def remote_url
+          result = `git -C "#{brand_path}" remote get-url origin 2>/dev/null`.strip
+          result.empty? ? nil : result
+        rescue StandardError
+          nil
+        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
+        end
+
+        def untracked_files_count
+          `git -C "#{brand_path}" status --porcelain 2>/dev/null | grep -E "^\\?\\?" | wc -l`.strip.to_i
+        rescue StandardError
+          0
+        end
+
+        def commits_ahead
+          `git -C "#{brand_path}" rev-list --count @{upstream}..HEAD 2>/dev/null`.strip.to_i
+        rescue StandardError
+          0
+        end
+
+        def commits_behind
+          `git -C "#{brand_path}" rev-list --count HEAD..@{upstream} 2>/dev/null`.strip.to_i
+        rescue StandardError
+          0
+        end
+      end
+    end
+  end
+end

data/lib/appydave/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Appydave
   module Tools
-    VERSION = '0.19.0'
+    VERSION = '0.20.0'
   end
 end

data/lib/appydave/tools.rb

@@ -59,6 +59,10 @@ require 'appydave/tools/dam/s3_operations'
 require 'appydave/tools/dam/project_listing'
 require 'appydave/tools/dam/manifest_generator'
 require 'appydave/tools/dam/sync_from_ssd'
+require 'appydave/tools/dam/status'
+require 'appydave/tools/dam/repo_status'
+require 'appydave/tools/dam/repo_sync'
+require 'appydave/tools/dam/repo_push'
 
 require 'appydave/tools/youtube_automation/gpt_agent'
 

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appydave-tools",
-  "version": "0.19.0",
+  "version": "0.20.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.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - David Cruwys
@@ -292,7 +292,11 @@ files:
 - lib/appydave/tools/dam/manifest_generator.rb
 - lib/appydave/tools/dam/project_listing.rb
 - lib/appydave/tools/dam/project_resolver.rb
+- lib/appydave/tools/dam/repo_push.rb
+- lib/appydave/tools/dam/repo_status.rb
+- lib/appydave/tools/dam/repo_sync.rb
 - lib/appydave/tools/dam/s3_operations.rb
+- lib/appydave/tools/dam/status.rb
 - lib/appydave/tools/dam/sync_from_ssd.rb
 - lib/appydave/tools/debuggable.rb
 - lib/appydave/tools/gpt_context/_doc.md