filepath 0.3.1 → 0.4

data/lib/{filepathlist.rb → filepath/filepathlist.rb}

@@ -1,6 +1,7 @@
 # This is free and unencumbered software released into the public domain.
 # See the `UNLICENSE` file or <http://unlicense.org/> for more details.
 
+
 class FilePathList
 	include Enumerable
 
@@ -36,16 +37,29 @@ class FilePathList
 		return FilePathList.new(@entries + extra_entries.to_a)
 	end
 
-	def -(others) # FIXME: block
-		if others.is_a? Regexp # FIXME: support any object that responds to =~
-			remaining_entries = @entries.delete_if { |e| e =~ others }
+	def -(others)
+		remaining_entries = @entries - others.as_path_list.to_a
+
+		return FilePathList.new(remaining_entries)
+	end
+
+	def exclude(pattern = nil, &block)
+		if block_given?
+			select { |e| !block.call(e) }
 		else
-			remaining_entries = @entries - others.as_path_list.to_a
+			select { |e| !(e =~ pattern) }
+		end
+	end
+
+	def select(pattern = nil, &block)
+		if !block_given?
+			block = proc { |e| e =~ pattern }
 		end
 
+		remaining_entries = @entries.select { |e| block.call(e) }
+
 		return FilePathList.new(remaining_entries)
 	end
-	alias :exclude :-
 
 	def <<(extra_path)
 		return FilePathList.new(@entries + [extra_path.as_path])
@@ -60,16 +74,16 @@ class FilePathList
 		return FilePathList.new(paths)
 	end
 
-	def remove_common_fragments
-		all_frags = @entries.map(&:fragments)
-		max_length = all_frags.map(&:length).min
+	def remove_common_segments
+		all_segs = @entries.map(&:segments)
+		max_length = all_segs.map(&:length).min
 
 		idx_different = nil
 
 		(0..max_length).each do |i|
-			fragment = all_frags.first[i]
+			segment = all_segs.first[i]
 
-			different = all_frags.any? { |frags| frags[i] != fragment }
+			different = all_segs.any? { |segs| segs[i] != segment }
 			if different
 				idx_different = i
 				break
@@ -78,9 +92,9 @@ class FilePathList
 
 		idx_different ||= max_length
 
-		remaining_frags = all_frags.map { |frags| frags[idx_different..-1] }
+		remaining_segs = all_segs.map { |segs| segs[idx_different..-1] }
 
-		return FilePathList.new(remaining_frags)
+		return FilePathList.new(remaining_segs)
 	end
 
 	# @return [FilePathList] the path list itself
@@ -97,6 +111,8 @@ class FilePathList
 		@to_s ||= @entries.map(&:to_str).join(SEPARATOR)
 	end
 
+
+	# @private
 	def inspect
 		@entries.inspect
 	end
@@ -106,6 +122,7 @@ class FilePathList
 	end
 
 	module ArrayMethods
+		# @private
 		def self.define_array_method(name)
 			define_method(name) do |*args, &block|
 				return @entries.send(name, *args, &block)
@@ -121,26 +138,9 @@ class FilePathList
 		define_array_method :each
 
 		define_array_method :map
+
+		define_array_method :size
 	end
 
 	include ArrayMethods
 end
-
-class Array
-	# Generates a path list from an array of paths.
-	#
-	# The elements of the array must respond to `#as_path`.
-	#
-	# `ary.as_path` is equivalent to `FilePathList.new(ary)`.
-	#
-	# @return [FilePathList] a new path list containing the elements of
-	#                        the array as FilePaths
-	#
-	# @see String#as_path
-	# @see Array#as_path
-	# @see FilePath#as_path
-
-	def as_path_list
-		FilePathList.new(self)
-	end
-end

data/spec/filepath_spec.rb

@@ -264,6 +264,24 @@ describe FilePath do
 		end
 	end
 
+	describe "#root?" do
+		it "says that </> points to the root directory" do
+			FilePath.new('/').should be_root
+		end
+
+		it "says that </..> points to the root directory" do
+			FilePath.new('/..').should be_root
+		end
+
+		it "says that <a/b> does not point to the root directory" do
+			FilePath.new('a/b').should_not be_root
+		end
+
+		it "says that </foo> does not point to the root directory" do
+			FilePath.new('/foo/bar').should_not be_root
+		end
+	end
+
 	describe "#absolute?" do
 		it "says that `/foo/bar` is absolute" do
 			FilePath.new('/foo/bar').should be_absolute
@@ -295,7 +313,7 @@ describe FilePath do
 	end
 
 	describe "#ascend" do
-		it "goes through all the fragments of an absolute path" do
+		it "goes through all the segments of an absolute path" do
 			steps = []
 			FilePath.new("/a/b/c").ascend do |p|
 				steps << p
@@ -308,7 +326,7 @@ describe FilePath do
 			steps[3].should eq("/")
 		end
 
-		it "goes through all the fragments of a relative path" do
+		it "goes through all the segments of a relative path" do
 			steps = []
 			FilePath.new("a/b/c").ascend do |p|
 				steps << p
@@ -319,10 +337,15 @@ describe FilePath do
 			steps[1].should eq("a/b")
 			steps[2].should eq("a")
 		end
+
+		it "returns the path itself" do
+			path = FilePath.new("/a/b/c/")
+			path.ascend { }.should be(path)
+		end
 	end
 
 	describe "#descend" do
-		it "goes through all the fragments of an absolute path" do
+		it "goes through all the segments of an absolute path" do
 			steps = []
 			FilePath.new("/a/b/c").descend do |p|
 				steps << p
@@ -335,7 +358,7 @@ describe FilePath do
 			steps[3].should eq("/a/b/c")
 		end
 
-		it "goes through all the fragments of a relative path" do
+		it "goes through all the segments of a relative path" do
 			steps = []
 			FilePath.new("a/b/c").descend do |p|
 				steps << p
@@ -346,6 +369,11 @@ describe FilePath do
 			steps[1].should eq("a/b")
 			steps[2].should eq("a/b/c")
 		end
+
+		it "returns the path itself" do
+			path = FilePath.new("/a/b/c/")
+			path.descend { }.should be(path)
+		end
 	end
 
 	describe "#to_s" do
@@ -580,11 +608,38 @@ describe FilePath do
 			end
 		end
 
+		describe "#find" do
+			it "finds all paths matching a glob string" do
+				list = @root.find('*1')
+
+				list.should have(6).items
+				list.each { |path| path.should =~ /1/ }
+			end
+
+			it "finds all paths matching a Regex" do
+				list = @root.find(/2/)
+
+				list.should have(5).items
+				list.each { |path| path.should =~ /2/ }
+			end
+
+			it "finds all paths for which the block returns true" do
+				list = @root.find { |path| path.directory? }
+
+				list.should have(9).items
+				list.each { |path| path.filename.should =~ /^d/ }
+			end
+		end
+
 		describe "#files" do
 			it "finds 1 file in the root directory" do
 				@root.files.should have(1).item
 			end
 
+			it "finds 3 files in the root directory and its sub directories" do
+				@root.files(true).should have(3).item
+			end
+
 			it "finds 2 files in directory <d1>" do
 				(@root / 'd1').files.should have(2).items
 			end
@@ -599,6 +654,10 @@ describe FilePath do
 				@root.directories.should have(4).items
 			end
 
+			it "finds 9 directories in the root directory and its sub directories" do
+				@root.directories(true).should have(9).item
+			end
+
 			it "finds 2 directories in directory <d2>" do
 				(@root / 'd2').directories.should have(2).items
 			end

data/spec/filepathlist_spec.rb

@@ -36,12 +36,6 @@ describe FilePathList do
 		end
 	end
 
-	describe "#exclude" do
-		list = FilePathList.new(%w{a.foo b.bar c.foo d.foo b.bar})
-		refined = list.exclude(/bar$/)
-		refined.each { |path| path.extension.should == 'foo' }
-	end
-
 	describe "#/" do
 		it "adds the same string to all the paths" do
 			list = FilePathList.new(%w{foo faa}) / 'bar'
@@ -75,6 +69,45 @@ describe FilePathList do
 		end
 	end
 
+	describe "#exclude" do
+		let(:list) { FilePathList.new(%w{a.foo b.bar c.foo d.foo b.bar}) }
+
+		it "excludes paths matching a Regex" do
+			remaining = list.exclude(/bar$/)
+
+			remaining.should be_a FilePathList
+			remaining.should have(3).items
+			remaining.each { |path| path.extension.should == 'foo' }
+		end
+
+		it "excludes all the paths for which the block returns true" do
+			remaining = list.exclude { |path| path.extension?('bar') }
+
+			remaining.should be_a FilePathList
+			remaining.should have(3).items
+			remaining.each { |path| path.extension.should == 'foo' }
+		end
+	end
+
+	describe "#select" do
+		let(:list) { FilePathList.new(%w{a.foo b.bar c.foo d.foo b.bar}) }
+
+		it "keeps paths matching a Regex" do
+			remaining = list.select(/bar$/)
+
+			remaining.should be_a FilePathList
+			remaining.should have(2).items
+			remaining.each { |path| path.extension.should == 'bar' }
+		end
+
+		it "keeps all the paths for which the block returns true" do
+			remaining = list.select { |ph| ph.extension?('bar') }
+
+			remaining.should have(2).items
+			remaining.each { |ph| ph.extension.should == 'bar' }
+		end
+	end
+
 	describe "#<<" do
 		it "adds a new to path to a existing FilePathList" do
 			list1 = FilePathList.new(%w{a/b /c/d})
@@ -133,10 +166,10 @@ describe FilePathList do
 		end
 	end
 
-	describe "#remove_common_fragments" do
+	describe "#remove_common_segments" do
 		it "works on lists of files from the same dir" do
 			paths = %w{a/b/x1 a/b/x2 a/b/x3}
-			list = FilePathList.new(paths).remove_common_fragments
+			list = FilePathList.new(paths).remove_common_segments
 
 			list.should have(3).items
 			list.should include(*%w{x1 x2 x3})
@@ -144,16 +177,16 @@ describe FilePathList do
 
 		it "works on lists of files from different dirs" do
 			list1 = FilePathList.new(%w{a/b/x1 a/b/c/x2 a/b/d/e/x3})
-			list2 = list1.remove_common_fragments
+			list2 = list1.remove_common_segments
 
 			list2.should have(3).items
 			list2.should include(*%w{x1 c/x2 d/e/x3})
 		end
 
-		it "works on lists of files with no common fragments" do
+		it "works on lists of files with no common segments" do
 			paths = %w{a/b a/d g/f}
 			list1 = FilePathList.new(paths)
-			list2 = list1.remove_common_fragments
+			list2 = list1.remove_common_segments
 
 			list1.should == list2
 		end
@@ -161,7 +194,7 @@ describe FilePathList do
 		it "works on lists that contain duplicates only" do
 			paths = %w{a/b a/b a/b}
 			list1 = FilePathList.new(paths)
-			list2 = list1.remove_common_fragments
+			list2 = list1.remove_common_segments
 
 			list2.should == FilePathList.new(['.', '.', '.'])
 		end

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@ LIB_DIR = File.expand_path(File.join(File.dirname(__FILE__), %w[.. lib]))
 $LOAD_PATH.unshift(LIB_DIR) unless $LOAD_PATH.include?(LIB_DIR)
 
 require 'filepath'
-require 'filepathlist'
 
 RSpec.configure do |config|
 	config.filter_run_excluding :broken => true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filepath
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: '0.4'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-21 00:00:00.000000000 Z
+date: 2012-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bones-rspec
-  requirement: &21597840 !ruby/object:Gem::Requirement
+  requirement: &19274420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.1
   type: :development
   prerelease: false
-  version_requirements: *21597840
+  version_requirements: *19274420
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &21595900 !ruby/object:Gem::Requirement
+  requirement: &19273040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 3.7.3
   type: :development
   prerelease: false
-  version_requirements: *21595900
+  version_requirements: *19273040
 description: ! 'filepath is a small library that helps dealing with files, directories
   and
 
@@ -48,7 +48,10 @@ files:
 - Rakefile
 - UNLICENSE
 - lib/filepath.rb
-- lib/filepathlist.rb
+- lib/filepath/core_ext/array.rb
+- lib/filepath/core_ext/string.rb
+- lib/filepath/filepath.rb
+- lib/filepath/filepathlist.rb
 - spec/filepath_spec.rb
 - spec/filepathlist_spec.rb
 - spec/spec_helper.rb