vete 0.3.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31328c3602f1174d697b56c9d0b8049986b68151975ed05c2febe3bab04d0c00
-  data.tar.gz: e4d99dd8303a7bcc8d589f66bb6ad0a0e2b79bfb718c7f2856f2e3a7aa558e63
+  metadata.gz: 9e19484c6c02cd403365def0a14367e2c31f302edd7b56842e863162d0178730
+  data.tar.gz: 303793b8c478fe08733f2da221a325d66e68b2d3ab54c89105482ef612866953
 SHA512:
-  metadata.gz: 0df917b8b8bb7cc72e0903130543e4e700b4264e8119b9f65d5c038cfa2dfb3538804945df489fcc27fa781deb18c923a2c540087dbf95b60c50f8a1eca48890
-  data.tar.gz: d05bac44008d71d71738b234d0d2f750fdfdaa4c5d3de24263dd72e1888039165c5d902bdb01510712e0741750ae57dca16a679728c9cf5e97384227d1af80b2
+  metadata.gz: 59e65ecb548ffa4ccc95f4928f83cb036cefaae98e447801c03616627557614f871f24442b331fd1f6d1211beaf8559f7b98870ea3e31a316ab22af6041d438f
+  data.tar.gz: 03aef3e49b3ee52dbd6867adee656d67fb6124f3eabc027732d35be04e46b0db0139a59abfc00d64079d2f4ce95b6d2cb24cb7e1f752283168196f965e028adb

data/lib/vete.rb

@@ -4,8 +4,6 @@
 # Author: Steve Shreeve (steve.shreeve@gmail.com)
 #   Date: Mar 21, 2023
 # ============================================================================
-# TODO: 1) progress should update until all workers have *finished*
-# ============================================================================
 
 STDOUT.sync = true
 
@@ -21,7 +19,7 @@ trap("INT"  ) { print clear + go; abort "\n" }
 trap("WINCH") { print clear or draw if @pid == Process.pid }
 
 OptionParser.new.instance_eval do
-  @version = "0.3.0"
+  @version = "0.6.0"
   @banner  = "usage: #{program_name} [options]"
 
   on "-b", "--bar <width>"            , "Progress bar width, in characters", Integer
@@ -57,7 +55,7 @@ end
 @todo = File.join(@vete, "todo")
 @live = File.join(@vete, "live")
 @done = File.join(@vete, "done")
-@bomb = File.join(@vete, "bomb")
+@died = File.join(@vete, "died")
 
 def move(path, dest)
   dest = File.join(dest, File.basename(path))
@@ -75,17 +73,17 @@ end
 
 def vete_init
   nuke
-  list = [@todo, @live, @done, @bomb]
-  list.each {|path| File.mkdir_p(path, force: true, secure: true) }
+  list = [@todo, @live, @done, @died]
+  list.each {|path| FileUtils.mkdir_p(path) }
 end
 
 def vete_retry
-  list = Dir.glob(File.join(@bomb, "*")).sort.each {|path| FileUtils.touch(path) }
+  list = Dir.glob(File.join(@died, "*")).sort.each {|path| FileUtils.touch(path) }
   move(list, @todo)
 end
 
 def vete_todo(path)
-  FileUtils.touch(path, force: true, secure: true)
+  FileUtils.touch(File.join(@todo, path.to_s))
 end
 
 # ==[ Drawing ]===============================================================
@@ -104,7 +102,7 @@ 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(live=0, done=0, bomb=0, jobs=0, info=nil)
+def draw(live=0, done=0, died=0, jobs=0, info=nil)
 
   # outer box
   unless info
@@ -118,16 +116,17 @@ def draw(live=0, done=0, bomb=0, jobs=0, info=nil)
   end
 
   # worker bars
-  lpct = live.to_f / jobs
-  dpct = done.to_f / jobs
+  ppct = (done + died).to_f / jobs
   most = info.values.max
   info.each do |slot, this|
     tpct = this.to_f / most
-    cols = dpct * tpct * @wide
+    cols = ppct * tpct * @wide
     print go(slot + 1, @len + 5) + bg("5383ec") + @char * cols
   end
 
   # summary bar
+  dpct = done.to_f / jobs
+  lpct = live.to_f / jobs
   gcol = dpct * @wide
   ycol = lpct * @wide
   print [
@@ -135,25 +134,17 @@ def draw(live=0, done=0, bomb=0, jobs=0, info=nil)
     fg("fff"),
     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 "),
+    bg("d85140") + " "  * (@wide - gcol - ycol).ceil, #    red (rest)
+    go(@work + 3, @len + 5 + @wide + 3)             , # scoot over...
+    bg("5383ec") + " %.1f%% " % [ppct * 100],         #   blue (done + died)
+    done > 0 ? (bg + " " + bg("58a65c") + " #{done} done ") : nil,
+    died > 0 ? (bg + " " + bg("d85140") + " #{died} died ") : nil,
   ].join
 
   # clear colors
   print fg + bg
 end
 
-# ==[ Simulate job creation, add helpers so vete makes this easy ]============
-
-FileUtils.rm_rf   @vete
-FileUtils.mkdir_p @todo
-FileUtils.mkdir_p @live
-FileUtils.mkdir_p @done
-FileUtils.mkdir_p @bomb
-
-100.times {|i| FileUtils.touch(File.join(@todo, (i + 1).to_s)) }
-
 # ==[ Configure workers ]=====================================================
 
 @len = @work.to_s.size
@@ -161,17 +152,19 @@ FileUtils.mkdir_p @bomb
 @que = Thread::Queue.new; @work.times {|slot| @que << (slot + 1) }
 
 begin
+  setup if defined?(setup)
+
   list = Dir[File.join(@todo, "*")]
+
+  live = 0
+  done = 0
+  died = 0
   jobs = list.size
   info = Hash.new(0)
 
-  setup if defined?(setup)
-
   cursor(false)
   draw
-  live = 0
-  done = 0
-  bomb = 0
+
   time = Time.now
   Thread.new do
     list.each_with_index do |path, task|
@@ -184,26 +177,29 @@ begin
       if chld = fork # parent
         Thread.new do
           okay = Process.waitpid2(chld)[1] == 0
-          move(path, okay ? @done : @bomb)
+          move(path, okay ? @done : @died)
           @que.push(slot)
           @mtx.synchronize {
             live -= 1
-            done += 1
-            bomb += 1 unless okay
+            okay ? (done += 1) : (died += 1)
             info[slot] += 1
           }
         end
-        draw(live, done, bomb, jobs, info.dup)
+        draw(live, done, died, 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)
+        perform(path)
         exit
       end
     end
+    while @que.size != @work
+      sleep 1
+      draw(live, done, died, jobs, info.dup)
+    end
   end.join
   secs = Time.now.to_f - time.to_f
 

data/test/example.rb

@@ -1,13 +1,15 @@
 #!/usr/bin/env ruby
 
 def setup
+  vete_init
+  100.times {|i| vete_todo(i + 1) }
   @time = Time.now
 end
 
-def perform(slot, task)
+def perform(task)
   sleep rand
   secs = Time.now - @time
-  exit 4 if rand < 0.02
+  exit 1 if rand < 0.03
 end
 
 require_relative "../lib/vete"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vete
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Steve Shreeve
@@ -42,7 +42,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.8
+rubygems_version: 3.4.9
 signing_key:
 specification_version: 4
 summary: Ruby CLI to spawn processes to get work done