confctl 2.2.1 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 177750f0895253859248355f7d3ffaf9ccdbeb7bfb5a0a24bc7fb6900ada9e18
-  data.tar.gz: f82c2f42f94f1c66745a6f9a930fd71a5a0dd32df1b5bb3ded9fe4f88a7c16f0
+  metadata.gz: 145a3b775c32414d32bf6dba2e9dbf69db302f1893f92f78cd5c5dc3f7bdca4a
+  data.tar.gz: fb1357049bec71e36b4d6fc9e76d0bf0ac8e620f10e7a3ebed8056ba8d6fc848
 SHA512:
-  metadata.gz: 760828ccbc067e319285146680c3f110d7ac545d990f8a254a24a2fdca6b71e44604c040acc277dafe5d99140ce1f594e173b2ab90150dd2d9cb94453869501d
-  data.tar.gz: 233f7c9b05e1fc4827c64d5d27736ffcedf2b181e6100007c5c858c144bb4899744ae77357c9e05e0a7ce8c38636c46d17fd69da2d5c06882af7a8f65056d4fe
+  metadata.gz: 30fa519e81a6bc96de302e573cfdef8d4aef4a5f0ce918778e94132c7cc6de661c26d3206c9223b4b9e1dbd295c4d4a902100504d0563f8ba64e015db022c952
+  data.tar.gz: 1158a757fea8cd633edc95b976e6db9ec65797fa1623f3cb20912b870dc0b6180bbdc37e5e7d788c8ddb5505d819a8322ff4d7f4e72e3f9b2fd50fe250a3486b

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# Fri Jun 06 2025 -- version 2.2.3
+- Open git commit editor only when running in a terminal
+
+# Fri Jun 06 2025 -- version 2.2.2
+- Fix `--[no-]editor` option on `confctl swpins cluster/channel update` commands
+
 # Fri Jun 06 2025 -- version 2.2.1
 - Fix `--[no-]editor` option on `confctl swpins core` commands
 

data/lib/confctl/cli/app.rb

@@ -561,6 +561,9 @@ module ConfCtl::Cli
         c.desc 'Include changelog 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 'Generate changelog for downgrade'
         c.switch %i[d downgrade], default_value: false
 

data/lib/confctl/cli/output_formatter.rb

@@ -185,9 +185,7 @@ module ConfCtl::Cli
             v = o[i]
           end
 
-          # rubocop:disable Lint/FormatParameterMismatch
           line format("%#{w}s:  %s", c[:label], v)
-          # rubocop:enable Lint/FormatParameterMismatch
         end
 
         line

data/lib/confctl/swpins/change_set.rb

@@ -55,7 +55,7 @@ module ConfCtl
       git_commit = [
         'git',
         'commit',
-        editor ? '-e' : nil,
+        use_editor?(editor) ? '-e' : nil,
         '-m', build_message(type, changelog),
         *changed_files
       ].compact
@@ -154,5 +154,9 @@ module ConfCtl
 
       true
     end
+
+    def use_editor?(editor)
+      editor && $stdout.tty?
+    end
   end
 end

data/lib/confctl/version.rb

@@ -1,3 +1,3 @@
 module ConfCtl
-  VERSION = '2.2.1'.freeze
+  VERSION = '2.2.3'.freeze
 end

data/nix/modules/confctl/carrier/netboot/build-netboot-server.rb

@@ -723,12 +723,9 @@ class Machine
     @spin = @current.json.fetch('spin', spin)
     @fqdn = @current.json.fetch('fqdn', name)
 
-    # rubocop:disable Naming/MemoizedInstanceVariableName
     @label = @current.json.fetch('label', nil)
     @label ||= @current.json.fetch('fqdn', nil)
     @label ||= name
-    # rubocop:enable Naming/MemoizedInstanceVariableName
-
     @short_label = @label.split('.')[0..1].join('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: confctl
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.3
 platform: ruby
 authors:
 - Jakub Skokan