build-files 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b40717a33b523317133659681b1ce50c021ac00
-  data.tar.gz: 61a65ca8c6d12d04a8a72bde0aac31557249e687
+  metadata.gz: dea84d68b0394c651e2593a20dc08b7f7631e4b3
+  data.tar.gz: 40cf1afa1b7bbfb740b73383529137d8810456c6
 SHA512:
-  metadata.gz: e692d35c69a5f5896d8902ad3c4960cf8c3aefa4d9f4c06329c36ada616dd4f4d2a2f3f77cbcdec47ce67a0fc0312746451739d7426b5dc50006233a62af0714
-  data.tar.gz: ad4623c1d5a3ca483d0f06630b96e715c4da232c9d376918d7a4b1b52cf54ddffd8184eb73c995fa334b84e317e1640e4a842137386873427df1e8be6b0f87b2
+  metadata.gz: c7a42fa79f16d31f4376b9dd86ca98ed794e14955b100cb844caead310f2f84c5d0b99e5d0060df9f0d1d7361f8e5d61e46a428adcbda4af4fe96e90c4c05d9c
+  data.tar.gz: 87603e85d029f54e8613348034c6846f3ef9a6ef19699fd3680de8b44ff7410d926abe8ef1a45b52de6ff258b329ebcc745c2ef7abc3de1b098fc8edb643f5b7

data/Rakefile

@@ -1,9 +1,6 @@
 require "bundler/gem_tasks"
-require "rake/testtask"
+require "rspec/core/rake_task"
 
-Rake::TestTask.new do |t|
-	t.libs << 'test'
-end
+RSpec::Core::RakeTask.new(:spec)
 
-desc "Run tests"
-task :default => :test
+task :default => :spec

data/build-files.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
 	spec.require_paths = ["lib"]
 
 	spec.add_development_dependency "bundler", "~> 1.3"
-	spec.add_development_dependency "minitest", "~> 5.3.2"
+	spec.add_development_dependency "rspec", "~> 3.0.0.rc1"
 	spec.add_development_dependency "rake"
 end

data/lib/build/files.rb

@@ -18,9 +18,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'files/paths'
+require_relative 'files/list'
 require_relative 'files/glob'
 require_relative 'files/directory'
 
 require_relative 'files/state'
 require_relative 'files/monitor'
+
+require_relative 'files/filesystem'

data/lib/build/files/directory.rb

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'paths'
+require_relative 'list'
 
 module Build
 	module Files

data/lib/build/files/filesystem.rb

@@ -0,0 +1,38 @@
+# 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
+		# Represents a file path with an absolute root and a relative offset:
+		class Path
+			def exist?
+				File.exist? self
+			end
+			
+			def directory?
+				File.directory? self
+			end
+			
+			def mtime
+				File.mtime self
+			end
+		end
+	end
+end

data/lib/build/files/glob.rb

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'paths'
+require_relative 'list'
 
 module Build
 	module Files

data/lib/build/files/{paths.rb → list.rb}

@@ -18,128 +18,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'set'
+require_relative 'path'
 
 module Build
 	module Files
-		# Represents a file path with an absolute root and a relative offset:
-		class Path
-			def self.relative_path(root, full_path)
-				relative_offset = root.length
-				
-				# Deal with the case where the root may or may not end with the path separator:
-				relative_offset += 1 unless root.end_with?(File::SEPARATOR)
-				
-				return full_path.slice(relative_offset..-1)
-			end
-			
-			# Both paths must be full absolute paths, and path must have root as an prefix.
-			def initialize(full_path, root = nil)
-				# This is the object identity:
-				@full_path = full_path
-				
-				if root
-					@root = root
-					@relative_path = nil
-				else
-					# Effectively dirname and basename:
-					@root, @relative_path = File.split(full_path)
-				end
-			end
-			
-			attr :root
-			
-			def to_str
-				@full_path
-			end
-			
-			def to_path
-				@full_path
-			end
-			
-			def length
-				@full_path.length
-			end
-			
-			def parts
-				@parts ||= @full_path.split(File::SEPARATOR)
-			end
-			
-			def relative_path
-				@relative_path ||= Path.relative_path(@root, @full_path)
-			end
-			
-			def relative_parts
-				basename, _, filename = self.relative_path.rpartition(File::SEPARATOR)
-				
-				return basename, filename
-			end
-			
-			def +(extension)
-				self.class.new(@full_path + extension, @root)
-			end
-			
-			def rebase(root)
-				self.class.new(File.join(root, relative_path), root)
-			end
-			
-			def with(root: @root, extension: nil)
-				self.class.new(File.join(root, extension ? relative_path + extension : relative_path), root)
-			end
-			
-			def self.join(root, relative_path)
-				self.new(File.join(root, relative_path), root)
-			end
-			
-			def shortest_path(working_directory = Dir.pwd)
-				if start_with? working_directory
-					Path.new(working_directory, @full_path)
-				else
-					self
-				end
-			end
-			
-			def to_s
-				@full_path
-			end
-			
-			def inspect
-				"#{@root.inspect}/#{relative_path.inspect}"
-			end
-			
-			def hash
-				@full_path.hash
-			end
-			
-			def eql?(other)
-				@full_path.eql?(other.to_s)
-			end
-			
-			def ==(other)
-				self.to_s == other.to_s
-			end
-			
-			def for_reading
-				[@full_path, File::RDONLY]
-			end
-			
-			def for_writing
-				[@full_path, File::CREAT|File::TRUNC|File::WRONLY]
-			end
-			
-			def for_appending
-				[@full_path, File::CREAT|File::APPEND|File::WRONLY]
-			end
-		end
-		
-		def self.Path(*args)
-			if Path === args[0]
-				args[0]
-			else
-				Path.new(*args)
-			end
-		end
-		
 		# A list of paths, where #each yields instances of Path.
 		class List
 			include Enumerable
@@ -308,7 +190,7 @@ module Build
 				"<Composite #{@files.inspect}>"
 			end
 		end
-	
-		NONE = Composite.new([]).freeze
+		
+		List::NONE = Composite.new([]).freeze
 	end
 end

data/lib/build/files/path.rb

@@ -0,0 +1,171 @@
+# 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
+		# Represents a file path with an absolute root and a relative offset:
+		class Path
+			# Returns the length of the prefix which is shared by two strings.
+			def self.prefix_length(a, b)
+				[a.size, b.size].min.times{|i| return i if a[i] != b[i]}
+			end
+			
+			# Returns a list of components for a path, either represented as a Path instance or a String.
+			def self.components(path)
+				if Path === path
+					path.components
+				else
+					path.split(File::SEPARATOR)
+				end
+			end
+			
+			# Return the shortest relative path to get to path from root:
+			def self.shortest_path(path, root)
+				path_components = Path.components(path)
+				root_components = Path.components(root)
+				
+				# Find the common prefix:
+				i = prefix_length(path_components, root_components)
+				
+				# 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])
+			end
+			
+			def self.relative_path(root, full_path)
+				relative_offset = root.length
+				
+				# Deal with the case where the root may or may not end with the path separator:
+				relative_offset += 1 unless root.end_with?(File::SEPARATOR)
+				
+				return full_path.slice(relative_offset..-1)
+			end
+			
+			# Both paths must be full absolute paths, and path must have root as an prefix.
+			def initialize(full_path, root = nil, relative_path = nil)
+				# This is the object identity:
+				@full_path = full_path
+				
+				if root
+					@root = root
+					@relative_path = relative_path
+				else
+					# Effectively dirname and basename:
+					@root, _, @relative_path = full_path.rpartition(File::SEPARATOR)
+				end
+			end
+			
+			
+			def components
+				@components ||= @full_path.split(File::SEPARATOR)
+			end
+			
+			# Ensure the path has an absolute root if it doesn't already:
+			def to_absolute(root)
+				if @root == "."
+					self.rebase(root)
+				else
+					self
+				end
+			end
+			
+			attr :root
+			
+			def to_str
+				@full_path
+			end
+			
+			def to_path
+				@full_path
+			end
+			
+			def length
+				@full_path.length
+			end
+			
+			def parts
+				@parts ||= @full_path.split(File::SEPARATOR)
+			end
+			
+			def relative_path
+				@relative_path ||= Path.relative_path(@root.to_s, @full_path)
+			end
+			
+			def relative_parts
+				basename, _, filename = self.relative_path.rpartition(File::SEPARATOR)
+				
+				return basename, filename
+			end
+			
+			def +(extension)
+				self.class.new(@full_path + extension, @root)
+			end
+			
+			def rebase(root)
+				self.class.new(File.join(root, relative_path), root)
+			end
+			
+			def with(root: @root, extension: nil)
+				self.class.new(File.join(root, extension ? relative_path + extension : relative_path), root)
+			end
+			
+			def self.join(root, relative_path)
+				self.new(File.join(root, relative_path), root)
+			end
+			
+			def shortest_path(root)
+				self.class.shortest_path(self, root)
+			end
+			
+			def to_s
+				@full_path
+			end
+			
+			def inspect
+				"#{@root.inspect}/#{relative_path.inspect}"
+			end
+			
+			def hash
+				@full_path.hash
+			end
+			
+			def eql?(other)
+				@full_path.eql?(other.to_s)
+			end
+			
+			def ==(other)
+				self.to_s == other.to_s
+			end
+			
+			def for_reading
+				[@full_path, File::RDONLY]
+			end
+			
+			def for_writing
+				[@full_path, File::CREAT|File::TRUNC|File::WRONLY]
+			end
+			
+			def for_appending
+				[@full_path, File::CREAT|File::APPEND|File::WRONLY]
+			end
+		end
+	end
+end

data/lib/build/files/state.rb

@@ -35,6 +35,10 @@ module Build
 			def <=> other
 				@time <=> other.time
 			end
+			
+			def inspect
+				"<FileTime #{@path.inspect} #{@time.inspect}>"
+			end
 		end
 		
 		class State
@@ -97,7 +101,7 @@ module Build
 						# puts "Missing: #{path}"
 					end
 				end
-			
+				
 				@removed = last_times.keys
 				
 				@oldest_time = file_times.min
@@ -105,24 +109,28 @@ module Build
 				
 				return @added.size > 0 || @changed.size > 0 || @removed.size > 0 || @missing.size > 0
 			end
-		
+			
 			attr :oldest_time
 			attr :newest_time
-		
+			
 			attr :missing
-		
+			
 			def missing?
 				!@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?
 			end
+			
+			def inspect
+				"<State Added:#{@added} Removed:#{@removed} Changed:#{@changed} Missing:#{@missing}>"
+			end
 		end
 	
 		class IOState
@@ -130,69 +138,75 @@ module Build
 				@input_state = State.new(inputs)
 				@output_state = State.new(outputs)
 			end
-		
+			
 			attr :input_state
 			attr :output_state
-		
+			
 			# Output is dirty if files are missing or if latest input is older than any output.
 			def dirty?
+				@dirty = []
+				
 				if @output_state.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
-			
+				
 				oldest_output_time = @output_state.oldest_time
 				newest_input_time = @input_state.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
-				
+					
 					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

data/lib/build/files/version.rb

@@ -20,6 +20,6 @@
 
 module Build
 	module Files
-		VERSION = "0.1.0"
+		VERSION = "0.2.0"
 	end
 end

data/spec/build/files/list_spec.rb

@@ -0,0 +1,118 @@
+# 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'
+require 'build/files/list'
+require 'build/files/glob'
+
+module Build::Files::ListSpec
+	include Build::Files
+	
+	describe Build::Files::Paths do
+		let(:path) {Path.new("/foo/bar/baz", "/foo")}
+		
+		it "maps paths with a new extension" do
+			paths = Paths.new([
+				Path.join('/foo/bar', 'alice'),
+				Path.join('/foo/bar', 'bob'),
+				Path.join('/foo/bar', 'charles'),
+				path
+			])
+			
+			expect(paths).to include(path)
+			
+			expect(paths).to be_intersects(paths)
+			expect(paths).to_not be_intersects(Paths::NONE)
+			
+			mapped_paths = paths.map {|path| path + ".o"}
+			
+			expect(mapped_paths).to be_kind_of(Paths)
+			expect(mapped_paths.roots).to be == paths.roots
+		end
+		
+		it "globs multiple files" do
+			glob = Glob.new(__dir__, '*.rb')
+			
+			expect(glob.count).to be > 1
+			
+			mapped_paths = glob.map {|path| path + ".txt"}
+			
+			expect(glob.roots).to be == mapped_paths.roots
+		end
+		
+		it "should intersect one file in the glob" do
+			# Glob all test files:
+			glob = Glob.new(__dir__, "*.rb")
+		
+			expect(glob.count).to be > 0
+		
+			# Should include this file:
+			expect(glob).to include(__FILE__)
+		
+			# Glob should intersect self:
+			expect(glob).to be_intersects(glob)
+		end
+		
+		it "should include composites" do
+			lib = File.join(__dir__, "../lib")
+		
+			test_glob = Glob.new(__dir__, "*.rb")
+			lib_glob = Glob.new(lib, "*.rb")
+		
+			both = test_glob + lib_glob
+		
+			# List#roots is the generic accessor for Lists
+			expect(both.roots).to include test_glob.root
+		
+			# The composite should include both:
+			expect(both).to include(__FILE__)
+		end
+		
+		it "should have path with correct root" do
+			test_glob = Glob.new(__dir__, "*.rb")
+			
+			expect(test_glob.first).to be_kind_of Path
+			
+			expect(test_glob.first.root).to be == __dir__
+		end
+		
+		it "maps paths with new extension" do
+			glob = Glob.new(__dir__, "*.rb")
+			
+			paths = glob.map {|path| path + ".txt"}
+			
+			expect(paths.first).to be == (glob.first + ".txt")
+		end
+		
+		it "should define an empty set of files" do
+			expect(Paths::NONE).to be_kind_of List
+			
+			expect(Paths::NONE.count).to be 0
+		end
+		
+		it "can be used as key in hash" do
+			cache = {}
+			
+			cache[Paths.new(path)] = true
+			
+			expect(cache).to include(Paths.new(path))
+		end
+	end
+end

data/spec/build/files/path_spec.rb

@@ -0,0 +1,100 @@
+# 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'
+require 'build/files/path'
+
+module Build::Files::PathSpec
+	include Build::Files
+	
+	describe Build::Files::Path do
+		let(:path) {Path.new("/foo/bar/baz", "/foo")}
+		
+		it "should convert to string" do
+			# The to_str method should return the full path (i.e. the same as to_s):
+			expect(path.to_s).to be == path.to_str
+			
+			# Check the equality operator:
+			expect(path).to be == path.dup
+			
+			# The length should be reported correctly:
+			expect(path.length).to be == path.to_s.length
+			
+			# Check the return types:
+			expect(path).to be_kind_of Path
+			expect(path.root).to be_kind_of String
+			expect(path.relative_path).to be_kind_of String
+		end
+		
+		it "should consist of parts" do
+			expect(path.parts).to be == ["", "foo", "bar", "baz"]
+			
+			expect(path.root).to be == "/foo"
+			
+			expect(path.relative_path).to be == "bar/baz"
+			
+			expect(path.relative_parts).to be == ["bar", "baz"]
+		end
+		
+		it "should have a new extension" do
+			renamed_path = path.with(root: '/tmp', extension: '.txt')
+			
+			expect(renamed_path.root).to be == '/tmp'
+			
+			expect(renamed_path.relative_path).to be == 'bar/baz.txt'
+			
+			object_path = path + ".o"
+		
+			expect(object_path.root).to be == "/foo"
+			expect(object_path.relative_path).to be == "bar/baz.o"
+		end
+		
+		it "should give the shortest path for outer paths" do
+			spec_path = Path.new(__FILE__)
+			source_path = Path.new(File.expand_path("../../../lib/build/files/list.rb"))
+			
+			input = Path.new("/a/b/c/file.cpp")
+			output = Path.new("/a/b/c/d/e/")
+			
+			expect(input.root).to be == "/a/b/c"
+			expect(output.root).to be == "/a/b/c/d/e"
+			
+			short = input.shortest_path(output)
+			
+			expect(short).to be == "../../file.cpp"
+			
+			expect(File.expand_path(short, output)).to be == input
+		end
+		
+		it "should give the shortest path for inner paths" do
+			input = Path.new("/a/b/c/file.cpp")
+			output = Path.new("/a/")
+			
+			expect(input.root).to be == "/a/b/c"
+			expect(output.root).to be == "/a"
+			
+			short = input.shortest_path(output)
+			
+			expect(short).to be == "b/c/file.cpp"
+			
+			expect(File.expand_path(short, output)).to be == input
+		end
+	end
+end

data/{test/test_state.rb → spec/build/files/state_spec.rb}

@@ -18,44 +18,43 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'minitest/autorun'
-
 require 'build/files'
 
-class TestState < MiniTest::Test
-	include Build::Files
-	
-	def setup
-		@files = Glob.new(__dir__, "*.rb")
-	end
-	
-	def test_basic_update
-		state = State.new(@files)
-		
-		refute state.update!, "Files not changed"
+module Build::Files::StateSpec
+	describe Build::Files::State do
+		let(:files) {Build::Files::Glob.new(__dir__, "*.rb")}
 		
-		assert_equal [], state.changed
-		assert_equal [], state.added
-		assert_equal [], state.removed
-		assert_equal [], state.missing
-	end
-	
-	def test_missing
-		files = @files.to_paths.rebase(File.join(__dir__, 'program'))
-		state = State.new(files)
-		
-		assert state.update!, "Files missing"
-		refute_empty state.missing
-	end
-	
-	def test_duplicates
-		state = State.new(@files + @files)
+		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
 		
-		refute state.update!, "Files not changed"
+		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
 		
-		assert_equal [], state.changed
-		assert_equal [], state.added
-		assert_equal [], state.removed
-		assert_equal [], state.missing
+		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
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-files
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-18 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.2
+        version: 3.0.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.2
+        version: 3.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,14 +66,16 @@ files:
 - build-files.gemspec
 - lib/build/files.rb
 - lib/build/files/directory.rb
+- lib/build/files/filesystem.rb
 - lib/build/files/glob.rb
+- lib/build/files/list.rb
 - lib/build/files/monitor.rb
-- lib/build/files/paths.rb
+- lib/build/files/path.rb
 - lib/build/files/state.rb
 - lib/build/files/version.rb
-- test/test_files.rb
-- test/test_paths.rb
-- test/test_state.rb
+- spec/build/files/list_spec.rb
+- spec/build/files/path_spec.rb
+- spec/build/files/state_spec.rb
 homepage: ''
 licenses:
 - MIT
@@ -100,6 +102,6 @@ specification_version: 4
 summary: Build::Files is a set of idiomatic classes for dealing with paths and monitoring
   directories.
 test_files:
-- test/test_files.rb
-- test/test_paths.rb
-- test/test_state.rb
+- spec/build/files/list_spec.rb
+- spec/build/files/path_spec.rb
+- spec/build/files/state_spec.rb

data/test/test_files.rb

@@ -1,75 +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 'minitest/autorun'
-
-require 'build/files'
-
-class TestFiles < MiniTest::Test
-	include Build::Files
-	
-	def test_inclusion
-		# Glob all test files:
-		glob = Glob.new(__dir__, "*.rb")
-		
-		assert glob.count > 0
-		
-		# Should include this file:
-		assert_includes glob, __FILE__
-		
-		# Glob should intersect self:
-		assert glob.intersects?(glob)
-	end
-	
-	def test_composites
-		lib = File.join(__dir__, "../lib")
-		
-		test_glob = Glob.new(__dir__, "*.rb")
-		lib_glob = Glob.new(lib, "*.rb")
-		
-		both = test_glob + lib_glob
-		
-		# List#roots is the generic accessor for Lists
-		assert both.roots.include? test_glob.root
-		
-		# The composite should include both:
-		assert both.include?(__FILE__)
-	end
-	
-	def test_roots
-		test_glob = Glob.new(__dir__, "*.rb")
-		
-		assert_kind_of Path, test_glob.first
-		
-		assert_equal __dir__, test_glob.first.root
-	end
-	
-	def test_renaming
-		glob = Glob.new(__dir__, "*.rb")
-		
-		paths = glob.map {|path| path + ".txt"}
-		
-		assert_equal(paths.first, glob.first + ".txt")
-	end
-	
-	def test_none
-		assert_equal 0, NONE.count
-	end
-end

data/test/test_paths.rb

@@ -1,111 +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 'minitest/autorun'
-
-require 'build/files/paths'
-require 'build/files/glob'
-
-class TestPaths < MiniTest::Test
-	include Build::Files
-	
-	def setup
-		@path = Path.new("/foo/bar/baz", "/foo")
-	end
-	
-	def test_path_conversions
-		# The to_str method should return the full path (i.e. the same as to_s):
-		assert_equal @path.to_s, @path.to_str
-		
-		# Checkt the equality operator:
-		assert_equal @path, @path.dup
-		
-		# The length should be reported correctly:
-		assert_equal @path.length, @path.to_s.length
-	end
-	
-	def test_path_parts
-		assert_equal ["", "foo", "bar", "baz"], @path.parts
-		
-		assert_equal "/foo", @path.root
-		
-		assert_equal "bar/baz", @path.relative_path
-		
-		assert_equal ["bar", "baz"], @path.relative_parts
-	end
-	
-	def test_path_with
-		path = @path.with(root: '/tmp', extension: '.txt')
-		
-		assert_equal '/tmp', path.root
-		
-		assert_equal 'bar/baz.txt', path.relative_path
-	end
-	
-	def test_path_class
-		assert_instance_of Path, @path
-		assert_instance_of String, @path.root
-		assert_instance_of String, @path.relative_path
-	end
-	
-	def test_path_manipulation
-		object_path = @path + ".o"
-		
-		assert_equal "/foo", object_path.root
-		assert_equal "bar/baz.o", object_path.relative_path
-	end
-	
-	def test_paths
-		paths = Paths.new([
-			Path.join('/foo/bar', 'alice'),
-			Path.join('/foo/bar', 'bob'),
-			Path.join('/foo/bar', 'charles'),
-			@path
-		])
-		
-		assert_includes paths, @path
-		
-		assert paths.intersects?(paths)
-		refute paths.intersects?(NONE)
-		
-		mapped_paths = paths.map {|path| path + ".o"}
-		
-		assert_instance_of Paths, mapped_paths
-		assert_equal paths.roots, mapped_paths.roots
-	end
-	
-	def test_glob
-		glob = Glob.new(__dir__, '*.rb')
-		
-		assert glob.count > 0, "Found some files"
-		
-		mapped_paths = glob.map {|path| path + ".txt"}
-		
-		assert_equal glob.roots, mapped_paths.roots
-	end
-	
-	def test_hashing
-		cache = {}
-		
-		cache[Paths.new(@path)] = true
-		
-		assert cache[Paths.new(@path)]
-	end
-end