wslc-wip 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3599b0a90a3528f5366a5ea007c213b60d66e47070e0ab419f267c7786587760
-  data.tar.gz: 5afad9f0783d325bdf5ccc72f84d3b4e7308ff326dab3c5d0837e029ab5b234e
+  metadata.gz: afc914ac16e4359e48e682f5dab523827ad782251365abee7abd60b6eee89044
+  data.tar.gz: dcc97ec1bace3262bc1c419162085de6a3f5e24f0dde8babb2532ef9bdd6446c
 SHA512:
-  metadata.gz: e57b54f645f50bc881a3702f54cb3a91ce099351047b75bd00df8aebfdea2536fb257756dd6f7d2277d629578d6afa764c7531befcd8b3b4eaf58e6174bbb818
-  data.tar.gz: cc735ce314bd1c1f5e8f543d1a4f145dd61465cb236f8c99adc79d73104d454f00d4d79d0087daefa0be5b877eab76166ca14b3c87dff8892d469421de512e4e
+  metadata.gz: 526f9730c15eb6beabda31c3df3ee95cac2f8058c6da2dddf27100aadb48276bb68d66a3ede2b7383f49ecb6cd6fd45604b39ec1130058718cfbf439e7629f5a
+  data.tar.gz: 87a5f6c40e948fabdc79eeaf3e81cb73fac3cdb0fdd306189a72a437f459de22deeb57fbd92167411c157485d66dd82f40734f72316f46cb65fe6aa74b111511

data/README.md

@@ -44,6 +44,7 @@ Put a `wip.yml` in your project root. Running from a subdirectory walks up to fi
 
 ```yaml
 version: 1
+mode: container # or compose; picks the orchestration path `up`/`down`/`sync`/etc. take (default: container)
 wslc:
   command: auto # tries wslc.exe, wslc, then System32; an absolute path also works
 defaults:
@@ -156,6 +157,8 @@ sync:
   command: rsync     # binary that does the mirroring (default: rsync)
   options: []        # extra flags appended to the rsync invocation
   interval: 2        # seconds between syncs for `wip sync --watch` (default: 2)
+  mode: exec         # exec (mirror inside the running container) or run (a throwaway one);
+                      # default: exec for `mode: container`, run for `mode: compose`
 ```
 
 Everything below `sync:` is optional — `sync: {}` alone already works. With it in place:
@@ -166,8 +169,10 @@ Everything below `sync:` is optional — `sync: {}` alone already works. With it
   `dependencies:` keep mounting whatever they declare.
 - `wip up` mirrors the source into the volume before the container boots; `wip up --no-sync`
   skips that step.
-- `wip sync` mirrors on demand — `wslc exec`ing rsync inside the container when it's running, and
-  falling back to a throwaway container with the same mounts when it isn't.
+- `wip sync` mirrors on demand: `sync.mode: exec` (the default under `mode: container`) execs
+  rsync inside the already-running container; `sync.mode: run` always uses a throwaway container
+  with the same mounts instead. Which one runs is fixed by config, not guessed at from whether a
+  container happens to be up.
 - `wip sync --watch [--interval N]` keeps re-syncing until Ctrl-C, so host edits reach the
   container with a short delay. Run it in a second terminal alongside `wip up -d`.
 - `wip doctor` reports the resolved source, volume, and target, and fails if the source is missing.
@@ -181,8 +186,11 @@ image already has. And the mirror is one-way (host → volume): anything the app
 `target` is removed by the next `--delete` pass unless you `exclude` it, give it its own volume,
 or set `delete: false`.
 
-`sync:` is mutually exclusive with `compose:` — in compose mode the compose file owns the volume
-layout.
+`sync:` works alongside `mode: compose` too. Compose still owns the volume layout — a compose
+service must mount the same named volume `sync.volume` names — but wip's mirror runs as its own
+throwaway container (`sync.mode` defaults to `run` and can't be set to `exec` under `mode:
+compose`, since only a container wip itself booted is guaranteed to have the read-only source
+mount attached).
 
 ### Compose mode
 
@@ -191,6 +199,7 @@ If your project already has a real `compose.yml`, don't duplicate it in `depende
 
 ```yaml
 version: 1
+mode: compose              # required to enable compose mode; a compose: block with no mode: compose is an error
 compose:
   service: app             # required: which compose service wip run/exec/NAME target
   command: wslc-compose    # required: the compose-for-wslc binary/path you have installed

data/lib/wip/cli.rb

@@ -271,15 +271,14 @@ module Wip
            "run it with `wip dispatch #{name}`"
     end
 
-    # Inside the running container the mirror is a plain `exec`; otherwise it
-    # takes a throwaway container that mounts the same source and volume.
+    # sync.mode picks the path explicitly (default: exec for mode: container,
+    # run for mode: compose) rather than probing whether a container happens
+    # to be running under a matching name.
     def run_sync(exit_on_failure: true)
-      command = container_running? ? builder.sync_exec : builder.sync_run
+      command = sync_settings!.exec? ? builder.sync_exec : builder.sync_run
       execute(command, exit_on_failure: exit_on_failure)
     end
 
-    def container_running? = resource_exists?(builder.find_running)
-
     def sync_before_boot
       settings = load_config.sync
       return unless settings

data/lib/wip/command_builder.rb

@@ -49,13 +49,9 @@ module Wip
       [@wslc, 'list', '--all', '--filter', "name=#{container}", '--format', 'json']
     end
 
-    def find_running
-      container = required(@config.defaults, 'container')
-      [@wslc, 'list', '--filter', "name=#{container}", '--format', 'json']
-    end
-
-    # Mirrors into the volume from a throwaway container, for when the app
-    # container isn't running yet (or at all) — e.g. just before `up` boots it.
+    # Mirrors into the volume from a throwaway container. Used for sync.mode:
+    # run (compose's default, and mode: container's fallback for when the app
+    # container isn't running yet — e.g. just before `up` boots it).
     def sync_run
       sync = required_sync
       command = [@wslc, 'run', '--rm']
@@ -63,8 +59,10 @@ module Wip
       command.push(required(@config.defaults, 'image')).concat(sync.mirror_command)
     end
 
-    # Mirrors from inside the running container, which already has both the
-    # read-only source mount and the volume attached.
+    # Mirrors from inside the already-running container. Only valid for
+    # sync.mode: exec (mode: container's default), since only a container wip
+    # itself booted is guaranteed to have both the read-only source mount and
+    # the volume attached.
     def sync_exec
       [@wslc, 'exec', required(@config.defaults, 'container'), *required_sync.mirror_command]
     end

data/lib/wip/config.rb

@@ -6,6 +6,10 @@ module Wip
     DEFAULTS = { 'container' => 'app', 'workdir' => '/app', 'interactive' => false,
                  'remove' => true, 'env' => {}, 'ports' => [], 'volumes' => [] }.freeze
     SECRET_PATTERN = /token|password|secret|credential|auth/i
+    # Which orchestration path `up`/`down`/`sync`/etc. take. Explicit rather than
+    # inferred from a `compose:` block's presence, so a config reader doesn't have
+    # to know that rule to predict which mode wip runs in.
+    MODES = %w[container compose].freeze
     attr_reader :path
 
     def initialize(raw, path = nil)
@@ -20,8 +24,9 @@ module Wip
     def up_command = @raw.dig('up', 'command')
     def dependencies = @raw['dependencies'] || {}
     def network = defaults['network']
+    def mode = @raw['mode'] || 'container'
     def compose = @raw['compose']
-    def compose? = !!compose
+    def compose? = mode == 'compose'
     def compose_service = compose && compose['service']
     def compose_file = compose && compose['file']
     def compose_project = compose && compose['project']
@@ -50,8 +55,8 @@ module Wip
 
     def to_h(redact: true)
       value = { 'version' => 1, 'wslc' => { 'command' => wslc_command }, 'defaults' => defaults,
-                'up' => { 'command' => up_command }, 'dependencies' => dependencies, 'compose' => compose,
-                'sync' => sync&.to_h,
+                'up' => { 'command' => up_command }, 'mode' => mode, 'dependencies' => dependencies,
+                'compose' => compose, 'sync' => sync&.to_h,
                 'commands' => commands.transform_values { |entry| defaults.merge('type' => 'exec').merge(entry) } }
       redact ? redact_secrets(value) : value
     end
@@ -62,6 +67,7 @@ module Wip
       raise ConfigError, "Unsupported configuration version: #{@raw['version']}" unless (@raw['version'] || 1) == 1
       raise ConfigError, 'up must be a mapping' if @raw.key?('up') && !@raw['up'].is_a?(Hash)
 
+      validate_mode!
       validate_commands!
       validate_dependencies!
       validate_compose!
@@ -70,12 +76,20 @@ module Wip
 
     def build_sync
       SyncSettings.new(@raw['sync'], base: path && File.dirname(path.to_s),
-                                     workdir: defaults['workdir'], container: defaults['container'])
+                                     workdir: defaults['workdir'], container: defaults['container'],
+                                     compose: compose?)
     end
 
+    def validate_mode!
+      raise ConfigError, "mode must be one of #{MODES.join(', ')}" unless MODES.include?(mode)
+      raise ConfigError, 'mode: compose requires a compose: block' if compose? && !@raw.key?('compose')
+      raise ConfigError, 'a compose: block requires mode: compose' if @raw.key?('compose') && !compose?
+    end
+
+    # Forces SyncSettings to build (and so run its own validation, including
+    # sync.mode vs. mode) at load time instead of on first access.
     def validate_sync!
-      return unless sync
-      raise ConfigError, 'sync is mutually exclusive with compose' if compose?
+      sync if @raw.key?('sync')
     end
 
     def validate_commands!

data/lib/wip/sync_settings.rb

@@ -16,24 +16,36 @@ module Wip
     DEFAULT_TARGET = '/app'
     DEFAULT_BINARY = 'rsync'
     DEFAULT_INTERVAL = 2
-    # -a preserves modes and timestamps so file watchers and bundler see a
-    # faithful copy rather than a tree that looks freshly written every sync.
-    BASE_OPTIONS = %w[-a].freeze
+    # Minimal set for a fast local-to-local mirror: -r walks the tree, -l
+    # keeps symlinks as symlinks, -t preserves mtimes so re-syncs can quick-
+    # check (size+mtime) instead of re-transferring unchanged files, and
+    # --whole-file skips the delta-transfer checksum pass that only pays off
+    # over a slow network. Owner/group/perm preservation (-o -g -p, part of
+    # -a) is left out since both sides are the same user; add them back via
+    # sync.options if a project needs them.
+    BASE_OPTIONS = %w[-r -l -t --whole-file].freeze
     # Trailing mount options wslc/docker accept after the container path.
     VOLUME_MODES = %w[ro rw z Z cached delegated consistent].freeze
+    # exec mirrors inside the already-running, wip-managed container (fast,
+    # but only correct when wip itself created that container with the sync
+    # mounts attached). run always mirrors from a disposable container, since
+    # compose owns its own services' mounts and never guarantees that shape.
+    SYNC_MODES = %w[exec run].freeze
 
-    attr_reader :target, :mount, :volume, :exclude, :binary, :extra_options, :interval
+    attr_reader :target, :mount, :volume, :exclude, :binary, :extra_options, :interval, :mode
 
-    def initialize(raw, base: nil, workdir: nil, container: nil)
+    def initialize(raw, base: nil, workdir: nil, container: nil, compose: false)
       raise ConfigError, 'sync must be a mapping' unless raw.is_a?(Hash)
 
       @base = base
       assign_paths(raw, workdir: workdir, container: container)
       assign_mirror(raw)
+      assign_mode(raw, compose: compose)
       validate!
     end
 
     def delete? = !!@delete
+    def exec? = mode == 'exec'
 
     # Expanded against the wip.yml directory so the mirror covers the same tree
     # no matter which subdirectory wip was invoked from.
@@ -64,7 +76,7 @@ module Wip
     def to_h
       { 'source' => source, 'target' => target, 'mount' => mount, 'volume' => volume,
         'delete' => delete?, 'exclude' => exclude, 'command' => binary, 'options' => extra_options,
-        'interval' => interval }
+        'interval' => interval, 'mode' => mode }
     end
 
     private
@@ -84,6 +96,15 @@ module Wip
       @interval = raw.key?('interval') ? raw['interval'] : DEFAULT_INTERVAL
     end
 
+    def assign_mode(raw, compose:)
+      @mode = presence(raw['mode']) || (compose ? 'run' : 'exec')
+      raise ConfigError, "sync.mode must be one of #{SYNC_MODES.join(', ')}" unless SYNC_MODES.include?(@mode)
+      return unless compose && exec?
+
+      raise ConfigError, 'sync.mode: exec needs mode: container (compose owns its services’ mounts, ' \
+                         'so it can’t guarantee the running container has the sync mounts attached)'
+    end
+
     def validate!
       raise ConfigError, 'sync.target must be an absolute path' unless @target.start_with?('/')
       raise ConfigError, 'sync.mount must be an absolute path' unless @mount.start_with?('/')

data/lib/wip/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wip
-  VERSION = '0.7.3'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wslc-wip
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - Wip contributors