file-spec 0.1.0 → 0.1.1

data/README.markdown

@@ -4,25 +4,40 @@ RSpec 2 matcher to specify expected file structures.
 
 ## Usage
 
-See /spec folder for usage examples.
-
-## TODO
-
-Currently these do not check file type of target but are just alias of generic have_symlink.
-This must be fixed!
-
-* have_symlink_file sym_file
-* have_symlink_dir sym_dir
-
-* have_symlink_files sym_file1, sym_file2
-* have_symlink_dirs sym_dir1, sym_dir2
+The following demonstrates File expectation nesting to test a File hierarchy structure!
+Each block is evaluated in a new Dir context, using a Dir#chdir block.
+
+Example: Nested file structure specs
+<pre>
+  Dir.chdir(my_path)
+  Dir.pwd.should have_file 'hello.txt' do |dir|
+    dir.should have_files 'abc.rb', 'def.rb'
+    dir.should have_dir :test do |test_dir|
+      test_dir.should have_dirs :test_abc, :test_def
+    end
+    dir.should have_symlink :xyz
+    dir.should have_symlink_files 'blip.rb', 'blap.rb', 'logfile.log'
+    dir.should have_symlink_dir 'my-secret-dir'
+  end
+end
+</pre>  
+
+See /spec folder for more usage examples.
 
 ## TODO - advanced
 
+* use Dir.tmpdir
 * have_file_structure yaml
 
-Should test that the files and dirs match the tree structure of the yaml string (or file).
+Should test that the files and dirs match the tree structure as indicated by the yaml string (or file).
 This is very convenient for more complex file structure specs!
+<pre>
+mydir:
+  - file1.txt
+  - file2.txt
+  subdir1: [abc.rb, def.rb]
+  subdir2: [x.txt, logfile.log] 
+</pre>
 
 ## Note on Patches/Pull Requests
  

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/file-spec.gemspec

@@ -0,0 +1,76 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{file-spec}
+  s.version = "0.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Kristian Mandrup"]
+  s.date = %q{2010-09-12}
+  s.description = %q{RSpec 2 matchers for files, directories and symlinks}
+  s.email = %q{kmandrup@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.markdown"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     ".rspec",
+     "LICENSE",
+     "README.markdown",
+     "Rakefile",
+     "VERSION",
+     "file-spec.gemspec",
+     "lib/file-spec.rb",
+     "lib/file_spec/file_helpers/test_dirs.rb",
+     "lib/file_spec/file_helpers/test_files.rb",
+     "lib/file_spec/file_helpers/test_symlinks.rb",
+     "lib/file_spec/matchers/abstract/have_file_item.rb",
+     "lib/file_spec/matchers/abstract/have_file_items.rb",
+     "lib/file_spec/matchers/have_dir.rb",
+     "lib/file_spec/matchers/have_file.rb",
+     "lib/file_spec/matchers/have_symlink.rb",
+     "spec/file-spec/matchers/multiple/have_directories_spec.rb",
+     "spec/file-spec/matchers/multiple/have_files_spec.rb",
+     "spec/file-spec/matchers/multiple/have_symlinks_spec.rb",
+     "spec/file-spec/matchers/single/have_directory_spec.rb",
+     "spec/file-spec/matchers/single/have_file_spec.rb",
+     "spec/file-spec/matchers/single/have_symlink_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/kristianmandrup/file-spec}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{RSpec 2 matchers for files, directories and symlinks}
+  s.test_files = [
+    "spec/file-spec/matchers/multiple/have_directories_spec.rb",
+     "spec/file-spec/matchers/multiple/have_files_spec.rb",
+     "spec/file-spec/matchers/multiple/have_symlinks_spec.rb",
+     "spec/file-spec/matchers/single/have_directory_spec.rb",
+     "spec/file-spec/matchers/single/have_file_spec.rb",
+     "spec/file-spec/matchers/single/have_symlink_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
+      s.add_runtime_dependency(%q<require_all>, [">= 1.1.0"])
+    else
+      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
+      s.add_dependency(%q<require_all>, [">= 1.1.0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
+    s.add_dependency(%q<require_all>, [">= 1.1.0"])
+  end
+end
+

data/lib/file-spec.rb

@@ -1,6 +1,7 @@
 require 'rspec'
 require 'require_all'      
 require 'fileutils'
+require 'tmpdir'
 require 'active_support/inflector'      
 
 module RSpec
@@ -10,6 +11,7 @@ end
 
 require_all File.dirname(__FILE__) + '/file_spec/matchers/abstract'
 require_all File.dirname(__FILE__) + '/file_spec/matchers'
+require_all File.dirname(__FILE__) + '/file_spec/file_helpers'
 
 RSpec.configure do |config|
   config.include(RSpec::FileMatchers)  

data/lib/file_spec/file_helpers/test_dirs.rb

@@ -0,0 +1,59 @@
+module FileHelper
+  module TestDirs
+    module Names
+      def test_dir
+        'test'
+      end
+
+      def test_dir2
+        'test2'
+      end
+
+      def test_dirs
+        [test_dir, test_dir2]
+      end
+    end
+    
+    module Make
+      def make_dir dir
+        Dir.mkdir dir if !File.directory? dir
+      end
+
+      def make_test_dir
+        make_dir test_dir
+      end
+
+      def make_test_dirs
+        test_dirs.each{|dir| make_dir dir}
+      end
+
+      def make_nested_test_dirs
+        make_test_dir
+        FileUtils.chdir test_dir do          
+          make_test_dirs        
+          make_test_files
+        end
+      end
+    end
+
+    module Remove
+      def remove_dir dir
+        FileUtils.rm_rf dir if File.directory? dir
+      end
+
+      def remove_test_dir
+        remove_dir test_dir
+      end
+
+      def remove_test_dirs
+        test_dirs.each{|dir| remove_dir dir}
+      end  
+    end
+    
+    include Names
+    include Make
+    include Remove    
+  end
+  
+  include TestDirs
+end

data/lib/file_spec/file_helpers/test_files.rb

@@ -0,0 +1,58 @@
+module FileHelper
+  def remove_all_test
+    remove_test_files
+    remove_test_dirs        
+    remove_test_symlink_files
+    remove_test_symlink_dirs
+  end  
+  
+  module TestFiles
+    module Names
+      def test_file
+        'test.txt'
+      end
+
+      def test_file2
+        'test2.txt'
+      end
+
+      def test_files
+        [test_file, test_file2] 
+      end
+    end
+  
+    module Make    
+      def make_test_file 
+        make_file test_file
+      end
+
+      def make_test_files
+        test_files.each{|f| make_file f}    
+      end
+  
+      def make_file file
+        File.open(file, 'w') {|f| f.write "hello" }
+      end
+    end
+  
+    module Remove
+      def remove_file file
+        File.delete file if File.exist? file
+      end
+
+      def remove_test_file
+        remove_file test_file
+      end
+
+      def remove_test_files
+        test_files.each{|f| remove_file f}    
+      end
+    end
+    
+    include Names
+    include Make
+    include Remove
+  end
+  
+  include TestFiles
+end

data/lib/file_spec/file_helpers/test_symlinks.rb

@@ -0,0 +1,106 @@
+module FileHelper
+  module TestSymlinks
+    module Files
+      module Names
+        def sym_test_file
+          "sym-#{test_file}"
+        end
+
+        def sym_test_file2
+          "sym-#{test_file2}"
+        end
+
+        def sym_test_files
+          [sym_test_file, sym_test_file2]
+        end               
+      end
+      
+      module Make
+        def make_file_symlink orig_file, sym_file
+          make_file orig_file if !File.file?(orig_file)
+          File.symlink(orig_file, sym_file) if !File.symlink?(sym_file)
+        end
+
+        def make_test_symlink_file  
+          make_file_symlink test_file, sym_test_file
+        end
+
+        def make_test_symlink_files
+          test_files.each_with_index{|file, i| make_file_symlink(file, sym_test_files[i])}
+        end
+      end
+      
+      module Remove
+        def remove_symlink_file path
+          File.delete path if File.symlink? path
+        end
+
+        def remove_test_symlink_file
+          remove_symlink_file sym_test_file
+        end
+
+        def remove_test_symlink_files
+          sym_test_files.each{|f| remove_symlink_file f} 
+        end
+      end 
+      
+      include Names
+      include Make
+      include Remove      
+    end
+    
+    module Dirs
+      module Names
+        def sym_test_dir
+          'sym-test-dir'
+        end
+
+        def sym_test_dir2
+          "#{sym_test_dir}2"
+        end
+
+        def sym_test_dirs
+          [sym_test_dir, sym_test_dir2]
+        end        
+      end
+      
+      module Make
+        def make_dir_symlink orig_dir, sym_dir
+          make_dir orig_dir if !File.directory?(orig_dir)
+          File.symlink(orig_dir, sym_dir) if !File.symlink?(sym_dir)
+        end
+
+        def make_test_symlink_dir             
+          make_dir_symlink test_dir, sym_test_dir    
+        end
+
+        def make_test_symlink_dirs
+          test_dirs.each_with_index{|file, i| make_dir_symlink(file, sym_test_dirs[i])}
+        end        
+      end
+      
+      module Remove
+        def remove_symlink_dir path
+          File.delete path if File.symlink? path
+        end
+        
+        def remove_test_symlink_dir
+          remove_symlink_dir sym_test_dir
+        end
+
+        def remove_test_symlink_dirs
+          sym_test_dirs.each{|dir| remove_symlink_dir dir}
+        end        
+      end
+      
+      include Names
+      include Make
+      include Remove
+    end
+    
+    include Dirs
+    include Files 
+  end
+  
+  include TestSymlinks
+end

data/lib/file_spec/matchers/abstract/have_file_item.rb

@@ -1,6 +1,6 @@
 module RSpec::FileMatchers
   class HaveFileItem         
-    attr_accessor :location
+    attr_accessor :location, :symlink_type
 
     def initialize(*args)
       self.location = get_location(args).to_s
@@ -8,6 +8,12 @@ module RSpec::FileMatchers
 
     def get_location(*args)
       args = args.flatten
+
+      case args.last
+      when Hash
+        self.symlink_type = args.last[:type]
+      end
+      
       loc = if args.size > 1
         dir, name = *args
         File.join(dir.to_s, name.to_s)
@@ -16,10 +22,40 @@ module RSpec::FileMatchers
       end
     end
 
-    def matches? x=nil, &block
-      puts location.inspect
+    def matches? relative_path, &block
+      case relative_path
+      when File, Dir
+        @location = relative_path if !@location
+        Dir.chdir File.dirname(location)
+      when String                        
+        if File.exist?(relative_path)      
+          @location = relative_path if !@location
+          Dir.chdir File.dirname(location) 
+        end
+      end      
+
       match = File.send :"#{artifact}?", location
-      yield if block && match
+      if artifact == :symlink
+        case symlink_type
+        when :dir, :directory
+          match = File.readlink(location).directory?
+        when :file
+          match = File.readlink(location).file?
+        else
+          raise ArgumentError, "Bad symlink type #{symlink_type}, must be either :file or :dir" if symlink_type
+        end
+      end
+            
+      if block && match   
+        case artifact
+        when :directory
+          Dir.chdir location do
+            yield Dir.new(location)
+          end
+        when :file        
+          yield File.new(location)          
+        end      
+      end
       match
     end          
 

data/lib/file_spec/matchers/abstract/have_file_items.rb

@@ -1,14 +1,48 @@
 module RSpec::FileMatchers
   class HaveFileItems
-    attr_accessor :file_items
+    attr_accessor :file_items, :location, :symlink_type
 
     def initialize(*file_items)
-      self.file_items = file_items.flatten
+      items = file_items.flatten
+      case items.last
+      when Hash
+        self.symlink_type = items.last[:type]
+      end
+      self.file_items = items.select{|item| !item.kind_of? Hash}
     end
 
-    def matches? x=nil, &block
-      file_item_names.each do |location|       
-        return false if  !File.send(:"#{artifact}?", location)
+    def matches? relative_path=nil, &block
+      case relative_path
+      when File, Dir             
+        full_path = File.expand_path(relative_path.path)
+        @location = File.dirname(full_path) if !@location
+      when String                        
+        begin
+          full_path = File.expand_path(relative_path)        
+          if File.directory?(full_path)
+            @location = full_path if !@location
+          end
+        rescue
+          raise ArgumentError, "The path string #{relative_path} could not be resolved to an existing directory on this filesystem."
+        end
+      end      
+      
+      file_item_names.each do |loc|                  
+        path = location ? File.join(location, loc) : loc
+        bad = !File.send(:"#{artifact}?", path)
+        
+        if artifact == :symlink && !bad    
+          sym_path = File.readlink(path)
+          case symlink_type
+          when :dir, :directory
+            bad = !File.directory?(sym_path)
+          when :file
+            bad = !File.file?(sym_path)
+          else
+            raise ArgumentError, "Bad symlink type #{symlink_type}, must be either :file or :dir" if symlink_type
+          end
+        end
+        return false if bad
       end
       true
     end          
@@ -23,12 +57,12 @@ module RSpec::FileMatchers
   
     def failure_message                                                               
       return "Expected #{artifact} #{file_item_names.first} to exist, but it did not" if file_items.size == 1
-      "Expected #{artifact.pluralize} [#{file_item_names}] to exist, but they did not"
+      "Expected #{artifact.to_s.pluralize} #{file_item_names} to exist, but they did not"
     end
 
     def negative_failure_message
       return "Did not expect #{artifact} #{file_item_names.first} to exist, but it did" if file_items.size == 1
-      "Did not expect #{artifact.pluralize} [#{file_item_names}] to exist, but they did"
+      "Did not expect #{artifact.to_s.pluralize} #{file_item_names} to exist, but they did"
     end    
   end
 

data/lib/file_spec/matchers/have_dir.rb

@@ -2,7 +2,7 @@ module RSpec::FileMatchers
   class HaveDir < HaveFileItem
 
     def artifact
-      'directory'
+      :directory
     end  
   end
 
@@ -15,7 +15,7 @@ module RSpec::FileMatchers
   class HaveDirs < HaveFileItems
 
     def artifact
-      'directory'
+      :directory
     end  
   end
 

data/lib/file_spec/matchers/have_file.rb

@@ -2,7 +2,7 @@ module RSpec::FileMatchers
   class HaveFile < HaveFileItem
     
     def artifact
-      'file'
+      :file
     end
   end
 
@@ -16,7 +16,7 @@ module RSpec::FileMatchers
   class HaveFiles < HaveFileItems
     
     def artifact
-      'file'
+      :file
     end
   end
 

data/lib/file_spec/matchers/have_symlink.rb

@@ -2,7 +2,7 @@ module RSpec::FileMatchers
   class HaveSymlink < HaveFileItem
 
     def artifact
-      'symlink'
+      :symlink
     end    
   end
 
@@ -10,19 +10,24 @@ module RSpec::FileMatchers
     HaveSymlink.new(args)
   end
   alias_method :contain_symlink, :have_symlink
-  
-  alias_method :contain_symlink_file, :have_symlink
-  alias_method :have_symlink_file, :have_symlink
-  
-  alias_method :contain_symlink_dir, :have_symlink
-  alias_method :have_symlink_dir, :have_symlink  
+
+  def have_symlink_file(*args)
+    have_symlink args, :type => :file
+  end
+  alias_method :contain_symlink_file, :have_symlink_file
+
+  def have_symlink_dir(*args)
+    have_symlink args, :type => :dir
+  end
+  alias_method :contain_symlink_dir, :have_symlink_dir
+
 end
 
 module RSpec::FileMatchers
   class HaveSymlinks < HaveFileItems
 
     def artifact
-      'symlink'
+      :symlink
     end    
   end
 
@@ -31,11 +36,14 @@ module RSpec::FileMatchers
   end
   alias_method :contain_symlinks, :have_symlinks
 
-  # TODO
-  alias_method :contain_symlink_files, :have_symlinks
-  alias_method :have_symlink_files, :have_symlinks
-  
-  alias_method :contain_symlink_dirs, :have_symlinks  
-  alias_method :have_symlink_dirs, :have_symlinks
+  def have_symlink_files(*args)
+    have_symlinks args, :type => :file
+  end
+  alias_method :contain_symlink_files, :have_symlink_files
+
+  def have_symlink_dirs(*args)
+    have_symlinks args, :type => :dir
+  end
+  alias_method :contain_symlink_dirs, :have_symlink_dirs
 end
 

data/spec/file-spec/matchers/multiple/have_directories_spec.rb

@@ -6,11 +6,11 @@ module RSpec::FileMatchers
       include FileHelper
       
       before :each do   
-        remove_test_dirs
+        remove_all_test
       end
 
       after :each do
-        remove_test_dirs
+        remove_all_test
       end
 
       it "should not have 'test' dirs" do
@@ -21,6 +21,11 @@ module RSpec::FileMatchers
         make_test_dirs
         nil.should have_dirs test_dirs
       end
+
+      it "should have 'test' dirs in the current dir" do      
+        make_test_dirs
+        Dir.pwd.should have_dirs test_dirs
+      end
     end
   end
 end

data/spec/file-spec/matchers/multiple/have_files_spec.rb

@@ -6,11 +6,11 @@ module RSpec::FileMatchers
       include FileHelper
       
       before :each do   
-        remove_test_files
+        remove_all_test
       end
 
       after :each do
-        remove_test_files
+        remove_all_test
       end
 
       it "should have file" do

data/spec/file-spec/matchers/multiple/have_symlinks_spec.rb

@@ -18,7 +18,7 @@ module RSpec::FileMatchers
       end
 
       it "should have symlink files" do
-        make_test_symlinks        
+        make_test_symlink_files        
         nil.should have_symlinks sym_test_files
       end
     

data/spec/file-spec/matchers/single/have_directory_spec.rb

@@ -4,29 +4,52 @@ module RSpec::FileMatchers
   describe HaveDir do
     describe '#have_dir' do
       include FileHelper
-      
+    
       before :each do   
-        remove_test_dir
+        remove_all_test
       end
-
+  
       after :each do
-        remove_test_dir
+        remove_all_test
       end
-
+  
       it "should not have 'test' dir" do
         nil.should_not have_dir test_dir
       end
-    
+  
       it "should have 'test' dir" do      
         make_test_dir
         nil.should have_dir test_dir
       end
-
+  
       it "should have 'test' dirs" do      
         make_test_dirs
         nil.should have_dirs test_dirs
       end
+  
+    end
+
+    describe '#have_dir nested blocks' do
+      include FileHelper
+    
+      before :each do   
+        remove_all_test
+      end
 
+      after :each do
+        remove_all_test
+      end
+  
+      it "should have nested test dirs" do      
+        make_nested_test_dirs       
+        nil.should have_dir :test
+        nil.should_not have_dir :test2
+        nil.should have_dir test_dir do |dir|
+          dir.should have_dirs test_dirs
+          dir.should have_files test_files
+        end      
+        test_dir.should have_files test_files
+      end
     end
   end
 end

data/spec/file-spec/matchers/single/have_file_spec.rb

@@ -6,7 +6,7 @@ module RSpec::FileMatchers
       include FileHelper
       
       before :each do   
-        remove_test_file
+        remove_all_test
       end
 
       after :each do

data/spec/file-spec/matchers/single/have_symlink_spec.rb

@@ -16,12 +16,12 @@ module RSpec::FileMatchers
       it "should not have symlink file" do
         nil.should_not have_symlink sym_test_file
       end
-
+      
       it "should have symlink file" do
-        make_test_symlink        
+        make_test_symlink_file        
         nil.should have_symlink sym_test_file
       end
-    
+          
       it "should not have symlink dir" do
         nil.should_not have_symlink sym_test_dir
       end
@@ -30,6 +30,37 @@ module RSpec::FileMatchers
         make_test_symlink_dir
         nil.should have_symlink sym_test_dir
       end
+
+      it "should not have symlink dirs" do      
+        nil.should_not have_symlinks sym_test_dirs
+      end
+
+      it "should not have symlink files" do      
+        nil.should_not have_symlinks sym_test_files
+      end
+      
+      it "should have symlink dirs" do      
+        make_test_symlink_dirs
+        nil.should have_symlinks sym_test_dirs
+      end
+      
+      it "should have symlink files" do      
+        make_test_symlink_files
+        nil.should have_symlinks sym_test_files
+      end
+
+      it "should have symlink dirs" do      
+        make_test_symlink_dirs
+        nil.should have_symlink_dirs sym_test_dirs
+        nil.should_not have_symlink_files sym_test_dirs
+      end
+      
+      it "should have symlink files" do      
+        make_test_symlink_files
+        nil.should have_symlink_files sym_test_files
+        nil.should_not have_symlink_dirs sym_test_files
+      end
+
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'rspec'
 require 'rspec/autorun'
 require 'file-spec'
-require 'file_spec/file_helper'
 require 'fileutils'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-16 00:00:00 +02:00
+date: 2010-09-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,8 +66,11 @@ files:
 - README.markdown
 - Rakefile
 - VERSION
+- file-spec.gemspec
 - lib/file-spec.rb
-- lib/file_spec/file_helper.rb
+- lib/file_spec/file_helpers/test_dirs.rb
+- lib/file_spec/file_helpers/test_files.rb
+- lib/file_spec/file_helpers/test_symlinks.rb
 - lib/file_spec/matchers/abstract/have_file_item.rb
 - lib/file_spec/matchers/abstract/have_file_items.rb
 - lib/file_spec/matchers/have_dir.rb

data/lib/file_spec/file_helper.rb

@@ -1,131 +0,0 @@
-module FileHelper
-  def test_file
-    'test.txt'
-  end
-
-  def test_files
-    [test_file, 'test2.txt'] 
-  end
-
-  def sym_test_file
-    'sym-test.txt'
-  end
-
-  def sym_test_files
-    test_files.map{|f| "sym-#{f}" }
-  end
-
-  def test_dir
-    'test'
-  end
-
-  def test_dirs
-    [test_dir, 'test2']
-  end
-
-  def sym_test_dir
-    'sym-test'
-  end
-
-  def sym_test_dirs
-    [sym_test_dir, 'sym-test2']
-  end
-
-  def remove_all_test
-    remove_test_files
-    remove_test_dirs
-    remove_test_symlinks
-    remove_test_symlink_dirs
-  end
-    
-  def make_test_file 
-    make_file test_file
-  end
-
-  def make_test_files
-    test_files.each{|f| make_file f}    
-  end
-  
-  def make_file file
-    File.open(file, 'w') {|f| f.write "hello" }    
-  end
-
-  def remove_file file
-    ::FileUtils.rm_f file
-  end
-
-  def remove_test_file
-    remove_file test_file
-  end
-
-  def remove_test_files
-    test_files.each{|f| remove_file f}    
-  end
-
-  def make_dir dir
-    ::FileUtils.mkdir dir
-  end
-
-  def make_test_dir
-    make_dir test_dir
-  end
-
-  def make_test_dirs
-    test_dirs.each{|dir| make_dir dir}
-  end
-
-  def remove_dir dir
-    ::FileUtils.rm_rf dir
-  end
-
-  def remove_test_dir
-    remove_dir test_dir
-  end
-
-  def remove_test_dirs
-    test_dirs.each{|dir| remove_dir dir}
-  end
-
-  def make_file_symlink orig_file, sym_file
-    make_file orig_file if !File.file?(orig_file)
-    File.symlink(orig_file, sym_file) if !File.symlink?(sym_file)
-  end
-
-  def make_test_symlink  
-    make_file_symlink test_file, sym_test_file
-  end
-
-  def make_test_symlinks
-    test_files.each_with_index{|file, i| make_file_symlink(file, sym_test_files[i])}
-  end
-
-  def remove_test_symlink
-    remove_file sym_test_file
-  end
-
-  def remove_test_symlinks
-    sym_test_files.each{|f| remove_file f} 
-  end
-
-  def make_dir_symlink orig_dir, sym_dir
-    make_dir orig_dir if !File.directory?(orig_dir)
-    File.symlink(orig_dir, sym_dir) if !File.symlink?(sym_dir)
-  end
-
-  def make_test_symlink_dir             
-    make_dir_symlink test_dir, sym_test_dir    
-  end
-
-  def make_test_symlink_dirs
-    test_dirs.each_with_index{|file, i| make_dir_symlink(file, sym_test_dirs[i])}
-  end
-
-  def remove_test_symlink_dir
-    remove_dir sym_test_dir
-  end
-  
-  def remove_test_symlink_dirs
-    sym_test_dirs.each{|dir| remove_dir dir}
-  end
-  
-end