messhy 0.9.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14432b60b44c17938ab995bb9e9ca0a360f1381bbfe4f746e3bcc6a07be2e658
-  data.tar.gz: d98203d9b327d971f61e81022611e0f54d9e08673d381ae57fa27b58a55dabeb
+  metadata.gz: fbcab708f43ed1ee21e30b2162ce6ec7aa4e762dfebeea5874d4f0f7d55a46d1
+  data.tar.gz: 5085a9ad4d3f8429e22544d32ca60275eda1079934f4dd63c5a80dd54c0944ec
 SHA512:
-  metadata.gz: c8db3c1b1b7f71680e565c0373b463f4c749d4be645a90f587970a8955ef95d1684dffe2bf46d4cbbaf4de763e4d21482ed7c9e8aa72d4a64c56190c1076038b
-  data.tar.gz: 2e59b8e950931e8f27a4f004a5e9e381176ced1cb670fd16f03045ea4ee0856a2f81e577a5fc07fc5b535d4bd45218989db72b896ec0ab18cfe003af864517aa
+  metadata.gz: 490c2acab762f4f14b39731a1c33408b0e9131316dff4f52ec2b1083d0b03273e475709d47a435cf7566f524013bff90ae7fb4cdb70cfbf5d2b4fc15fe62def8
+  data.tar.gz: 2f29f271a42b84f6f9b205233c175f203fa0a69efe5fc65b119e570a2029cafc2a8e6b4f4cc725aa7da6ac07eabf8216e7c745cf53d66ada9e53e88a89ae649a

data/CHANGELOG.md

@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.9.2] - 2026-10-02
+
+### Changed
+
+- Update development dependencies.
+- Link gem source metadata to the matching release tag.
+
+## [0.9.1] - 2026-09-02
+
+### Fixed
+
+- Preserve live peers outside the source-owned mesh during reconciliation.
+  Exact-source pruning is available only through the explicit `--prune` option.
+
 ## [0.9.0] - 2026-09-02
 
 ### Added

data/README.md

@@ -178,8 +178,11 @@ messhy reconcile --environment=production
 `import-keys` writes the same mode-`0600` local secret files as initial setup
 and never prints key material. `reconcile` validates each candidate config,
 applies active peer changes with `wg syncconf`, and restores the previous config
-if a live sync fails. Set `ssh_known_hosts_file` to a reviewed file when the
-mesh should not depend on the operator's global SSH configuration.
+if a live sync fails. Existing peers outside the source configuration are
+preserved by default so another system can own adjacent mesh members. Pass
+`--prune` only when the source configuration should remove those peers. Set
+`ssh_known_hosts_file` to a reviewed file when the mesh should not depend on
+the operator's global SSH configuration.
 
 ### Status & Monitoring
 

data/lib/messhy/cli.rb

@@ -28,9 +28,10 @@ module Messhy
 
     desc 'reconcile', 'Apply mesh changes without restarting active WireGuard interfaces'
     option :dry_run, type: :boolean, default: false
+    option :prune, type: :boolean, default: false, desc: 'Remove live peers absent from the source configuration'
     def reconcile
       config = load_config
-      Installer.new(config, dry_run: options[:dry_run]).reconcile
+      Installer.new(config, dry_run: options[:dry_run], prune: options[:prune]).reconcile
     rescue SSHKit::Runner::ExecuteError => e
       handle_ssh_error(e, config)
     end

data/lib/messhy/host_trust_manager.rb

@@ -8,7 +8,7 @@ module Messhy
     DEFAULT_TIMEOUT = 5
     DEFAULT_KEY_TYPES = %w[ed25519 ecdsa rsa].freeze
 
-    # rubocop:disable Metrics/ParameterLists
+    # rubocop:disable-next Metrics/ParameterLists
     def initialize(config,
                    known_hosts_path: File.expand_path('~/.ssh/known_hosts'),
                    timeout: DEFAULT_TIMEOUT,
@@ -22,7 +22,6 @@ module Messhy
       @hash_hosts = hash_hosts
       @replace_existing = replace_existing
     end
-    # rubocop:enable Metrics/ParameterLists
 
     def trust_all_hosts
       ensure_ssh_keyscan!

data/lib/messhy/installer.rb

@@ -7,13 +7,14 @@ require 'digest'
 require 'base64'
 
 module Messhy
-  # rubocop:disable Metrics/ClassLength
+  # rubocop:disable-next Metrics/ClassLength
   class Installer
-    attr_reader :config, :dry_run, :ssh_executor
+    attr_reader :config, :dry_run, :prune, :ssh_executor
 
-    def initialize(config, dry_run: false, ssh_executor: SSHExecutor.new(config))
+    def initialize(config, dry_run: false, prune: false, ssh_executor: SSHExecutor.new(config))
       @config = config
       @dry_run = dry_run
+      @prune = prune
       @ssh_executor = ssh_executor
       @node_keys = load_existing_keys
       @psk_map = load_existing_psks
@@ -52,6 +53,7 @@ module Messhy
         if dry_run
           puts "  [DRY RUN] Would reconcile #{node_name}"
         else
+          config_content = preserve_unmanaged_peers(node_name, config_content) unless prune
           ssh_executor.reconcile_config(node_name, config_content)
           puts "  ✓ Reconciled #{node_name}"
         end
@@ -179,6 +181,12 @@ module Messhy
 
     private
 
+    def preserve_unmanaged_peers(node_name, config_content)
+      current = WireguardConfig.parse(ssh_executor.read_wireguard_config(node_name))
+      managed_peer_names = config.node_names - [node_name]
+      current.preserve_unmanaged_peers_in(config_content, managed_peer_names: managed_peer_names)
+    end
+
     def validate_imported_address!(node_name, node_config, snapshot)
       address = snapshot.interface['Address'].to_s.split('/').first
       return if address == node_config['mesh_ip']
@@ -414,5 +422,4 @@ module Messhy
       base[0, 44]
     end
   end
-  # rubocop:enable Metrics/ClassLength
 end

data/lib/messhy/mesh_builder.rb

@@ -12,7 +12,7 @@ module Messhy
       @psk_map = psk_map
     end
 
-    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable-next Metrics/AbcSize
     def build_config_for_node(node_name)
       node_config = config.node_config(node_name)
       raise Error, "Node not found: #{node_name}" unless node_config
@@ -73,7 +73,6 @@ module Messhy
       binding_context = binding
       template.result(binding_context)
     end
-    # rubocop:enable Metrics/AbcSize
 
     def build_all_configs
       configs = {}

data/lib/messhy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Messhy
-  VERSION = '0.9.0'
+  VERSION = '0.9.2'
 end

data/lib/messhy/wireguard_config.rb

@@ -36,5 +36,33 @@ module Messhy
 
       self
     end
+
+    def preserve_unmanaged_peers_in(candidate_content, managed_peer_names:)
+      candidate = self.class.parse(candidate_content)
+      candidate_public_keys = candidate.peers.filter_map { |peer| peer['PublicKey'] }
+      managed_peer_names = managed_peer_names.to_set
+
+      unmanaged_peers = peers.reject do |peer|
+        managed_peer_names.include?(peer['Name']) || candidate_public_keys.include?(peer['PublicKey'])
+      end
+
+      return candidate_content if unmanaged_peers.empty?
+
+      [candidate_content.rstrip, *unmanaged_peers.map { |peer| render_peer(peer) }, ''].join("\n\n")
+    end
+
+    private
+
+    def render_peer(peer)
+      lines = []
+      lines << "# Peer: #{peer['Name']}" if peer['Name']
+      lines << '[Peer]'
+      peer.each do |key, value|
+        next if key == 'Name'
+
+        lines << "#{key} = #{value}"
+      end
+      lines.join("\n")
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: messhy
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.2
 platform: ruby
 authors:
 - BoringCache
@@ -99,7 +99,7 @@ homepage: https://github.com/boringcache/messhy
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/boringcache/messhy
+  source_code_uri: https://github.com/boringcache/messhy/tree/v0.9.2
   documentation_uri: https://github.com/boringcache/messhy/blob/main/README.md
   changelog_uri: https://github.com/boringcache/messhy/blob/main/CHANGELOG.md
   bug_tracker_uri: https://github.com/boringcache/messhy/issues