build-files 1.4.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 227e24df878d95517873d1f07ecc789cff1320ad76090f1da90b3273f46c901e
-  data.tar.gz: f086ae85dcabc453cb5ee6155af0d6357db47d828eb0b7733461ecd2065b97d0
+  metadata.gz: 266f5c2f5a839934620afe4a06289bf7c4363d39c04b39fc3fef8b87104d7ff1
+  data.tar.gz: b775a997766d4ff2fc751e08fc93d6512a373e944813ee09097731f432087714
 SHA512:
-  metadata.gz: ce4cf1a75166c6cfa4acf0703b05e727c3ec2422ee1f29abfc11c3046f9ede6d6460a314ea449b9346bff2f352c137c2bb0d1f061b34ef71ecfda448020ee79e
-  data.tar.gz: 7bcc9d126cf37ae30527b908c0f0f4f799f85eb0ea83ff4dd588393c745ea587e334a6141ceadef393e2b7ca5edcb0aa0343d5f5dda8a3c70b5e38a3eb38a101
+  metadata.gz: 303be1f16bcadc201db4fd2c9530250926942e1f3f63d269646d943ca439b2c2ca930c0a9fc5caeb16fc4c35362c84580699f5732917f9df51739f339aa7640c
+  data.tar.gz: 52f6d5d1441dcd15d5be335cab08620aa41524aef8294a13c4adaa2df5513d9e1a03b29b42336afe29b98bdd6f8f1c53c1eb90d7279d855738acfe4e0a29be3b

data/.gitignore

@@ -0,0 +1,24 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp
+*.bundle
+*.so
+*.o
+*.a
+mkmf.log
+.rspec_status
+

data/build-files.gemspec

@@ -18,11 +18,8 @@ Gem::Specification.new do |spec|
 	
 	spec.required_ruby_version = '>= 2.0'
 	
-	spec.add_dependency "rb-inotify"
-	spec.add_dependency "rb-fsevent"
-	
 	spec.add_development_dependency "covered"
 	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rspec", "~> 3.4"
-	spec.add_development_dependency "rake"
+	spec.add_development_dependency "bake-bundler"
 end

data/lib/build/files.rb

@@ -24,7 +24,4 @@ require_relative 'files/paths'
 require_relative 'files/glob'
 require_relative 'files/directory'
 
-require_relative 'files/state'
-require_relative 'files/monitor'
-
 require_relative 'files/system'

data/lib/build/files/glob.rb

@@ -44,12 +44,15 @@ module Build
 			def full_pattern
 				Path.join(@root, @pattern)
 			end
-		
+			
 			# Enumerate all paths matching the pattern.
 			def each(&block)
-				return to_enum(:each) unless block_given?
+				return to_enum unless block_given?
 				
-				Dir.glob(full_pattern) do |path|
+				::Dir.glob(full_pattern, ::File::FNM_DOTMATCH) do |path|
+					# Ignore `.` and `..` entries.
+					next if path =~ /\/..?$/
+					
 					yield Path.new(path, @root)
 				end
 			end
@@ -57,15 +60,15 @@ module Build
 			def eql?(other)
 				self.class.eql?(other.class) and @root.eql?(other.root) and @pattern.eql?(other.pattern)
 			end
-		
+			
 			def hash
 				[@root, @pattern].hash
 			end
-		
+			
 			def include?(path)
 				File.fnmatch(full_pattern, path)
 			end
-		
+			
 			def rebase(root)
 				self.class.new(root, @pattern)
 			end

data/lib/build/files/list.rb

@@ -55,13 +55,13 @@ module Build
 				other.any?{|path| include?(path)}
 			end
 			
-			def with(**args)
-				return to_enum(:with, **args) unless block_given?
+			def with(**options)
+				return to_enum(:with, **options) unless block_given?
 				
 				paths = []
 				
-				each do |path|
-					updated_path = path.with(args)
+				self.each do |path|
+					updated_path = path.with(**options)
 					
 					yield path, updated_path
 					

data/lib/build/files/path.rb

@@ -22,6 +22,10 @@ module Build
 	module Files
 		# Represents a file path with an absolute root and a relative offset:
 		class Path
+			def self.current
+				self.new(::Dir.pwd)
+			end
+			
 			def self.split(path)
 				# Effectively dirname and basename:
 				dirname, separator, filename = path.rpartition(File::SEPARATOR)
@@ -44,6 +48,14 @@ module Build
 				end
 			end
 			
+			def self.root(path)
+				if Path === path
+					path.root
+				else
+					File.dirname(path)
+				end
+			end
+			
 			# Return the shortest relative path to get to path from root. Root should be a directory with which you are computing the relative path.
 			def self.shortest_path(path, root)
 				path_components = Path.components(path)
@@ -55,7 +67,13 @@ module Build
 				# The difference between the root path and the required path, taking into account the common prefix:
 				up = root_components.size - i
 				
-				return File.join([".."] * up + path_components[i..-1])
+				components = [".."] * up + path_components[i..-1]
+				
+				if components.empty?
+					return "."
+				else
+					return File.join(components)
+				end
 			end
 			
 			def self.relative_path(root, full_path)
@@ -83,9 +101,6 @@ module Build
 					# Effectively dirname and basename:
 					@root, _, @relative_path = full_path.rpartition(File::SEPARATOR)
 				end
-				
-				# This improves the cost of hash/eql? slightly but the root cannot be deconstructed if it was an instance of Path.
-				# @root = @root.to_s
 			end
 			
 			attr :root
@@ -103,6 +118,17 @@ module Build
 				self.parts.last
 			end
 			
+			def parent
+				root = @root
+				full_path = File.dirname(@full_path)
+				
+				while root.size > full_path.size
+					root = Path.root(root)
+				end
+				
+				self.class.new(full_path, root)
+			end
+			
 			def start_with?(*args)
 				@full_path.start_with?(*args)
 			end
@@ -110,7 +136,7 @@ module Build
 			alias parts components
 			
 			def relative_path
-				@relative_path ||= Path.relative_path(@root.to_s, @full_path).freeze
+				@relative_path ||= Path.relative_path(@root.to_s, @full_path.to_s).freeze
 			end
 			
 			def relative_parts
@@ -170,12 +196,12 @@ module Build
 				self.new(File.join(root, relative_path), root)
 			end
 			
-			# Expand a subpath within a given root, similar to `File.expand_path`
-			def self.expand(subpath, root = Dir.getwd)
-				if subpath.start_with? File::SEPARATOR
-					self.new(subpath)
+			# Expand a path within a given root.
+			def self.expand(path, root = Dir.getwd)
+				if path.start_with?(File::SEPARATOR)
+					self.new(path)
 				else
-					self.join(root, subpath)
+					self.join(root, path)
 				end
 			end
 			
@@ -184,7 +210,7 @@ module Build
 			end
 			
 			def to_str
-				@full_path
+				@full_path.to_str
 			end
 			
 			def to_path
@@ -192,7 +218,8 @@ module Build
 			end
 			
 			def to_s
-				@full_path
+				# It's not guaranteed to be string.
+				@full_path.to_s
 			end
 			
 			def inspect

data/lib/build/files/paths.rb

@@ -69,5 +69,11 @@ module Build
 				self.new(paths, [root])
 			end
 		end
+		
+		class Path
+			def list(*relative_paths)
+				Paths.directory(self, relative_paths)
+			end
+		end
 	end
 end

data/lib/build/files/version.rb

@@ -20,6 +20,6 @@
 
 module Build
 	module Files
-		VERSION = "1.4.2"
+		VERSION = "1.7.0"
 	end
 end

data/spec/build/files/glob_spec.rb

@@ -20,30 +20,34 @@
 
 require 'build/files/glob'
 
-module Build::Files::GlobSpec
-	include Build::Files
+RSpec.describe Build::Files::Glob do
+	let(:path) {Build::Files::Path.new(__dir__)}
 	
-	describe Build::Files::Glob do
-		let(:path) {Path.new(__dir__)}
+	it "can glob paths" do
+		paths = path.glob("*.rb")
 		
-		it "can glob paths" do
-			paths = path.glob("*.rb")
-			
-			expect(paths.count).to be >= 1
-		end
+		expect(paths.count).to be >= 1
+	end
+	
+	it "can be used as key in hash" do
+		cache = {}
 		
-		it "can be used as key in hash" do
-			cache = {}
-			
-			cache[path.glob("*.rb")] = true
-			
-			expect(cache).to be_include(path.glob("*.rb"))
-		end
+		cache[path.glob("*.rb")] = true
+		
+		expect(cache).to be_include(path.glob("*.rb"))
+	end
+	
+	it "should print nice string represenation" do
+		glob = Build::Files::Glob.new(".", "*.rb")
 		
-		it "should print nice string represenation" do
-			glob = Build::Files::Glob.new(".", "*.rb")
+		expect("#{glob}").to be == '<Glob "."/"*.rb">'
+	end
+	
+	context 'with dotfiles' do
+		it "should list files starting with dot" do
+			paths = path.glob("glob_spec/dotfiles/**/*")
 			
-			expect("#{glob}").to be == '<Glob "."/"*.rb">'
+			expect(paths.count).to be == 1
 		end
 	end
 end

data/spec/build/files/path_spec.rb

@@ -24,10 +24,20 @@ require 'build/files/path'
 require 'pathname'
 
 RSpec.describe Build::Files::Path do
+	it "can get current path" do
+		expect(Build::Files::Path.current.full_path).to be == Dir.pwd
+	end
+	
 	it "should expand the path" do
 		expect(Build::Files::Path.expand("foo", "/bar")).to be == "/bar/foo"
 	end
 	
+	it "should give current path" do
+		path = Build::Files::Path.new("/a/b/c/file.cpp")
+		
+		expect(path.shortest_path(path)).to be == "."
+	end
+	
 	it "should give the shortest path for outer paths" do
 		input = Build::Files::Path.new("/a/b/c/file.cpp")
 		output = Build::Files::Path.new("/a/b/c/d/e/")
@@ -82,10 +92,24 @@ RSpec.describe Build::Files::Path.new("/foo/bar.txt") do
 end
 
 RSpec.describe Build::Files::Path.new("/foo/bar/baz", "/foo") do
+	it "can compute parent path" do
+		parent = subject.parent
+		
+		expect(parent.root).to be == subject.root
+		expect(parent.relative_path).to be == "bar"
+		expect(parent.full_path).to be == "/foo/bar"
+	end
+	
 	it "can add nil path" do
 		expect(subject + nil).to be == subject
 	end
 	
+	it "can inspect path with nil root" do
+		expect do
+			(subject / nil).inspect
+		end.to_not raise_error
+	end
+	
 	it "can add nil root" do
 		expect(subject / nil).to be == subject
 	end

metadata

@@ -1,43 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: build-files
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.7.0
 platform: ruby
 authors:
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-14 00:00:00.000000000 Z
+date: 2021-05-22 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rb-inotify
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: covered
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bake-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,50 +66,43 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - samuel.williams@oriontransfer.co.nz
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - ".rspec"
 - ".travis.yml"
 - Gemfile
 - README.md
-- Rakefile
 - build-files.gemspec
 - lib/build/files.rb
 - lib/build/files/composite.rb
 - lib/build/files/difference.rb
 - lib/build/files/directory.rb
 - lib/build/files/glob.rb
-- lib/build/files/handle.rb
 - lib/build/files/list.rb
-- lib/build/files/monitor.rb
-- lib/build/files/monitor/fsevent.rb
-- lib/build/files/monitor/inotify.rb
-- lib/build/files/monitor/polling.rb
 - lib/build/files/path.rb
 - lib/build/files/paths.rb
-- lib/build/files/state.rb
 - lib/build/files/system.rb
 - lib/build/files/version.rb
 - spec/build/files/directory_spec.rb
 - spec/build/files/directory_spec/.dot_file.yaml
 - spec/build/files/directory_spec/normal_file.txt
 - spec/build/files/glob_spec.rb
+- spec/build/files/glob_spec/dotfiles/.file
 - spec/build/files/list_spec.rb
-- spec/build/files/monitor_spec.rb
 - spec/build/files/path_spec.rb
-- spec/build/files/state_spec.rb
 - spec/build/files/system_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -152,8 +117,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Build::Files is a set of idiomatic classes for dealing with paths and monitoring
   directories.
@@ -162,9 +127,8 @@ test_files:
 - spec/build/files/directory_spec/.dot_file.yaml
 - spec/build/files/directory_spec/normal_file.txt
 - spec/build/files/glob_spec.rb
+- spec/build/files/glob_spec/dotfiles/.file
 - spec/build/files/list_spec.rb
-- spec/build/files/monitor_spec.rb
 - spec/build/files/path_spec.rb
-- spec/build/files/state_spec.rb
 - spec/build/files/system_spec.rb
 - spec/spec_helper.rb

data/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec

data/lib/build/files/handle.rb

@@ -1,59 +0,0 @@
-# Copyright, 2014, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require_relative 'state'
-
-module Build
-	module Files
-		class Handle
-			def initialize(monitor, files, &block)
-				@monitor = monitor
-				@state = State.new(files)
-				@block = block
-			end
-		
-			attr :monitor
-		
-			def commit!
-				@state.update!
-			end
-		
-			def directories
-				@state.files.roots
-			end
-		
-			def remove!
-				@monitor.delete(self)
-			end
-			
-			# Inform the handle that it might have been modified.
-			def changed!
-				# If @state.update! did not find any changes, don't invoke the callback:
-				if @state.update!
-					@block.call(@state)
-				end
-			end
-			
-			def to_s
-				"\#<#{self.class} @state=#{@state} @block=#{@block}>"
-			end
-		end
-	end
-end

data/lib/build/files/monitor.rb

@@ -1,43 +0,0 @@
-# Copyright, 2014, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-module Build
-	module Files
-		module Monitor
-			case RUBY_PLATFORM
-			when /linux/i
-				require_relative 'monitor/inotify'
-				Native = INotify
-				Default = Native
-			when /darwin/i
-				require_relative 'monitor/fsevent'
-				Native = FSEvent
-				Default = Native
-			else 
-				require_relative 'monitor/polling'
-				Default = Polling
-			end
-		
-			def self.new(*args)
-				Default.new(*args)
-			end
-		end
-	end
-end

data/lib/build/files/monitor/fsevent.rb

@@ -1,55 +0,0 @@
-# Copyright, 2014, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require_relative 'polling'
-
-require 'rb-fsevent'
-
-module Build
-	module Files
-		module Monitor
-			class FSEvent < Polling
-				def run(**options, &block)
-					notifier = ::FSEvent.new
-					
-					catch(:interrupt) do
-						while true
-							notifier.watch self.roots do |directories|
-								directories.collect! do |directory|
-									File.expand_path(directory)
-								end
-								
-								self.update(directories)
-								
-								yield
-								
-								if self.updated
-									notifier.stop
-								end
-							end
-							
-							notifier.run
-						end
-					end
-				end
-			end
-		end
-	end
-end

data/lib/build/files/monitor/inotify.rb

@@ -1,53 +0,0 @@
-# Copyright, 2014, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require_relative 'polling'
-
-require 'rb-inotify'
-
-module Build
-	module Files
-		module Monitor
-			class INotify < Polling
-				def run(**options, &block)
-					notifier = ::INotify::Notifier.new
-					
-					catch(:interrupt) do
-						while true
-							self.roots.each do |root|
-								notifier.watch root, :create, :modify, :attrib, :delete do |event|
-									self.update([root])
-									
-									yield
-									
-									if self.updated
-										notifier.stop
-									end
-								end
-							end
-							
-							notifier.run
-						end
-					end
-				end
-			end
-		end
-	end
-end

data/lib/build/files/monitor/polling.rb

@@ -1,145 +0,0 @@
-# Copyright, 2014, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require 'set'
-require 'logger'
-
-require_relative '../handle'
-
-module Build
-	module Files
-		module Monitor
-			class Polling
-				def initialize(logger: nil)
-					@directories = Hash.new do |hash, key|
-						hash[key] = Set.new
-					end
-					
-					@updated = false
-					
-					@deletions = nil
-					
-					@logger = logger || Logger.new(nil)
-				end
-				
-				attr :updated
-				
-				# Notify the monitor that files in these directories have changed.
-				def update(directories, *args)
-					@logger.debug{"Update: #{directories} #{args.inspect}"}
-					
-					delay_deletions do
-						directories.each do |directory|
-							@logger.debug{"Directory: #{directory}"}
-							
-							@directories[directory].each do |handle|
-								@logger.debug{"Handle changed: #{handle.inspect}"}
-								
-								# Changes here may not actually require an update to the handle:
-								handle.changed!(*args)
-							end
-						end
-					end
-				end
-				
-				def roots
-					@directories.keys
-				end
-				
-				def delete(handle)
-					if @deletions
-						@logger.debug{"Delayed delete handle: #{handle}"}
-						@deletions << handle
-					else
-						purge(handle)
-					end
-				end
-				
-				def track_changes(files, &block)
-					handle = Handle.new(self, files, &block)
-					
-					add(handle)
-				end
-				
-				def add(handle)
-					@logger.debug{"Adding handle: #{handle}"}
-					
-					handle.directories.each do |directory|
-						# We want the full path as a plain string:
-						directory = directory.to_s
-						
-						@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
-				
-				def run(**options, &block)
-					catch(:interrupt) do
-						while true
-							monitor.update(monitor.roots)
-							
-							yield
-							
-							sleep(options[:latency] || 1.0)
-						end
-					end
-				end
-				
-				protected
-				
-				def delay_deletions
-					@deletions = []
-					
-					yield
-					
-					@deletions.each do |handle|
-						purge(handle)
-					end
-					
-					@deletions = nil
-				end
-				
-				def purge(handle)
-					@logger.debug{"Purge handle: #{handle}"}
-					
-					handle.directories.each do |directory|
-						directory = directory.to_s
-						
-						@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
-		end
-	end
-end

data/lib/build/files/state.rb

@@ -1,172 +0,0 @@
-# Copyright, 2014, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# 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.
-		class FileTime
-			include Comparable
-		
-			def initialize(path, time)
-				@path = path
-				@time = time
-			end
-		
-			attr :path
-			attr :time
-		
-			def <=> other
-				@time <=> other.time
-			end
-			
-			def inspect
-				"<FileTime #{@path.inspect} #{@time.inspect}>"
-			end
-		end
-		
-		# 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|
-					# When processing the same path twice (perhaps by accident), we should skip it otherwise it might cause issues when being deleted from last_times multuple times.
-					next if @times.include? path
-					
-					if File.exist?(path)
-						modified_time = File.mtime(path)
-					
-						if last_time = last_times.delete(path)
-							# Path was valid last update:
-							if modified_time != last_time
-								@changed << path
-								
-								# puts "Changed: #{path}"
-							end
-						else
-							# Path didn't exist before:
-							@added << path
-							
-							# puts "Added: #{path}"
-						end
-					
-						@times[path] = modified_time
-					
-						unless File.directory?(path)
-							file_times << FileTime.new(path, modified_time)
-						end
-					else
-						@missing << path
-						
-						# puts "Missing: #{path}"
-					end
-				end
-				
-				@removed = last_times.keys
-				# puts "Removed: #{@removed.inspect}" if @removed.size > 0
-				
-				@oldest_time = file_times.min
-				@newest_time = file_times.max
-				
-				return @added.size > 0 || @changed.size > 0 || @removed.size > 0 || @missing.size > 0
-			end
-			
-			attr :oldest_time
-			attr :newest_time
-			
-			def missing?
-				!@missing.empty?
-			end
-			
-			def empty?
-				@times.empty?
-			end
-			
-			def inspect
-				"<State Added:#{@added} Removed:#{@removed} Changed:#{@changed} Missing:#{@missing}>"
-			end
-			
-			# Are these (output) files dirty with respect to the given inputs?
-			def dirty?(inputs)
-				if self.missing?
-					return true
-				end
-				
-				# If there are no inputs or no outputs, we are always clean:
-				if inputs.empty? or self.empty?
-					return false
-				end
-				
-				oldest_output_time = self.oldest_time
-				newest_input_time = inputs.newest_time
-				
-				if newest_input_time and oldest_output_time
-					# We are dirty if any inputs are newer (bigger) than any outputs:
-					if newest_input_time > oldest_output_time
-						return true
-					else
-						return false
-					end
-				end
-				
-				return true
-			end
-			
-			def self.dirty?(inputs, outputs)
-				outputs.dirty?(inputs)
-			end
-		end
-	end
-end

data/spec/build/files/monitor_spec.rb

@@ -1,90 +0,0 @@
-#!/usr/bin/env rspec
-
-# Copyright, 2015, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require 'build/files/monitor'
-require 'build/files/path'
-require 'build/files/system'
-require 'build/files/directory'
-
-RSpec.shared_examples_for Monitor do |driver|
-	let(:root) {Build::Files::Path.expand('tmp', __dir__)}
-	let(:path) {root + "test.txt"}
-	
-	before do
-		root.delete
-		root.create
-	end
-	
-	let(:directory) {Build::Files::Directory.new(root)}
-	let(:monitor) {Build::Files::Monitor.new}
-	
-	it "should include touched path" do
-		path.touch
-		
-		expect(directory.to_a).to include(path)
-	end
-	
-	it 'should detect additions' do
-		changed = false
-		
-		monitor.track_changes(directory) do |state|
-			changed = true
-			
-			expect(state.added).to include(path)
-		end
-		
-		thread = Thread.new do
-			sleep 1
-			path.touch
-		end
-		
-		monitor.run do
-			throw :interrupt if changed
-		end
-		
-		thread.join
-		
-		expect(changed).to be true
-	end
-	
-	it "should add and remove monitored paths" do
-		handler = monitor.track_changes(directory) do |state|
-			# Do nothing.
-		end
-		
-		expect(monitor.roots).to be_include root
-		
-		handler.remove!
-		
-		expect(monitor.roots).to be_empty
-	end
-end
-
-RSpec.describe Build::Files::Monitor::Polling do
-	it_behaves_like Monitor
-end
-
-if defined? Build::Files::Monitor::Native
-	RSpec.describe Build::Files::Monitor::Native do
-		it_behaves_like Monitor
-	end
-end

data/spec/build/files/state_spec.rb

@@ -1,90 +0,0 @@
-# Copyright, 2012, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require 'build/files'
-
-module Build::Files::StateSpec
-	describe Build::Files::State do
-		let(:files) {Build::Files::Glob.new(__dir__, "*.rb")}
-		
-		it "should have no changes initially" do
-			state = Build::Files::State.new(files)
-			
-			expect(state.update!).to be false
-			
-			expect(state.changed).to be == []
-			expect(state.added).to be == []
-			expect(state.removed).to be == []
-			expect(state.missing).to be == []
-		end
-		
-		it "should report missing files" do
-			rebased_files = files.to_paths.rebase(File.join(__dir__, 'foo'))
-			state = Build::Files::State.new(rebased_files)
-			
-			# Some changes were detected:
-			expect(state.update!).to be true
-			
-			# Some files are missing:
-			expect(state.missing).to_not be_empty
-		end
-		
-		it "should not be confused by duplicates" do
-			state = Build::Files::State.new(files + files)
-			
-			expect(state.update!).to be false
-			
-			expect(state.changed).to be == []
-			expect(state.added).to be == []
-			expect(state.removed).to be == []
-			expect(state.missing).to be == []
-		end
-	end
-	
-	describe Build::Files::State do
-		before(:each) do
-			@temporary_files = Build::Files::Paths.directory(__dir__, ['a'])
-			@temporary_files.touch
-			
-			@new_files = Build::Files::State.new(@temporary_files)
-			@old_files = Build::Files::State.new(Build::Files::Glob.new(__dir__, "*.rb"))
-		end
-		
-		after(:each) do
-			@temporary_files.delete
-		end
-		
-		let(:empty) {Build::Files::State.new(Build::Files::List::NONE)}
-		
-		it "should be clean with empty inputs or outputs" do
-			expect(Build::Files::State.dirty?(empty, @new_files)).to be false
-			expect(Build::Files::State.dirty?(@new_files, empty)).to be false
-		end
-		
-		it "should be clean if files are newer" do
-			expect(Build::Files::State.dirty?(@old_files, @new_files)).to be false
-		end
-		
-		it "should be dirty if files are modified" do
-			# In this case, the file mtime is usually different so... 
-			expect(Build::Files::State.dirty?(@new_files, @old_files)).to be true
-		end
-	end
-end