appydave-tools 0.76.6 → 0.76.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4172ac86ad4f32c89534b2129ffed582137abc47e21fe1fb2e1d18c5a56608e
-  data.tar.gz: ed067098e65634fce56abf446313a7f58657dbc7fc45499915cb34d6a9ae5afe
+  metadata.gz: 51ac1542f215f90d518a24c96b5185cf954b9db2beab4bbb93c8d43f3b106fb7
+  data.tar.gz: 11acb6d8817125846945e4f7ba3bfb77b305155093f507f346a21477c4102cdb
 SHA512:
-  metadata.gz: 79f3caf203405a2cf7337da3129595433515c04e6b4f9f1203b70b5ef89e07caa07ac212d6e9bb85244185f5d5d3b8e20f175e01e7587fb1fe1920630dadf8e1
-  data.tar.gz: e42dfc787b1331d7fdfbd32c731f13e03f946bf5e2fa9d89f948f9cb59dc393a80e054b075b650d51d72eb7070f846f0253beef5e011cf3c632b8181b5b30f7f
+  metadata.gz: 02a5b3623de62bbb09d343101c1edc48b711fc8682d9396689043afcdd134276c887de57d802e8a717db9adaeb34b48eb14dd6a199e085d64430a0525300cf1e
+  data.tar.gz: ce60ac62a7753a206768335c7cc51c8d4765223efd9dd34d4a490fc250f8af63aca11fd532f9918f15ac075be8e7698bd7613704040a16f66777a0455ca54c25

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.76.6](https://github.com/appydave/appydave-tools/compare/v0.76.5...v0.76.6) (2026-03-19)
+
+
+### Bug Fixes
+
+* extract S3ScanCommand class from VatCLI; add smoke-test spec ([cd03606](https://github.com/appydave/appydave-tools/commit/cd03606e3307665c7f69391d6c160f50df1773ba))
+* remove redundant rubocop disable directives from S3ScanCommand (CI rubocop 1.85.1) ([4c9deb4](https://github.com/appydave/appydave-tools/commit/4c9deb4298d4577a99d0e82e7b72918a26275d40))
+
 ## [0.76.5](https://github.com/appydave/appydave-tools/compare/v0.76.4...v0.76.5) (2026-03-19)
 
 

data/bin/dam

@@ -154,7 +154,7 @@ class VatCLI
 
   # S3 Upload
   def s3_up_command(args)
-    options = parse_s3_args(args, 's3-up')
+    options = Appydave::Tools::Dam::S3ArgParser.parse_s3(args, 's3-up')
     s3_ops = Appydave::Tools::Dam::S3Operations.new(options[:brand], options[:project])
     s3_ops.upload(dry_run: options[:dry_run])
   rescue StandardError => e
@@ -164,7 +164,7 @@ class VatCLI
 
   # S3 Download
   def s3_down_command(args)
-    options = parse_s3_args(args, 's3-down')
+    options = Appydave::Tools::Dam::S3ArgParser.parse_s3(args, 's3-down')
     s3_ops = Appydave::Tools::Dam::S3Operations.new(options[:brand], options[:project])
     s3_ops.download(dry_run: options[:dry_run])
   rescue StandardError => e
@@ -174,7 +174,7 @@ class VatCLI
 
   # S3 Status
   def s3_status_command(args)
-    options = parse_s3_args(args, 's3-status')
+    options = Appydave::Tools::Dam::S3ArgParser.parse_s3(args, 's3-status')
     s3_ops = Appydave::Tools::Dam::S3Operations.new(options[:brand], options[:project])
     s3_ops.status
   rescue StandardError => e
@@ -184,7 +184,7 @@ class VatCLI
 
   # S3 Cleanup Remote
   def s3_cleanup_remote_command(args)
-    options = parse_s3_args(args, 's3-cleanup-remote')
+    options = Appydave::Tools::Dam::S3ArgParser.parse_s3(args, 's3-cleanup-remote')
     s3_ops = Appydave::Tools::Dam::S3Operations.new(options[:brand], options[:project])
     s3_ops.cleanup(force: options[:force], dry_run: options[:dry_run])
   rescue StandardError => e
@@ -194,7 +194,7 @@ class VatCLI
 
   # S3 Cleanup Local
   def s3_cleanup_local_command(args)
-    options = parse_s3_args(args, 's3-cleanup-local')
+    options = Appydave::Tools::Dam::S3ArgParser.parse_s3(args, 's3-cleanup-local')
     s3_ops = Appydave::Tools::Dam::S3Operations.new(options[:brand], options[:project])
     s3_ops.cleanup_local(force: options[:force], dry_run: options[:dry_run])
   rescue StandardError => e
@@ -204,7 +204,7 @@ class VatCLI
 
   # Share file via pre-signed URL
   def s3_share_command(args)
-    options = parse_share_args(args)
+    options = Appydave::Tools::Dam::S3ArgParser.parse_share(args)
 
     share_ops = Appydave::Tools::Dam::ShareOperations.new(options[:brand], options[:project])
     share_ops.generate_links(files: options[:file], expires: options[:expires], download: options[:download])
@@ -215,7 +215,7 @@ class VatCLI
 
   # Discover files in S3 for a project
   def s3_discover_command(args)
-    options = parse_discover_args(args)
+    options = Appydave::Tools::Dam::S3ArgParser.parse_discover(args)
     files = fetch_s3_files(options[:brand_key], options[:project_id])
 
     return if handle_empty_files?(files, options[:brand_key], options[:project_id])
@@ -228,7 +228,7 @@ class VatCLI
 
   # Archive project to SSD
   def archive_command(args)
-    options = parse_s3_args(args, 'archive')
+    options = Appydave::Tools::Dam::S3ArgParser.parse_s3(args, 'archive')
     s3_ops = Appydave::Tools::Dam::S3Operations.new(options[:brand], options[:project])
     s3_ops.archive(force: options[:force], dry_run: options[:dry_run])
   rescue StandardError => e
@@ -461,132 +461,6 @@ class VatCLI
     exit 1
   end
 
-  # Parse S3 command arguments
-  # rubocop:disable Metrics/MethodLength
-  def parse_s3_args(args, command)
-    dry_run = args.include?('--dry-run')
-    force = args.include?('--force')
-    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? || project_id.nil?
-        puts '❌ Could not auto-detect brand/project from current directory'
-        puts "Usage: dam #{command} <brand> <project> [--dry-run]"
-        exit 1
-      end
-      brand_key = brand # Already detected, use as-is
-    else
-      # Validate brand exists before trying to resolve project
-      unless valid_brand?(brand_arg)
-        puts "❌ Invalid brand: '#{brand_arg}'"
-        puts ''
-        puts 'Valid brands:'
-        puts '  appydave  → v-appydave         (AppyDave brand)'
-        puts '  voz       → v-voz              (VOZ client)'
-        puts '  aitldr    → v-aitldr           (AITLDR brand)'
-        puts '  kiros     → v-kiros            (Kiros client)'
-        puts '  joy       → v-beauty-and-joy   (Beauty & Joy)'
-        puts '  ss        → v-supportsignal    (SupportSignal)'
-        puts ''
-        puts "Usage: dam #{command} <brand> <project> [--dry-run]"
-        exit 1
-      end
-
-      brand_key = brand_arg # Use the shortcut/key (e.g., 'appydave')
-      brand = Appydave::Tools::Dam::Config.expand_brand(brand_arg) # Expand for path resolution
-      project_id = Appydave::Tools::Dam::ProjectResolver.resolve(brand_arg, project_arg)
-    end
-
-    # Set ENV for compatibility with ConfigLoader
-    ENV['BRAND_PATH'] = Appydave::Tools::Dam::Config.brand_path(brand)
-
-    { brand: brand_key, project: project_id, dry_run: dry_run, force: force }
-  end
-  # rubocop:enable Metrics/MethodLength
-
-  def valid_brand?(brand_key)
-    Appydave::Tools::Configuration::Config.configure
-    brands = Appydave::Tools::Configuration::Config.brands
-    brands.key?(brand_key) || brands.shortcut?(brand_key)
-  end
-
-  def parse_share_args(args)
-    # Extract --expires flag
-    expires = '7d' # default
-    if (expires_index = args.index('--expires'))
-      expires = args[expires_index + 1]
-      args.delete_at(expires_index + 1)
-      args.delete_at(expires_index)
-    end
-
-    # Extract --download flag
-    download = args.include?('--download')
-
-    # Remove other flags
-    args = args.reject { |arg| arg.start_with?('--') }
-
-    brand_arg = args[0]
-    project_arg = args[1]
-    file_arg = args[2]
-
-    show_share_usage_and_exit if brand_arg.nil? || project_arg.nil? || file_arg.nil?
-
-    brand_key = brand_arg
-    brand = Appydave::Tools::Dam::Config.expand_brand(brand_arg)
-    project_id = Appydave::Tools::Dam::ProjectResolver.resolve(brand_arg, project_arg)
-
-    # Set ENV for compatibility with ConfigLoader
-    ENV['BRAND_PATH'] = Appydave::Tools::Dam::Config.brand_path(brand)
-
-    { brand: brand_key, project: project_id, file: file_arg, expires: expires, download: download }
-  end
-
-  def show_share_usage_and_exit
-    puts 'Usage: dam s3-share <brand> <project> <file> [--expires 7d] [--download]'
-    puts ''
-    puts 'Options:'
-    puts '  --expires TIME    Expiry time (default: 7d)'
-    puts '  --download        Force download instead of viewing in browser'
-    puts ''
-    puts 'Examples:'
-    puts '  dam s3-share appydave b70 video.mp4'
-    puts '  dam s3-share appydave b70 video.mp4 --expires 24h'
-    puts '  dam s3-share appydave b70 video.mp4 --download'
-    puts '  dam s3-share voz boy-baker final-edit.mov --expires 3d --download'
-    exit 1
-  end
-
-  def parse_discover_args(args)
-    shareable = args.include?('--shareable')
-    args = args.reject { |arg| arg.start_with?('--') }
-
-    brand_arg = args[0]
-    project_arg = args[1]
-
-    if brand_arg.nil? || project_arg.nil?
-      puts 'Usage: dam s3-discover <brand> <project> [--shareable]'
-      puts ''
-      puts 'Examples:'
-      puts '  dam s3-discover appydave b70              # List files'
-      puts '  dam s3-discover appydave b70 --shareable  # Generate share commands'
-      exit 1
-    end
-
-    brand_key = brand_arg
-    brand = Appydave::Tools::Dam::Config.expand_brand(brand_arg)
-    project_id = Appydave::Tools::Dam::ProjectResolver.resolve(brand_arg, project_arg)
-
-    # Set ENV for compatibility with ConfigLoader
-    ENV['BRAND_PATH'] = Appydave::Tools::Dam::Config.brand_path(brand)
-
-    { brand_key: brand_key, project_id: project_id, shareable: shareable }
-  end
-
   def fetch_s3_files(brand_key, project_id)
     s3_ops = Appydave::Tools::Dam::S3Operations.new(brand_key, project_id)
     s3_ops.list_s3_files

data/docs/planning/extract-vat-cli/IMPLEMENTATION_PLAN.md

@@ -10,8 +10,8 @@
 ## Pending
 - [x] extract-format-bytes — Replaced 4 callers (plan said 3; orphaned-projects loop in display_s3_scan_table was a 4th). format_bytes deleted. rubocop 0 offenses. Commit: 3cd362f.
 - [x] extract-local-sync-status — LocalSyncStatus module created, 7 specs added (838 total), both methods gone from VatCLI. Side-fix: restored youtube_automation_config require incorrectly removed in prior commit. v0.76.5.
-- [~] extract-s3-scan-command — Extract `scan_single_brand_s3` + `scan_all_brands_s3` + `display_s3_scan_table` → new `S3ScanCommand` class; add spec; **depends on extract-local-sync-status completing first**
-- [ ] extract-s3-arg-parser — Extract `parse_s3_args` + `valid_brand?` + `parse_share_args` + `show_share_usage_and_exit` + `parse_discover_args` → new `S3ArgParser` class; add spec
+- [x] extract-s3-scan-command — S3ScanCommand created, 2 smoke tests added (840 total), 3 methods gone from VatCLI. Note: rubocop-disable directives became redundant once methods left God class — needed 2nd kfix to remove them. v0.76.6.
+- [~] extract-s3-arg-parser — Extract `parse_s3_args` + `valid_brand?` + `parse_share_args` + `show_share_usage_and_exit` + `parse_discover_args` → new `S3ArgParser` class; add spec
 
 ## In Progress
 

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

@@ -0,0 +1,136 @@
+# frozen_string_literal: true
+
+module Appydave
+  module Tools
+    module Dam
+      # Parses and validates CLI arguments for S3-related dam commands
+      # Handles brand resolution, project lookup, flag extraction, and ENV setup
+      module S3ArgParser
+        module_function
+
+        def parse_s3(args, command)
+          dry_run = args.include?('--dry-run')
+          force = args.include?('--force')
+          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? || project_id.nil?
+              puts '❌ Could not auto-detect brand/project from current directory'
+              puts "Usage: dam #{command} <brand> <project> [--dry-run]"
+              exit 1
+            end
+            brand_key = brand # Already detected, use as-is
+          else
+            # Validate brand exists before trying to resolve project
+            unless valid_brand?(brand_arg)
+              puts "❌ Invalid brand: '#{brand_arg}'"
+              puts ''
+              puts 'Valid brands:'
+              puts '  appydave  → v-appydave         (AppyDave brand)'
+              puts '  voz       → v-voz              (VOZ client)'
+              puts '  aitldr    → v-aitldr           (AITLDR brand)'
+              puts '  kiros     → v-kiros            (Kiros client)'
+              puts '  joy       → v-beauty-and-joy   (Beauty & Joy)'
+              puts '  ss        → v-supportsignal    (SupportSignal)'
+              puts ''
+              puts "Usage: dam #{command} <brand> <project> [--dry-run]"
+              exit 1
+            end
+
+            brand_key = brand_arg # Use the shortcut/key (e.g., 'appydave')
+            brand = Appydave::Tools::Dam::Config.expand_brand(brand_arg) # Expand for path resolution
+            project_id = Appydave::Tools::Dam::ProjectResolver.resolve(brand_arg, project_arg)
+          end
+
+          # Set ENV for compatibility with ConfigLoader
+          ENV['BRAND_PATH'] = Appydave::Tools::Dam::Config.brand_path(brand)
+
+          { brand: brand_key, project: project_id, dry_run: dry_run, force: force }
+        end
+
+        def parse_share(args)
+          # Extract --expires flag
+          expires = '7d' # default
+          if (expires_index = args.index('--expires'))
+            expires = args[expires_index + 1]
+            args.delete_at(expires_index + 1)
+            args.delete_at(expires_index)
+          end
+
+          # Extract --download flag
+          download = args.include?('--download')
+
+          # Remove other flags
+          args = args.reject { |arg| arg.start_with?('--') }
+
+          brand_arg = args[0]
+          project_arg = args[1]
+          file_arg = args[2]
+
+          show_share_usage_and_exit if brand_arg.nil? || project_arg.nil? || file_arg.nil?
+
+          brand_key = brand_arg
+          brand = Appydave::Tools::Dam::Config.expand_brand(brand_arg)
+          project_id = Appydave::Tools::Dam::ProjectResolver.resolve(brand_arg, project_arg)
+
+          # Set ENV for compatibility with ConfigLoader
+          ENV['BRAND_PATH'] = Appydave::Tools::Dam::Config.brand_path(brand)
+
+          { brand: brand_key, project: project_id, file: file_arg, expires: expires, download: download }
+        end
+
+        def parse_discover(args)
+          shareable = args.include?('--shareable')
+          args = args.reject { |arg| arg.start_with?('--') }
+
+          brand_arg = args[0]
+          project_arg = args[1]
+
+          if brand_arg.nil? || project_arg.nil?
+            puts 'Usage: dam s3-discover <brand> <project> [--shareable]'
+            puts ''
+            puts 'Examples:'
+            puts '  dam s3-discover appydave b70              # List files'
+            puts '  dam s3-discover appydave b70 --shareable  # Generate share commands'
+            exit 1
+          end
+
+          brand_key = brand_arg
+          brand = Appydave::Tools::Dam::Config.expand_brand(brand_arg)
+          project_id = Appydave::Tools::Dam::ProjectResolver.resolve(brand_arg, project_arg)
+
+          # Set ENV for compatibility with ConfigLoader
+          ENV['BRAND_PATH'] = Appydave::Tools::Dam::Config.brand_path(brand)
+
+          { brand_key: brand_key, project_id: project_id, shareable: shareable }
+        end
+
+        def valid_brand?(brand_key)
+          Appydave::Tools::Configuration::Config.configure
+          brands = Appydave::Tools::Configuration::Config.brands
+          brands.key?(brand_key) || brands.shortcut?(brand_key)
+        end
+
+        def show_share_usage_and_exit
+          puts 'Usage: dam s3-share <brand> <project> <file> [--expires 7d] [--download]'
+          puts ''
+          puts 'Options:'
+          puts '  --expires TIME    Expiry time (default: 7d)'
+          puts '  --download        Force download instead of viewing in browser'
+          puts ''
+          puts 'Examples:'
+          puts '  dam s3-share appydave b70 video.mp4'
+          puts '  dam s3-share appydave b70 video.mp4 --expires 24h'
+          puts '  dam s3-share appydave b70 video.mp4 --download'
+          puts '  dam s3-share voz boy-baker final-edit.mov --expires 3d --download'
+          exit 1
+        end
+      end
+    end
+  end
+end

data/lib/appydave/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Appydave
   module Tools
-    VERSION = '0.76.6'
+    VERSION = '0.76.7'
   end
 end

data/lib/appydave/tools.rb

@@ -80,6 +80,7 @@ require 'appydave/tools/dam/repo_sync'
 require 'appydave/tools/dam/repo_push'
 require 'appydave/tools/dam/local_sync_status'
 require 'appydave/tools/dam/s3_scan_command'
+require 'appydave/tools/dam/s3_arg_parser'
 
 require 'appydave/tools/jump/path_validator'
 require 'appydave/tools/jump/location'

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appydave-tools",
-  "version": "0.76.6",
+  "version": "0.76.7",
   "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.76.6
+  version: 0.76.7
 platform: ruby
 authors:
 - David Cruwys
@@ -361,6 +361,7 @@ files:
 - 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_arg_parser.rb
 - lib/appydave/tools/dam/s3_operations.rb
 - lib/appydave/tools/dam/s3_scan_command.rb
 - lib/appydave/tools/dam/s3_scanner.rb