build-files 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c4adb72625aa71340bebd18aea8d8dca1d4e8e06
-  data.tar.gz: 5a6b6825dddfbf18889e24ee2884008d909332c3
+SHA256:
+  metadata.gz: 4198299da23d7090752a148991d1d2287a13cd64243091b1c812fe257fec1fbe
+  data.tar.gz: 58e749b04d06f6311bce8232705545f2d115d3d22a7df38791c5a49797980671
 SHA512:
-  metadata.gz: a265973dd1029a474df7ac5b843b1e79ac6e4e2458e39a8abd28be36491781c3c2f915de01bc1bcd55360ed7d95254d58727904925ec10a49ad31a5ce912085e
-  data.tar.gz: 41de69d7681dcfe20bef304177d0a3a765bd32a242761ab579f984a9d13ddfc2a1c35d29342ced5a4e43446b5f4ee7c882d21e94a7ad4fe2dd86eb303c8b3aa7
+  metadata.gz: 8eac17319e61c722d12268116d85bb319944b34904cabe4c49319a181d21fe119ba38bf39823b1ca3c25c7f5d012a4c19a7ce2f589597cce1b0a4a4f18667fb1
+  data.tar.gz: fcf580850c89ce67f96bc4512495d12dd10eeaeb8f3ecddd77857b56c32f11c2977558bc7a89b586b335d640224d45eaaa9e190d1a3ea7841011537c1c2ac648

data/.rspec

@@ -1,4 +1,4 @@
---color
 --format documentation
 --backtrace
 --warnings
+--require spec_helper

data/.travis.yml

@@ -1,15 +1,14 @@
 language: ruby
-sudo: false
-rvm:
-  - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
-  - ruby-head
-  - rbx-2
-env: COVERAGE=true
-matrix:
-  allow_failures:
-    - rvm: rbx-2
-    - rvm: ruby-head
+dist: xenial
+cache: bundler
 
+matrix:
+  include:
+    - rvm: 2.3
+    - rvm: 2.4
+    - rvm: 2.5
+    - rvm: 2.6
+      env: COVERAGE=BriefSummary,Coveralls
+    - rvm: 2.6
+      os: osx
+      env: COVERAGE=BriefSummary,Coveralls

data/Gemfile

@@ -4,9 +4,6 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-	gem 'simplecov'
-	gem 'coveralls', require: false
-	
 	gem 'rb-fsevent'
 	gem 'rb-inotify'
 end

data/Rakefile

@@ -1,8 +1,6 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec) do |task|
-	task.rspec_opts = ["--require", "simplecov"] if ENV['COVERAGE']
-end
+RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec

data/build-files.gemspec

@@ -1,7 +1,5 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'build/files/version'
+
+require_relative 'lib/build/files/version'
 
 Gem::Specification.new do |spec|
 	spec.name          = "build-files"
@@ -20,7 +18,8 @@ Gem::Specification.new do |spec|
 	
 	spec.required_ruby_version = '>= 2.0'
 	
-	spec.add_development_dependency "bundler", "~> 1.3"
+	spec.add_development_dependency "covered"
+	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rspec", "~> 3.4"
 	spec.add_development_dependency "rake"
 end

data/lib/build/files.rb

@@ -19,6 +19,7 @@
 # THE SOFTWARE.
 
 require_relative 'files/list'
+require_relative 'files/composite'
 require_relative 'files/paths'
 require_relative 'files/glob'
 require_relative 'files/directory'

data/lib/build/files/composite.rb

@@ -0,0 +1,99 @@
+# 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'
+
+module Build
+	module Files
+		class Composite < List
+			def initialize(files, roots = nil)
+				@files = []
+				
+				files.each do |list|
+					if list.kind_of? Composite
+						@files += list.files
+					elsif List.kind_of? List
+						@files << list
+					else
+						# Try to convert into a explicit paths list:
+						@files << Paths.new(list)
+					end
+				end
+				
+				@files.freeze
+				@roots = roots
+			end
+			
+			attr :files
+			
+			def freeze
+				self.roots
+				
+				super
+			end
+			
+			def each
+				return to_enum(:each) unless block_given?
+				
+				@files.each do |files|
+					files.each{|path| yield path}
+				end
+			end
+			
+			def roots
+				@roots ||= @files.collect(&:roots).flatten.uniq
+			end
+			
+			def eql?(other)
+				self.class.eql?(other.class) and @files.eql?(other.files)
+			end
+		
+			def hash
+				@files.hash
+			end
+			
+			def +(list)
+				if list.kind_of? Composite
+					self.class.new(@files + list.files)
+				else
+					self.class.new(@files + [list])
+				end
+			end
+		
+			def include?(path)
+				@files.any? {|list| list.include?(path)}
+			end
+		
+			def rebase(root)
+				self.class.new(@files.collect{|list| list.rebase(root)}, [root])
+			end
+		
+			def to_paths
+				self.class.new(@files.collect(&:to_paths), roots: @roots)
+			end
+			
+			def inspect
+				"<Composite #{@files.inspect}>"
+			end
+		end
+		
+		List::NONE = Composite.new([]).freeze
+	end
+end

data/lib/build/files/difference.rb

@@ -0,0 +1,65 @@
+# 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'
+
+module Build
+	module Files
+		class Difference < List
+			def initialize(list, excludes)
+				@list = list
+				@excludes = excludes
+			end
+			
+			attr :files
+			
+			def freeze
+				@list.freeze
+				@excludes.freeze
+				
+				super
+			end
+			
+			def each
+				return to_enum(:each) unless block_given?
+				
+				@list.each do |path|
+					yield path unless @excludes.include?(path)
+				end
+			end
+			
+			def -(list)
+				self.class.new(@list, Composite.new(@excludes, list))
+			end
+			
+			def include?(path)
+				@list.includes?(path) and !@excludes.include?(path)
+			end
+			
+			def rebase(root)
+				self.class.new(@files.collect{|list| list.rebase(root)}, [root])
+			end
+			
+			def inspect
+				"<Difference #{@files.inspect} - #{@excludes.inspect}>"
+			end
+		end
+	end
+end

data/lib/build/files/handle.rb

@@ -0,0 +1,59 @@
+# 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/list.rb

@@ -35,6 +35,10 @@ module Build
 				Composite.new([self, list])
 			end
 			
+			def -(list)
+				Difference.new(self, list)
+			end
+			
 			# This isn't very efficient, but it IS generic.
 			def ==(other)
 				if self.class == other.class
@@ -91,79 +95,5 @@ module Build
 				inspect
 			end
 		end
-		
-		class Composite < List
-			def initialize(files, roots = nil)
-				@files = []
-				
-				files.each do |list|
-					if list.kind_of? Composite
-						@files += list.files
-					elsif List.kind_of? List
-						@files << list
-					else
-						# Try to convert into a explicit paths list:
-						@files << Paths.new(list)
-					end
-				end
-				
-				@files.freeze
-				@roots = roots
-			end
-			
-			attr :files
-			
-			def freeze
-				self.roots
-				
-				super
-			end
-			
-			def each
-				return to_enum(:each) unless block_given?
-				
-				@files.each do |files|
-					files.each{|path| yield path}
-				end
-			end
-			
-			def roots
-				@roots ||= @files.collect(&:roots).flatten.uniq
-			end
-			
-			def eql?(other)
-				self.class.eql?(other.class) and @files.eql?(other.files)
-			end
-		
-			def hash
-				@files.hash
-			end
-			
-			def +(list)
-				if list.kind_of? Composite
-					self.class.new(@files + list.files)
-				else
-					self.class.new(@files + [list])
-				end
-			end
-		
-			def include?(path)
-				@files.any? {|list| list.include?(path)}
-			end
-		
-			def rebase(root)
-				self.class.new(@files.collect{|list| list.rebase(root)}, [root])
-			end
-		
-			def to_paths
-				self.class.new(@files.collect(&:to_paths), roots: @roots)
-			end
-			
-			def inspect
-				"<Composite #{@files.inspect}>"
-			end
-		end
-		
-		List::NONE = Composite.new([]).freeze
 	end
 end

data/lib/build/files/monitor.rb

@@ -18,214 +18,26 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'set'
-require 'logger'
-
-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
-			
-			# 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!
-					@on_changed.call(@state)
-				end
-			end
-		end
-		
-		class Monitor
-			def initialize(logger: nil)
-				@directories = Hash.new { |hash, key| hash[key] = Set.new }
-				
-				@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|
-					@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 default_driver
-				case RUBY_PLATFORM
-				when /linux/i then :inotify
-				when /darwin/i then :fsevent
-				else :polling
-				end
-			end
-			
-			def run(options = {}, &block)
-				if driver = (options[:driver] || default_driver)
-					method_name = "run_with_#{driver}"
-					Files.send(method_name, self, options, &block)
-				else
-					raise ArgumentError.new("Could not find driver for platform #{RUBY_PLATFORM}!")
-				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|
-					@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)
-			require 'rb-inotify'
-			
-			notifier = INotify::Notifier.new
-			
-			catch(:interrupt) do
-				while true
-					monitor.roots.each do |root|
-						notifier.watch root, :create, :modify, :attrib, :delete do |event|
-							monitor.update([root])
-							
-							yield
-							
-							if monitor.updated
-								notifier.stop
-							end
-						end
-					end
-					
-					notifier.run
-				end
-			end
-		end
-		
-		def self.run_with_fsevent(monitor, options = {}, &block)
-			require 'rb-fsevent'
-			
-			notifier = FSEvent.new
-			
-			catch(:interrupt) do
-				while true
-					notifier.watch monitor.roots do |directories|
-						directories.collect!{|directory| File.expand_path(directory)}
-						
-						monitor.update(directories)
-						
-						yield
-						
-						if monitor.updated
-							notifier.stop
-						end
-					end
-					
-					notifier.run
-				end
-			end
-		end
-		
-		def self.run_with_polling(monitor, options = {}, &block)
-			catch(:interrupt) do
-				while true
-					monitor.update(monitor.roots)
-					
-					yield
-					
-					sleep(options[:latency] || 1.0)
-				end
+		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
+end