mark-twin 0.1.3 → 0.3.0

data/lib/twin/sync.rb

@@ -1,9 +1,23 @@
 require "fileutils"
 
+require_relative "remote"
+
 module Twin
   module Sync
     module_function
 
+    # A line from `rsync --itemize-changes` describing a real change: an
+    # itemize code whose first column is the update type (< > c h *) and second
+    # the file type (f d L D S), e.g. ">f+++++++++", "cd+++++++++", "*deleting".
+    # No-op runs emit no such line; headers ("sending …", "created directory …")
+    # and the summary don't match. Deterministic — no scraping of prose.
+    ITEMIZE_CHANGE = /\A[<>ch*][fdLDS]/
+
+    # True when rsync reported at least one changed item.
+    def transferred?(output)
+      output.lines.any? { |l| ITEMIZE_CHANGE.match?(l) }
+    end
+
     # True if the path lives on a mounted volume other than the root filesystem.
     # Walks up parents until it finds a mount point (different device than parent)
     # or hits "/" (path is on the root volume, not externally mounted).
@@ -20,16 +34,109 @@ module Twin
       false
     end
 
-    # Sync one Job. Returns [success, combined_output].
-    def run_job(cfg, job, dry_run: false)
+    # Render a template Job: read source, substitute {{vars}}, write if changed.
+    # Returns [success, output, changed].
+    def render_job(cfg, job, dry_run: false)
+      return [false, "render: remote targets are not supported", false] if job.remote?
+
       src = job.source_path
       tgt = job.target_path
 
-      return [false, "source not found: #{src}"] unless File.exist?(src)
+      return [false, "source not found: #{src}", false] unless File.exist?(src)
+      return [false, "render: source must be a file, not a directory: #{src}", false] if File.directory?(src)
+
+      begin
+        rendered = Twin::Template.render_file(src, cfg.var_map, context: job.path)
+      rescue => e
+        return [false, e.message, false]
+      end
+
+      if dry_run
+        return [true, "(dry-run) would render #{File.basename(src)} → #{tgt}", false]
+      end
 
       FileUtils.mkdir_p(File.dirname(tgt))
 
-      args = ["rsync", "-av", "--update"]
+      current = File.exist?(tgt) ? File.binread(tgt) : nil
+      changed = (current != rendered)
+
+      if changed
+        File.binwrite(tgt, rendered)
+        output = "rendered #{File.basename(src)} → #{tgt}"
+      else
+        output = "#{File.basename(src)}: content unchanged"
+      end
+
+      if !job.cmd.empty?
+        if changed
+          cmd_out, cmd_status = run(["sh", "-c", job.cmd])
+          output += "\ncmd: #{job.cmd}\n#{cmd_out}"
+          unless cmd_status.success?
+            output += "cmd failed (exit #{cmd_status.exitstatus})"
+            return [false, output, changed]
+          end
+        else
+          output += "\ncmd skipped (content unchanged)"
+        end
+      end
+
+      [true, output, changed]
+    end
+
+    # Sync one Job. Returns [success, combined_output, transferred].
+    # transferred is true when rsync actually moved bytes (false on no-op or dry_run).
+    def run_job(cfg, job, dry_run: false)
+      return render_job(cfg, job, dry_run: dry_run) if job.render
+
+      src = job.source_path
+      tgt = job.target_path
+
+      return [false, "source not found: #{src}", false] unless File.exist?(src)
+
+      if job.remote?
+        host, rpath = Twin::Remote.split(tgt)
+        unless dry_run || Twin::Remote.mkdir_p(host, File.dirname(rpath))
+          return [false, "ssh: could not create #{File.dirname(rpath)} on #{host}", false]
+        end
+      else
+        FileUtils.mkdir_p(File.dirname(tgt))
+      end
+
+      output, status = run(rsync_args(cfg, job, dry_run: dry_run))
+      return [false, output, false] unless status.success?
+
+      xfr = !dry_run && transferred?(output)
+
+      if job.conflict && !xfr && !dry_run
+        output += "\nskipped: target is newer, source not synced"
+      end
+
+      if !job.cmd.empty? && !dry_run
+        if xfr
+          cmd_out, cmd_status = run(["sh", "-c", job.cmd])
+          output += "\ncmd: #{job.cmd}\n#{cmd_out}"
+          unless cmd_status.success?
+            output += "cmd failed (exit #{cmd_status.exitstatus})"
+            return [false, output, xfr]
+          end
+        else
+          output += "\ncmd skipped (nothing transferred)"
+        end
+      end
+
+      [true, output, xfr]
+    end
+
+    # Full rsync argument vector for a job.
+    def rsync_args(cfg, job, dry_run: false)
+      src = job.source_path
+      tgt = job.target_path
+
+      args = ["rsync", "-av", "--itemize-changes", "--update"]
+      if job.delete
+        args << "--delete"
+        args.concat(backup_args(job))
+      end
       args << "--dry-run" if dry_run
       cfg.global_excludes.each { |ex| args << "--exclude=#{ex}" }
       job.excludes.each       { |ex| args << "--exclude=#{ex}" }
@@ -39,17 +146,23 @@ module Twin
       else
         args << src << tgt
       end
+      args
+    end
 
-      output, status = run(args)
-      return [false, output] unless status.success?
-
-      if !job.cmd.empty? && !dry_run
-        cmd_out, cmd_status = run(["sh", "-c", job.cmd])
-        output += "\ncmd: #{job.cmd}\n#{cmd_out}"
-        return [false, output] unless cmd_status.success?
-      end
+    # Safety net for --delete: deleted and overwritten files land in a
+    # per-run backup dir on the target side (<target>/.twin-backup/<stamp>).
+    # rsync only creates the dir when it actually backs something up.
+    # The exclude keeps a backup dir inside the transfer root (Path: ".")
+    # from being deleted by the very sync it protects against.
+    def backup_args(job)
+      root = job.remote? ? Twin::Remote.split(job.target).last : job.target
+      dir  = File.join(root, ".twin-backup", run_stamp)
+      ["--backup", "--backup-dir=#{dir}", "--exclude=.twin-backup/"]
+    end
 
-      [true, output]
+    # One timestamp per twin process, so a multi-job run shares a backup dir.
+    def run_stamp
+      @run_stamp ||= Time.now.strftime("%Y-%m-%d_%H%M%S")
     end
 
     # Sync all jobs in a Program. Returns array of [job, success, output].

data/lib/twin/template.rb

@@ -0,0 +1,36 @@
+module Twin
+  module Template
+    PATTERN = /\{\{([^}]+)\}\}/
+
+    # Fields in a grubber record that may contain {{tokens}}.
+    FIELDS = %w[Source Target Path Target-Path Exclude Cmd].freeze
+
+    module_function
+
+    # Replace {{token}} in value using vars. Raises on unknown token.
+    def substitute(value, vars, context:)
+      return value unless value.is_a?(String)
+      value.gsub(PATTERN) do
+        token = $1
+        vars.fetch(token) { raise "unknown template token {{#{token}}} in #{context}" }
+      end
+    end
+
+    # Read a template file and substitute {{tokens}} in its content.
+    # Binary read preserves bytes exactly; raises on unknown token.
+    def render_file(path, vars, context:)
+      substitute(File.binread(path), vars, context: context)
+    end
+
+    # Return a copy of grubber record r with FIELDS substituted.
+    def substitute_record(r, vars, context:)
+      return r if vars.empty?
+      result = r.dup
+      FIELDS.each do |field|
+        next unless result.key?(field) && result[field].is_a?(String)
+        result[field] = substitute(result[field], vars, context: context)
+      end
+      result
+    end
+  end
+end

data/lib/twin/version.rb

@@ -1,3 +1,3 @@
 module Twin
-  VERSION = "0.1.3"
+  VERSION = "0.3.0"
 end

data/lib/twin.rb

@@ -1,7 +1,11 @@
 require_relative "twin/version"
+require_relative "twin/remote"
+require_relative "twin/template"
 require_relative "twin/config"
 require_relative "twin/scanner"
 require_relative "twin/sync"
+require_relative "twin/journal"
+require_relative "twin/add"
 require_relative "twin/preview"
 require_relative "twin/picker"
 require_relative "twin/cli"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mark-twin
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Ralf Hülsmann
@@ -37,12 +37,16 @@ files:
 - README.md
 - bin/twin
 - lib/twin.rb
+- lib/twin/add.rb
 - lib/twin/cli.rb
 - lib/twin/config.rb
+- lib/twin/journal.rb
 - lib/twin/picker.rb
 - lib/twin/preview.rb
+- lib/twin/remote.rb
 - lib/twin/scanner.rb
 - lib/twin/sync.rb
+- lib/twin/template.rb
 - lib/twin/version.rb
 homepage: https://github.com/rhsev/mark-twin
 licenses: