wslc-wip 0.17.4 → 0.17.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c7d06fb49766e980be92c2d70d3a0c86dc68b16c0c2b5d84e05d5baa1dd40f1
-  data.tar.gz: 61ad143b173b17849427d03efdaa451849b0e58d16a3eb97c55855d641ced273
+  metadata.gz: adf27a8bafbb2482bfe25b393e3623a39fd0c8d77f92a7c6e6e60286506c8f17
+  data.tar.gz: 77d180849706ea0915e82c03a7bfcae6d5ee0c581a87db808e3eceacdb0b8210
 SHA512:
-  metadata.gz: c1accaef0df664f9d35659d08cb8782c1e54ea9a56cae60e1bd53ddd347c2736501e1fc785be9667541c225f88340e448fd8b2fab32a4f41171f613863533ea4
-  data.tar.gz: 235f4c9ad2997138d262eaac4098edfe0582db8bf56dc8743250a17d10fac14df96fdea3ab575faef91f096e4f091ad2a1ffb06931da59aa5e683eaf40327c03
+  metadata.gz: f894b61d72a792604221a0bc41c5bef018cb2257ee7469d958f17f96fd5de57e52f2a1665b74e51bfbbd3e6cea6ba9f684f42a4ab64747462098c4742b7cd350
+  data.tar.gz: 68201cce4009583ffee442f06858d930a9d618a399553fbf04523281c8012630e0c8bedc1517012b5f9afca9896612d42829206303943b5548118d0a2d960d17

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. By default, wip passes the target tag as `--cache-from` so previous layers can be reused; `--no-cache` disables that cache path. |
+| `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/build_context.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'find'
 require 'fileutils'
 require 'pathname'
 require 'tmpdir'
@@ -41,13 +42,31 @@ module Wip
       end
     end
 
+    # Walks the tree by hand (rather than Dir.glob-ing it all up front) so an
+    # ignored directory — node_modules, vendor/bundle, a multi-gigabyte
+    # storage/ — is never descended into just to be thrown away afterward.
     def included_files
-      Dir.glob('**/*', File::FNM_DOTMATCH, base: @root.to_s).select do |entry|
-        next false if %w[. ..].include?(entry)
+      result = []
+      Find.find(@root.to_s) do |path|
+        next if path == @root.to_s
 
-        path = @root.join(entry)
-        (path.file? || path.symlink?) && !@ignore.ignored?(entry)
+        entry = Pathname(path).relative_path_from(@root).to_s
+        result << entry if visit?(path, entry)
       end
+      result
+    end
+
+    # Returns whether `path` belongs in the staged context, pruning the walk
+    # when it's an ignored directory so nothing under it is even visited —
+    # unless a later negated rule could still re-include something beneath it.
+    def visit?(path, entry)
+      ignored = @ignore.ignored?(entry)
+      if !File.symlink?(path) && File.directory?(path)
+        Find.prune if ignored && @ignore.prunable?(entry)
+        return false
+      end
+
+      !ignored && (File.file?(path) || File.symlink?(path))
     end
   end
 end

data/lib/wip/cli.rb

@@ -66,15 +66,17 @@ 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 = settings['context'] || '.'
+      context = Pathname(load_config.path).dirname.join(settings['context'] || '.').to_s
       warn "wip: staging build context (#{context})"
       progress = StagingProgress.new
       BuildContext.new(context).stage(on_progress: progress.method(:tick)) do |staged_context|
         progress.finish
-        execute(builder.build(settings: settings.merge('context' => staged_context), extra: extra))
+        built = builder.build(settings: settings.merge('context' => staged_context), extra: extra)
+        execute(built, interactive: tty?(true))
       end
     ensure
       progress&.finish
@@ -83,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]
@@ -301,11 +304,39 @@ module Wip
     # `wip up` invocation, mirroring ensure_sync_image's "build once, not every tick"
     # approach. A no-op for mode: container/compose and for build:-less services.
     def ensure_compose_images
-      load_config.compose_build_specs.each_value do |spec|
-        extra = spec['dockerfile'] ? ['-f', spec['dockerfile']] : []
-        spec['args']&.each { |key, value| extra.push('--build-arg', "#{key}=#{value}") }
-        execute(builder.build(settings: { 'context' => spec['context'], 'tag' => spec['tag'] }, extra: extra))
+      load_config.compose_build_specs.each_value { |spec| build_compose_image(spec) }
+    end
+
+    # 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 = 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|
+        progress.finish
+        settings = { 'context' => staged_context, 'tag' => spec['tag'] }
+        execute(builder.build(settings: settings, extra: extra), interactive: tty?(true))
       end
+    ensure
+      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

data/lib/wip/command_builder.rb

@@ -142,7 +142,8 @@ module Wip
       tag = values['tag'] || values['image']
       raise ConfigError, 'Build image/tag must not be empty' if tag.to_s.empty?
 
-      [@wslc, 'build', '-t', tag, *extra, context]
+      cache_options = extra.include?('--no-cache') ? [] : ['--cache-from', tag]
+      [@wslc, 'build', '-t', tag, *cache_options, *extra, context]
     end
 
     def custom(name, arguments)

data/lib/wip/command_runner.rb

@@ -27,7 +27,7 @@ module Wip
         status = wait.value
       end
       report_hint(captured) unless status.success?
-      status.exitstatus
+      exitstatus(status)
     rescue Errno::ENOENT => e
       @stderr.puts e.message
       127
@@ -38,6 +38,13 @@ module Wip
 
     private
 
+    # exitstatus is nil when the process was killed by a signal instead of
+    # exiting normally; fall back to the conventional 128+signal shell code
+    # so callers always get a comparable integer.
+    def exitstatus(status)
+      status.exitstatus || (128 + status.termsig)
+    end
+
     def report_hint(captured)
       hint = @interpreter.interpret(captured.force_encoding(Encoding::UTF_8).scrub)
       @stderr.puts("\n#{hint}") if hint
@@ -50,7 +57,7 @@ module Wip
     def run_attached(command, env)
       pid = Process.spawn(env, *command)
       _, status = Process.wait2(pid)
-      status.exitstatus
+      exitstatus(status)
     rescue Errno::ENOENT => e
       @stderr.puts e.message
       127

data/lib/wip/docker_ignore.rb

@@ -30,8 +30,26 @@ module Wip
       end
     end
 
+    # Whether a walker can stop descending into an ignored directory without
+    # risking a miss: false if some later negated rule (e.g. `!node_modules/pkg`
+    # after `node_modules`) could still match something beneath it.
+    def prunable?(relative_path)
+      dir_components = relative_path.split('/')
+      @rules.none? { |rule| rule.negate && targets_descendant?(rule.pattern, dir_components) }
+    end
+
     private
 
+    def targets_descendant?(pattern, dir_components)
+      pattern_components = pattern.split('/')
+      return true if pattern_components.first == '**'
+      return false if pattern_components.size <= dir_components.size
+
+      pattern_components.first(dir_components.size).each_with_index.all? do |component, i|
+        File.fnmatch(component, dir_components[i], FNMATCH_FLAGS)
+      end
+    end
+
     def parse(line)
       line = line.strip
       return nil if line.empty? || line.start_with?('#')

data/lib/wip/doctor.rb

@@ -151,6 +151,8 @@ module Wip
                  condition == :ok ? ok_message : fail_message)
     end
 
-    def command_available?(name) = ENV.fetch('PATH', '').split(File::PATH_SEPARATOR).any? { |dir| File.executable?(File.join(dir, name)) }
+    def command_available?(name)
+      ENV.fetch('PATH', '').split(File::PATH_SEPARATOR).any? { |dir| File.executable?(File.join(dir, name)) }
+    end
   end
 end

data/lib/wip/version.rb

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

metadata

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