directory? -> dir? to be more consistent

lib/commands.rb

@@ -12,7 +12,7 @@ def vi(*args)
 		def search(pattern)
 			results = {}
 			entries.each do |entry|
-				if !entry.directory? and m = entry.contents.match(pattern)
+				if !entry.dir? and m = entry.contents.match(pattern)
 					results[entry] = m
 				end
 			end
@@ -21,7 +21,7 @@ def search(pattern)
 
 		def replace!(pattern, with_text)
 			entries.each do |entry|
-				entry.replace!(pattern, with_text) unless entry.directory?
+				entry.replace!(pattern, with_text) unless entry.dir?
 			end
 		end
 	end

lib/dir.rb

@@ -1,6 +1,6 @@
 module Rush
 	class Dir < Entry
-		def directory?
+		def dir?
 			true
 		end
 

lib/file.rb

@@ -1,6 +1,6 @@
 module Rush
 	class File < Entry
-		def directory?
+		def dir?
 			false
 		end
 

spec/dir_spec.rb

@@ -69,7 +69,7 @@
 		@dir.find_by_regexp(/\d$/).should == [ file2 ]
 	end
 
-	it "find_subitem finds entries in a subdirectory" do
+	it "find_subitem finds entries in a subdir" do
 		file = @dir.create_dir('a/b').create_file('c')
 		@dir.find_subitem('a/b/c').should == file
 	end

spec/entry_spec.rb

@@ -19,7 +19,7 @@
 		@entry.name.should == File.basename(@filename)
 	end
 
-	it "knows its parent directory" do
+	it "knows its parent dir" do
 		@entry.parent.should be_kind_of(Rush::Dir)
 		@entry.parent.name.should == File.basename(@sandbox_dir)
 		@entry.parent.full_path.should == @sandbox_dir

spec/file_spec.rb

@@ -20,8 +20,8 @@
 		@file.should be_kind_of(Rush::Entry)
 	end
 
-	it "is not a directory" do
-		@file.should_not be_directory
+	it "is not a dir" do
+		@file.should_not be_dir
 	end
 
 	it "knows its size in bytes" do