autorespawn 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d577eb9b9d0d736476e22b3431a5a791ed704e6
-  data.tar.gz: f80a5b60abbe557c1316a9a560be65be4243a43c
+  metadata.gz: 7611aabbaa1ad2c8d52ca80fa16ea0c66960dec5
+  data.tar.gz: 72812f7b5baf6deefa772122cd8cee4f29f4ff53
 SHA512:
-  metadata.gz: 869b489054c370e01612a5b1b7dfed6a0dad02de82e1b00ac8de9b8903cb0d0020b68dccd3e8b0fa0fa1b2aaa1e3793cbfe0d3efe40f154c546fe25502e92a4f
-  data.tar.gz: 5ffdcebad8ac26a6f37068543de8f36d0e641ccd91d4625a06821cd1d12f0e978a7f079cb4d7508928bf26afd6c0587af8a33468db95792f88fa9e54314eb6e0
+  metadata.gz: d94adfafc6192c05751edfb426a4f0fda3077bdc111ccdfdda44374feb4bba8410308bc13a3053e1d4017b3a20462b14b82a69acf9dbe3a67ecacfed67e93962
+  data.tar.gz: f466b32d71fdf8a7b14216c85025c20727f14a361331d779c98f6e3a5deb317b8a33e2c9d3ced02c14075add52fd78e58b30d53147dedf71ea96fffa8ea86152

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 /vendor/
+.*.sw?

data/autorespawn.gemspec

@@ -31,5 +31,6 @@ EOD
   spec.add_development_dependency "minitest", ">= 5.0", "~> 5.0"
   spec.add_development_dependency "fakefs", ">= 0.6", "~> 0.6.0"
   spec.add_development_dependency 'flexmock', ">= 2.0", '~> 2.0'
+  spec.add_development_dependency "simplecov", '>= 0.11'
   spec.add_development_dependency "coveralls"
 end

data/lib/autorespawn.rb

@@ -8,6 +8,7 @@
 require "autorespawn/slave"
 require "autorespawn/self"
 require "autorespawn/manager"
+require 'autorespawn/tracked_file'
 
 # Automatically exec's the current program when one of the source file changes
 #

data/lib/autorespawn/manager.rb

@@ -25,6 +25,9 @@ class Manager
         attr_reader :active_slaves
         # @return [Array<Slave>] list of slaves explicitely queued with {#queue}
         attr_reader :queued_slaves
+        # @return [Hash<Pathname,TrackedFile>] the whole set of files that are
+        #   tracked by this manager's slaves
+        attr_reader :tracked_files
 
         # @!group Hooks
 
@@ -74,6 +77,7 @@ def initialize(name: nil, parallel_level: 1)
             @workers   = Array.new
             @name = name
             @seed = ProgramID.for_self
+            @tracked_files = Hash.new
 
             @self_slave = Self.new(name: name)
             @workers << self_slave
@@ -121,6 +125,7 @@ def active?(slave)
         #   reporting / tracking
         def add_slave(*cmdline, name: nil, **spawn_options)
             slave = Slave.new(*cmdline, name: name, seed: seed, **spawn_options)
+            slave.needed!
             register_slave(slave)
             slave
         end
@@ -168,11 +173,20 @@ def collect_finished_slaves
         def process_finished_slave(pid, status)
             return if !(slave = active_slaves.delete(pid))
 
-            slave.finished(status)
+            if slave.finished(status).empty?
+                # Do not register the slave if it is already marked as needed?
+                slave.each_tracked_file(with_status: true) do |path, mtime, size|
+                    tracker = (tracked_files[path] ||= TrackedFile.new(path, mtime: mtime, size: size))
+                    tracker.slaves << slave
+                end
+                slave.not_needed!
+            end
+
             slave.subcommands.each do |name, cmdline, spawn_options|
                 add_slave(*cmdline, name: name, **spawn_options)
             end
             seed.merge!(slave.program_id)
+
             run_hook :on_slave_finished, slave
             slave
         end
@@ -214,10 +228,25 @@ def run
             end
         end
 
+        def trigger_slaves_as_necessary
+            tracked_files.delete_if do |path, tracker|
+                tracker.slaves.delete_if(&:needed?)
+                if tracker.slaves.empty?
+                    true
+                elsif tracker.update
+                    tracker.slaves.each(&:needed!)
+                    true
+                end
+            end
+        end
+
         # Wait for children to terminate and spawns them when needed
-        def poll(autospawn: true)
+        def poll(autospawn: true, update_files: true)
             finished_slaves = collect_finished_slaves
             new_slaves = Array.new
+
+            trigger_slaves_as_necessary
+
             while active_slaves.size < parallel_level + 1
                 if slave = queued_slaves.find { |s| !s.running? }
                     queued_slaves.delete(slave)
@@ -228,6 +257,9 @@ def poll(autospawn: true)
 
                 if slave
                     slave.spawn
+                    # We manually track the slave's needed flag, just forcefully
+                    # set it to false at that point
+                    slave.not_needed!
                     run_hook :__on_slave_start, slave
                     new_slaves << slave
                     active_slaves[slave.pid] = slave

data/lib/autorespawn/program_id.rb

@@ -128,8 +128,15 @@ def refresh
         # Enumerate the path of all the files that are being tracked
         #
         # @yieldparam [Pathname] path
-        def each_tracked_file(&block)
-            files.keys.each(&block)
+        def each_tracked_file(with_status: false, &block)
+            if with_status
+                return enum_for(__method__, with_status: true) if !block_given?
+                files.each do |path, info|
+                    yield(path, info.mtime, info.size)
+                end
+            else
+                files.keys.each(&block)
+            end
         end
 
         # Returns a string that can ID this program

data/lib/autorespawn/self.rb

@@ -7,7 +7,7 @@ def initialize(*args, **options)
             @pid = Process.pid
         end
 
-        def needed?; false end
+        def needed?(*); false end
         def needed!; end
         def spawn
             pid

data/lib/autorespawn/slave.rb

@@ -61,6 +61,11 @@ def inspect
             "#<Autorespawn::Slave #{object_id.to_s(16)} #{cmdline.join(" ")}>"
         end
 
+        # Enumerate the files that are tracked for {#needed?}
+        def each_tracked_file(with_status: false, &block)
+            @program_id.each_tracked_file(with_status: with_status, &block)
+        end
+
         def to_s; inspect end
 
         # Register files on the program ID
@@ -85,7 +90,7 @@ def spawn
                 SLAVE_RESULT_ENV        => result_w.fileno.to_s)
 
             program_id.refresh
-            @needed = false
+            @needed = nil
             pid = Kernel.spawn(env, *cmdline, initial_r => initial_r, result_w => result_w, **spawn_options)
             initial_r.close
             result_w.close
@@ -113,7 +118,11 @@ def spawn
         # Whether this slave would need to be spawned, either because it has
         # never be, or because the program ID changed
         def needed?
-            !running? && (@needed || program_id.changed?)
+            if running? then false
+            elsif !@needed.nil?
+                @needed
+            else program_id.changed?
+            end
         end
 
         # Marks this slave for execution
@@ -127,11 +136,18 @@ def needed!
             @needed = true
         end
 
-        # Resets {#needed?} to false
+        # Forces {#needed?} to return false
+        #
+        # Call {#needed_auto} to revert back to determining if the slave is
+        # needed or not using the tracked files
         def not_needed!
             @needed = false
         end
 
+        def needed_auto
+            @needed = nil
+        end
+
         # Whether the slave is running
         def running?
             pid && !status
@@ -177,6 +193,9 @@ def success?
         # Announce that the slave already finished, with the given exit status
         #
         # @param [Process::Status] the exit status
+        # @return [Array<Pathname>] a set of files that either changed or got
+        #   added since the call to {#spawn}. If not empty, the slave calls
+        #   {#needed!} by itself to force a re-execution
         def finished(status)
             @status = status
             read_queued_result
@@ -188,8 +207,8 @@ def finished(status)
                 file_list = Array.new
                 @success = false
             end
-            modified = program_id.register_files(file_list)
             @program_id = program_id.slice(file_list)
+            modified = program_id.register_files(file_list)
             if !modified.empty?
                 needed!
             end

data/lib/autorespawn/tracked_file.rb

@@ -0,0 +1,25 @@
+class Autorespawn
+    class TrackedFile
+        attr_reader :path, :mtime, :size, :slaves
+
+        def initialize(path, mtime: nil, size: nil)
+            @path  = path
+            @mtime = mtime
+            @size  = size
+            @slaves = Array.new
+        end
+
+        def update
+            return true if !path.exist?
+            return true if !mtime
+
+            stat = path.stat
+            if stat.mtime != mtime || stat.size != size
+                @mtime = stat.mtime
+                @size  = stat.size
+                true
+            end
+        end
+    end
+end
+

data/lib/autorespawn/version.rb

@@ -1,3 +1,3 @@
 class Autorespawn
-    VERSION = "0.4.1"
+    VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autorespawn
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Sylvain Joyeux
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hooks
@@ -112,6 +112,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +165,7 @@ files:
 - lib/autorespawn/program_id.rb
 - lib/autorespawn/self.rb
 - lib/autorespawn/slave.rb
+- lib/autorespawn/tracked_file.rb
 - lib/autorespawn/version.rb
 - lib/autorespawn/watch.rb
 homepage: https://github.com/doudou/autorespawn