revised work with initial RSpec work

Author: Nuo Yan

chef/lib/chef/util/FileEdit.rb

@@ -74,14 +74,14 @@ def write_file
   #method is to control operation on whole line or only the match (1 for line, 2 for match)
   def search_match(regex, replace, command, method)
 
-    #check if regex is Regexp object or simple string and store the Regexp object in exp.
-    exp = (regex.respond_to?(:gsub!) ? regex : Regexp.new(regex.to_s))
+    #convert regex to a Regexp object (if not already is one) and store it in exp.
+    exp = Regexp.new(regex)
 
     #loop through contents and do the appropriate operation depending on 'command' and 'method'
     new_contents = []
 
     contents.each do |line|
-      if exp.match(line) # =~ exp
+      if line.match(exp) 
         self.file_edited = true
         case
         when command == 'r'
@@ -102,14 +102,3 @@ def search_match(regex, replace, command, method)
     self.contents = new_contents
   end
 end
-
-#test
-if __FILE__ == $0
-  fedit = FileEdit.new("test")
-  fedit.insert_line_after_match(/test/, "new Line Inserted")
-  fedit.search_file_replace(/test/, "replace")
-  fedit.search_file_replace_line(/replace/, "this line is replaced")
-  fedit.search_file_delete(/this/)
-  fedit.search_file_delete_line(/new/)
-  fedit.write_file()
-end

chef/lib/chef/util/spec/FileEdit/FileEdit_spec.rb

@@ -0,0 +1,107 @@
+require File.join(File.dirname(__FILE__), "/../spec_helper")
+
+describe FileEdit, "initialiize" do
+  it "should create a new FileEdit object" do
+    FileEdit.new("./spec/FileEdit/hosts").should be_kind_of(FileEdit)
+  end
+  
+  it "should throw an exception if the input file does not exist" do
+    lambda{FileEdit.new("nonexistfile")}.should raise_error
+  end
+
+  it "should throw an exception if the input file is blank" do
+    lambda{FileEdit.new("./spec/FileEdit/blank")}.should raise_error 
+  end
+  
+end
+
+describe FileEdit, "search_file_replace" do
+  
+  it "should accept regex passed in as a string (not Regexp object) and replace the match if there is one" do
+    helper_method("./spec/FileEdit/hosts", "localhost", true)
+  end
+  
+
+  it "should accept regex passed in as a Regexp object and replace the match if there is one" do
+    helper_method("./spec/FileEdit/hosts", /localhost/, true)
+  end
+
+  
+  it "should do nothing if there isn't a match" do
+    helper_method("./spec/FileEdit/hosts", /pattern/, false)
+  end
+
+  
+  def helper_method(filename, regex, value)
+    fedit = FileEdit.new(filename)
+    fedit.search_file_replace(regex, "replacement")
+    fedit.write_file
+    (File.exist? filename+".old").should be(value)
+    if value == true
+      newfile = File.new(filename).readlines 
+      newfile[0].should match(/replacement/)
+      File.delete("./spec/FileEdit/hosts")
+      File.rename("./spec/FileEdit/hosts.old", "./spec/FileEdit/hosts")
+    end
+  end
+  
+end
+
+describe FileEdit, "search_file_replace_line" do
+
+  it "should search for match and replace the whole line" do
+    fedit = FileEdit.new("./spec/FileEdit/hosts")
+    fedit.search_file_replace_line(/localhost/, "replacement line")
+    fedit.write_file
+    newfile = File.new("./spec/FileEdit/hosts").readlines
+    newfile[0].should match(/replacement/)
+    File.delete("./spec/FileEdit/hosts")
+    File.rename("./spec/FileEdit/hosts.old", "./spec/FileEdit/hosts")
+  end
+  
+end
+
+
+describe FileEdit, "search_file_delete" do
+  it "should search for match and delete the match" do
+    fedit = FileEdit.new("./spec/FileEdit/hosts")
+    fedit.search_file_delete(/localhost/)
+    fedit.write_file
+    newfile = File.new("./spec/FileEdit/hosts").readlines
+    newfile[0].should_not match(/localhost/)
+    File.delete("./spec/FileEdit/hosts")
+    File.rename("./spec/FileEdit/hosts.old", "./spec/FileEdit/hosts")
+  end
+end
+
+describe FileEdit, "search_file_delete_line" do
+  it "should search for match and delete the matching line" do
+    fedit = FileEdit.new("./spec/FileEdit/hosts")
+    fedit.search_file_delete_line(/localhost/)
+    fedit.write_file
+    newfile = File.new("./spec/FileEdit/hosts").readlines
+    newfile[0].should_not match(/localhost/)
+    newfile[0].should match(/broadcasthost/)
+    File.delete("./spec/FileEdit/hosts")
+    File.rename("./spec/FileEdit/hosts.old", "./spec/FileEdit/hosts")
+  end
+end
+
+describe FileEdit, "insert_line_after_match" do
+  it "should search for match and insert the given line after the matching line" do
+    fedit = FileEdit.new("./spec/FileEdit/hosts")
+    fedit.insert_line_after_match(/localhost/, "new line inserted")
+    fedit.write_file
+    newfile = File.new("./spec/FileEdit/hosts").readlines
+    newfile[1].should match(/new/)
+    File.delete("./spec/FileEdit/hosts")
+    File.rename("./spec/FileEdit/hosts.old", "./spec/FileEdit/hosts")
+  end
+  
+end
+
+
+
+
+
+

chef/lib/chef/util/spec/FileEdit/blank

@@ -0,0 +1,4 @@
+127.0.0.1       localhost
+255.255.255.255 broadcasthost
+::1             localhost
+fe80::1%lo0     localhost

chef/lib/chef/util/spec/FileEdit/hosts

@@ -0,0 +1,5 @@
+$: << File.join(File.dirname(__FILE__), "..")
+
+require 'spec'
+require 'FileEdit'
+