automateit 0.71031 → 0.71031.1

data/lib/automateit/edit_manager.rb

@@ -183,10 +183,12 @@ class AutomateIt::EditManager::EditSession < AutomateIt::Common
   #   # Won't prepend line because Regexp matches exisint line in buffer.
   #   prepend("add this line", :unless => /add\s*this\*line/)
   def prepend(line, opts={})
-    query = Regexp.new(opts[:unless] || line)
-    query = Regexp.escape(query) if query.is_a?(String)
+    query = opts[:unless] || line
+    if query.is_a?(String)
+      query = Regexp.new(Regexp.escape(query))
+    end
     return if contains?(query)
-    @contents = "%s\n%s" % [line, @contents]
+    @contents = "%s\n%s" % [line.chomp, @contents]
   end
 
   # Append +line+ to the bottom of the buffer, but only if it's not in
@@ -207,16 +209,14 @@ class AutomateIt::EditManager::EditSession < AutomateIt::Common
   end
 
   # Does the buffer contain anything that matches the String or Regexp +query+?
-  def contains?(query)
-    if query.is_a?(String)
-      query = Regexp.new(Regexp.escape(query))
-    end
+  def contains?(line)
+    query = line.is_a?(String) ? Regexp.new(Regexp.escape(line)) : line
     ! @contents.match(query).nil?
   end
 
   # Delete lines matching the String or Regexp +query+
-  def delete(query, opts={})
-    query = Regexp.escape(query) if query.is_a?(String)
+  def delete(line, opts={})
+    query = line.is_a?(String) ? Regexp.escape(line) : line
     query = Regexp.new("^[^\n]*%s[^\n]*\n?" % query)
     @contents.gsub!(query, "")
   end
@@ -232,26 +232,24 @@ class AutomateIt::EditManager::EditSession < AutomateIt::Common
   end
 
   # Comment out lines matching the String or Regexp +query+.
-  def comment(query, opts={})
-    query = Regexp.escape(query) if query.is_a?(String)
+  def comment(line, opts={})
+    query = line.is_a?(String) ? Regexp.escape(line) : line
     query = Regexp.new("^(?!#{comment_prefix})([^\n]*%s[^\n]*)(\n*)" % query)
     return false unless @contents.match(query)
     @contents.gsub!(query, "%s%s%s%s" % [@comment_prefix, $1, @comment_suffix, $2])
   end
 
   # Uncomment lines matching the String or Regexp +query+.
-  def uncomment(query, opts={})
-    query = Regexp.escape(query) if query.is_a?(String)
+  def uncomment(line, opts={})
+    query = line.is_a?(String) ? Regexp.escape(line) : line
     query = Regexp.new("^(%s)([^\n]*%s[^\n]*)(%s)(\n*)" % [@comment_prefix, query, @comment_suffix])
     return false unless @contents.match(query)
     @contents.gsub!(query, "%s%s" % [$2, $4])
   end
 
   # Replace contents matching the String or Regexp +query+ with the +string+.
-  def replace(query, string, opts={})
-    if query.is_a?(String)
-      query = Regexp.new(Regexp.escape(query))
-    end
+  def replace(line, string, opts={})
+    query = line.is_a?(String) ? Regexp.new(Regexp.escape(line)) : line
     @contents.gsub!(query, string)
   end
 

data/lib/automateit/root.rb

@@ -1,7 +1,7 @@
 # See AutomateIt::Interpreter for usage information.
 module AutomateIt # :nodoc:
   # AutomateIt version
-  VERSION=Gem::Version.new("0.71031")
+  VERSION=Gem::Version.new("0.71031.1")
 
   # Instantiates a new Interpreter. See documentation for
   # Interpreter#setup.

data/spec/unit/edit_manager_spec.rb

@@ -41,6 +41,14 @@ describe "AutomateIt::EditManager for strings" do
     output.should =~ /\APREPEND\nThis/s
   end
 
+  it "should prepend strings to the top even if they have regexp-like characters" do
+    output = @a.edit(:text => @input) do
+      prepend "@ini_set('memory_limit', '32M');"
+      prepend "@ini_set('memory_limit', '32M');" # Will be ignored
+    end
+    output.should == "@ini_set('memory_limit', '32M');"+"\n"+@input
+  end
+
   it "should prepend lines to the top unless they match an expression" do
     output = @a.edit(:text => @input) do
       prepend "PREPEND", :unless => /PR.+ND/

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: automateit
 version: !ruby/object:Gem::Version 
-  version: "0.71031"
+  version: 0.71031.1
 date: 2007-10-31 00:00:00 -07:00
 summary: AutomateIt is an open source tool for automating the setup and maintenance of servers, applications and their dependencies.
 require_paths: