wslc-wip 0.17.5 → 0.17.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae440c584eee01b5fca703f10fe051f457cd24534a54b8d2c76fe485d33fc256
-  data.tar.gz: '0078b9598b5084d7b62ff7cf3aa85589c61739801bdae6d8bfa76e3218459fde'
+  metadata.gz: 3f6c715d39600201d79b4181892f546555b4ccb48fb6046815c2dd27d2e4d203
+  data.tar.gz: 4aab099d2fa77a875c8037fb865739d9858d59abda28ae4d3bda83d85b2ac7aa
 SHA512:
-  metadata.gz: 8d92d054446d0b517db26312afa196e0f4486181ea3c6254d7eecb11a4bd239c5b0a48ff28804d3c2806d1acfc0f9beeaebcce5dcacdd73855b3ed629386774d
-  data.tar.gz: 0b19afc749ee393752613e27306b56559e8ff5c31d29f0248ddc2bee05e0ba4b327725cef1a371b9f24f4fc9fef85c5972e1a005e041003100bd2e44a2c9f664
+  metadata.gz: 75beec87e7d2b2d4b9a2e71f72a0d126d4e407840a3c9d4fc06a63af80d5fe7d0b4ae68cfbaaf85b9fe749356f9f455953118110cc2c955db5bb152c9eed5dab
+  data.tar.gz: 3ac4feb3c65bef872f8b86027ecff32f9f3891a6f3c630b481167e87fb18e7b17a1fed631a23731a9445275e37feb521cb2a0ecf98adf82d7e0a7df9f515536d

data/README.md

@@ -370,8 +370,8 @@ valid compose.yml over sections it doesn't need to look at:
 | `wip version` | wip's version, plus WSLC's if it can be detected |
 | `wip doctor` | Diagnose WSL2, interop, WSLC, config, architecture, and Git |
 | `wip config` | Print the effective configuration (secrets masked) |
-| `wip build -- --no-cache` | Build the image from the `build` definition |
-| `wip up [-d] [--no-sync]` | Start the primary `dependencies:` entry (`container:` names which one) and its sidecars (creating any that are missing, on `network:` if set). `-d` runs the main container in the background; with `sync:` configured, the source is mirrored into the volume first unless `--no-sync` |
+| `wip build [--no-cache] [-- OPTIONS]` | Build the image from the `build` definition. `wslc build` reuses matching local layers by default; `--no-cache` disables that. |
+| `wip up [-d] [--no-sync] [--no-cache]` | Start the primary `dependencies:` entry (`container:` names which one) and its sidecars (creating any that are missing, on `network:` if set). `-d` runs the main container in the background; with `sync:` configured, the source is mirrored into the volume first unless `--no-sync` |
 | `wip down` | Stop and remove the primary container and its sidecar `dependencies:` |
 | `wip exec [--no-interactive] COMMAND...` | Run a command in the existing container |
 | `wip run [--no-interactive] COMMAND...` | Run a command in a new `--rm` container (mode: compose `exec`s into `compose.service` instead — see "Compose mode" above) |

data/lib/wip/cli.rb

@@ -66,8 +66,9 @@ module Wip
     end
 
     desc 'build [OPTIONS]', 'Build the configured image'
+    option :no_cache, type: :boolean, default: false, desc: 'Build without using cached layers'
     def build(*extra)
-      extra.shift if extra.first == '--'
+      extra = build_extra_options(extra)
       settings = load_config.command('build') || {}
       context = Pathname(load_config.path).dirname.join(settings['context'] || '.').to_s
       warn "wip: staging build context (#{context})"
@@ -84,6 +85,7 @@ module Wip
     desc 'up', 'Start the configured container and its dependencies, creating them if necessary'
     option :detach, type: :boolean, default: false, aliases: '-d'
     option :sync, type: :boolean, default: true, desc: 'Mirror the source into the sync volume first (--no-sync skips)'
+    option :no_cache, type: :boolean, default: false, desc: 'Build compose-native images without cached layers'
     def up
       if load_config.compose?
         sync_before_boot if options[:sync]
@@ -308,8 +310,7 @@ module Wip
     # Stages spec['context'] the same way `wip build` does, so a .dockerignore next to
     # a compose-native service's build: is honored and progress is reported here too.
     def build_compose_image(spec)
-      extra = spec['dockerfile'] ? ['-f', spec['dockerfile']] : []
-      spec['args']&.each { |key, value| extra.push('--build-arg', "#{key}=#{value}") }
+      extra = compose_build_extra(spec)
       warn "wip: staging build context (#{spec['context']})"
       progress = StagingProgress.new
       BuildContext.new(spec['context']).stage(on_progress: progress.method(:tick)) do |staged_context|
@@ -321,6 +322,23 @@ module Wip
       progress&.finish
     end
 
+    def build_extra_options(extra)
+      extra = extra.dup
+      extra.shift if extra.first == '--'
+      with_no_cache_option(extra)
+    end
+
+    def compose_build_extra(spec)
+      extra = spec['dockerfile'] ? ['-f', spec['dockerfile']] : []
+      spec['args']&.each { |key, value| extra.push('--build-arg', "#{key}=#{value}") }
+      with_no_cache_option(extra)
+    end
+
+    def with_no_cache_option(extra)
+      extra.unshift('--no-cache') if options[:no_cache] && !extra.include?('--no-cache')
+      extra
+    end
+
     # Builds sync.build's image once per invocation (not per --watch tick, which
     # would pay Docker build-cache-lookup overhead on every mirror for no reason).
     # A no-op unless sync.build is configured.

data/lib/wip/command_builder.rb

@@ -136,6 +136,9 @@ module Wip
       [@wslc, 'remove', '-f', name.to_s]
     end
 
+    # `wslc build` reuses matching local layers by default (like `docker build`
+    # without `--pull`) — it has no `--cache-from` flag to ask for that explicitly,
+    # and passing one is a hard error (unrecognized argument).
     def build(settings:, extra: [])
       values = primary_values.merge(settings)
       context = values['context'] || '.'

data/lib/wip/compose_file.rb

@@ -15,20 +15,18 @@ module Wip
   # "Compose mode (native)") — once wslc ships that support, or a
   # compose-for-wslc tool reliably supports `run`.
   class ComposeFile
-    Service = Struct.new(:image, :build, :command, :env, :ports, :volumes, :workdir, :user, :depends_on,
+    Service = Struct.new(:image, :build, :command, :env, :ports, :volumes, :workdir, :user, :depends_on, :profiles,
                          keyword_init: true)
 
-    SERVICE_KEYS = %w[image build command environment ports volumes working_dir user depends_on].freeze
+    SERVICE_KEYS = %w[image build command environment ports volumes working_dir user depends_on profiles].freeze
     # Real Compose keys that read as meaningful here but have nothing to map onto: TTY/stdin
-    # allocation is already decided per invocation (see CommandBuilder#tty?), not fixed per
-    # service; there's no per-service network to join beyond the one project network `network`
-    # (config.rb) already puts every service on; `wslc run`/`exec` has no restart-policy or
-    # capability flag to forward `restart:`/`cap_add:` to; and `profiles:` gates which services a
-    # real `docker compose up` starts by default, which doesn't apply here since wip never starts
-    # "every service" — only `compose.service` and whatever it reaches via `depends_on`.
-    IGNORED_SERVICE_KEYS = %w[tty stdin_open networks restart cap_add profiles].freeze
+    # allocation is decided per invocation (CommandBuilder#tty?), not per service; every
+    # service already shares one project network (config.rb); and `wslc run`/`exec` has no
+    # restart-policy or capability flag to forward `restart:`/`cap_add:` to.
+    IGNORED_SERVICE_KEYS = %w[tty stdin_open networks restart cap_add].freeze
     BUILD_KEYS = %w[context dockerfile args].freeze
     SUPPORTED_CONDITIONS = %w[service_started].freeze
+    LIST_HINT = 'only supports short syntax ("host:container"), not long-syntax mappings'
 
     # env interpolates compose.yml's ${VAR} references the way `docker compose` does,
     # so values like `user: ${USER_ID}:${GROUP_ID}` reach wslc already substituted
@@ -53,9 +51,13 @@ module Wip
 
     def service_names_in_dependency_order = @order.dup
 
+    # True if `name` is gated behind profiles: (wip has no --profile flag); false for an unknown name.
+    def profiled?(name) = @services[name.to_s]&.profiles&.any? || false
+
     # name => {context:, dockerfile:, tag:} for every service with a build:.
+    # Profile-gated services are skipped — see #startable_order.
     def build_specs
-      @order.filter_map do |name|
+      startable_order.filter_map do |name|
         service = @services.fetch(name)
         next unless service.build
 
@@ -66,7 +68,7 @@ module Wip
     # Shaped like Config::DEPENDENCY_DEFAULTS expects: image/command/env/ports/volumes/workdir,
     # in dependency order so callers iterating sidecars start them before their dependents.
     def to_dependencies_hash
-      @order.to_h do |name|
+      startable_order.to_h do |name|
         service = @services.fetch(name)
         [name, { 'image' => service.build ? image_tag(name, service) : service.image, 'command' => service.command,
                  'env' => service.env, 'ports' => service.ports, 'volumes' => service.volumes,
@@ -76,6 +78,10 @@ module Wip
 
     private
 
+    # A profile-gated service (see #profiled?) is never among the ones wip starts
+    # on its own, but still participates in #topological_order/depends_on validation.
+    def startable_order = @order.reject { |name| profiled?(name) }
+
     # A service naming both `build:` and `image:` builds via the former and tags the
     # result with the latter (real Compose's own rule for that combination), instead
     # of the auto-generated tag a build:-only service gets.
@@ -96,7 +102,8 @@ module Wip
 
     def normalize_service_lists(name, entry)
       { ports: normalize_list(name, entry['ports'], 'ports'),
-        volumes: normalize_list(name, entry['volumes'], 'volumes') }
+        volumes: normalize_list(name, entry['volumes'], 'volumes'),
+        profiles: normalize_list(name, entry['profiles'], 'profiles', hint: 'must be an array of strings') }
     end
 
     def image_or_build(name, entry)
@@ -129,10 +136,8 @@ module Wip
 
     def normalize_build_mapping(name, value)
       unknown = value.keys.map(&:to_s) - BUILD_KEYS
-      if unknown.any?
-        raise ConfigError,
-              "#{@path}: services.#{name}.build has unsupported key(s): #{unknown.join(', ')}"
-      end
+      raise ConfigError, "#{@path}: services.#{name}.build has unsupported key(s): #{unknown.join(', ')}" \
+        unless unknown.empty?
 
       context = resolve_context(presence(value['context']) || '.')
       dockerfile = presence(value['dockerfile'])
@@ -179,13 +184,12 @@ module Wip
       end
     end
 
-    def normalize_list(name, value, key)
+    def normalize_list(name, value, key, hint: LIST_HINT)
       return [] unless value
       raise ConfigError, "#{@path}: services.#{name}.#{key} must be an array" unless value.is_a?(Array)
-      if value.any?(Hash)
-        raise ConfigError, "#{@path}: services.#{name}.#{key} only supports short syntax (\"host:container\"), " \
-                           'not long-syntax mappings'
-      end
+
+      nested = value.any? { |item| item.is_a?(Hash) || item.is_a?(Array) }
+      raise ConfigError, "#{@path}: services.#{name}.#{key} #{hint}" if nested
 
       value.map(&:to_s)
     end
@@ -209,10 +213,18 @@ module Wip
       dep.to_s
     end
 
+    # Also rejects a startable (unprofiled) service depending on a profile-gated one —
+    # with no profile activation, real Compose treats that as an invalid model, since
+    # the dependency would silently never start.
     def validate_depends_on!
       @services.each do |name, service|
         service.depends_on.each do |dep|
           raise ConfigError, "#{@path}: services.#{name} depends_on unknown service '#{dep}'" unless @services.key?(dep)
+          next if service.profiles.any? || !profiled?(dep)
+
+          raise ConfigError, "#{@path}: services.#{name} depends_on '#{dep}', gated behind profiles: " \
+                             "(#{@services.fetch(dep).profiles.join(', ')}) wip never activates " \
+                             '(no --profile flag)'
         end
       end
     end

data/lib/wip/config.rb

@@ -204,6 +204,19 @@ module Wip
 
     def parsed_compose_file
       @parsed_compose_file ||= ComposeFile.load(ComposeBridge.file_path(self), env: compose_interpolation_env)
+                                          .tap { |file| validate_compose_service_startable!(file) }
+    end
+
+    # compose.service is what wip always starts by default (container:) — wip has no
+    # --profile flag to activate one, so naming a profile-gated service here would
+    # otherwise fail later with a misleading "No dependencies.<name> entry" instead
+    # of pointing at the real cause.
+    def validate_compose_service_startable!(file)
+      return unless file.profiled?(compose_service)
+
+      raise ConfigError, "compose.service '#{compose_service}' is gated behind profiles: in compose.yml, " \
+                         'but wip has no --profile flag to activate one — pick a service with no profiles: ' \
+                         'or remove profiles: from it'
     end
 
     # Compose interpolates ${VAR} references in compose.yml from the shell environment

data/lib/wip/version.rb

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

metadata

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