walheim 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d19e8685c0c52cb39ba23885c62d508846a85bb92b378634ccf577f3f8b3cd9
-  data.tar.gz: da82158c9db6c6c4a34633d10ca7c0c532ad3ead820dd244339d64ebd77182be
+  metadata.gz: 5b943785b380c1a8fcd220c0f9c4716a6e9fe5d255b31e7b874115f0b0c8734a
+  data.tar.gz: a5d62f283a0da1189b07129512a0f7698b3c4811f653f5735576139fa76c4f0f
 SHA512:
-  metadata.gz: b995e6d2017d058690016d58881af050cd1f0c629c6a38ff741f29d11df27ffc86050f8ea17e0a1c83964f29a6c87a7a003e94b6f2fac9ce593d6c08b53d68bc
-  data.tar.gz: cce38837eb9ba755d59463334c03b8e383f6cf9484b0062625695af198ac637bb648e1c3e93d28f42b30966edfa04b8b04f028d793d0befc60c9f11a4363fbc1
+  metadata.gz: 3b01e7611db7c3f589c3c0043ed8762f1fac6768c884f177c045a188ff16440b0f5ac4184b31ad681febdf2b79d7db247856c191fd9bb074cdfe4884bc4521aa
+  data.tar.gz: 5374cfd930d9ddb54117209f2ac9eefa1436dbc293db46d2ef8f1307dd91b6bba72b82ce918ef8511569720d9992662fa59c0103e2bdf0bc0544db021a72f71d

data/lib/walheim/cli/base_command.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'helpers'
+require_relative "helpers"
 
 module Walheim
   module BaseCommand
@@ -9,8 +9,8 @@ module Walheim
       handler_info = Walheim::HandlerRegistry.get(kind)
       unless handler_info
         warn "Error: unknown kind '#{kind}'"
-        warn ''
-        warn 'Available kinds:'
+        warn ""
+        warn "Available kinds:"
         Walheim::HandlerRegistry.all_visible.each { |h| warn "  #{h[:name]}" }
         exit 1
       end
@@ -28,16 +28,12 @@ module Walheim
       handler = handler_info[:handler].new(data_dir: data_dir)
 
       # 5. Validate namespace requirements
-      if handler.is_a?(Walheim::NamespacedResource)
-        validate_namespace_options!(operation, kind, name, options)
-      end
+      validate_namespace_options!(operation, kind, name, options) if handler.is_a?(Walheim::NamespacedResource)
 
       # 6. Dispatch to handler
       dispatch_to_handler(handler, operation, name, options, handler_info)
     end
 
-    private
-
     def self.resolve_data_dir(options, parent_options)
       # Merge options
       all_options = parent_options.merge(options)
@@ -51,49 +47,50 @@ module Walheim
         if context_name
           config.data_dir(context_name)
         elsif all_options[:data_dir]
-          warn 'Warning: --data-dir is deprecated. Use contexts.'
+          warn "Warning: --data-dir is deprecated. Use contexts."
           all_options[:data_dir]
         else
-          warn 'Error: No Walheim configuration found.'
-          warn ''
-          warn 'Create your first context:'
-          warn '  whctl context new <name> --data-dir <path>'
+          warn "Error: No Walheim configuration found."
+          warn ""
+          warn "Create your first context:"
+          warn "  whctl context new <name> --data-dir <path>"
           exit 1
         end
       rescue Walheim::Config::ConfigError, Walheim::Config::ValidationError
         if all_options[:data_dir]
-          warn 'Warning: --data-dir is deprecated.'
+          warn "Warning: --data-dir is deprecated."
           all_options[:data_dir]
         else
-          warn 'Error: No Walheim configuration found.'
-          warn ''
-          warn 'Create your first context:'
-          warn '  whctl context new <name> --data-dir <path>'
+          warn "Error: No Walheim configuration found."
+          warn ""
+          warn "Create your first context:"
+          warn "  whctl context new <name> --data-dir <path>"
           exit 1
         end
       end
     end
 
-    def self.validate_namespace_options!(operation, kind, name, options)
+    def self.validate_namespace_options!(operation, kind, _name, options)
       # Operations that require namespace or --all
-      requires_namespace = [:get, :apply, :delete, :start, :pause, :stop, :logs, :import]
+      requires_namespace = %i[get apply delete start pause stop logs import]
       return unless requires_namespace.include?(operation)
 
       # get can use --all
       if operation == :get
         return if options[:all] || options[:namespace]
-        warn 'Error: either -n {namespace} or --all/-A flag is required'
+
+        warn "Error: either -n {namespace} or --all/-A flag is required"
         warn "Usage: whctl get #{kind} -n {namespace}"
         warn "Usage: whctl get #{kind} --all"
         exit 1
       end
 
       # Other operations require namespace
-      unless options[:namespace]
-        warn 'Error: -n {namespace} is required'
-        warn "Usage: whctl #{operation} #{kind} {name} -n {namespace}"
-        exit 1
-      end
+      return if options[:namespace]
+
+      warn "Error: -n {namespace} is required"
+      warn "Usage: whctl #{operation} #{kind} {name} -n {namespace}"
+      exit 1
     end
 
     def self.dispatch_to_handler(handler, operation, name, options, handler_info)
@@ -131,45 +128,43 @@ module Walheim
         Walheim::Helpers.print_cluster_resources_table(result, handler_info[:name])
       else
         result = if options[:all]
-          handler.get(namespace: nil, name: nil)
+                   handler.get(namespace: nil, name: nil)
         else
-          handler.get(namespace: options[:namespace], name: name)
+                   handler.get(namespace: options[:namespace], name: name)
         end
         Walheim::Helpers.print_resources_table(result, options[:all], handler_info[:name])
       end
     end
 
-    def self.dispatch_apply(handler, name, options, handler_info)
+    def self.dispatch_apply(handler, name, options, _handler_info)
       # Extract from manifest if -f provided
       if options[:file]
         manifest_data = Walheim::Helpers.read_yaml_input(options[:file])
 
         if handler.is_a?(Walheim::NamespacedResource)
-          namespace = manifest_data['metadata']['namespace']
-          name = manifest_data['metadata']['name']
+          namespace = manifest_data["metadata"]["namespace"]
+          name = manifest_data["metadata"]["name"]
 
           unless namespace && name
-            warn 'Error: Manifest must contain metadata.namespace and metadata.name'
+            warn "Error: Manifest must contain metadata.namespace and metadata.name"
             exit 1
           end
 
           handler.apply(namespace: namespace, name: name, manifest_source: options[:file])
         else
           # Cluster resource
-          name = manifest_data['metadata']['name']
+          name = manifest_data["metadata"]["name"]
           unless name
-            warn 'Error: Manifest must contain metadata.name'
+            warn "Error: Manifest must contain metadata.name"
             exit 1
           end
           handler.apply(name: name, manifest_source: options[:file])
         end
-      else
+      elsif handler.is_a?(Walheim::NamespacedResource)
         # Apply from existing manifest in data dir
-        if handler.is_a?(Walheim::NamespacedResource)
-          handler.apply(namespace: options[:namespace], name: name)
-        else
-          handler.apply(name: name)
-        end
+        handler.apply(namespace: options[:namespace], name: name)
+      else
+        handler.apply(name: name)
       end
     end
   end

data/lib/walheim/cli/helpers.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'terminal-table'
-require 'yaml'
+require "terminal-table"
+require "yaml"
 
 module Walheim
   module Helpers
@@ -22,31 +22,31 @@ module Walheim
       summary_fields = result.first[:summary].keys
 
       # Build header row
-      if all_namespaces
-        headers = ['NAMESPACE', 'NAME'] + summary_fields.map(&:to_s).map(&:upcase)
+      headers = if all_namespaces
+                  %w[NAMESPACE NAME] + summary_fields.map(&:to_s).map(&:upcase)
       else
-        headers = ['NAME'] + summary_fields.map(&:to_s).map(&:upcase)
+                  [ "NAME" ] + summary_fields.map(&:to_s).map(&:upcase)
       end
 
       # Build data rows
       rows = result.map do |resource|
         row = if all_namespaces
-          [resource[:namespace], resource[:name]]
+                [ resource[:namespace], resource[:name] ]
         else
-          [resource[:name]]
+                [ resource[:name] ]
         end
 
         # Add summary field values
-        summary_values = summary_fields.map { |field| resource[:summary][field] || 'N/A' }
+        summary_values = summary_fields.map { |field| resource[:summary][field] || "N/A" }
         row + summary_values
       end
 
-      all_rows = [headers] + rows
+      all_rows = [ headers ] + rows
 
       table = Terminal::Table.new do |t|
         t.rows = all_rows
         t.style = {
-          border_x: '', border_y: '', border_i: '',
+          border_x: "", border_y: "", border_i: "",
           padding_left: 0, padding_right: 3,
           border_top: false, border_bottom: false,
           all_separators: false
@@ -73,23 +73,23 @@ module Walheim
       summary_fields = result.first[:summary].keys
 
       # Build header row (no NAMESPACE column for cluster resources)
-      headers = ['NAME'] + summary_fields.map(&:to_s).map(&:upcase)
+      headers = [ "NAME" ] + summary_fields.map(&:to_s).map(&:upcase)
 
       # Build data rows
       rows = result.map do |resource|
-        row = [resource[:name]]
+        row = [ resource[:name] ]
 
         # Add summary field values
-        summary_values = summary_fields.map { |field| resource[:summary][field] || 'N/A' }
+        summary_values = summary_fields.map { |field| resource[:summary][field] || "N/A" }
         row + summary_values
       end
 
-      all_rows = [headers] + rows
+      all_rows = [ headers ] + rows
 
       table = Terminal::Table.new do |t|
         t.rows = all_rows
         t.style = {
-          border_x: '', border_y: '', border_i: '',
+          border_x: "", border_y: "", border_i: "",
           padding_left: 0, padding_right: 3,
           border_top: false, border_bottom: false,
           all_separators: false
@@ -101,9 +101,9 @@ module Walheim
 
     # Read YAML from file or stdin
     def self.read_yaml_input(file_path)
-      if file_path == '-'
+      if file_path == "-"
         # Read from stdin
-        YAML.load(STDIN.read)
+        YAML.safe_load($stdin.read)
       else
         # Read from file
         YAML.load_file(file_path)

data/lib/walheim/cli/legacy_context.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'optparse'
-require 'terminal-table'
+require "optparse"
+require "terminal-table"
 
 module Walheim
   module LegacyContext
@@ -9,12 +9,12 @@ module Walheim
       options = {}
 
       # Remove 'context' from argv since it's already been identified
-      argv.shift if argv[0] == 'context'
+      argv.shift if argv[0] == "context"
 
       # Parse global flags
       global_parser = OptionParser.new do |opts|
-        opts.on('--whconfig PATH', 'Alternate config file path') { |v| options[:whconfig] = v }
-        opts.on('-d DIR', '--data-dir DIR', 'Data directory') { |v| options[:data_dir] = v }
+        opts.on("--whconfig PATH", "Alternate config file path") { |v| options[:whconfig] = v }
+        opts.on("-d DIR", "--data-dir DIR", "Data directory") { |v| options[:data_dir] = v }
       end
 
       # Parse global flags (use parse! to consume all flags)
@@ -30,17 +30,17 @@ module Walheim
       context_name = argv[1]
 
       case subcommand
-      when 'new'
+      when "new"
         # whctl context new {name} --data-dir {path}
         unless context_name
-          warn 'Error: context name is required'
-          warn 'Usage: whctl context new {name} --data-dir {path}'
+          warn "Error: context name is required"
+          warn "Usage: whctl context new {name} --data-dir {path}"
           exit 1
         end
 
         unless options[:data_dir]
-          warn 'Error: --data-dir flag is required'
-          warn 'Usage: whctl context new {name} --data-dir {path}'
+          warn "Error: --data-dir flag is required"
+          warn "Usage: whctl context new {name} --data-dir {path}"
           exit 1
         end
 
@@ -48,19 +48,19 @@ module Walheim
         expanded_data_dir = File.expand_path(options[:data_dir])
         unless Dir.exist?(expanded_data_dir)
           warn "Error: data directory '#{expanded_data_dir}' does not exist"
-          warn ''
-          warn 'Please create the directory first or provide a valid path'
+          warn ""
+          warn "Please create the directory first or provide a valid path"
           exit 1
         end
 
         # Check for namespaces subdirectory
-        namespaces_path = File.join(expanded_data_dir, 'namespaces')
+        namespaces_path = File.join(expanded_data_dir, "namespaces")
         unless Dir.exist?(namespaces_path)
           warn "Warning: data directory does not contain 'namespaces' subdirectory"
           warn "Expected path: #{namespaces_path}"
-          warn ''
-          warn 'This directory should contain your homelab configuration.'
-          warn 'Creating namespaces directory...'
+          warn ""
+          warn "This directory should contain your homelab configuration."
+          warn "Creating namespaces directory..."
           Dir.mkdir(namespaces_path)
         end
 
@@ -81,34 +81,34 @@ module Walheim
           exit 1
         end
 
-      when 'list'
+      when "list"
         # whctl context list
         config = Walheim::Config.new(config_path: options[:whconfig])
 
         unless Walheim::Config.exists?(config_path: options[:whconfig])
-          warn 'No Walheim configuration found.'
-          warn ''
-          warn 'Create your first context:'
-          warn '  whctl context new <name> --data-dir <path>'
+          warn "No Walheim configuration found."
+          warn ""
+          warn "Create your first context:"
+          warn "  whctl context new <name> --data-dir <path>"
           exit 1
         end
 
         contexts = config.list_contexts
         if contexts.empty?
-          puts 'No contexts configured.'
+          puts "No contexts configured."
           exit 0
         end
 
         rows = contexts.map do |ctx|
-          active_marker = ctx['active'] ? '*' : ''
-          [active_marker, ctx['name'], ctx['dataDir']]
+          active_marker = ctx["active"] ? "*" : ""
+          [ active_marker, ctx["name"], ctx["dataDir"] ]
         end
 
         table = Terminal::Table.new do |t|
-          t.headings = ['CURRENT', 'NAME', 'DATA DIRECTORY']
+          t.headings = [ "CURRENT", "NAME", "DATA DIRECTORY" ]
           t.rows = rows
           t.style = {
-            border_x: '', border_y: '', border_i: '',
+            border_x: "", border_y: "", border_i: "",
             padding_left: 0, padding_right: 3,
             border_top: false, border_bottom: false,
             all_separators: false
@@ -117,11 +117,11 @@ module Walheim
 
         puts table
 
-      when 'use'
+      when "use"
         # whctl context use {name}
         unless context_name
-          warn 'Error: context name is required'
-          warn 'Usage: whctl context use {name}'
+          warn "Error: context name is required"
+          warn "Usage: whctl context use {name}"
           exit 1
         end
 
@@ -136,15 +136,15 @@ module Walheim
           exit 1
         end
 
-      when 'current'
+      when "current"
         # whctl context current
         config = Walheim::Config.new(config_path: options[:whconfig])
 
         unless Walheim::Config.exists?(config_path: options[:whconfig])
-          warn 'No Walheim configuration found.'
-          warn ''
-          warn 'Create your first context:'
-          warn '  whctl context new <name> --data-dir <path>'
+          warn "No Walheim configuration found."
+          warn ""
+          warn "Create your first context:"
+          warn "  whctl context new <name> --data-dir <path>"
           exit 1
         end
 
@@ -152,22 +152,22 @@ module Walheim
           puts "Current context: #{config.current_context}"
           puts "Data directory: #{config.data_dir}"
         else
-          puts 'No active context selected.'
-          puts ''
-          puts 'Available contexts:'
+          puts "No active context selected."
+          puts ""
+          puts "Available contexts:"
           config.list_contexts.each do |ctx|
             puts "  - #{ctx['name']}"
           end
-          puts ''
-          puts 'Select a context:'
-          puts '  whctl context use <context-name>'
+          puts ""
+          puts "Select a context:"
+          puts "  whctl context use <context-name>"
         end
 
-      when 'delete'
+      when "delete"
         # whctl context delete {name}
         unless context_name
-          warn 'Error: context name is required'
-          warn 'Usage: whctl context delete {name}'
+          warn "Error: context name is required"
+          warn "Usage: whctl context delete {name}"
           exit 1
         end
 
@@ -180,10 +180,10 @@ module Walheim
 
           # Show warning if this was the active context
           unless config.current_context
-            puts ''
-            puts 'Note: This was your active context.'
-            puts 'Select a new context with:'
-            puts '  whctl context use <context-name>'
+            puts ""
+            puts "Note: This was your active context."
+            puts "Select a new context with:"
+            puts "  whctl context use <context-name>"
           end
         rescue Walheim::Config::ConfigError => e
           warn "Error: #{e.message}"
@@ -192,13 +192,13 @@ module Walheim
 
       else
         warn "Error: unknown context subcommand '#{subcommand}'"
-        warn ''
-        warn 'Available context commands:'
-        warn '  whctl context new {name} --data-dir {path}'
-        warn '  whctl context list'
-        warn '  whctl context use {name}'
-        warn '  whctl context current'
-        warn '  whctl context delete {name}'
+        warn ""
+        warn "Available context commands:"
+        warn "  whctl context new {name} --data-dir {path}"
+        warn "  whctl context list"
+        warn "  whctl context use {name}"
+        warn "  whctl context current"
+        warn "  whctl context delete {name}"
         exit 1
       end
     end

data/lib/walheim/cli/resource_command.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'base_command'
+require_relative "base_command"
 
 module Walheim
   module ResourceCommand
@@ -10,7 +10,7 @@ module Walheim
       return if handlers.empty?
 
       # Build command description
-      descriptions = handlers.map { |h| h[:name] }.join(', ')
+      descriptions = handlers.map { |h| h[:name] }.join(", ")
       desc_text = "#{operation.to_s.capitalize} resources (#{descriptions})"
 
       # Define Thor command
@@ -21,12 +21,10 @@ module Walheim
       all_options = {}
       handlers.each do |handler_info|
         handler_class = handler_info[:handler]
-        if handler_class.respond_to?(:operation_info)
-          op_metadata = handler_class.operation_info[operation]
-          if op_metadata && op_metadata[:options]
-            all_options.merge!(op_metadata[:options])
-          end
-        end
+        next unless handler_class.respond_to?(:operation_info)
+
+        op_metadata = handler_class.operation_info[operation]
+        all_options.merge!(op_metadata[:options]) if op_metadata && op_metadata[:options]
       end
 
       # Register options with Thor
@@ -43,7 +41,11 @@ module Walheim
           kind: kind,
           name: name,
           options: options,
-          parent_options: self.class.class_options.transform_keys(&:to_sym).transform_values { |v| options[v.name] rescue nil }
+          parent_options: self.class.class_options.transform_keys(&:to_sym).transform_values do |v|
+            options[v.name]
+          rescue StandardError
+            nil
+          end
         )
       end
     end

data/lib/walheim/cli.rb

@@ -1,25 +1,25 @@
 # frozen_string_literal: true
 
-require 'thor'
-require_relative 'cli/helpers'
-require_relative 'cli/base_command'
-require_relative 'cli/resource_command'
+require "thor"
+require_relative "cli/helpers"
+require_relative "cli/base_command"
+require_relative "cli/resource_command"
 
 module Walheim
   class CLI < Thor
     # Global flags
     class_option :context,
                  type: :string,
-                 desc: 'Override active context'
+                 desc: "Override active context"
 
     class_option :whconfig,
                  type: :string,
-                 desc: 'Alternate config file path'
+                 desc: "Alternate config file path"
 
     class_option :data_dir,
                  type: :string,
-                 aliases: [:d],
-                 desc: 'Data directory (deprecated: use contexts)'
+                 aliases: [ :d ],
+                 desc: "Data directory (deprecated: use contexts)"
 
     # Dynamically register operations
     def self.register_operations
@@ -29,7 +29,7 @@ module Walheim
     end
 
     # Version command
-    desc 'version', 'Show version'
+    desc "version", "Show version"
     def version
       puts "whctl version #{Walheim::VERSION}"
     end
@@ -42,19 +42,20 @@ module Walheim
       end
 
       # Group commands by category
-      shell.say 'Usage: whctl [global flags] <command> [arguments]'
-      shell.say ''
-      shell.say 'Global flags:'
-      shell.say '  --context CONTEXT     Override active context for this command'
-      shell.say '  --whconfig PATH       Use alternate config file (default: ~/.walheim/config)'
-      shell.say '  -d, --data-dir DIR    Data directory containing namespaces (deprecated: use contexts)'
-      shell.say ''
-      shell.say 'Available commands:'
-      shell.say ''
+      shell.say "Usage: whctl [global flags] <command> [arguments]"
+      shell.say ""
+      shell.say "Global flags:"
+      shell.say "  --context CONTEXT     Override active context for this command"
+      shell.say "  --whconfig PATH       Use alternate config file (default: ~/.walheim/config)"
+      shell.say "  -d, --data-dir DIR    Data directory containing namespaces (deprecated: use contexts)"
+      shell.say ""
+      shell.say "Available commands:"
+      shell.say ""
 
       # Print commands
       list.each do |command|
-        next if command[0] == 'help'
+        next if command[0] == "help"
+
         shell.say "  #{command[0].ljust(30)} #{command[1]}"
       end
     end

data/lib/walheim/cluster_resource.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'resource'
+require_relative "resource"
 
 module Walheim
   # ClusterResource represents resources that are cluster-scoped (not namespaced)
@@ -69,9 +69,9 @@ module Walheim
     # Apply operation - create or update
     def apply(name:, manifest_source: nil)
       manifest_data = if manifest_source
-        File.read(manifest_source)
+                        File.read(manifest_source)
       else
-        read_manifest_from_db(name)
+                        read_manifest_from_db(name)
       end
 
       if resource_exists?(name)
@@ -91,7 +91,7 @@ module Walheim
 
       manifest_path = File.join(resource_dir(name), manifest_filename)
       manifest_content = File.read(manifest_path)
-      manifest_data = YAML.load(manifest_content)
+      manifest_data = YAML.safe_load(manifest_content)
 
       # Compute summary fields
       summary = {}
@@ -123,7 +123,7 @@ module Walheim
     def find_resource_names
       base_dir = File.join(@data_dir, self.class.kind_info[:plural])
       Dir.entries(base_dir)
-         .select { |entry| File.directory?(File.join(base_dir, entry)) && !entry.start_with?('.') }
+         .select { |entry| File.directory?(File.join(base_dir, entry)) && !entry.start_with?(".") }
          .select { |entry| File.exist?(File.join(base_dir, entry, manifest_filename)) }
          .sort
     end