confctl 2.2.2 → 3.0.0

data/lib/confctl/cli/inputs/machines.rb

@@ -0,0 +1,83 @@
+require 'confctl/cli/command'
+require 'confctl/config_type'
+require 'confctl/nix'
+require 'confctl/inputs/setter'
+require 'confctl/inputs/updater'
+
+module ConfCtl::Cli
+  class Inputs::Machines < Command
+    def update
+      ensure_flake_config!
+      require_args!('machine', 'role')
+
+      machine_name = args[0]
+      role = args[1]
+
+      inputs_info = ConfCtl::Nix.new.eval_inputs_info(machine_name)
+      unless inputs_info.is_a?(Hash)
+        raise ConfCtl::Error, "inputs info unavailable for machine '#{machine_name}'"
+      end
+
+      role_info = inputs_info[role] || inputs_info[role.to_s] || inputs_info[role.to_sym]
+      input = role_info.is_a?(Hash) ? (role_info['input'] || role_info[:input]) : nil
+
+      raise ConfCtl::Error, "machine '#{machine_name}' has no role '#{role}'" unless input
+
+      ConfCtl::Inputs::Updater.run!(
+        conf_dir: ConfCtl::ConfDir.path,
+        inputs: [input],
+        commit: opts[:commit],
+        changelog: opts[:changelog],
+        downgrade: opts[:downgrade],
+        editor: opts[:editor]
+      )
+
+      lock = ConfCtl::FlakeLock.load(File.join(ConfCtl::ConfDir.path, 'flake.lock'))
+      info = lock.input_info(input)
+      rev = info[:short_rev] || info[:rev] || '-'
+      puts "Updating #{role} in #{machine_name} -> #{rev}"
+    end
+
+    def set
+      ensure_flake_config!
+      require_args!('machine', 'role', 'rev')
+
+      machine_name = args[0]
+      role = args[1]
+      rev = args[2]
+
+      inputs_info = ConfCtl::Nix.new.eval_inputs_info(machine_name)
+      unless inputs_info.is_a?(Hash)
+        raise ConfCtl::Error, "inputs info unavailable for machine '#{machine_name}'"
+      end
+
+      role_info = inputs_info[role] || inputs_info[role.to_s] || inputs_info[role.to_sym]
+      input = role_info.is_a?(Hash) ? (role_info['input'] || role_info[:input]) : nil
+
+      raise ConfCtl::Error, "machine '#{machine_name}' has no role '#{role}'" unless input
+
+      ConfCtl::Inputs::Setter.run!(
+        conf_dir: ConfCtl::ConfDir.path,
+        inputs: [input],
+        rev: rev,
+        commit: opts[:commit],
+        changelog: opts[:changelog],
+        downgrade: opts[:downgrade],
+        editor: opts[:editor]
+      )
+
+      lock = ConfCtl::FlakeLock.load(File.join(ConfCtl::ConfDir.path, 'flake.lock'))
+      info = lock.input_info(input)
+      resolved_rev = info[:short_rev] || info[:rev] || '-'
+      puts "Configuring #{role} in #{machine_name} -> #{resolved_rev}"
+    end
+
+    protected
+
+    def ensure_flake_config!
+      return if ConfCtl::ConfigType.flake?(ConfCtl::ConfDir.path)
+
+      raise ConfCtl::Error, 'confctl inputs machine is available only in flake configs'
+    end
+  end
+end

data/lib/confctl/cli/inputs/root.rb

@@ -0,0 +1,101 @@
+require 'confctl/cli/command'
+require 'confctl/config_type'
+require 'confctl/flake_lock'
+require 'confctl/pattern'
+require 'confctl/inputs/setter'
+require 'confctl/inputs/updater'
+
+module ConfCtl::Cli
+  class Inputs::Root < Command
+    def list
+      ensure_flake_config!
+
+      lock = ConfCtl::FlakeLock.load(File.join(ConfCtl::ConfDir.path, 'flake.lock'))
+      rows = lock.root_inputs.map do |input_name|
+        info = lock.input_info(input_name)
+        {
+          input: input_name,
+          type: info[:type],
+          ref: info[:ref],
+          rev: info[:short_rev],
+          url: info[:url]
+        }
+      end
+
+      if args[0]
+        rows.select! { |r| ConfCtl::Pattern.match?(args[0], r[:input]) }
+      end
+
+      OutputFormatter.print(rows, %i[input type ref rev url], layout: :columns)
+    end
+
+    def update
+      ensure_flake_config!
+
+      conf_dir = ConfCtl::ConfDir.path
+      inputs = if opts[:all]
+                 lock = ConfCtl::FlakeLock.load_optional(File.join(conf_dir, 'flake.lock'))
+                 raise ConfCtl::Error, 'flake.lock missing; specify inputs explicitly' if lock.nil?
+
+                 lock.root_inputs
+               else
+                 raise GLI::BadCommandLine, 'missing input name (or pass --all)' if args.empty?
+
+                 args
+               end
+
+      raise ConfCtl::Error, 'no inputs selected' if inputs.empty?
+
+      res = ConfCtl::Inputs::Updater.run!(
+        conf_dir: conf_dir,
+        inputs: inputs,
+        commit: opts[:commit],
+        changelog: opts[:changelog],
+        downgrade: opts[:downgrade],
+        editor: opts[:editor]
+      )
+
+      print_update_summary(res[:changes])
+    end
+
+    def set
+      ensure_flake_config!
+      require_args!('input-name', 'rev')
+
+      input = args[0]
+      rev = args[1]
+
+      res = ConfCtl::Inputs::Setter.run!(
+        conf_dir: ConfCtl::ConfDir.path,
+        inputs: [input],
+        rev: rev,
+        commit: opts[:commit],
+        changelog: opts[:changelog],
+        downgrade: opts[:downgrade],
+        editor: opts[:editor]
+      )
+
+      print_update_summary(res[:changes])
+    end
+
+    protected
+
+    def ensure_flake_config!
+      return if ConfCtl::ConfigType.flake?(ConfCtl::ConfDir.path)
+
+      raise ConfCtl::Error, 'inputs is for flake configs only; this config has no flake.nix; use swpins.'
+    end
+
+    def print_update_summary(changes)
+      if changes.empty?
+        puts 'No changes.'
+        return
+      end
+
+      puts "Updated inputs (#{changes.length}):"
+      changes.each do |ch|
+        puts "  #{ch.name}: #{ch.old_short_rev || '-'} -> #{ch.new_short_rev || '-'}"
+      end
+    end
+  end
+end

data/lib/confctl/cli/inputs.rb

@@ -0,0 +1,5 @@
+module ConfCtl::Cli
+  module Inputs; end
+end
+
+require_rel 'inputs'

data/lib/confctl/cli/log_view.rb

@@ -14,8 +14,8 @@ module ConfCtl::Cli
 
     # Instantiate {LogView}, yield and then cleanup
     # @yieldparam log_view [LogView]
-    def self.open(**kwargs)
-      lw = new(**kwargs)
+    def self.open(**)
+      lw = new(**)
       lw.start
 
       begin
@@ -28,8 +28,8 @@ module ConfCtl::Cli
     # Instantiate {LogView} with feed from {ConfCtl::Logger}, yield
     # and then cleanup
     # @yieldparam log_view [LogView]
-    def self.open_with_logger(**kwargs)
-      lw = new(**kwargs)
+    def self.open_with_logger(**)
+      lw = new(**)
       lw.start
 
       lb = ConfCtl::LineBuffer.new { |line| lw << line }
@@ -63,7 +63,7 @@ module ConfCtl::Cli
       @current_size = size if size != :auto
       @reserved_lines = reserved_lines
       @output = output
-      @enabled = output.respond_to?(:tty?) && output.tty?
+      @enabled = output.respond_to?(:tty?) && output.tty? && ConfCtl::Ui.tty?
       @resized = false
       @stop = false
       @generation = 0
@@ -209,7 +209,8 @@ module ConfCtl::Cli
         end
 
         output.print(cursor.clear_line)
-        output.puts("<#{'-' * (cols - 1)}")
+        line_len = [cols - 1, 1].max
+        output.puts("<#{'-' * line_len}")
         output.puts
       end
     end
@@ -220,21 +221,31 @@ module ConfCtl::Cli
       ret = ''
       ret << s
       ret << ' '
-      ret << ('-' * (cols - uncolored.length - 2))
+      dash_count = cols - uncolored.length - 2
+      dash_count = 1 if dash_count < 1
+      ret << ('-' * dash_count)
       ret << '>'
       ret
     end
 
     def fit_line(line)
-      if line.length >= (cols - 4)
-        "#{line[0..(cols - 4)]}..."
+      width = [cols - 4, 1].max
+      if line.length >= width
+        "#{line[0..width]}..."
       else
         line
       end
     end
 
     def fetch_size
-      @rows, @cols = IO.console.winsize
+      console = IO.console
+      rows, cols = console ? console.winsize : [24, 80]
+      rows = rows.to_i
+      cols = cols.to_i
+      rows = 24 if rows <= 0
+      cols = 80 if cols <= 0
+      @rows = rows
+      @cols = cols
 
       return unless size == :auto