confctl 2.2.2 → 3.0.0

data/lib/confctl/cli/app.rb

@@ -36,6 +36,9 @@ module ConfCtl::Cli
 
       desc 'Create a new configuration'
       command :init do |c|
+        c.desc 'Create legacy swpins-based configuration (non-flake)'
+        c.switch %i[swpins legacy], default_value: false
+
         c.action(&Command.run(c, Configuration, :init))
       end
 
@@ -145,6 +148,148 @@ module ConfCtl::Cli
         end
       end
 
+      desc 'Manage flake inputs (replacement for swpins in flake configs)'
+      command :inputs do |inputs|
+        inputs.desc 'List root-level flake inputs and their locked revisions'
+        inputs.arg_name '[input-pattern]'
+        inputs.command :ls do |c|
+          c.action(&Command.run(c, Inputs::Root, :list))
+        end
+
+        inputs.desc 'Update flake inputs in flake.lock'
+        inputs.arg_name '[input-name ...]'
+        inputs.command :update do |c|
+          c.desc 'Commit changes to git'
+          c.switch :commit, default_value: false
+
+          c.desc 'Include git log in the commit message'
+          c.switch :changelog, default_value: true
+
+          c.desc 'Open $EDITOR with commit message'
+          c.switch :editor, default_value: true
+
+          c.desc 'Treat change as downgrade for changelog direction'
+          c.switch %i[d downgrade], default_value: false
+
+          c.desc 'Update all root inputs (dangerous; normally specify names)'
+          c.switch :all, default_value: false
+
+          c.action(&Command.run(c, Inputs::Root, :update))
+        end
+
+        inputs.desc 'Set a flake input to a specific revision'
+        inputs.arg_name '<input-name> <rev>'
+        inputs.command :set do |c|
+          c.desc 'Commit changes to git'
+          c.switch :commit, default_value: false
+
+          c.desc 'Include git log in the commit message'
+          c.switch :changelog, default_value: true
+
+          c.desc 'Open $EDITOR with commit message'
+          c.switch :editor, default_value: true
+
+          c.desc 'Treat change as downgrade for changelog direction'
+          c.switch %i[d downgrade], default_value: false
+
+          c.action(&Command.run(c, Inputs::Root, :set))
+        end
+
+        inputs.desc 'Channel-based input operations'
+        inputs.command :channel do |ch|
+          ch.desc 'List channels and their role->input mapping (with locked revisions)'
+          ch.arg_name '[channel-pattern]'
+          ch.command :ls do |c|
+            c.action(&Command.run(c, Inputs::Channels, :list))
+          end
+
+          ch.desc 'Update inputs referenced by channels (optionally only a single role)'
+          ch.arg_name '<channels> [role]'
+          ch.command :update do |c|
+            c.switch :commit, default_value: false
+            c.switch :changelog, default_value: true
+            c.switch :editor, default_value: true
+            c.switch %i[d downgrade], default_value: false
+            c.action(&Command.run(c, Inputs::Channels, :update))
+          end
+
+          ch.desc 'Set inputs referenced by channels for a role to a specific revision'
+          ch.arg_name '<channels> <role> <rev>'
+          ch.command :set do |c|
+            c.switch :commit, default_value: false
+            c.switch :changelog, default_value: true
+            c.switch :editor, default_value: true
+            c.switch %i[d downgrade], default_value: false
+            c.desc 'Allow setting inputs shared with other channels/roles'
+            c.switch :allow_shared, default_value: false
+            c.action(&Command.run(c, Inputs::Channels, :set))
+          end
+        end
+
+        inputs.desc 'Machine-based input operations'
+        inputs.command :machine do |m|
+          m.desc 'Update the input used by a specific machine for a specific role'
+          m.arg_name '<machine> <role>'
+          m.command :update do |c|
+            c.switch :commit, default_value: false
+            c.switch :changelog, default_value: true
+            c.switch :editor, default_value: true
+            c.switch %i[d downgrade], default_value: false
+            c.action(&Command.run(c, Inputs::Machines, :update))
+          end
+
+          m.desc 'Set the input used by a specific machine for a specific role to a revision'
+          m.arg_name '<machine> <role> <rev>'
+          m.command :set do |c|
+            c.switch :commit, default_value: false
+            c.switch :changelog, default_value: true
+            c.switch :editor, default_value: true
+            c.switch %i[d downgrade], default_value: false
+            c.action(&Command.run(c, Inputs::Machines, :set))
+          end
+        end
+      end
+
+      desc 'Migration helpers'
+      command :migrate do |m|
+        m.desc 'Migrate swpins-based configuration repository to flake-based inputs'
+        m.command :'swpins-to-flakes' do |stf|
+          stf.desc 'Assume yes for all prompts'
+          stf.switch %i[y yes], default_value: false
+
+          stf.desc 'Do not modify files, only print what would be done'
+          stf.switch %i[n dry-run], default_value: false
+
+          # Default action = run full migration
+          stf.action(&Command.run(stf, Migrate::SwpinsToFlakes, :all))
+
+          stf.desc 'Create flake.nix (+ lock revisions from swpins)'
+          stf.command :flake do |c|
+            c.action(&Command.run(c, Migrate::SwpinsToFlakes, :flake))
+          end
+
+          stf.desc 'Rewrite cluster/**/module.nix metadata to use inputs.*'
+          stf.command :machines do |c|
+            c.action(&Command.run(c, Migrate::SwpinsToFlakes, :machines))
+          end
+
+          stf.desc 'Scan for legacy <...> imports and optionally enable legacyNixPath'
+          stf.command :imports do |c|
+            c.action(&Command.run(c, Migrate::SwpinsToFlakes, :imports))
+          end
+
+          stf.desc 'Remove swpins/ and other legacy files'
+          stf.command :clean do |c|
+            c.action(&Command.run(c, Migrate::SwpinsToFlakes, :clean))
+          end
+
+          stf.desc 'Run the full migration (same as running without a subcommand)'
+          stf.command :all do |c|
+            c.action(&Command.run(c, Migrate::SwpinsToFlakes, :all))
+          end
+        end
+      end
+
       desc 'List configured machines'
       arg_name '[machine-pattern]'
       command :ls do |c|

data/lib/confctl/cli/attr_filters.rb

@@ -45,7 +45,7 @@ module ConfCtl::Cli
       return false unless i
 
       len = sep.length
-      [v[0..i - 1], v[i + len..]]
+      [v[0..(i - 1)], v[(i + len)..]]
     end
   end
 end