mockfs 0.1.3 → 0.1.4

data/lib/mockfs.rb

@@ -94,7 +94,7 @@ require 'fileutils'
 require 'singleton'
 
 module MockFS
-	Version = '0.1.3'
+	Version = '0.1.4'
 
 	@@mock = false
 	
@@ -252,6 +252,10 @@ module MockFS
 			end
 		end
 		
+		def self.dirname( file_name )
+			File.dirname file_name
+		end
+		
 		class << self
 			def exist?( filename )
 				begin
@@ -365,7 +369,7 @@ module MockFS
 			rescue Errno::ENOENT
 				path = Path.new( file ).absolute
 				parent_dir = node( path.parent )
-				file = MockFileSystem::MockFile.new( parent_dir, path.node, nil )
+				file = MockFileSystem::MockFile.new( parent_dir, path.node, '' )
 				parent_dir[path.node] = file
 			end
 		end

data/lib/mockfs.rb~

@@ -94,7 +94,7 @@ require 'fileutils'
 require 'singleton'
 
 module MockFS
-	Version = '0.1.2'
+	Version = '0.1.3'
 
 	@@mock = false
 	
@@ -118,6 +118,9 @@ module MockFS
 	# +is_mock+ should be a Boolean.
 	def self.mock= ( is_mock ); @@mock = is_mock; end
 	
+	# Returns +true+ or +false+ depending on whether MockFS is using the mock file system.
+	def self.mock?; @@mock; end
+	
 	# If we're in mock mode, this will return the MockFileSystem; otherwise it
 	# will raise a RuntimeError.
 	def self.mock_file_system
@@ -163,7 +166,9 @@ module MockFS
 		def self.[]( string ); glob( string, 0 ); end
 		
 		def self.glob( string, flags = 0 )
-			self.new( '.' ).send( :glob, string, flags )
+			DirAdapter.new( '.' ).send( :glob, string, flags ).map { |result|
+				Path.new( result )[1..-1]
+			}
 		end
 		
 		def self.mkdir( dirname )
@@ -176,31 +181,59 @@ module MockFS
 			node( path ).delete
 		end
 		
+		attr_reader :path
+		
 		def initialize( dirname )
 			unless node( dirname ).class == MockFileSystem::MockDir
 				raise Errno::ENOTDIR 
 			end
-			@dirname = dirname
+			@path = dirname
 		end
 		
-		def entries; self.class.entries( @dirname ); end
+		def entries; self.class.entries( @path ); end
 		
-		private
+		protected
 		
 		def glob( string, flags = 0 )
-			path = Path.new string
-			string = path.node
+			glob_path = Path.new string
+			if glob_path.size > 1
+				if glob_path.first != '**'
+					subdir = DirAdapter.new( File.join( self.path, glob_path.first ) )
+					subdir.send( :glob, glob_path[1..-1], flags )
+				else
+					if glob_path.size > 2 and glob_path[1] == Path.new( path ).last
+						glob( glob_path[2..-1], flags )
+					else
+						if glob_path.size == 2
+							matches = match_entries( glob_path[-1], flags )
+						else
+							matches = []
+						end
+						DirAdapter.entries( path ).each do |entry|
+							unless %w( . .. ).include? entry
+								if FileAdapter.directory? File.join( path, entry )
+									subdir = DirAdapter.new File.join( self.path, entry )
+									matches << subdir.send( :glob, glob_path, flags )
+								end
+							end
+						end
+						matches.flatten.uniq
+					end
+				end
+			else
+				match_entries( string, flags )
+			end
+		end
+		
+		def match_entries( string, flags )
 			string = string.gsub( /\./, '\.' )
 			string = string.gsub( /\?/, '.' )
 			string = string.gsub( /\*/, ".*" )
 			string = string.gsub( /\{(.+),(.+)\}/, '(\1|\2)' )
-			puts "  #{ string }"
 			re = Regexp.new string
-			entries( path.parent ).select { |entry|
+			DirAdapter.entries( path ).select { |entry|
 				flags & File::FNM_DOTMATCH != 0 || !%w( . .. ).include?( entry )
-			}.select { |entry| entry =~ re }.map { |entry|
-				File.join( path.parent, entry )
-			}
+			}.select { |entry| entry =~ re }.map { |entry| File.join( path, entry ) }
 		end
 	end
 	
@@ -219,6 +252,10 @@ module MockFS
 			end
 		end
 		
+		def self.dirname( file_name )
+			File.dirname file_name
+		end
+		
 		class << self
 			def exist?( filename )
 				begin
@@ -278,7 +315,7 @@ module MockFS
 			mfile.read
 		end
 		
-		class Mode
+		class Mode #:nodoc:
 			def initialize( string_or_bitwise )
 				if string_or_bitwise.is_a?( String )
 					if string_or_bitwise == 'w'
@@ -480,7 +517,13 @@ module MockFS
 			@@getwd
 		end
 	
-		def []( *args ); Path.new( self.split( "/" )[*args].join( "/" ) ); end
+		def []( *args )
+			if args.size == 1 and args.first.is_a? Fixnum
+				Path.new self.split( "/" )[*args]
+			else
+				Path.new self.split( "/" )[*args].join( "/" )
+			end
+		end
 	
 		def absolute
 			if self =~ %r{^\w}
@@ -495,6 +538,8 @@ module MockFS
 		
 		def first; self.split( "/" ).first; end
 	
+		def last; self.split( "/" ).last; end
+
 		def node
 			self =~ %r{^(.*)/(.*?)$}
 			$2

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: mockfs
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
-date: 2006-06-11 00:00:00 -04:00
+  version: 0.1.4
+date: 2006-12-31 00:00:00 -05:00
 summary: MockFS is a test-obsessed library for mocking out the entire file system.
 require_paths: 
 - lib