fasten 0.12.6 → 0.12.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccba14b261264ae79b9144b3de97610d2499763baab8e03eb5b0cf049c179925
-  data.tar.gz: 2b611452336f62c2de1f48625870ab5dd53589867e609300eedcc4638114ea15
+  metadata.gz: 9dd4cb73dcf32492c0e11fac100e3726acdff174e0233e41728459f226a7cec1
+  data.tar.gz: 7d4981e1ee8793750cedf2bb153fc60b4a27c5f0802db03a9c02f4202205bc07
 SHA512:
-  metadata.gz: c139aad75f9abb28ea50a34fe78b166819cf4ae7c125fe9ee6b9f1beec410a2ebbbbad6fdc1a1ff3a52f1cc6f3c85aa239e0274ee4caef66db58741fb846f0ad
-  data.tar.gz: 216a6776f631a1d8d1d9526ae6408978c722fc36a13982151ba6ac7c3050344a892a6f5844b784402add158b33592c0b6fba555cfabd60273a03d8dd7aa9e37f
+  metadata.gz: b856359819576b19d03223a8d7c927b4f6698aa51e4fb7c4baf97b83566db6762c9f42f7242a055c5830af23a1af1e612db1a6b6cc227264b20c571718020980
+  data.tar.gz: 7311a2544fe423929c45c3ce82dd61ebdfdd2e1c310d1cee3096b154571f67858d71f4b450c74dec94ff292ce77d4cd5e5b4469a4f32590a381e0cedd71cb1e0

data/Gemfile.lock

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

data/README.md

@@ -40,7 +40,7 @@ It has been released so people can try it and make feature requests, comments an
 - [x] Press ⬅️ or ➡️ keys to dynamically increase/decrease number of jobs
 - [ ] Use ⬆️ and ⬇️ to select tasks
 - [ ] Calculate ETA, assuming all tasks take same time
-- [ ] Calculate ETA, based on saved tasks statistics
+- [x] Calculate ETA, based on saved tasks statistics
 - [ ] Live tail -f of selected tasks
 
 ### UI/Console

data/lib/fasten/support/fork_worker.rb

@@ -75,10 +75,6 @@ module Fasten
       end
 
       def redirect_std(path)
-        logger.reopen($stdout)
-
-        @saved_stdout_instance = $stdout.clone
-        @saved_stderr_instance = $stderr.clone
         @saved_stdout_constant = STDOUT.clone
         @saved_stderr_constant = STDERR.clone
 
@@ -86,24 +82,20 @@ module Fasten
         @redirect_log = File.new path, 'a'
         @redirect_log.sync = true
 
-        $stdout.reopen @redirect_log
-        $stderr.reopen @redirect_log
         STDOUT.reopen @redirect_log
         STDERR.reopen @redirect_log
+
+        logger.reopen($stdout)
       end
 
       def restore_std
-        oldverbose = $VERBOSE
-        $VERBOSE = nil
+        @redirect_log.close
 
-        $stdout = @saved_stdout_instance
-        $stderr = @saved_stderr_instance
-        Object.const_set :STDOUT, @saved_stdout_constant
-        Object.const_set :STDERR, @saved_stderr_constant
+        STDOUT.reopen @saved_stdout_constant
+        STDERR.reopen @saved_stderr_constant
 
-        @redirect_log.close
-      ensure
-        $VERBOSE = oldverbose
+        @saved_stdout_constant = nil
+        @saved_stderr_constant = nil
       end
     end
   end

data/lib/fasten/support/state.rb

@@ -1,3 +1,5 @@
+require 'digest'
+
 module Fasten
   module Support
     module State
@@ -28,20 +30,44 @@ module Fasten
         state == :QUITTING
       end
 
-      def last
-        return @last if defined? @last
+      def last_stat
+        return @last_stat if defined? @last_stat
 
         return {} unless @runner
 
-        @last = runner.stats_last(self)
+        @last_stat = runner.stats_last(self)
       end
 
       def last_avg
-        @last_avg ||= last['avg']&.to_f
+        @last_avg ||= last_stat['avg']
       end
 
       def last_err
-        @last_err ||= last['err']&.to_f
+        @last_err ||= last_stat['err']
+      end
+
+      def deps
+        return @deps if defined? @deps
+
+        str = deps_str
+
+        @deps = str && Digest::SHA1.hexdigest(str)
+      end
+
+      def deps_str
+        if is_a? Fasten::Task
+          if after.is_a? Array
+            after.sort_by do |task|
+              task.is_a?(Fasten::Task) ? task.name : task
+            end&.join(', ')
+          else
+            after
+          end
+        elsif is_a? Fasten::Runner
+          tasks.sort_by(&:name).map do |task|
+            [task.name, task.deps_str].compact.join(': ')
+          end.join("\n")
+        end
       end
     end
   end

data/lib/fasten/support/stats.rb

@@ -21,16 +21,16 @@ module Fasten
         return unless @stats_path && File.exist?(@stats_path)
 
         self.stats_data = []
-        CSV.foreach(@stats_path, headers: true) do |row|
+        CSV.foreach(@stats_path, headers: true, converters: [:all]) do |row|
           stats_data << row.to_h
         end
 
         @tasks.each do |task|
           task.runner = self
-          task.last
+          task.last_stat
         end
         self.runner = self
-        last
+        last_stat
 
         @tasks.waiting = nil
       rescue StandardError
@@ -40,7 +40,7 @@ module Fasten
       def save_stats
         return unless @stats_path && stats_data
 
-        keys = %w[state kind name run cnt avg std err ini fin]
+        keys = %w[state kind name run cnt avg std err ini fin deps]
 
         CSV.open(@stats_path, 'wb') do |csv|
           csv << keys
@@ -58,6 +58,7 @@ module Fasten
           'ini'    => target.ini.to_f,
           'fin'    => target.fin.to_f,
           'run'    => target.fin - target.ini,
+          'deps'   => target.deps,
           'worker' => target.respond_to?(:worker) ? target.worker.name : nil }
       end
 
@@ -76,7 +77,7 @@ module Fasten
         stats_data << entry
         stats_entries << entry
 
-        history = stats_history(entry)
+        history = stats_run_history(entry)
 
         update_stats(history, entry)
       end
@@ -123,12 +124,12 @@ module Fasten
                     task: hformat(sub), runner: hformat(tot, sub), saved: hformat(sub - tot, sub), jobs: jobs.to_s)
       end
 
-      def stats_history(entry)
-        stats_data.select { |e| e['state'] == entry['state'] && e['kind'] == entry['kind'] && e['name'] == entry['name'] }.map { |x| x['run'].to_f }
+      def stats_run_history(entry)
+        stats_data.select { |item| %w[state kind name deps].all? { |key| item[key] == entry[key] } }.map { |item| item['run'] }
       end
 
-      def stats_last(item)
-        stats_data.select { |e| e['kind'] == item.kind && e['name'] == item.name }.last || {}
+      def stats_last(target)
+        stats_data.select { |item| %w[kind name deps].all? { |key| item[key] == target.send(key) } }.last || {}
       end
 
       def update_stats(history, entry)

data/lib/fasten/task_manager.rb

@@ -160,7 +160,7 @@ module Fasten
         @waiting.sort_by!.with_index do |task, index|
           task.state = :WAIT
           last_avg = task.last_avg || 0
-          [-task.run_score, -last_avg.to_f, index]
+          [-task.run_score, -last_avg, index]
         end
       else
         raise "Unknown priority #{@runner.priority}"

data/lib/fasten/version.rb

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

metadata

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