build-files 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e35654286f32140f640677be45768252c787b496
-  data.tar.gz: 7edf8aa92f327d5ba8e96c25a8731b249b05f6e0
+  metadata.gz: 2e83395d241b8365a554f4f56d3c6a79019e4912
+  data.tar.gz: 02c1657d7907c8a9955b1d329cb343cd5946a1af
 SHA512:
-  metadata.gz: 8c06e927233aed011f491da416cec580053dda563f9dcbce6777c341f03a290a1e7db064a9a86c91c42f51034fc9a1c10b4e85dc85f5eb619f8d05a120221653
-  data.tar.gz: 54b64d67398fb465a1a679f91b9d381a8bbce41044e66514b7c20b9cd89ae32da0bf4c060ba8daa10ce0cf68f78d6f55de95750941860f5fd63832def8a90e55
+  metadata.gz: ce8ea60d34378a7bd007479e5ec7b005819d5484421adfc14bae08331eca00b5e62c6eee56ad8828d8547b4c06339c9d644ff46f94e0f77fd481e664b354cdf3
+  data.tar.gz: 84980ca0c4bfc21caf219355276ff44463c665b0d0e4802603d92a583ba9288513a03e9bc3877e1d6b9e2a2bd86799e8c3d5405019e2326e6324e91340ca8824

data/lib/build/files/list.rb

@@ -146,6 +146,12 @@ module Build
 			
 			attr :files
 			
+			def freeze
+				self.roots
+				
+				super
+			end
+			
 			def each
 				return to_enum(:each) unless block_given?
 				

data/lib/build/files/monitor.rb

@@ -24,60 +24,85 @@ require 'build/files/state'
 
 module Build
 	module Files
+		class Handle
+			def initialize(monitor, files, &block)
+				@monitor = monitor
+				@state = State.new(files)
+				@on_changed = block
+			end
+		
+			attr :monitor
+		
+			def commit!
+				@state.update!
+			end
+		
+			def directories
+				@state.files.roots
+			end
+		
+			def remove!
+				monitor.delete(self)
+			end
+		
+			def changed!
+				@on_changed.call(@state) if @state.update!
+			end
+		end
+		
 		class Monitor
 			def initialize
 				@directories = Hash.new { |hash, key| hash[key] = Set.new }
 				
 				@updated = false
+				
+				@deletions = nil
 			end
 			
 			attr :updated
 			
 			# Notify the monitor that files in these directories have changed.
 			def update(directories, *args)
-				directories.each do |directory|
-					# directory = File.realpath(directory)
-					
-					@directories[directory].each do |handle|
-						handle.changed!(*args)
+				delay_deletions do
+					directories.each do |directory|
+						# directory = File.realpath(directory)
+						
+						@directories[directory].each do |handle|
+							handle.changed!(*args)
+						end
 					end
 				end
 			end
-	
+			
 			def roots
 				@directories.keys
 			end
-	
-			def delete(handle)
-				handle.directories.each do |directory|
-					@directories[directory].delete(handle)
 			
-					# Remove the entire record if there are no handles:
-					if @directories[directory].size == 0
-						@directories.delete(directory)
-				
-						@updated = true
-					end
+			def delete(handle)
+				if @deletions
+					@deletions << handle
+				else
+					purge(handle)
 				end
 			end
-	
+			
 			def track_changes(files, &block)
 				handle = Handle.new(self, files, &block)
-		
+				
 				add(handle)
 			end
-	
+			
 			def add(handle)
 				handle.directories.each do |directory|
 					@directories[directory] << handle
-			
+					
 					# We just added the first handle:
 					if @directories[directory].size == 1
 						# If the handle already existed, this might trigger unnecessarily.
 						@updated = true
 					end
 				end
-		
+				
 				handle
 			end
 			
@@ -93,6 +118,33 @@ module Build
 					Files.send(method_name, self, options, &block)
 				end
 			end
+			
+			protected
+			
+			def delay_deletions
+				@deletions = []
+				
+				yield
+				
+				@deletions.each do |handle|
+					purge(handle)
+				end
+				
+				@deletions = nil
+			end
+			
+			def purge(handle)
+				handle.directories.each do |directory|
+					@directories[directory].delete(handle)
+					
+					# Remove the entire record if there are no handles:
+					if @directories[directory].size == 0
+						@directories.delete(directory)
+						
+						@updated = true
+					end
+				end
+			end
 		end
 		
 		def self.run_with_inotify(monitor, options = {}, &block)
@@ -135,7 +187,7 @@ module Build
 							notifier.stop
 						end
 					end
-			
+					
 					notifier.run
 				end
 			end

data/lib/build/files/state.rb

@@ -18,6 +18,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require_relative 'list'
+
+require 'forwardable'
+
 module Build
 	module Files
 		# Represents a specific file on disk with a specific mtime.
@@ -41,35 +45,40 @@ module Build
 			end
 		end
 		
-		class State
+		# A stateful list of files captured at a specific time, which can then be checked for changes.
+		class State < Files::List
+			extend Forwardable
+			
 			def initialize(files)
 				raise ArgumentError.new("Invalid files list: #{files}") unless Files::List === files
-			
+				
 				@files = files
-		
+				
 				@times = {}
-			
+				
 				update!
 			end
-	
+			
 			attr :files
-	
+			
 			attr :added
 			attr :removed
 			attr :changed
 			attr :missing
-		
+			
 			attr :times
-		
+			
+			def_delegators :@files, :each, :roots, :count
+			
 			def update!
 				last_times = @times
 				@times = {}
-			
+				
 				@added = []
 				@removed = []
 				@changed = []
 				@missing = []
-			
+				
 				file_times = []
 				
 				@files.each do |path|
@@ -123,120 +132,40 @@ module Build
 				!@missing.empty?
 			end
 			
-			# Outputs is a list of full paths and must not include any patterns/globs.
-			def intersects?(outputs)
-				@files.intersects?(outputs)
-			end
-			
 			def empty?
-				@files.to_a.empty?
+				@times.empty?
 			end
 			
 			def inspect
 				"<State Added:#{@added} Removed:#{@removed} Changed:#{@changed} Missing:#{@missing}>"
 			end
-		end
-	
-		class IOState
-			def initialize(inputs, outputs)
-				@input_state = State.new(inputs)
-				@output_state = State.new(outputs)
-			end
 			
-			attr :input_state
-			attr :output_state
+			# Are these files dirty with respect to the given inputs?
+			def dirty?(inputs)
+				self.class.dirty?(inputs, self)
+			end
 			
-			# Output is dirty if files are missing or if latest input is older than any output.
-			def dirty?
-				@dirty = []
-				
-				if @output_state.missing?
+			def self.dirty?(inputs, outputs)
+				if outputs.missing?
 					# puts "Output file missing: #{output_state.missing.inspect}"
-					
 					return true
 				end
 				
-				# If there are no inputs, we are always clean as long as outputs exist:
-				# if @input_state.empty?
-				#	return false
-				# end
+				# If there are no inputs or no outputs, we are always clean:
+				if inputs.empty? or outputs.empty?
+					return false
+				end
 				
-				oldest_output_time = @output_state.oldest_time
-				newest_input_time = @input_state.newest_time
+				oldest_output_time = outputs.oldest_time
+				newest_input_time = inputs.newest_time
 				
 				if newest_input_time and oldest_output_time
-					# if newest_input_time > oldest_output_time
-					#	puts "Out of date file: #{newest_input_time.inspect} > #{oldest_output_time.inspect}"
-					# end
-					
+					# We are dirty if any inputs are newer (bigger) than any outputs:
 					return newest_input_time > oldest_output_time
 				end
 				
-				# puts "Missing file dates: #{newest_input_time.inspect} < #{oldest_output_time.inspect}"
-				
 				return true
 			end
-			
-			def fresh?
-				not dirty?
-			end
-			
-			def files
-				@input_state.files + @output_state.files
-			end
-			
-			def added
-				@input_state.added + @output_state.added
-			end
-			
-			def removed
-				@input_state.removed + @output_state.removed
-			end
-			
-			def changed
-				@input_state.changed + @output_state.changed
-			end
-			
-			def update!
-				input_changed = @input_state.update!
-				output_changed = @output_state.update!
-			
-				input_changed or output_changed
-			end
-			
-			def intersects?(outputs)
-				@input_state.intersects?(outputs) or @output_state.intersects?(outputs)
-			end
-			
-			def inspect
-				"<IOState Input:#{@input_state.inspect} Output:#{@output_state.inspect}>"
-			end
-		end
-	
-		class Handle
-			def initialize(monitor, files, &block)
-				@monitor = monitor
-				@state = State.new(files)
-				@on_changed = block
-			end
-		
-			attr :monitor
-		
-			def commit!
-				@state.update!
-			end
-		
-			def directories
-				@state.files.roots
-			end
-		
-			def remove!
-				monitor.delete(self)
-			end
-		
-			def changed!
-				@on_changed.call(@state) if @state.update!
-			end
 		end
 	end
 end

data/lib/build/files/version.rb

@@ -20,6 +20,6 @@
 
 module Build
 	module Files
-		VERSION = "0.3.1"
+		VERSION = "0.3.2"
 	end
 end

data/spec/build/files/state_spec.rb

@@ -56,5 +56,13 @@ module Build::Files::StateSpec
 			expect(state.removed).to be == []
 			expect(state.missing).to be == []
 		end
+		
+		it "should be clean with empty inputs or outputs" do
+			empty = Build::Files::State.new(Build::Files::Paths::NONE)
+			something = Build::Files::State.new(files)
+			
+			expect(Build::Files::State.dirty?(empty, something)).to be false
+			expect(Build::Files::State.dirty?(something, empty)).to be false
+		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-files
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-18 00:00:00.000000000 Z
+date: 2015-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler