vete 0.6.5 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3b218ba1e2c6d9d7c66167c0f1e15b07a0dafeacfeacb2810f16636b50f4e42
-  data.tar.gz: 0a62e8259399064a0f20d1679afccdaf935f0e518caa01ad102b543929a926e4
+  metadata.gz: 96b64fc68cb1332add0e65d46131d363ac1723c9b70f0f814382c29efeecb65f
+  data.tar.gz: 2601b593a3ca14b98576cde84de8dc40abd79cb3a6243784099ec8e4298baf7d
 SHA512:
-  metadata.gz: 4e0ff4061b2e7e930bf9dd7195b957874368cd17b07bd7a2b650d9af5c4a3e087a1963d905186445bbf23ddf02d23f0f45815e152026046bdfbc9f443e5d67cf
-  data.tar.gz: e6b58f1834bc6039c442f85356511a5d4769d080246ec6479ece58e8b39b89cbce9e5491b4f93bf25dc3b77e6391b50b4e329c1fd05aded977b36bdaed7e0b65
+  metadata.gz: fb245248250c901de9ca611e4aa424fb7376fae97a96a71f448879cda58852632c6d7f98437ec271431ffa23cb8fc66fbcd09254850192480e3fe8d16032c7f7
+  data.tar.gz: c9e88e46d546b8ea63ef92f71b2684db2c114e1303cac1380a7e43a574d3bd45fb79a01ba53f8909d1dbef8e893506b7f00dfc5be1f40549f5fd62ae01788faa

data/lib/vete.rb

@@ -2,7 +2,7 @@
 # vete - Ruby CLI to spawn processes to get work done
 #
 # Author: Steve Shreeve (steve.shreeve@gmail.com)
-#   Date: Mar 22, 2023
+#   Date: June 29, 2023
 # ============================================================================
 
 STDOUT.sync = true
@@ -19,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.6.5"
+  @version = "0.6.7"
   @banner  = "usage: #{program_name} [options]"
 
   on "-b", "--bar <width>"            , "Progress bar width, in characters", Integer
@@ -53,7 +53,6 @@ end
 # define job directories
 @vete = File.expand_path(".vete")
 @todo = File.join(@vete, "todo")
-@live = File.join(@vete, "live")
 @done = File.join(@vete, "done")
 @died = File.join(@vete, "died")
 
@@ -73,13 +72,13 @@ end
 
 def vete_init
   nuke
-  list = [@todo, @live, @done, @died]
+  list = [@todo, @done, @died]
   list.each {|path| FileUtils.mkdir_p(path) }
 end
 
 def vete_retry
   list = Dir.glob(File.join(@died, "*")).sort.each {|path| FileUtils.touch(path) }
-  move(list, @todo)
+  list.empty? ? false : !!move(list, @todo)
 end
 
 def vete_todo(path, data=nil)
@@ -96,13 +95,19 @@ 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
-def hx(str=nil); str =~ /\A#?(?:(\h\h)(\h\h)(\h\h)|(\h)(\h)(\h))\z/ or return
-  r, g, b = $1 ? [$1, $2, $3] : [$4*2, $5*2, $6*2]
-  [r.hex, g.hex, b.hex] * ";"
+@hex={}
+
+def hex(str=nil)
+  @hex[str] ||= begin
+    str =~ /\A#?(?:(\h\h)(\h\h)(\h\h)|(\h)(\h)(\h))\z/ or return
+    r, g, b = $1 ? [$1, $2, $3] : [$4*2, $5*2, $6*2]
+    [r.hex, g.hex, b.hex] * ";"
+  end
 end
 
+def fg(rgb=nil); rgb ? "\e[38;2;#{hex(rgb)}m" : "\e[39m"; end
+def bg(rgb=nil); rgb ? "\e[48;2;#{hex(rgb)}m" : "\e[49m"; end
+
 def draw(live=0, done=0, died=0, jobs=0, info=nil)
 
   # outer box
@@ -122,7 +127,7 @@ def draw(live=0, done=0, died=0, jobs=0, info=nil)
   info.each do |slot, this|
     tpct = this.to_f / most
     cols = ppct * tpct * @wide
-    print go(slot + 1, @len + 5) + bg("5383ec") + @char * cols
+    print go(slot + 1, @len + 5) + bg("5383ec") + @char * cols # fg("fff")
   end
 
   # summary bar
@@ -138,8 +143,8 @@ def draw(live=0, done=0, died=0, jobs=0, info=nil)
     bg("d85140") + " "  * (@wide - gcol - ycol).ceil, #    red (rest)
     go(@work + 3, @len + 5 + @wide + 3),
     bg("5383ec") + " %.1f%% " % [ppct * 100],         #   blue (done + died)
-    done > 0 ? (bg + " " + bg("58a65c") + " #{done} done ") : nil,
-    died > 0 ? (bg + " " + bg("d85140") + " #{died} died ") : nil,
+    done > 0 ? (bg + " " + bg("58a65c") + " #{done}/#{jobs} done ") : nil,
+    died > 0 ? (bg + " " + bg("d85140") +         " #{died} died ") : nil,
   ].join
 
   # clear colors

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vete
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.7
 platform: ruby
 authors:
 - Steve Shreeve
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-22 00:00:00.000000000 Z
+date: 2023-06-29 00:00:00.000000000 Z
 dependencies: []
 description: Ruby CLI to spawn processes to get work done
 email: steve.shreeve@gmail.com
@@ -44,7 +44,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.9
+rubygems_version: 3.4.14
 signing_key:
 specification_version: 4
 summary: Ruby CLI to spawn processes to get work done