build-files 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0e9df595930cd10f04835cd412e5433ac3fb397
-  data.tar.gz: a3caddaada1da8b22354ee6d1f96d8c8be606dbf
+  metadata.gz: d6e05a581a90d4c4b687188353883ff5b94bdbd2
+  data.tar.gz: 346cd2802c3cd5e343dcc27fffc2c3acde2012bd
 SHA512:
-  metadata.gz: 88d97a6446e7cbbabbbda3bc2f59510a982b3470e629e8ce1692b7b1edd57bf011210ec53217468b2c61a03ab0ab8c99f5ac46d6fd67186351fa6c967698c334
-  data.tar.gz: d27587bea9749292160c0f02b1019865ea3945066e71e35daad2c59163f161f23e41896aa0890838c519ded4d503e8343de3ce7e20ba03cb4b2e8f6a8d78ad4a
+  metadata.gz: af419028f2a16b2caf1d59c261db593437efcb75bf5efd2952f0edc22f80e755d04ab130f9b59470ee124e42dee94d3f0208907ac414da35f095f72952f049a8
+  data.tar.gz: caf234a78d92532a3ef9a70e127bc33df3489434b5fca9e2dbfd2def28fa9c986cf436385613eb1503038bfa8ca140f55f2f5c6fbb06802afcab95bf823b7515

data/build-files.gemspec

@@ -17,7 +17,9 @@ Gem::Specification.new do |spec|
 	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
 	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
 	spec.require_paths = ["lib"]
-
+	
+	spec.required_ruby_version = '>= 2.0'
+	
 	spec.add_development_dependency "bundler", "~> 1.3"
 	spec.add_development_dependency "rspec", "~> 3.0.0.rc1"
 	spec.add_development_dependency "rake"

data/lib/build/files/directory.rb

@@ -23,45 +23,55 @@ require_relative 'list'
 module Build
 	module Files
 		class Directory < List
-			def initialize(root)
-				@root = root
+			def self.join(*args)
+				self.new(Path.join(*args))
+			end
+			
+			def initialize(path)
 				@path = path
 			end
 			
-			attr :root
 			attr :path
 			
-			def roots
-				[@root]
+			def root
+				@path.root
 			end
 			
-			def full_path
-				Path.join(@root, @path)
+			def roots
+				[root]
 			end
-		
+			
 			def each
 				return to_enum(:each) unless block_given?
 				
-				Dir.glob(full_path + "**/*") do |path|
-					yield Path.new(path, @root)
+				Dir.glob(@path + "**/*") do |path|
+					yield Path.new(path, @path.root)
 				end
 			end
 		
 			def eql?(other)
-				other.kind_of?(self.class) and @root.eql?(other.root) and @path.eql?(other.path)
+				other.kind_of?(self.class) and @path.eql?(other.path)
 			end
 		
 			def hash
-				[@root, @path].hash
+				@path.hash
 			end
 		
 			def include?(path)
 				# Would be true if path is a descendant of full_path.
-				path.start_with?(full_path)
+				path.start_with?(@path)
 			end
 		
 			def rebase(root)
-				self.class.new(root, @path)
+				self.class.new(@path.rebase(root))
+			end
+			
+			def to_str
+				@path.to_str
+			end
+			
+			def to_path
+				@path
 			end
 		end
 	end

data/lib/build/files/list.rb

@@ -40,8 +40,8 @@ module Build
 				other.any?{|path| include?(path)}
 			end
 			
-			def with(**args)
-				return to_enum(:with, **args) unless block_given?
+			def with(*args)
+				return to_enum(:with, *args) unless block_given?
 				
 				paths = []
 				

data/lib/build/files/monitor.rb

@@ -80,6 +80,10 @@ module Build
 		
 				handle
 			end
+			
+			def run(options = {}, &block)
+				Files::run_with_polling(self, options, &block)
+			end
 		end
 		
 		def self.run_with_fsevent(monitor, options = {}, &block)
@@ -115,9 +119,5 @@ module Build
 				end
 			end
 		end
-		
-		def run(monitor, options = {}, &block)
-			self.class.run_with_polling(monitor, options, &block)
-		end
 	end
 end

data/lib/build/files/{filesystem.rb → path/filesystem.rb}

@@ -20,8 +20,23 @@
 
 module Build
 	module Files
-		# Represents a file path with an absolute root and a relative offset:
 		class Path
+			def open(mode, &block)
+				File.open(self, mode, &block)
+			end
+			
+			def read(mode = File::RDONLY)
+				open(mode) do |file|
+					file.read
+				end
+			end
+			
+			def write(buffer, mode = File::CREAT|File::TRUNC|File::WRONLY)
+				open(mode) do |file|
+					file.write(buffer)
+				end
+			end
+			
 			def exist?
 				File.exist? self
 			end

data/lib/build/files/path.rb

@@ -59,6 +59,10 @@ module Build
 				return full_path.slice(relative_offset..-1)
 			end
 			
+			def self.[] path
+				self === path ? path : self.new(path.to_s)
+			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:
@@ -73,11 +77,14 @@ module Build
 				end
 			end
 			
-			
 			def components
 				@components ||= @full_path.split(File::SEPARATOR)
 			end
 			
+			def basename
+				self.components.last
+			end
+			
 			# Ensure the path has an absolute root if it doesn't already:
 			def to_absolute(root)
 				if @root == "."
@@ -88,14 +95,7 @@ module Build
 			end
 			
 			attr :root
-			
-			def to_str
-				@full_path
-			end
-			
-			def to_path
-				@full_path
-			end
+			attr :full_path
 			
 			def length
 				@full_path.length
@@ -110,21 +110,28 @@ module Build
 			end
 			
 			def relative_parts
-				basename, _, filename = self.relative_path.rpartition(File::SEPARATOR)
+				dirname, _, basename = self.relative_path.rpartition(File::SEPARATOR)
 				
-				return basename, filename
+				return dirname, basename
 			end
 			
-			def +(extension)
+			def append(extension)
 				self.class.new(@full_path + extension, @root)
 			end
 			
+			def +(path)
+				self.class.new(File.join(@full_path, path), @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)
+				# self.relative_path should be a string so using + to add an extension should be fine.
+				relative_path = extension ? self.relative_path + extension : self.relative_path
+				
+				self.class.new(File.join(root, relative_path), root, relative_path)
 			end
 			
 			def self.join(root, relative_path)
@@ -135,6 +142,14 @@ module Build
 				self.class.shortest_path(self, root)
 			end
 			
+			def to_str
+				@full_path
+			end
+			
+			def to_path
+				@full_path
+			end
+			
 			def to_s
 				@full_path
 			end
@@ -144,11 +159,11 @@ module Build
 			end
 			
 			def hash
-				@full_path.hash
+				[@root, @full_path].hash
 			end
 			
 			def eql?(other)
-				@full_path.eql?(other.to_s)
+				@root.eql?(other.root) and @full_path.eql?(other.full_path)
 			end
 			
 			def ==(other)

data/lib/build/files/version.rb

@@ -20,6 +20,6 @@
 
 module Build
 	module Files
-		VERSION = "0.2.1"
+		VERSION = "0.2.2"
 	end
 end

data/lib/build/files.rb

@@ -25,4 +25,4 @@ require_relative 'files/directory'
 require_relative 'files/state'
 require_relative 'files/monitor'
 
-require_relative 'files/filesystem'
+require_relative 'files/path/filesystem'

data/spec/build/files/directory_spec.rb

@@ -0,0 +1,39 @@
+# 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 'build/files/directory'
+
+module Build::Files::DirectorySpec
+	include Build::Files
+	
+	describe Build::Files::Directory do
+		let(:path) {Path.new("/foo/bar/baz", "/bob")}
+		let(:directory) {Directory.new(path)}
+		
+		it "has a root and path component" do
+			expect(directory.root).to be == path.root
+			expect(directory.path).to be == path
+		end
+		
+		it "includes subpaths" do
+			expect(directory).to be_include "/foo/bar/baz/bob/dole"
+		end
+	end
+end

data/spec/build/files/path_spec.rb

@@ -21,13 +21,24 @@
 require 'build/files'
 require 'build/files/path'
 
+require 'pathname'
+
 module Build::Files::PathSpec
 	include Build::Files
 	
 	describe Build::Files::Path do
 		let(:path) {Path.new("/foo/bar/baz", "/foo")}
 		
+		it "should convert to path" do
+			pathname = Pathname("/foo/bar/baz")
+			
+			expect(Path[pathname]).to be == path
+			expect(Path["/foo/bar/baz"]).to be == path
+		end
+		
 		it "should convert to string" do
+			expect(path.to_s).to be == "/foo/bar/baz"
+			
 			# 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
 			
@@ -60,7 +71,7 @@ module Build::Files::PathSpec
 			
 			expect(renamed_path.relative_path).to be == 'bar/baz.txt'
 			
-			object_path = path + ".o"
+			object_path = path.append(".o")
 		
 			expect(object_path.root).to be == "/foo"
 			expect(object_path.relative_path).to be == "bar/baz.o"
@@ -96,5 +107,11 @@ module Build::Files::PathSpec
 			
 			expect(File.expand_path(short, output)).to be == input
 		end
+		
+		it "should append a path" do
+			path = Path.new("/a/b/c")
+			
+			expect(path + "d/e/f").to be == "/a/b/c/d/e/f"
+		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: build-files
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,13 +66,14 @@ 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/path.rb
+- lib/build/files/path/filesystem.rb
 - lib/build/files/state.rb
 - lib/build/files/version.rb
+- spec/build/files/directory_spec.rb
 - spec/build/files/list_spec.rb
 - spec/build/files/path_spec.rb
 - spec/build/files/state_spec.rb
@@ -88,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -102,6 +103,7 @@ specification_version: 4
 summary: Build::Files is a set of idiomatic classes for dealing with paths and monitoring
   directories.
 test_files:
+- spec/build/files/directory_spec.rb
 - spec/build/files/list_spec.rb
 - spec/build/files/path_spec.rb
 - spec/build/files/state_spec.rb