fasten 0.7.6 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a5f2710522752673a8cbaf767ad0a9310c5cc24e980139ef274c957422ad90b
-  data.tar.gz: 6f58aa4dbd2a8996e65fa26d70e64e9bb1ac5bd0e4a6d6da05c04919e1b810ea
+  metadata.gz: c77fcc3eddc4f86d6b6a2ad36fbeb6f7edb302c6068b65df3dd61d2531e8251a
+  data.tar.gz: 3638c6cf10144c9a47bedfca7ada81547c3f2b15a440a81b1c4b8a055bd38d3d
 SHA512:
-  metadata.gz: 247189b714300179c8b9ab1ec7bbab9d643b9bb2d7c3aff4fbe6b991debe2345de12e696650985f01c2b1e71efee51e1649ffe2719314c5e8127fedc92d7df4d
-  data.tar.gz: 71476a45dc759402cbc19972586a3080ebd4e6b6b2a2fbfacfa70ec135336e38a2070e9394c9af2be3ea970fad8a2849f3e1075675484ac4d977dd3055ab43b1
+  metadata.gz: 2b0ca6dcec14736e254d66ce33f536f70982923d638403f7e3a4cb0c950e59e74727fb47d847d24a8f9a1a80ad594d0cbae9734ef3ef9bdd7e5cc6b12b913ea5
+  data.tar.gz: b1e139f7a7f62677a581a47ca95959919430a13d338e0adf3731d13d2675cbbfeba9a3173d31a5659002da3635a254f6b59cb95060042d77a54cb2faf4359537

data/Gemfile.lock

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

data/README.md

@@ -21,7 +21,7 @@ It has been released so people can try it and make feature requests, comments an
 ### Execution:
 - [x] tasks are executed in parallel, using worker processes/threads
 - [x] process are preferred on POSIX systems, otherwise threads are used
-- [x] default number of workers is the # of real cpu cores on the system
+- [x] default number of jobs is the # of real cpu cores on the system
 - [x] in case of task Error or Exception, the whole run will be stopped
 - [x] runner saves a log file in `$(pwd)/fasten/log/runner/*name_of_runner*.log`
 - [x] each task saves its STDERR/STDOUT to a log file in `$(pwd)/fasten/log/task/*name_of_task*.log`
@@ -30,14 +30,14 @@ It has been released so people can try it and make feature requests, comments an
 
 ### UI/Curses
 - [x] only available if the 'curses' gem is installed
-- [x] Display number of workers running, idle, waiting, and number of workers (max)
+- [x] Display number of jobs running, idle, waiting, and number of jobs (max)
 - [x] Display current running tasks, pending tasks, waiting tasks, etc; showing which task is pending because other tasks need to be run first
 - [x] Display the number of tasks done/pending
 - [x] Display a progressbar
 - [x] Display current local time
 - [x] Pause whole runner with `P` key (waits current running tasks end)
 - [x] Resume paused runner with `R` key
-- [x] Press ⬅️ or ➡️ keys to dynamically increase/decrease number of workers
+- [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

data/lib/fasten/defaults.rb

@@ -14,7 +14,7 @@ module Fasten
       false
     end
 
-    def default_workers
+    def default_jobs
       Parallel.physical_processor_count
     end
 
@@ -35,7 +35,7 @@ module Fasten
 
       require 'fasten/ui/curses'
 
-      @default_ui_mode = :curses
+      @default_ui_mode = STDIN.tty? && STDOUT.tty? ? :curses : :console
     rescue StandardError, LoadError
       @default_ui_mode = :console
     end

data/lib/fasten/runner.rb

@@ -18,27 +18,26 @@ module Fasten
     include Fasten::Support::UI
     include Fasten::Support::Yaml
 
-    attr_accessor :name, :stats, :summary, :workers, :worker_class, :fasten_dir, :use_threads, :ui_mode, :developer, :worker_list, :queue, :tasks
+    attr_accessor :name, :stats, :summary, :jobs, :worker_class, :fasten_dir, :use_threads, :ui_mode, :developer, :workers, :queue, :tasks
 
     def initialize(**options)
-      %i[name stats summary workers worker_class fasten_dir use_threads ui_mode developer].each do |key|
+      %i[name stats summary jobs worker_class fasten_dir use_threads ui_mode developer].each do |key|
         options[key] = Fasten.send "default_#{key}" unless options.key? key
       end
 
-      @tasks = TaskManager.new
+      @tasks = TaskManager.new(targets: options[:targets] || [])
+      @workers = []
 
       reconfigure(options)
     end
 
     def reconfigure(**options)
-      %i[name stats summary workers worker_class fasten_dir use_threads ui_mode developer].each do |key|
+      %i[name stats summary jobs worker_class fasten_dir use_threads ui_mode developer].each do |key|
         send "#{key}=", options[key] if options.key? key
       end
 
       initialize_stats
       initialize_logger
-
-      self.worker_list ||= []
     end
 
     def task(name, **opts, &block)
@@ -117,7 +116,7 @@ module Fasten
     end
 
     def should_wait_for_running_tasks?
-      tasks.running? && (tasks.no_waiting? || tasks.failed? || %i[PAUSING QUITTING].include?(state)) || tasks.running.count >= workers
+      tasks.running? && (tasks.no_waiting? || tasks.failed? || %i[PAUSING QUITTING].include?(state)) || tasks.running.count >= jobs
     end
 
     def wait_for_running_tasks
@@ -130,13 +129,13 @@ module Fasten
       while should_wait_for_running_tasks?
         ui.update
 
-        receive_workers_tasks_thread queue.receive_with_timeout(0.5)
+        receive_jobs_tasks_thread queue.receive_with_timeout(0.5)
       end
 
       ui.update
     end
 
-    def receive_workers_tasks_thread(items)
+    def receive_jobs_tasks_thread(items)
       items&.each do |task|
         tasks.running.delete task
 
@@ -153,18 +152,18 @@ module Fasten
     def wait_for_running_tasks_fork
       while should_wait_for_running_tasks?
         ui.update
-        reads = worker_list.map(&:parent_read)
+        reads = workers.map(&:parent_read)
         reads, _writes, _errors = IO.select(reads, [], [], 0.5)
 
-        receive_workers_tasks_fork(reads)
+        receive_jobs_tasks_fork(reads)
       end
 
       ui.update
     end
 
-    def receive_workers_tasks_fork(reads)
+    def receive_jobs_tasks_fork(reads)
       reads&.each do |read|
-        next unless (worker = worker_list.find { |item| item.parent_read == read })
+        next unless (worker = workers.find { |item| item.parent_read == read })
 
         task = worker.receive_response_from_child
 
@@ -206,24 +205,24 @@ module Fasten
     end
 
     def remove_workers_as_needed
-      while worker_list.count > workers
-        return unless (worker = worker_list.find { |item| item.running_task.nil? })
+      while workers.count > jobs
+        return unless (worker = workers.find { |item| item.running_task.nil? })
 
         worker.kill
-        worker_list.delete worker
+        workers.delete worker
 
         ui.force_clear
       end
     end
 
     def find_or_create_worker
-      worker = worker_list.find { |item| item.running_task.nil? }
+      worker = workers.find { |item| item.running_task.nil? }
 
       unless worker
         @worker_id = (@worker_id || 0) + 1
         worker = worker_class.new runner: self, name: "#{worker_class.to_s.gsub('::', '-')}-#{format '%02X', @worker_id}", use_threads: use_threads
         worker.start
-        worker_list << worker
+        workers << worker
 
         log_info "Worker created: #{worker}"
 
@@ -234,7 +233,7 @@ module Fasten
     end
 
     def dispatch_pending_tasks
-      while tasks.waiting? && tasks.running.count < workers
+      while tasks.waiting? && tasks.running.count < jobs
         worker = find_or_create_worker
 
         task = tasks.next
@@ -247,8 +246,8 @@ module Fasten
     end
 
     def remove_all_workers
-      worker_list.each(&:kill)
-      worker_list.clear
+      workers.each(&:kill)
+      workers.clear
 
       ui.force_clear
     end

data/lib/fasten/support/stats.rb

@@ -112,8 +112,8 @@ module Fasten
                                     filters: { 'run' => FLOAT_FORMATTER, 'avg' => FLOAT_FORMATTER, 'std' => FLOAT_FORMATTER, 'err' => FLOAT_FORMATTER },
                                     description: false)
 
-        puts format('∑tasks: %<task>s runner: %<runner>s saved: %<saved>s workers: %<workers>s',
-                    task: hformat(sub), runner: hformat(tot, sub), saved: hformat(sub - tot, sub), workers: workers.to_s)
+        puts format('∑tasks: %<task>s runner: %<runner>s saved: %<saved>s jobs: %<jobs>s',
+                    task: hformat(sub), runner: hformat(tot, sub), saved: hformat(sub - tot, sub), jobs: jobs.to_s)
       end
 
       def stats_history(entry)

data/lib/fasten/task_manager.rb

@@ -2,7 +2,7 @@ module Fasten
   class TaskManager < Array
     attr_reader :done, :failed, :pending, :running, :targets
 
-    def initialize(targets: nil)
+    def initialize(targets: [])
       super()
 
       @map = {}
@@ -53,6 +53,7 @@ module Fasten
 
       reset
       setup_dependencies
+      setup_targets
       setup_scores
       move_pending_to_waiting
     end
@@ -87,8 +88,6 @@ module Fasten
       @running = by_state.delete(:RUNNING) || []
       @waiting = []
 
-      return unless @targets.nil? || @targets.empty?
-
       @pending = by_state.values.flatten.each do |task|
         task.depends = []
         task.dependants = []
@@ -110,8 +109,37 @@ module Fasten
       end
     end
 
-    def setup_scores
+    def setup_targets
+      return if @targets.empty?
+
+      @targets.each do |target|
+        task = target.is_a?(Task) ? target : @map[target]
+        raise "Target task #{target} not found" unless task
+
+        mark_needed(task)
+      end
+
+      @pending.reject { |task| task.state == :NEED }.each do |task|
+        @pending.delete task
+        delete task
+      end
+
       @pending.each do |task|
+        task.state = nil
+      end
+    end
+
+    def mark_needed(task)
+      return unless task.state == :IDLE
+
+      task.state = :NEED
+      task.depends.each do |depend_task|
+        mark_needed(depend_task)
+      end
+    end
+
+    def setup_scores
+      each do |task|
         task.run_score = task.dependants.count
       end
     end

data/lib/fasten/ui/console.rb

@@ -5,8 +5,8 @@ module Fasten
     class Console
       extend Forwardable
 
-      def_delegators :runner, :worker_list, :tasks, :worker_list
-      def_delegators :runner, :name, :workers, :workers=, :state, :state=, :hformat
+      def_delegators :runner, :workers, :tasks
+      def_delegators :runner, :name, :jobs, :jobs=, :state, :state=, :hformat
 
       attr_accessor :runner
 
@@ -20,7 +20,7 @@ module Fasten
         puts <<~FIN
 
           = == === ==== ===== ====== ======= ======== ========= ==========
-          Fasten your seatbelts! #{'💺' * workers} #{runner.use_threads ? 'threads' : 'processes'}
+          Fasten your seatbelts! #{'💺' * jobs} #{runner.use_threads ? 'threads' : 'processes'}
 
           #{name}
         FIN

data/lib/fasten/ui/curses.rb

@@ -9,8 +9,8 @@ module Fasten
       include ::Curses
       extend Forwardable
 
-      def_delegators :runner, :worker_list, :tasks, :worker_list
-      def_delegators :runner, :name, :workers, :workers=, :state, :state=
+      def_delegators :runner, :workers, :tasks
+      def_delegators :runner, :name, :jobs, :jobs=, :state, :state=
 
       attr_accessor :n_rows, :n_cols, :selected, :sel_index, :clear_needed, :message, :runner
 
@@ -28,7 +28,7 @@ module Fasten
         ui_keyboard
         clear if clear_needed
         draw_title
-        ui_workers
+        ui_jobs
         ui_tasks
 
         refresh
@@ -96,15 +96,15 @@ module Fasten
         self.message = nil
 
         if key == Curses::Key::LEFT
-          if workers <= 1
+          if jobs <= 1
             self.message = "Can't remove 1 worker left, press [P] to pause"
           else
-            self.workers -= 1
-            self.message = "Decreasing workers to #{workers}"
+            self.jobs -= 1
+            self.message = "Decreasing jobs to #{jobs}"
           end
         elsif key == Curses::Key::RIGHT
-          self.workers += 1
-          self.message = "Increasing workers to #{workers}"
+          self.jobs += 1
+          self.message = "Increasing jobs to #{jobs}"
         elsif key == Curses::Key::DOWN
           self.sel_index = sel_index ? [sel_index + 1, tasks.count - 1].min : 0
           self.selected = tasks[sel_index]
@@ -124,18 +124,18 @@ module Fasten
         force_clear
       end
 
-      def ui_workers_summary
+      def ui_jobs_summary
         running_count = tasks.running.count
         waiting_count = tasks.waiting.count
-        workers_count = worker_list.count
+        workers_count = workers.count
 
-        "Procs running: #{running_count} idle: #{workers_count - running_count} waiting: #{waiting_count} #{runner.use_threads ? 'threads' : 'processes'}: #{workers}"
+        "Procs running: #{running_count} idle: #{workers_count - running_count} waiting: #{waiting_count} #{runner.use_threads ? 'threads' : 'processes'}: #{jobs}"
       end
 
-      def ui_workers
-        l = ui_text_aligned(1, :left, ui_workers_summary) + 1
+      def ui_jobs
+        l = ui_text_aligned(1, :left, ui_jobs_summary) + 1
 
-        worker_list.each_with_index do |worker, index|
+        workers.each_with_index do |worker, index|
           setpos 1, l + index
           attrs = worker.running? ? A_STANDOUT : color_pair(4) | A_DIM
           attrset attrs
@@ -227,7 +227,7 @@ module Fasten
       end
 
       def ui_tasks
-        worker_list.each do |worker|
+        workers.each do |worker|
           worker.spinner = (worker.spinner + 1) % SPINNER_LEN if worker.running?
         end
 

data/lib/fasten/version.rb

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

data/lib/fasten.rb

@@ -63,7 +63,7 @@ module Fasten
       @load_path = []
 
       @opt_parser = OptionParser.new do |opts|
-        opts.banner = "Usage: #{$PROGRAM_NAME} [options]"
+        opts.banner = "Usage: #{$PROGRAM_NAME} [options] [targets]"
         opts.separator ''
         opts.separator 'Examples:'
         opts.separator '    fasten              # load and run all task from fasten/*_fasten.rb'
@@ -72,26 +72,25 @@ module Fasten
         opts.separator ''
         opts.separator 'Options:'
 
-        opts.on '-n NAME', '--name=NAME', String, "Change name of this runner (default: #{default_name} from current directory)" do |name|
+        opts.on '-n NAME', '--name NAME', String, "Change name of this runner (default: #{default_name} from current directory)" do |name|
           @options[:name] = name
         end
-        opts.on '-f PATH', '--file=PATH', String, 'File or folder with ruby code' do |path|
+        opts.on '-f PATH', '--file PATH', String, 'File or folder with ruby code' do |path|
           @load_path << path
         end
-        opts.on '-w WORKERS', '--workers=WORKERS', Numeric, "Number of processes/threads to use (default: #{default_workers} on this machine)" do |workers|
-          @options[:workers] = workers
+        opts.on '-j JOBS', '--jobs JOBS', Numeric, "Maximum number of tasks to execute in parallel (default: #{default_jobs} on this machine)" do |jobs|
+          @options[:jobs] = jobs
         end
         opts.on '-s', '--[no-]summary', TrueClass, 'Display summary at the end of execution' do |boolean|
-          puts "SUMMAMRY: #{boolean}"
           @options[:summary] = boolean
         end
         opts.on '--ui=UI', String, "Type of UI: curses, console. (default: #{default_ui_mode} on this machine)" do |ui_mode|
           @options[:ui_mode] = ui_mode
         end
-        opts.on '-t', '--threads', "Use threads workers for parallel execution#{default_use_threads && ' (default on this machine)' || nil}" do
+        opts.on '-t', '--threads', "Use threads based jobs for parallel execution#{default_use_threads && ' (default on this machine)' || nil}" do
           @options[:use_threads] = true
         end
-        opts.on '-p', '--processes', "Use process workers for parallel execution#{!default_use_threads && ' (default on this machine)' || nil}" do
+        opts.on '-p', '--processes', "Use process based jobs for parallel execution#{!default_use_threads && ' (default on this machine)' || nil}" do
           @options[:use_threads] = false
         end
         opts.on '-v', '--version', 'Display version info' do
@@ -112,7 +111,10 @@ module Fasten
     def invoke
       opt_parser.parse!
 
+      @options[:targets] = ARGV.to_a
+
       runner @options
+      @load_path = Dir['fasten/*_fasten.rb'] if @load_path.empty?
       load_fasten @load_path
 
       show_help 1 if runner.tasks.empty?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fasten
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.8.0
 platform: ruby
 authors:
 - Aldrin Martoq
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler