confctl 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df6cafd6791e22c22b68c7513f10275c4f472fb155145451bcfe309d5e542b23
-  data.tar.gz: b594538eed2e3ee692417a5acf7035e90570928556585a190f1338baf36b6603
+  metadata.gz: 145a3b775c32414d32bf6dba2e9dbf69db302f1893f92f78cd5c5dc3f7bdca4a
+  data.tar.gz: fb1357049bec71e36b4d6fc9e76d0bf0ac8e620f10e7a3ebed8056ba8d6fc848
 SHA512:
-  metadata.gz: 00af7a05b9712db251a4f8e74550368984628a23a5d0a8292f106ed75272d1264af2f8567a8b48fd9f8dbe9dab3c7ee781af7c6c5685c401d120e239b156525d
-  data.tar.gz: 70af2cf269e92e6c940a98ab79ae9ae5619326faee1031167e84d8b1c2713bf04e6d474bdef5c500cacfe314ccd5c3c329d124ccb31452ca3b0ec9e8d8e3f222
+  metadata.gz: 30fa519e81a6bc96de302e573cfdef8d4aef4a5f0ce918778e94132c7cc6de661c26d3206c9223b4b9e1dbd295c4d4a902100504d0563f8ba64e015db022c952
+  data.tar.gz: 1158a757fea8cd633edc95b976e6db9ec65797fa1623f3cb20912b870dc0b6180bbdc37e5e7d788c8ddb5505d819a8322ff4d7f4e72e3f9b2fd50fe250a3486b

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 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
 

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.2'.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.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Jakub Skokan