fasten 0.12.4 → 0.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3529d50d7d2bc28cb85f1c41828504cf602b8b04b066e7a3ab11ec2102c6aee0
-  data.tar.gz: f68633c37fc30cded6460bf7093ca010d6d214f4d04ed592bc938e078eb8a1b0
+  metadata.gz: 790a1d8191184aff7cc7db302aa2675d7222321fadc2762f23037f1ee31c4673
+  data.tar.gz: 19d21a87a855fdcb23a07ffd6ccb5787eaf33dfb1ce9eba8edb2e49ffa06ee62
 SHA512:
-  metadata.gz: 7d7afa32077b61a6c4d2f14966eee04925bab79b63e4fb297ab64426aabf74def1e7e67ce48c35d58e6d5e883ca112e73d7b37d616c338a4b7d11d618df30919
-  data.tar.gz: 2b662abc55dc8f6a3248e4b67959c52240b6f27635719295b87dfb794e7d40f8c4573716137ea22a01f7b9076dcdc79c515d9b326692a72bd4696026278f3c18
+  metadata.gz: 19539cc0b6f947655a61533020107d8b7e023a3ed69de5aa7b88979f21c2d9ee71a9549c2f1d704880f23f7c666ac57a60ed86724c17c1f34bbe74c9f848b0c5
+  data.tar.gz: b3b679c630152b39a489748ace2293992ddef25791698599fe8302257898aec2b47d6ebd4e030e3ac1d75829b18d07581aa7e83995db5a7ef7993c9da8b4055b

data/.gitignore

@@ -9,6 +9,8 @@
 
 # rspec failure tracking
 .rspec_status
+
+# custom ignores
 /fasten/log
 /demo/fasten/log
 *.testfile

data/.rubocop.yml

@@ -1,4 +1,4 @@
-Metrics/LineLength:
+Layout/LineLength:
   Max: 160
 Style/Documentation:
   Enabled: false
@@ -23,10 +23,14 @@ Style:
 Metrics/AbcSize:
   Max: 25
 Metrics/MethodLength:
-  Max: 15
+  Max: 20
 Metrics/ParameterLists:
   Max: 8
-Layout/AlignHash:
+Layout/HashAlignment:
   EnforcedHashRocketStyle: table
 Style/FormatStringToken:
   Enabled: false
+
+AllCops:
+  NewCops: enable
+  TargetRubyVersion: 2.6

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6.4
+ruby-2.6.6

data/.tool-versions

@@ -1 +1 @@
-ruby 2.6.4
+ruby 2.6.6

data/.travis.yml

@@ -3,5 +3,5 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.5.1
-before_install: gem install bundler -v 1.16.4
+  - 2.7.2
+before_install: gem install bundler -v 2.1.4

data/CODE_OF_CONDUCT.md

@@ -68,7 +68,7 @@ members of the project's leadership.
 ## Attribution
 
 This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
+available at [https://contributor-covenant.org/version/1/4][version]
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+[homepage]: https://contributor-covenant.org
+[version]: https://contributor-covenant.org/version/1/4/

data/Gemfile

@@ -4,3 +4,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in fasten.gemspec
 gemspec
+
+gem 'os'
+gem 'rake', '~> 12.0'
+gem 'rspec', '~> 3.0'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fasten (0.12.4)
+    fasten (0.14.4)
       binding_of_caller
       hirb
       os
@@ -10,59 +10,71 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
-    binding_of_caller (0.8.0)
+    ast (2.4.2)
+    binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
-    coderay (1.1.2)
-    curses (1.3.1)
-    debug_inspector (0.0.3)
-    diff-lcs (1.3)
+    coderay (1.1.3)
+    curses (1.4.1)
+    debug_inspector (1.1.0)
+    diff-lcs (1.4.4)
     hirb (0.7.3)
-    jaro_winkler (1.5.3)
-    method_source (0.9.2)
-    os (1.0.1)
-    parallel (1.17.0)
-    parser (2.6.5.0)
-      ast (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    method_source (1.0.0)
+    os (1.1.1)
+    parallel (1.20.1)
+    parser (3.0.1.1)
+      ast (~> 2.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rainbow (3.0.0)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.5)
+    rake (12.3.3)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.2)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.3)
-    rubocop (0.75.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.16.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.1)
-    unicode-display_width (1.6.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.7.0)
+      parser (>= 3.0.1.1)
+    rubocop-rake (0.5.1)
+      rubocop
+    rubocop-rspec (2.3.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    unicode-display_width (2.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.17.1)
   curses
   fasten!
+  os
   pry
-  rake (~> 10.0)
+  rake (~> 12.0)
   rspec (~> 3.0)
   rubocop
+  rubocop-rake
+  rubocop-rspec
 
 BUNDLED WITH
-   1.17.3
+   1.17.2

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/fasten.gemspec

@@ -1,6 +1,4 @@
-lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'fasten/version'
+require_relative 'lib/fasten/version'
 require 'os'
 
 Gem::Specification.new do |spec|
@@ -13,29 +11,31 @@ Gem::Specification.new do |spec|
   spec.description   = 'Fasten your seatbelts! Run jobs in parallel, intelligently.'
   spec.homepage      = 'https://github.com/a0/a0-fasten-ruby/'
   spec.license       = 'MIT'
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.6.0')
+
+  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = 'https://github.com/a0/a0-fasten-ruby/CHANGELOG.md'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|demo)/}) }
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.17.1'
   spec.add_development_dependency 'curses' unless OS.windows?
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.add_development_dependency 'rubocop-rspec'
 
   spec.add_runtime_dependency 'binding_of_caller'
   spec.add_runtime_dependency 'hirb'
   spec.add_runtime_dependency 'os'
   spec.add_runtime_dependency 'parallel'
-
-  raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.' unless spec.respond_to?(:metadata)
-
-  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 end

data/lib/fasten/defaults.rb

@@ -35,13 +35,13 @@ module Fasten
 
       require 'fasten/ui/curses'
 
-      @default_ui_mode = STDIN.tty? && STDOUT.tty? ? :curses : :console
+      @default_ui_mode = $stdin.tty? && $stdout.tty? ? :curses : :console
     rescue StandardError, LoadError
       @default_ui_mode = :console
     end
 
     def default_developer
-      STDIN.tty? && STDOUT.tty?
+      $stdin.tty? && $stdout.tty?
     end
 
     def default_priority

data/lib/fasten/runner.rb

@@ -37,7 +37,6 @@ module Fasten
       end
 
       initialize_stats
-      initialize_logger
     end
 
     def task(name, **opts, &block)
@@ -51,9 +50,12 @@ module Fasten
     end
 
     def perform
+      initialize_logger
+      StdThreadProxy.install if use_threads
       self.state = :RUNNING
       log_ini self, running_counters
       load_stats
+      touch_task_logs
 
       run_ui do
         perform_loop
@@ -66,9 +68,20 @@ module Fasten
 
       stats_summary if summary
     ensure
+      StdThreadProxy.uninstall if use_threads
+      close_logger
       save_stats
     end
 
+    def touch_task_logs
+      FileUtils.mkdir_p "#{fasten_dir}/log/task/"
+      tasks.each do |task|
+        path = "#{fasten_dir}/log/task/#{task.name}.log"
+        puts "Fasten: creating log #{path}"
+        FileUtils.touch path
+      end
+    end
+
     def map(list, &block)
       list.each do |item|
         task item.to_s, request: item, &block
@@ -218,7 +231,7 @@ module Fasten
     end
 
     def find_or_create_worker(worker_class:)
-      worker = workers.find { |item| item.class == worker_class && item.running_task.nil? }
+      worker = workers.find { |item| item.instance_of?(worker_class) && item.running_task.nil? }
 
       unless worker
         @worker_id = (@worker_id || 0) + 1

data/lib/fasten/std_thread_proxy.rb

@@ -1,24 +1,28 @@
 module Fasten
   class StdThreadProxy
-    def initialize(original)
-      @original = original
+    attr_reader :fasten_original
+
+    def initialize(fasten_original)
+      @fasten_original = fasten_original
     end
 
-    def respond_to?(name, include_private = false)
-      target = Thread.current[:FASTEN_STD_THREAD_PROXY] || @original
-      target.send :respond_to?, name, include_private
+    def respond_to?(*args)
+      target = Thread.current[:FASTEN_STD_THREAD_PROXY] || @fasten_original
+      target.send :respond_to?, *args
     end
 
     private
 
-    def respond_to_missing?(name, include_private = false)
-      target = Thread.current[:FASTEN_STD_THREAD_PROXY] || @original
-      target.send :respond_to_missing?, name, include_private
+    def respond_to_missing?(*args)
+      target = Thread.current[:FASTEN_STD_THREAD_PROXY] || @fasten_original
+      target.send :respond_to_missing?, *args
     end
 
-    def method_missing(method, *args, &block) # rubocop:disable Style/MethodMissingSuper
-      target = Thread.current[:FASTEN_STD_THREAD_PROXY] || @original
+    def method_missing(method, *args, &block)
+      target = Thread.current[:FASTEN_STD_THREAD_PROXY] || @fasten_original
       target.send method, *args, &block
+    rescue StandardError => e
+      raise e
     end
 
     class << self
@@ -28,8 +32,9 @@ module Fasten
         oldverbose = $VERBOSE
         $VERBOSE = nil
 
-        Object.const_set :STDOUT, StdThreadProxy.new(STDOUT)
-        Object.const_set :STDERR, StdThreadProxy.new(STDERR)
+        Object.const_set :STDOUT, StdThreadProxy.new(STDOUT) # rubocop:disable Style/GlobalStdStream
+        Object.const_set :STDERR, StdThreadProxy.new(STDERR) # rubocop:disable Style/GlobalStdStream
+
         $stdout = StdThreadProxy.new $stdout
         $stderr = StdThreadProxy.new $stderr
 
@@ -49,7 +54,18 @@ module Fasten
       def uninstall
         return unless @installed
 
+        oldverbose = $VERBOSE
+        $VERBOSE = nil
+
+        Object.const_set :STDOUT, STDOUT.fasten_original if STDOUT.is_a? StdThreadProxy # rubocop:disable Style/GlobalStdStream
+        Object.const_set :STDERR, STDERR.fasten_original if STDERR.is_a? StdThreadProxy # rubocop:disable Style/GlobalStdStream
+
+        $stdout = $stdout.fasten_original if $stdout.is_a? StdThreadProxy
+        $stderr = $stderr.fasten_original if $stderr.is_a? StdThreadProxy
+
         @installed = nil
+      ensure
+        $VERBOSE = oldverbose
       end
     end
   end

data/lib/fasten/support/fork_worker.rb

@@ -75,12 +75,8 @@ 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
+        @saved_stdout_constant ||= $stdout.clone
+        @saved_stderr_constant ||= $stderr.clone
 
         FileUtils.mkdir_p File.dirname(path)
         @redirect_log = File.new path, 'a'
@@ -88,22 +84,15 @@ module Fasten
 
         $stdout.reopen @redirect_log
         $stderr.reopen @redirect_log
-        STDOUT.reopen @redirect_log
-        STDERR.reopen @redirect_log
+
+        logger.reopen(@redirect_log)
       end
 
       def restore_std
-        oldverbose = $VERBOSE
-        $VERBOSE = nil
-
-        $stdout = @saved_stdout_instance
-        $stderr = @saved_stderr_instance
-        Object.const_set :STDOUT, @saved_stdout_constant
-        Object.const_set :STDERR, @saved_stderr_constant
-
         @redirect_log.close
-      ensure
-        $VERBOSE = oldverbose
+
+        $stdout.reopen @saved_stdout_constant
+        $stderr.reopen @saved_stderr_constant
       end
     end
   end

data/lib/fasten/support/logger.rb

@@ -26,14 +26,18 @@ module Fasten
         if log_file
           self.log_file = log_file
         else
-          log_path ||= "#{fasten_dir}/log/#{kind}/#{name}.log"
-          FileUtils.mkdir_p File.dirname(log_path)
-          self.log_file = File.new(log_path, 'a')
-          self.log_file.sync = true
+          self.log_file ||= "#{fasten_dir}/log/#{kind}/#{name}.log"
+          FileUtils.mkdir_p File.dirname(self.log_file)
         end
+
+        close_logger
         self.logger = ::Logger.new self.log_file, level: Fasten.logger.level, progname: Fasten.logger.progname
       end
 
+      def close_logger
+        logger.close if logger.is_a? ::Logger
+      end
+
       def log_ini(object, message = nil)
         object.ini ||= Time.new
         log_info "Ini #{object.state} #{object.class} #{object} #{message}"
@@ -51,7 +55,7 @@ end
 
 Fasten.logger ||=
   begin
-    Logger.new STDOUT, level: Logger::DEBUG, progname: $PROGRAM_NAME
+    Logger.new $stdout, level: Logger::DEBUG, progname: $PROGRAM_NAME
   rescue StandardError
     nil
   end

data/lib/fasten/support/state.rb

@@ -1,7 +1,9 @@
+require 'digest'
+
 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 +29,54 @@ module Fasten
       def quitting?
         state == :QUITTING
       end
+
+      def last_stat
+        return @last_stat if defined? @last_stat
+
+        return {} unless @runner
+
+        @last_stat = runner.stats_last(self)
+      end
+
+      def last_avg
+        @last_avg ||= last_stat['avg']
+      end
+
+      def last_err
+        @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
+          deps_str_task
+        elsif is_a? Fasten::Runner
+          deps_str_runner
+        end
+      end
+
+      def deps_str_task
+        if after.is_a? Array
+          after.sort_by do |task|
+            task.is_a?(Fasten::Task) ? task.name : task
+          end&.join(', ')
+        else
+          after
+        end
+      end
+
+      def deps_str_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

@@ -5,8 +5,8 @@ require 'fileutils'
 module Fasten
   module Support
     module Stats
-      attr_writer :stats_data, :stats_entries
-      attr_reader :stats_path
+      # attr_writer :stats_data, :stats_entries
+      # attr_reader :stats_path
 
       def initialize_stats
         return unless stats
@@ -20,14 +20,17 @@ module Fasten
       def load_stats
         return unless @stats_path && File.exist?(@stats_path)
 
-        self.stats_data = []
-        CSV.foreach(@stats_path, headers: true) do |row|
+        @stats_data = []
+        CSV.foreach(@stats_path, headers: true, converters: [:all]) do |row|
           stats_data << row.to_h
         end
 
         @tasks.each do |task|
-          stats_last(task)
+          task.runner = self
+          task.last_stat
         end
+        self.runner = self
+        last_stat
 
         @tasks.waiting = nil
       rescue StandardError
@@ -37,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
@@ -55,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
 
@@ -73,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
@@ -120,14 +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)
-        return item.last if item.last
-
-        item.last = 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/support/thread_worker.rb

@@ -54,7 +54,6 @@ module Fasten
       def restore_std
         @redirect_log&.close
         StdThreadProxy.thread_io = nil
-        logger.reopen(log_file)
       end
     end
   end

data/lib/fasten/support/ui.rb

@@ -6,7 +6,7 @@ module Fasten
       def ui
         require 'fasten/ui/curses'
 
-        @ui ||= if ui_mode.to_s == 'curses' && STDIN.tty? && STDOUT.tty?
+        @ui ||= if ui_mode.to_s == 'curses' && $stdin.tty? && $stdout.tty?
                   Fasten::UI::Curses.new(runner: self)
                 else
                   Fasten::UI::Console.new(runner: self)

data/lib/fasten/support/yaml.rb

@@ -5,9 +5,10 @@ module Fasten
     module Yaml
       def load_yaml(path)
         items = YAML.safe_load(File.read(path)).each do |name, params|
-          if params.is_a? String
+          case params
+          when String
             params = { after: params }
-          elsif params.is_a? Hash
+          when Hash
             transform_params(params)
           else
             params = {}
@@ -38,15 +39,16 @@ module Fasten
       protected
 
       def transform_params(params)
-        params.keys.each do |k|
-          val = params[k]
+        keys = params.keys
+
+        keys.each do |key|
+          val = params.delete key
 
           if val.is_a?(String) && (match = %r{^/(.+)/$}.match(val))
             val = Regexp.new(match[1])
           end
 
-          params[k.to_sym] = val
-          params.delete(k)
+          params[key.to_sym] = val
         end
       end
     end

data/lib/fasten/task.rb

@@ -4,8 +4,7 @@ module Fasten
   class Task
     include Fasten::Support::State
 
-    attr_accessor :name, :after, :shell, :ruby, :worker_class
-    attr_accessor :dependants, :depends, :request, :response, :worker, :run_score, :weight, :block
+    attr_accessor :name, :after, :shell, :ruby, :worker_class, :dependants, :depends, :request, :response, :worker, :run_score, :weight, :block
 
     def initialize(name:, shell: nil, ruby: nil, block: nil, request: nil, after: nil, weight: 1, worker_class: nil)
       self.name = name
@@ -16,6 +15,20 @@ module Fasten
       self.after = after
       self.weight = weight
       self.worker_class = worker_class
+
+      # ObjectSpace.define_finalizer(self) do
+      #   puts "I am dying! pid: #{Process.pid} thread: #{Thread.current} TASK #{@name}"
+      # end
+
+      block&.object_id
+      # block && begin
+
+      #   # puts "block_id: #{block.object_id} for task #{@name}"
+      # end
+
+      # block && ObjectSpace.define_finalizer(block) do
+      #   puts "I am dying! pid: #{Process.pid} thread: #{Thread.current} TASK #{@name} BLOCK"
+      # end
     end
 
     def marshal_dump
@@ -24,7 +37,11 @@ module Fasten
 
     def marshal_load(data)
       @name, @state, @ini, @fin, @dif, @request, @response, @shell, @ruby, block_id, @error = data
-      @block = ObjectSpace._id2ref block_id if block_id
+      @block = begin
+        ObjectSpace._id2ref block_id.to_i if block_id
+      rescue StandardError
+        # pass
+      end
 
       raise "Sorry, unable to get block for task #{self}, please try using threads" if block_id && !@block.is_a?(Proc)
     end

data/lib/fasten/task_manager.rb

@@ -2,7 +2,7 @@ module Fasten
   class TaskManager < Array # rubocop:disable Metrics/ClassLength
     attr_reader :done, :failed, :pending, :running, :targets, :runner
 
-    def initialize(targets: [], runner:)
+    def initialize(runner:, targets: [])
       super()
 
       @map = {}
@@ -120,6 +120,10 @@ module Fasten
         mark_needed(task)
       end
 
+      setup_pending
+    end
+
+    def setup_pending
       @pending.reject { |task| task.state == :NEED }.each do |task|
         @pending.delete task
         delete task
@@ -159,8 +163,8 @@ module Fasten
       when :dependants_avg
         @waiting.sort_by!.with_index do |task, index|
           task.state = :WAIT
-          last_avg = task.last && task.last['avg'] || 0
-          [-task.run_score, -last_avg.to_f, index]
+          last_avg = task.last_avg || 0
+          [-task.run_score, -last_avg, index]
         end
       else
         raise "Unknown priority #{@runner.priority}"

data/lib/fasten/ui/console.rb

@@ -49,7 +49,7 @@ module Fasten
         return unless old.count != orig.count
 
         (orig - old).each do |task|
-          puts "Time: #{hformat Time.new - runner.ini} #{message} #{hformat task.dif} Task #{task}"
+          puts "Time: #{hformat Time.new - runner.ini} #{message} #{hformat task.dif} #{task.worker} Task #{task}"
           old << task
         end
       end

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
 
@@ -37,7 +39,7 @@ module Fasten
 
       def draw_title
         ui_text_aligned(0, :left, 'Fasten your seatbelts!')
-        ui_text_aligned(0, :center, name.to_s)
+        ui_text_aligned(0, :center, "#{name} #{$PID}")
         ui_text_aligned(0, :right, Time.new.to_s)
       end
 
@@ -125,11 +127,12 @@ module Fasten
       end
 
       def ui_jobs_summary
-        running_count = tasks.running.count
-        waiting_count = tasks.waiting.count
-        workers_count = workers.count
+        running = tasks.running.count
+        waiting = tasks.waiting.count
+        working = workers.count
+        idle    = working - running
 
-        "Procs running: #{running_count} idle: #{workers_count - running_count} waiting: #{waiting_count} #{runner.use_threads ? 'threads' : 'processes'}: #{jobs}"
+        "Procs running: #{running} idle: #{idle} waiting: #{waiting} #{runner.use_threads ? 'threads' : 'processes'}: #{jobs}"
       end
 
       def ui_jobs
@@ -194,6 +197,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 +238,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 +253,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 +306,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.14.4'
 end

data/lib/fasten/worker.rb

@@ -89,6 +89,7 @@ module Fasten
       perform_task task
     ensure
       restore_std
+
       logger.reopen(log_file)
       log_fin task, 'run_task'
     end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fasten
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.14.4
 platform: ruby
 authors:
 - Aldrin Martoq
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-10-06 00:00:00.000000000 Z
+date: 2021-06-07 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.17.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.17.1
 - !ruby/object:Gem::Dependency
   name: curses
   requirement: !ruby/object:Gem::Requirement
@@ -53,35 +39,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -199,7 +185,9 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+  homepage_uri: https://github.com/a0/a0-fasten-ruby/
+  source_code_uri: https://github.com/a0/a0-fasten-ruby/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -207,7 +195,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -215,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Fasten your seatbelts! Run jobs in parallel, intelligently.
 test_files: []