mark-twin 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e643b14b2fe0dd153539ff16d10a0950f3c478d327620dec1b9b04d7af4f340
-  data.tar.gz: 4eb24c0280ee5f1085024c1357a6d7b8dd0b7f16198e3cce8b4c9ce5849705b5
+  metadata.gz: 519b3a75fa38033ef08e8b3b41c2542e05b4525447ba36ddfc590d6d97d863cc
+  data.tar.gz: 13041e31c2c5fd66ceae626b14cb01bb54cd97b4ecc79aa76924056e95b40023
 SHA512:
-  metadata.gz: 7d5567dc0637bc767f7ddff5716a2e5031902e787958e1ecd69f54931e737b2946d82c999637d6610d732e5063898c3b717b49148f8e495af328ea2f0b716d03
-  data.tar.gz: 94df8bd72ea5548e668b1173e17b9e9bf54efc1fbca4576c109ed64740794decb94eb23fab78c50ed2b0654bc2160bb1a4be85c74a2f9281bd2a178e0f33b270
+  metadata.gz: '07758fd73934de83ac8690f63da7d208c6921af143928c0de4d0a60d230bd50541cef667a5896b95261e0efa742d92669ea21a12874a9ee539e714f8679568dc'
+  data.tar.gz: 20cd8530927aa75138ddef786044166dbaded5b82d143890204926d3398d3bfbbbd1ea28346f5d32864e55f69c88ae6c1954cb0a960a5d345347c7bf7336400f

data/README.md

@@ -39,7 +39,9 @@ way.
 That is the whole idea, and for most entries it stays as small as the excerpt
 above. The rest of this README is long because twin also covers more complex
 cases: files that are specific to the other computer, files that have changed
-on both sides since the last sync, and paths that differ per host.
+on both sides since the last sync, and paths that differ per host. If you are
+wondering how this differs from chezmoi and its kind:
+[Alternatives](#alternatives).
 
 ## Why Markdown
 
@@ -492,6 +494,27 @@ global_excludes:
 Environment overrides: `TWIN_SYNC_DIR`, `TWIN_CONFIG`, `TWIN_HOST` (which host
 twin runs as — lets one config serve both machines).
 
+## Alternatives
+
+twin overlaps with the dotfile managers without being one: it syncs whatever
+you want, documents included, but it specialises in configuration files.
+Taking [chezmoi](https://chezmoi.io) as the most capable representative of
+its kind:
+
+| | twin | dotfile managers (e.g. chezmoi) |
+|---|---|---|
+| Focus | deliberate sync between a few machines | converging many machines from one repo |
+| Model | interactive: pick, preview, sync | git: commit, push, apply |
+| Where the *why* lives | prose next to the YAML block, same file | commit messages, separate docs |
+| Conflicts | stops and asks, diff in hand | three-way merge on apply |
+| Templating | host paths (`{{dst.home}}`) | full engine, secrets from password managers |
+| Scale | two or three Macs/servers | dozens of machines |
+
+If you want a fleet converging automatically, or secrets injected at apply
+time, choose chezmoi. twin is built for the smaller case: easy to configure,
+with room to read and think about what the target changed before it gets
+overwritten.
+
 ## Design
 
 Sync instructions and their context in one place. No TUI framework: `fzf` does

data/lib/twin/remote.rb

@@ -64,17 +64,26 @@ module Twin
       )
       return nil unless status.success?
 
+      parse_stats(out)
+    rescue Errno::ENOENT
+      nil # ssh not installed
+    end
+
+    # Nur echte Epochen als Zeit werten. Scheitert die ganze stat-Kette, ist
+    # das Feld leer — das ist "unbekannt", nicht 1970. Und unbekannt ist
+    # nicht fehlend: "-" heißt, die Datei ist nicht da; nil heißt, sie ist
+    # da, aber niemand konnte ihre mtime nennen.
+    def parse_stats(out)
       result = {}
       out.each_line do |line|
         path, mtime = line.chomp.split("\t", 2)
         next unless path && mtime
-        # Nur echte Epochen als Zeit werten. Scheitert die ganze stat-Kette,
-        # ist das Feld leer — das ist "unbekannt", nicht 1970.
-        result[path] = mtime.match?(/\A\d+\z/) ? Time.at(mtime.to_i) : nil
+        result[path] =
+          if mtime == "-" then :missing
+          elsif mtime.match?(/\A\d+\z/) then Time.at(mtime.to_i)
+          end
       end
       result
-    rescue Errno::ENOENT
-      nil # ssh not installed
     end
 
     # Checksum many paths in one ssh round-trip, same shape as stat_paths:

data/lib/twin/scanner.rb

@@ -114,11 +114,14 @@ module Twin
             j.target_unreachable = true
             next
           end
-          mtime = stats[rpath]
-          j.target_exists = !mtime.nil?
-          j.target_mtime  = mtime
-          j.conflict      = !j.directory && j.source_exists && mtime && j.source_mtime &&
-                            mtime - j.source_mtime >= 60
+          # :missing = not there; nil = there, but the stat chain could not
+          # name an mtime (degrades to unknown, exactly what doctor warns).
+          # A path absent from the answer counts as missing, not as unknown.
+          mtime = stats.fetch(rpath, :missing)
+          j.target_exists = mtime != :missing
+          j.target_mtime  = mtime.is_a?(Time) ? mtime : nil
+          j.conflict      = !j.directory && j.source_exists && j.target_mtime &&
+                            j.source_mtime && j.target_mtime - j.source_mtime >= 60
         end
         verify_remote_file_content(host, host_jobs)
       end

data/lib/twin/version.rb

@@ -1,3 +1,3 @@
 module Twin
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mark-twin
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Ralf Hülsmann