wslc-wip 0.17.3 → 0.17.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c00368614ae5c01c7f514957368d9533f2faf9be114cfd17c676fc70ebfec138
-  data.tar.gz: 86d094ead585366c91633a963d0436a0c68af10f5bda3dace5ab46485f714a4a
+  metadata.gz: 0c7d06fb49766e980be92c2d70d3a0c86dc68b16c0c2b5d84e05d5baa1dd40f1
+  data.tar.gz: 61ad143b173b17849427d03efdaa451849b0e58d16a3eb97c55855d641ced273
 SHA512:
-  metadata.gz: 99cd7c6e59ccd6b64667ab7a179c240d96577f24296a93b801484f994570d6262ccc30d1535853a6cd7b4fb2a31f5e8145fa227aa637d7d9960f0aa794756a67
-  data.tar.gz: 13a319d2b312f709a5937711bb65d69a560e098bed809e3f5f76fc83bae419983f5f4dbb0ae541e5afa3c93b9a7fd290b9c963378b6f405cd4bb0ceb3900e274
+  metadata.gz: c1accaef0df664f9d35659d08cb8782c1e54ea9a56cae60e1bd53ddd347c2736501e1fc785be9667541c225f88340e448fd8b2fab32a4f41171f613863533ea4
+  data.tar.gz: 235f4c9ad2997138d262eaac4098edfe0582db8bf56dc8743250a17d10fac14df96fdea3ab575faef91f096e4f091ad2a1ffb06931da59aa5e683eaf40327c03

data/lib/wip/build_context.rb

@@ -14,9 +14,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 +29,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)

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.4'
 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.4
 platform: ruby
 authors:
 - Wip contributors