vete 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d1ef6e5614f544a633cfe36109f37ef7a37676b7ba276be48abcc40d6e9cf54
-  data.tar.gz: a0036c27a47eddba9385673345f4456fbae869fa816c8c2c0d46ce92a0866d82
+  metadata.gz: 31328c3602f1174d697b56c9d0b8049986b68151975ed05c2febe3bab04d0c00
+  data.tar.gz: e4d99dd8303a7bcc8d589f66bb6ad0a0e2b79bfb718c7f2856f2e3a7aa558e63
 SHA512:
-  metadata.gz: a0f287195bba7b81a368560aa3f0694b60e7afe8292957b9d947ca820291b603bdfc3d231bd9432c175a4f3df88714eba91b7a41db5dea744154e063000d2e42
-  data.tar.gz: 0aeb6cfa54c5a55d6b822ce29e5045f78176b428bd2948fd039ea5dce5096d42a0d7dd6e8b04ce2c2631fb28bd02480f79e5c75fdb8a489e729f614ae191c428
+  metadata.gz: 0df917b8b8bb7cc72e0903130543e4e700b4264e8119b9f65d5c038cfa2dfb3538804945df489fcc27fa781deb18c923a2c540087dbf95b60c50f8a1eca48890
+  data.tar.gz: d05bac44008d71d71738b234d0d2f750fdfdaa4c5d3de24263dd72e1888039165c5d902bdb01510712e0741750ae57dca16a679728c9cf5e97384227d1af80b2

data/lib/vete.rb

@@ -4,6 +4,8 @@
 # Author: Steve Shreeve (steve.shreeve@gmail.com)
 #   Date: Mar 21, 2023
 # ============================================================================
+# TODO: 1) progress should update until all workers have *finished*
+# ============================================================================
 
 STDOUT.sync = true
 
@@ -13,16 +15,20 @@ require "fileutils"
 require "optparse"
 require "thread"
 
-trap("INT" ) { print clear + go; abort "\n" }
+@pid = Process.pid
+
+trap("INT"  ) { print clear + go; abort "\n" }
+trap("WINCH") { print clear or draw if @pid == Process.pid }
 
 OptionParser.new.instance_eval do
-  @version = "0.2.0"
+  @version = "0.3.0"
   @banner  = "usage: #{program_name} [options]"
 
   on "-b", "--bar <width>"            , "Progress bar width, in characters", Integer
   on "-c", "--char <character>"       , "Character to use for progress bar", String
-  on "-r", "--reset"                  , "Remove directory used for job processing and quit"
+  on "-d", "--delay <mode>"           , "Delay mode (rand, task, numeric)"
   on "-h", "--help"                   , "Show help and command usage" do Kernel.abort to_s; end
+  on "-r", "--reset"                  , "Remove directory used for job processing and quit"
   on "-v", "--version"                , "Show version number" do Kernel.abort "#{program_name} #{@version}"; end
   on "-w", "--workers <count>"        , "Set the number of workers (default is 1)", Integer
 
@@ -31,10 +37,21 @@ end.parse!(into: opts={}) rescue abort($!.message)
 
 # populate CLI options
 @char = opts[:char   ] || "•"; @char = @char[0]
+@wait = opts[:delay  ]
 @nuke = opts[:reset  ]
 @wide = opts[:bar    ] || 20
 @work = opts[:workers] || 1
 
+# handle wait mode
+case @wait
+when "rand", "task", nil
+when /\A(?:0|[1-9]\d*|(?:0?\.|[1-9]\d*\.)\d*)\z/
+  @wait = @wait.to_f
+  @wait > 0 or abort "invalid delay time (#{@wait.to_f} secs)"
+else
+  abort "invalid delay mode '#{@wait}'"
+end
+
 # define job directories
 @vete = File.expand_path(".vete")
 @todo = File.join(@vete, "todo")
@@ -42,7 +59,6 @@ end.parse!(into: opts={}) rescue abort($!.message)
 @done = File.join(@vete, "done")
 @bomb = File.join(@vete, "bomb")
 
-
 def move(path, dest)
   dest = File.join(dest, File.basename(path))
   FileUtils.mv(path, dest, force: true, secure: true)
@@ -76,10 +92,10 @@ end
 
 # https://www.cse.psu.edu/~kxc104/class/cmpen472/16f/hw/hw8/vt100ansi.htm
 
-def clear      ; "\e[2J"                        ; end
-def cursor(on) ; print on ? "\e[?25h": "\e[?25l"; end
-def go(r=1,c=1); "\e[#{r};#{c}H"                ; end
-def go!(...)   ; print go(...)                  ; end
+def clear(line=nil); line ? "\e[K" : "\e[2J"        ; end
+def cursor(on)     ; print on ? "\e[?25h": "\e[?25l"; end
+def go(r=1,c=1)    ; "\e[#{r};#{c}H"                ; end
+def go!(...)       ; print go(...)                  ; end
 
 def fg(rgb=nil); rgb ? "\e[38;2;#{hx(rgb)}m" : "\e[39m"; end
 def bg(rgb=nil); rgb ? "\e[48;2;#{hx(rgb)}m" : "\e[49m"; end
@@ -88,22 +104,22 @@ def hx(str=nil); str =~ /\A#?(?:(\h\h)(\h\h)(\h\h)|(\h)(\h)(\h))\z/ or return
   [r.hex, g.hex, b.hex] * ";"
 end
 
-def draw(rows, done=0, live=0, bomb=0, jobs=0, info=nil)
+def draw(live=0, done=0, bomb=0, jobs=0, info=nil)
 
   # outer box
   unless info
     print [
       clear,
-      go(2 + rows, @len + 3) + "└" + "─" * (@wide + 2) + "┘\n",
-      go(1       , @len + 3) + "┌" + "─" * (@wide + 2) + "┐\n",
+      go(2 + @work, @len + 3) + "└" + "─" * (@wide + 2) + "┘\n",
+      go(1        , @len + 3) + "┌" + "─" * (@wide + 2) + "┐\n",
     ].join
-    rows.times {|i| print " %*d │ %*s │\n" % [@len, i + 1, @wide, ""] }
+    @work.times {|i| print " %*d │ %*s │\n" % [@len, i + 1, @wide, ""] }
     return
   end
 
   # worker bars
-  dpct = done.to_f / jobs
   lpct = live.to_f / jobs
+  dpct = done.to_f / jobs
   most = info.values.max
   info.each do |slot, this|
     tpct = this.to_f / most
@@ -115,12 +131,12 @@ def draw(rows, done=0, live=0, bomb=0, jobs=0, info=nil)
   gcol = dpct * @wide
   ycol = lpct * @wide
   print [
-    go(rows + 3, @len + 5),
+    go(@work + 3, @len + 5),
     fg("fff"),
     bg("58a65c") + @char * (       gcol       )     , #  green (done)
-    bg("f1bf42") + @char * (              ycol)     , # yellow (live) <= Add live
+    bg("f1bf42") + @char * (              ycol)     , # yellow (live)
     bg("d85140") + " "  * (@wide - gcol - ycol).ceil, #    red (left)
-    go(rows + 3, @len + 5 + @wide + 3) + " %.1f%% done " % [dpct * 100],
+    go(@work + 3, @len + 5 + @wide + 3) + " %.1f%% done " % [dpct * 100],
     bomb == 0 ? nil : (bg + " " + bg("f1bf42") + " #{bomb} bombed "),
   ].join
 
@@ -136,7 +152,7 @@ FileUtils.mkdir_p @live
 FileUtils.mkdir_p @done
 FileUtils.mkdir_p @bomb
 
-1.upto(100) {|i| FileUtils.touch(File.join(@todo, i.to_s)) }
+100.times {|i| FileUtils.touch(File.join(@todo, (i + 1).to_s)) }
 
 # ==[ Configure workers ]=====================================================
 
@@ -149,43 +165,46 @@ begin
   jobs = list.size
   info = Hash.new(0)
 
-  setup
+  setup if defined?(setup)
 
   cursor(false)
-  draw(@work)
-
-  time = Time.now
-  done = 0
+  draw
   live = 0
+  done = 0
   bomb = 0
+  time = Time.now
   Thread.new do
-    list.each do |path|
+    list.each_with_index do |path, task|
       slot = @que.pop
       @mtx.synchronize {
         live += 1
       }
       show = "Working on task " + File.basename(path)
-      print go(slot + 1, @len + 5 + @wide + 3) + show
+      print go(slot + 1, @len + 5 + @wide + 3) + show + clear(true)
       if chld = fork # parent
         Thread.new do
           okay = Process.waitpid2(chld)[1] == 0
           move(path, okay ? @done : @bomb)
           @que.push(slot)
           @mtx.synchronize {
-            done += 1
             live -= 1
+            done += 1
             bomb += 1 unless okay
             info[slot] += 1
           }
         end
-        draw(@work, done, live, bomb, jobs, info.dup)
+        draw(live, done, bomb, jobs, info.dup)
       else
+        case @wait
+        when "rand"  then sleep rand(@work)
+        when "task"  then sleep task
+        when Numeric then sleep task * @wait
+        end if task < @work
         perform(slot, path)
         exit
       end
     end
   end.join
-  draw(@work, done, live, bomb, jobs, info)
   secs = Time.now.to_f - time.to_f
 
   # summary

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vete
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Steve Shreeve