vete 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c68c30f1f9ce2177fb7c5a83ac8fa9f402b387203e2e1de2321a04ec3effa0c
-  data.tar.gz: 246eed50879a2fd260d1f0b18aab85d3ffe953cd6980d9bb5cca1311a789b202
+  metadata.gz: 31328c3602f1174d697b56c9d0b8049986b68151975ed05c2febe3bab04d0c00
+  data.tar.gz: e4d99dd8303a7bcc8d589f66bb6ad0a0e2b79bfb718c7f2856f2e3a7aa558e63
 SHA512:
-  metadata.gz: 55b4b6dd945930575cf37a814ce1c9d7b7dbfbab6e8a306887841d48dd49331f6b302cfbac0d1741e409fd6bac57153fa52d5bbabe5fab4110f736f3e7660136
-  data.tar.gz: 992cd2007a936f4f7ef53b0741011c916aa3b90802a8794c31a48577fb551fadb50adbcb98e6521d0f5e2716a29e74ca650b5b0dd01c0b023585ecabf89696bc
+  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.1.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
 
@@ -30,10 +36,21 @@ OptionParser.new.instance_eval do
 end.parse!(into: opts={}) rescue abort($!.message)
 
 # populate CLI options
-@bar = opts[:bar    ] || 20
-@chr = opts[:char   ] || "•"; @chr = @chr[0]
-@rmf = opts[:reset  ]
-@wrk = opts[:workers] || 1
+@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")
@@ -42,24 +59,43 @@ end.parse!(into: opts={}) rescue abort($!.message)
 @done = File.join(@vete, "done")
 @bomb = File.join(@vete, "bomb")
 
-if @rmf
-  FileUtils.rm_rf @vete
+def move(path, dest)
+  dest = File.join(dest, File.basename(path))
+  FileUtils.mv(path, dest, force: true, secure: true)
+end
+
+def nuke
+  FileUtils.rm_rf(@vete)
+end
+
+if @nuke
+  nuke
   exit
 end
 
-def move(path, dest)
-  dest = File.join(dest, File.basename(path))
-  FileUtils.mv(path, dest)
+def vete_init
+  nuke
+  list = [@todo, @live, @done, @bomb]
+  list.each {|path| File.mkdir_p(path, force: true, secure: true) }
+end
+
+def vete_retry
+  list = Dir.glob(File.join(@bomb, "*")).sort.each {|path| FileUtils.touch(path) }
+  move(list, @todo)
+end
+
+def vete_todo(path)
+  FileUtils.touch(path, force: true, secure: true)
 end
 
 # ==[ Drawing ]===============================================================
 
 # 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
@@ -68,39 +104,39 @@ 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) + "└" + "─" * (@bar + 2) + "┘\n",
-      go(1       , @len + 3) + "┌" + "─" * (@bar + 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, @bar, ""] }
+    @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
-    cols = dpct * tpct * @bar
-    print go(slot + 1, @len + 5) + bg("5383ec") + @chr * cols
+    cols = dpct * tpct * @wide
+    print go(slot + 1, @len + 5) + bg("5383ec") + @char * cols
   end
 
   # summary bar
-  gcol = dpct * @bar
-  ycol = lpct * @bar
+  gcol = dpct * @wide
+  ycol = lpct * @wide
   print [
-    go(rows + 3, @len + 5),
+    go(@work + 3, @len + 5),
     fg("fff"),
-    bg("58a65c") + @chr * (       gcol       )     , #  green (done)
-    bg("f1bf42") + @chr * (              ycol)     , # yellow (live) <= Add live
-    bg("d85140") + " "  * (@bar - gcol - ycol).ceil, #    red (left)
-    go(rows + 3, @len + 5 + @bar + 3) + " %.1f%% done " % [dpct * 100],
+    bg("58a65c") + @char * (       gcol       )     , #  green (done)
+    bg("f1bf42") + @char * (              ycol)     , # yellow (live)
+    bg("d85140") + " "  * (@wide - gcol - ycol).ceil, #    red (left)
+    go(@work + 3, @len + 5 + @wide + 3) + " %.1f%% done " % [dpct * 100],
     bomb == 0 ? nil : (bg + " " + bg("f1bf42") + " #{bomb} bombed "),
   ].join
 
@@ -116,64 +152,67 @@ 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 ]=====================================================
 
-@len = @wrk.to_s.size
+@len = @work.to_s.size
 @mtx = Mutex.new
-@que = Thread::Queue.new; @wrk.times {|slot| @que << (slot + 1) }
+@que = Thread::Queue.new; @work.times {|slot| @que << (slot + 1) }
 
 begin
   list = Dir[File.join(@todo, "*")]
   jobs = list.size
   info = Hash.new(0)
 
-  setup
+  setup if defined?(setup)
 
   cursor(false)
-  draw(@wrk)
-
-  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 + @bar + 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(@wrk, 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(@wrk, done, live, bomb, jobs, info)
   secs = Time.now.to_f - time.to_f
 
   # summary
   print [
-    go(@wrk + 5, 1),
+    go(@work + 5, 1),
     "%.2f secs" % secs,
     " for #{jobs} jobs",
-    " by #{@wrk} workers",
+    " by #{@work} workers",
     " @ %.2f jobs/sec" % [jobs / secs]
   ].join + "\n\n"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vete
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Steve Shreeve
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-21 00:00:00.000000000 Z
+date: 2023-03-22 00:00:00.000000000 Z
 dependencies: []
 description: Ruby CLI to spawn processes to get work done
 email: steve.shreeve@gmail.com