wslc-wip 0.17.3 → 0.17.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c00368614ae5c01c7f514957368d9533f2faf9be114cfd17c676fc70ebfec138
-  data.tar.gz: 86d094ead585366c91633a963d0436a0c68af10f5bda3dace5ab46485f714a4a
+  metadata.gz: ae440c584eee01b5fca703f10fe051f457cd24534a54b8d2c76fe485d33fc256
+  data.tar.gz: '0078b9598b5084d7b62ff7cf3aa85589c61739801bdae6d8bfa76e3218459fde'
 SHA512:
-  metadata.gz: 99cd7c6e59ccd6b64667ab7a179c240d96577f24296a93b801484f994570d6262ccc30d1535853a6cd7b4fb2a31f5e8145fa227aa637d7d9960f0aa794756a67
-  data.tar.gz: 13a319d2b312f709a5937711bb65d69a560e098bed809e3f5f76fc83bae419983f5f4dbb0ae541e5afa3c93b9a7fd290b9c963378b6f405cd4bb0ceb3900e274
+  metadata.gz: 8d92d054446d0b517db26312afa196e0f4486181ea3c6254d7eecb11a4bd239c5b0a48ff28804d3c2806d1acfc0f9beeaebcce5dcacdd73855b3ed629386774d
+  data.tar.gz: 0b19afc749ee393752613e27306b56559e8ff5c31d29f0248ddc2bee05e0ba4b327725cef1a371b9f24f4fc9fef85c5972e1a005e041003100bd2e44a2c9f664

data/lib/wip/build_context.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'find'
 require 'fileutils'
 require 'pathname'
 require 'tmpdir'
@@ -14,9 +15,8 @@ module Wip
       @ignore = ignore || DockerIgnore.load(@root.join('.dockerignore'))
     end
 
-    # on_progress fires once per file copied, as `|count, total|` — so a caller
-    # can show that staging a large context (thousands of small files can take
-    # tens of seconds) is still moving instead of looking hung.
+    # on_progress fires before copying and after each file, as `|count, total|`,
+    # so a caller can report elapsed progress even while copying one large file.
     def stage(on_progress: nil)
       return yield @root.to_s if @ignore.empty?
 
@@ -30,6 +30,7 @@ module Wip
 
     def copy_included_files(destination, on_progress)
       files = included_files
+      on_progress&.call(0, files.size)
       files.each_with_index do |relative_path, index|
         target = destination.join(relative_path)
         FileUtils.mkdir_p(target.dirname)
@@ -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

@@ -69,12 +69,13 @@ module Wip
     def build(*extra)
       extra.shift if extra.first == '--'
       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
@@ -301,11 +302,23 @@ 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 = spec['dockerfile'] ? ['-f', spec['dockerfile']] : []
+      spec['args']&.each { |key, value| extra.push('--build-arg', "#{key}=#{value}") }
+      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
 
     # Builds sync.build's image once per invocation (not per --watch tick, which

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/staging_progress.rb

@@ -1,35 +1,63 @@
 # frozen_string_literal: true
 
 module Wip
-  # Prints a self-overwriting "copying build context files: N/total" line, at
-  # most every half second, while a slow, silent step (staging a large build
-  # context file by file can take tens of seconds) is still moving — so it
-  # doesn't read as hung.
+  # Prints a self-overwriting "copying build context files: N/total" line
+  # every half second while a slow, silent step is running. Reporting runs on
+  # its own thread so a single large file does not make progress appear hung.
   class StagingProgress
     def initialize(out: $stderr, interval: 0.5)
       @out = out
       @interval = interval
-      # Backdated so the very first tick always prints immediately, rather
-      # than waiting a full interval before the first sign of life.
-      @last = Process.clock_gettime(Process::CLOCK_MONOTONIC) - interval
-      @printed = false
+      @mutex = Mutex.new
+      @condition = ConditionVariable.new
+      @worker = nil
+      @stopped = false
     end
 
     def tick(count, total)
-      now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      return if now - @last < @interval && count != total
-
-      @last = now
-      @printed = true
-      @out.print "\rwip: copying build context files: #{count}/#{total}"
+      @mutex.synchronize do
+        @count = count
+        @total = total
+        print_progress if @worker.nil? || count == total
+        unless @worker
+          @stopped = false
+          @worker = Thread.new { report_on_interval }
+        end
+      end
     end
 
     # Idempotent: a caller can't know in advance whether tick ever fired.
     def finish
-      return unless @printed
+      worker = @mutex.synchronize do
+        return unless @worker
+
+        @stopped = true
+        @condition.broadcast
+        @worker
+      end
+      worker.join
+
+      @mutex.synchronize do
+        @worker = nil
+        @out.puts
+        @out.flush
+      end
+    end
+
+    private
+
+    def report_on_interval
+      @mutex.synchronize do
+        until @stopped
+          @condition.wait(@mutex, @interval)
+          print_progress unless @stopped
+        end
+      end
+    end
 
-      @printed = false
-      @out.puts
+    def print_progress
+      @out.print "\rwip: copying build context files: #{@count}/#{@total}"
+      @out.flush
     end
   end
 end

data/lib/wip/version.rb

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

metadata

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