fasten 0.12.4 → 0.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3529d50d7d2bc28cb85f1c41828504cf602b8b04b066e7a3ab11ec2102c6aee0
-  data.tar.gz: f68633c37fc30cded6460bf7093ca010d6d214f4d04ed592bc938e078eb8a1b0
+  metadata.gz: ccba14b261264ae79b9144b3de97610d2499763baab8e03eb5b0cf049c179925
+  data.tar.gz: 2b611452336f62c2de1f48625870ab5dd53589867e609300eedcc4638114ea15
 SHA512:
-  metadata.gz: 7d7afa32077b61a6c4d2f14966eee04925bab79b63e4fb297ab64426aabf74def1e7e67ce48c35d58e6d5e883ca112e73d7b37d616c338a4b7d11d618df30919
-  data.tar.gz: 2b662abc55dc8f6a3248e4b67959c52240b6f27635719295b87dfb794e7d40f8c4573716137ea22a01f7b9076dcdc79c515d9b326692a72bd4696026278f3c18
+  metadata.gz: c139aad75f9abb28ea50a34fe78b166819cf4ae7c125fe9ee6b9f1beec410a2ebbbbad6fdc1a1ff3a52f1cc6f3c85aa239e0274ee4caef66db58741fb846f0ad
+  data.tar.gz: 216a6776f631a1d8d1d9526ae6408978c722fc36a13982151ba6ac7c3050344a892a6f5844b784402add158b33592c0b6fba555cfabd60273a03d8dd7aa9e37f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fasten (0.12.4)
+    fasten (0.12.6)
       binding_of_caller
       hirb
       os

data/lib/fasten/support/state.rb

@@ -1,7 +1,7 @@
 module Fasten
   module Support
     module State
-      attr_accessor :error, :ini, :fin, :dif, :last
+      attr_accessor :error, :ini, :fin, :dif, :runner
       attr_writer :state
 
       def state
@@ -27,6 +27,22 @@ module Fasten
       def quitting?
         state == :QUITTING
       end
+
+      def last
+        return @last if defined? @last
+
+        return {} unless @runner
+
+        @last = runner.stats_last(self)
+      end
+
+      def last_avg
+        @last_avg ||= last['avg']&.to_f
+      end
+
+      def last_err
+        @last_err ||= last['err']&.to_f
+      end
     end
   end
 end

data/lib/fasten/support/stats.rb

@@ -26,8 +26,11 @@ module Fasten
         end
 
         @tasks.each do |task|
-          stats_last(task)
+          task.runner = self
+          task.last
         end
+        self.runner = self
+        last
 
         @tasks.waiting = nil
       rescue StandardError
@@ -125,9 +128,7 @@ module Fasten
       end
 
       def stats_last(item)
-        return item.last if item.last
-
-        item.last = stats_data.select { |e| e['kind'] == item.kind && e['name'] == item.name }.last || {}
+        stats_data.select { |e| e['kind'] == item.kind && e['name'] == item.name }.last || {}
       end
 
       def update_stats(history, entry)

data/lib/fasten/task_manager.rb

@@ -159,7 +159,7 @@ module Fasten
       when :dependants_avg
         @waiting.sort_by!.with_index do |task, index|
           task.state = :WAIT
-          last_avg = task.last && task.last['avg'] || 0
+          last_avg = task.last_avg || 0
           [-task.run_score, -last_avg.to_f, index]
         end
       else

data/lib/fasten/ui/curses.rb

@@ -16,6 +16,8 @@ module Fasten
 
       SPINNER_STR = '⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏'
       SPINNER_LEN = SPINNER_STR.length
+      MOON_STR = '🌑🌒🌓🌔🌕'
+      MOON_LEN = MOON_STR.length
       PROGRESSBAR_STR = ' ▏▎▍▌▋▊▉'
       PROGRESSBAR_LEN = PROGRESSBAR_STR.length
 
@@ -194,6 +196,22 @@ module Fasten
         end
       end
 
+      def ui_task_clock(task, cur, avg)
+        return unless task.ini
+
+        dif = cur - task.ini
+        avg = avg.to_f
+        if task.ini && avg.positive?
+          percent = dif / avg
+          index = (percent * MOON_LEN).to_i
+          index = MOON_LEN - 1 if index > MOON_LEN - 1
+
+          format '  %.2f s %s ', dif, MOON_STR[index]
+        else
+          format '  %.2f s   ', dif
+        end
+      end
+
       def ui_task_color(task)
         rev = task == selected ? A_REVERSE : 0
 
@@ -219,6 +237,9 @@ module Fasten
 
         str ||= icon ? "#{icon} #{task}" : task.to_s
 
+        delta = x + str.length - n_cols
+        str = str[0...-delta] if delta.positive?
+
         attrset attrs if attrs
         addstr str
         attroff attrs if attrs
@@ -231,14 +252,38 @@ module Fasten
           worker.spinner = (worker.spinner + 1) % SPINNER_LEN if worker.running?
         end
 
+        cur = Time.new
+
         count_done = tasks.done.count
         count_total = tasks.count
         tl = count_total.to_s.length
-        col_ini = ui_text_aligned(2, :left, format("Tasks %#{tl}d/%d", count_done, count_total)) + 1
-        col_fin = n_cols - 5
-        ui_text_aligned(2, :right, "#{(count_done * 100 / count_total).to_i}%") if count_total.positive?
+        percentstr = count_total.positive? && " #{(count_done * 100 / count_total).to_i}%"
+        elapsed_str = format ' %.2f s', (dif = cur - runner.ini) if runner.ini
+
+        @stat_str ||= begin
+          @runner_last_avg = runner.last_avg
+          if runner.last_avg && runner.last_err
+            format '≈ %.2f s ± %.2f', runner.last_avg, runner.last_err
+          elsif runner.last_avg
+            format '≈ %.2f s', runner.last_avg
+          end
+        end
+
+        end_str = [elapsed_str, @stat_str].compact.join(' ')
+
+        if @runner_last_avg
+          a = dif
+          b = @runner_last_avg
+        else
+          a = count_done
+          b = count_total
+        end
+
+        col_ini = ui_text_aligned(2, :left, format("Tasks %#{tl}d/%d%s", count_done, count_total, percentstr)) + 1
+        col_fin = n_cols - 1 - end_str.length
+        ui_text_aligned(2, :right, end_str)
 
-        ui_progressbar(2, col_ini, col_fin, count_done, count_total)
+        ui_progressbar(2, col_ini, col_fin, a, b)
 
         max = 2
         list = tasks.sort_by.with_index { |x, index| [x.run_score, index] }
@@ -260,13 +305,16 @@ module Fasten
             end
           else
             x = max + 1
-            last = runner.stats_last(task)
+            last_avg = task.last_avg
+            last_err = task.last_err
             if task.dif
               str = format '  %.2f s', task.dif
-            elsif last['avg'] && last['err']
-              str = format '≈ %.2f s ± %.2f %s', last['avg'], last['err'], task.worker&.name
-            elsif last['avg']
-              str = format '≈ %.2f s %s', last['avg'], task.worker&.name
+            elsif last_avg && last_err
+              str = format '%s ≈ %.2f s ± %.2f %s', ui_task_clock(task, cur, last_avg), last_avg, last_err, task.worker&.name
+            elsif last_avg
+              str = format '%s ≈ %.2f s %s', ui_task_clock(task, cur, last_avg), last_avg, task.worker&.name
+            else
+              str = ui_task_clock(task, cur, 0)
             end
             ui_task_string(task, 3 + index, x, str: str) if str
           end

data/lib/fasten/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fasten
-  VERSION = '0.12.4'
+  VERSION = '0.12.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fasten
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.12.6
 platform: ruby
 authors:
 - Aldrin Martoq
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-06 00:00:00.000000000 Z
+date: 2019-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler