sugar-high 0.3.3 → 0.3.4

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/sugar-high/array.rb

@@ -1,4 +1,5 @@
 require 'sugar-high/kind_of'
+require 'sugar-high/path'
 
 class Array    
   def to_symbols option=nil
@@ -7,9 +8,27 @@ class Array
     res.select_labels.map(&:to_s).map(&:to_sym)
   end  
 
-  def to_strings option=nil
+  def to_strings
     self.flatten.select_labels.map(&:to_s)
   end  
+
+  def to_filenames
+    self.to_strings.map(&:underscore)
+  end  
+
+
+  def to_paths
+    self.map(&:path)
+  end
+
+  def file_join
+    File.join(*self.flatten)
+  end    
+
+  def to_files
+    self.map{|fp| fp.path.to_file }
+    self.extend FilesArray    
+  end
   
   def none?
     self.flatten.compact.empty?
@@ -17,7 +36,15 @@ class Array
   
  def flat_uniq
    self.flatten.compact.uniq
- end
+ end 
+end
+
+module FilesArray
+  def delete_all!
+    self.each do |f| 
+      f.delete! if f.kind_of?(File)
+    end
+  end
 end
 
 class NilClass  

data/lib/sugar-high/file.rb

@@ -4,17 +4,7 @@ require 'sugar-high/path'
 require 'sugar-high/regexp'
 require 'sugar-high/string'
 
-class File 
-  def self.delete! name
-    return nil if !File.exist?(name)
-    File.delete name
-  end
-
-  def self.delete_file! name
-    return nil if !File.file?(name)
-    File.delete name
-  end
-  
+class File   
   def self.blank? file_name
     raise ArgumentError, "Filename argument must not be blank" if file_name.blank?
     raise ArgumentError, "There is no file at: #{file_name}" if !File.file?(file_name)
@@ -24,174 +14,87 @@ class File
   def blank?
     File.zero?(self.path)
   end   
-  
-  def self.overwrite path, content=nil, &block
-    File.open(path, 'w') do |f|
-      f.puts content ||= yield
-    end
-  end
 
-  def self.append path, content=nil, &block
-    File.open(path, 'a') do |f|
-      f.puts content ||= yield
-    end
-  end 
-
-  def self.remove_from file_name, content=nil, &block
-    content ||= yield
-    replace_content_from file_name, :content => content, :with => '', &block
+  def self.has_content? file_name, content_matcher, &block
+    File.new(file_name).has_content? content_matcher, &block  
   end
-  
-  # replaces content found at replacement_expr with content resulting from yielding block
-  # File.replace_content_from 'myfile.txt', where => /HelloWorld/, with => 'GoodBye'
-  def self.replace_content_from file_name, options = {}, &block
-    replacement_expr = options[:where] || options[:content]
-    new_content = options[:with]
 
-    replacement_expr = case replacement_expr
-    when Regexp
-      replacement_expr
-    when String
-      /#{Regexp.escape(replacement_expr)}/
-    else
-      raise ArgumentError, "Content to be replaced must be specified as either a String or Regexp in a :where or :content option"
+  def has_content? content_matcher = nil, &block  
+    content_matcher ||= yield
+    begin
+      content_matcher = content_matcher.to_regexp
+    rescue
+      raise ArgumentError, "Content match must be specified as either a String or Regexp"
     end
+    !(self.read =~ content_matcher).nil?
+  end
 
-    # get existing file content
-    content = File.read file_name 
-
-    # return nil if no mathing replacement found
-    return nil if !(content =~ replacement_expr)
-
-    new_content ||= yield if block
-
-    raise ArgumentError, "Content to be replaced with must be specified as a :with option or as a block" if !new_content
-    
-    # remove content that matches expr, by replacing with empty
-    mutated_content = content.gsub replacement_expr, new_content
-
-    # write mutated content as new file
-    File.overwrite file_name, mutated_content
-
-    true # signal success!
+  def read_content options = {}, &block
+    File.read_from self.path, options, &block
   end
+  alias_method :with_content, :read_content
 
+  class << self
 
-  def self.read_from file_name, options = {}, &block
-    raise ArgumentError, "File to read from not found or not a file: #{file_name}" if !File.file? file_name
-    content = File.read file_name
+    def read_from file_name, options = {}, &block
+      raise ArgumentError, "File to read from not found or not a file: #{file_name}" if !File.file? file_name
+      content = File.read file_name
     
-    if options[:before] 
-      begin
-        regexp = options[:before].to_regexp
-        index = content.match(regexp).offset_before
-        content = content[0..index]
-      rescue
-        raise ArgumentError, ":before option must be a string or regular expression, was : #{options[:before]}"
+      if options[:before] 
+        begin
+          regexp = options[:before].to_regexp
+          index = content.match(regexp).offset_before
+          content = content[0..index]
+        rescue
+          raise ArgumentError, ":before option must be a string or regular expression, was : #{options[:before]}"
+        end
+      end 
+
+      if options[:after]   
+        begin
+          regexp = options[:after].to_regexp
+          index = content.match(regexp).offset_after
+          content = content[index..-1]      
+        rescue
+          raise ArgumentError, ":after option must be a string or regular expression, was : #{options[:after]}"
+        end      
       end
-    end 
-
-    if options[:after]   
-      begin
-        regexp = options[:after].to_regexp
-        index = content.match(regexp).offset_after
-        content = content[index..-1]      
-      rescue
-        raise ArgumentError, ":after option must be a string or regular expression, was : #{options[:after]}"
-      end      
+      yield content if block
+      content
     end
-    yield content if block
-    content
+    alias_method :read_content_from, :read_from
+    alias_method :with_content_from, :read_from
   end
+end
 
-  def self.remove_content_from file_name, options = {}, &block
-    replace_content_from file_name, options.merge(:with => ''), &block
-  end   
-
-  # TODO: Needs spec
-  
-  # insert_into 'my_file.txt', :after => 'Blip', :content => 'Hello
-  # insert_into 'my_file.txt', 'Hello', :after => 'Blip' 
-  # insert_into 'my_file.txt', :after => 'Blip' do 
-  #  'Hello'
-  # end
+class String
+  def as_filename
+    self.underscore  
+  end
   
-  def self.insert_into file_name, *args, &block
-    options = last_option args
-    content = Insert.content options, *args, &block
-
-    file = File.new(file_name)
-    return nil if !File.exist?(file)
-
-    # already inserted?
-    return nil if content.blank? || (file.read =~ /#{content}/)
-
-    place, marker = if options[:before] 
-        [ :before, options[:before] ]
-      elsif options[:before_last]
-        [ :before_last, options[:before_last] ]
-      else
-        [ :after, options[:after] ]
-    end 
-    
-
-    marker = Insert.get_marker marker
-
-    return nil if !(File.new(file.path).read =~ /#{marker}/)
-    
-    Mutate.mutate_file file.path, marker, place do
-       content
-     end
-   end   
-
-   module Insert
-     def self.get_marker marker
-       marker = case marker
-       when String
-         Regexp.escape(marker)
-       when Regexp
-         marker.source  
-       end
-     end
+  def valid_file_command?
+    self.to_sym.valid_file_command?
+  end
+end
 
-     def self.content options = {}, *args, &block
-       case args.first
-       when String
-         args.first
-       when Hash
-         options[:content] || (yield if block)      
-       else
-         return yield if block
-         raise ArgumentError, "You must supply content to insert, either as a String before the options hash, a :content option or a block" 
-       end     
-     end
-   end
+class Symbol
+  def as_filename
+    self.to_s.underscore  
+  end
+  
+  def valid_file_command?
+    [:read, :remove, :delete].include? self
+  end
+end                 
 
-   module Mutate     
-     def self.mutate_file file, marker, place, &block
-       raise ArgumentError, "You must define a replacement marker for a :before, :before_last or :after key" if !marker 
-       
-       if place == :before_last
-         content = File.read(file)
-         content = content.insert_before_last yield, marker
-         File.open(file, 'wb') { |file| file.write(content) }         
-         return
-       end
-                     
-       replace_in_file file, /(#{marker})/mi do |match|
-         place == :after ? "#{match}\n  #{yield}" : "#{yield}\n  #{match}"         
-       end
-     end  
-   
-     def self.replace_in_file(path, regexp, *args, &block)
-       content = File.read(path).gsub(regexp, *args, &block)
-       File.open(path, 'wb') { |file| file.write(content) }
-     end    
-   end
-end                  
+class NilClass
+  def valid_file_command?
+    false
+  end
+end  
 
 class Array
   def file_names ext = '*'
-    self.map{|a| a.gsub( /(.*)\//, '').gsub(/\.#{Regexp.escape(ext)}/, '')}
+    self.map{|a| a.gsub( /(.*)\//, '').gsub(/\.#{Regexp.escape(ext.to_s)}/, '')}
   end
 end

data/lib/sugar-high/file_mutate.rb

@@ -0,0 +1,193 @@
+require 'sugar-high/blank'
+require 'sugar-high/arguments'
+require 'sugar-high/path'
+require 'sugar-high/regexp'
+require 'sugar-high/string'
+require 'sugar-high/file'
+
+class File
+  class << self
+    def delete! name
+      return nil if !File.exist?(name)
+      File.delete name
+    end
+    alias_method :delete_file!, :delete!
+  end
+
+  def delete!
+    File.delete(self.path)
+  end
+  alias_method :delete_file!, :delete!
+  
+  
+  def overwrite content=nil, &block           
+    File.overwrite self.path, content, &block
+  end
+
+  def self.overwrite file, content=nil, &block
+    filepath = case file
+    when PathString, String
+      file
+    when File
+      file.path
+    else
+      raise ArgumentError, "Expected first argument to be a File instance or a path indicating file to overwrite"
+    end
+    File.open(filepath, 'w') do |f|
+      f.puts content ||= yield
+    end
+  end
+
+  def append content=nil, &block
+    File.append self.path, content, &block
+  end
+
+  def self.append path, content=nil, &block
+    File.open(path, 'a') do |f|
+      f.puts content ||= yield
+    end
+  end 
+
+  def remove_content options=nil, &block
+    opt_str = case options
+    when String
+      options
+    when Hash
+      content = options[:content] || options[:where]
+      raise ArgumentError, "Bad :content value in Hash" if !content || content.strip.empty?
+      content.strip
+    else
+      raise ArgumentError, "non-block argument must be either String or Hash with a :content option" if !block
+    end    
+    content = block ? yield : opt_str
+    File.remove_content_from self.path, :content => content, :with => '', &block
+  end
+  alias_method :remove, :remove_content
+
+  def self.remove_from file_name, content=nil, &block
+    content ||= yield
+    replace_content_from file_name, :content => content, :with => '', &block
+  end
+   
+  def self.remove_content_from file_name, options = {}, &block
+    replace_content_from file_name, options.merge(:with => ''), &block
+  end
+
+  def replace_content options = {}, &block
+    File.replace_content_from self.path, options, &block
+  end
+
+  # replaces content found at replacement_expr with content resulting from yielding block
+  # File.replace_content_from 'myfile.txt', where => /HelloWorld/, with => 'GoodBye'
+  def self.replace_content_from file_name, options = {}, &block
+    replacement_expr = options[:where] || options[:content]
+    new_content = options[:with]
+
+    begin
+      replacement_expr = replacement_expr.to_regexp
+    rescue
+      raise ArgumentError, "Content to be replaced must be specified as either a String or Regexp in a :where or :content option"
+    end
+
+    # get existing file content
+    content = File.read file_name 
+
+    # return nil if no mathing replacement found
+    return nil if !(content =~ replacement_expr)
+
+    new_content ||= yield if block
+
+    raise ArgumentError, "Content to be replaced with must be specified as a :with option or as a block" if !new_content
+  
+    # remove content that matches expr, by replacing with empty
+    mutated_content = content.gsub replacement_expr, new_content
+
+    # write mutated content as new file
+    File.overwrite file_name, mutated_content
+
+    true # signal success!
+  end
+
+  def insert *args, &block
+    File.insert_into self.path, *args, &block
+  end
+  
+  # insert_into 'my_file.txt', :after => 'Blip', :content => 'Hello
+  # insert_into 'my_file.txt', 'Hello', :after => 'Blip' 
+  # insert_into 'my_file.txt', :after => 'Blip' do 
+  #  'Hello'
+  # end  
+  def self.insert_into file_name, *args, &block
+    options = last_option args
+    content = Insert.content options, *args, &block
+
+    file = File.new(file_name)
+    return nil if !File.exist?(file)
+
+    # already inserted?
+    return nil if content.blank? 
+    return nil if !options[:repeat] && (file.read =~ /#{Regexp.escape(content.to_s)}/)
+
+    place, marker = if options[:before] 
+        [ :before, options[:before] ]
+      elsif options[:before_last]
+        [ :before_last, options[:before_last] ]
+      else
+        [ :after, options[:after] ]
+    end 
+    
+
+    marker = Insert.get_marker marker
+
+    return nil if !(File.new(file.path).read =~ /#{Regexp.escape(marker.to_s)}/)
+    
+    Mutate.mutate_file file.path, marker, place do
+       content
+    end
+  end   
+
+  module Insert
+   def self.get_marker marker
+     marker = case marker
+     when String
+       Regexp.escape(marker)
+     when Regexp
+       marker.source  
+     end
+   end
+
+   def self.content options = {}, *args, &block
+     case args.first
+     when String
+       args.first
+     when Hash
+       options[:content] || (yield if block)      
+     else
+       return yield if block
+       raise ArgumentError, "You must supply content to insert, either as a String before the options hash, a :content option or a block" 
+     end     
+   end
+  end
+
+  module Mutate     
+   def self.mutate_file file, marker, place, &block
+     raise ArgumentError, "You must define a replacement marker for a :before, :before_last or :after key" if !marker 
+   
+     if place == :before_last
+       content = File.read(file)
+       content = content.insert_before_last yield, marker
+       File.open(file, 'wb') { |file| file.write(content) }         
+       return
+     end
+                 
+     replace_in_file file, /(#{Regexp.escape(marker.to_s)})/mi do |match|
+       place == :after ? "#{match}\n  #{yield}" : "#{yield}\n  #{match}"         
+     end
+   end  
+
+   def self.replace_in_file(path, regexp, *args, &block)
+     content = File.read(path).gsub(regexp, *args, &block)
+     File.open(path, 'wb') { |file| file.write(content) }
+   end    
+  end
+end

data/lib/sugar-high/path.rb

@@ -5,21 +5,47 @@ class String
 end
 
 module PathString
+  def to_file option=nil
+    raise ArgumentError, "File doesn't exist" if option == :raise && !File.directory?(self)
+    File.new(self) if File.file? self
+  end
+  alias_method :file, :to_file
+  alias_method :new_file, :to_file
+
+  def to_dir option=nil
+    raise ArgumentError, "Dir doesn't exist" if option == :raise && !File.directory?(self)
+    Dir.new(self) if File.directory? self
+  end  
+  alias_method :new_dir, :to_dir
+  alias_method :dir, :to_dir
+
+  def to_symlink new_path #, option=nil  
+    # raise ArgumentError, "New link location doesn't exist" if option == :raise && !File.exist?(new_path)
+    File.symlink(self, new_path)
+  end
+  alias_method :new_symlink, :to_symlink
+  alias_method :symlink, :to_symlink
+  
   def exists?  
     File.exist? self
   end
+  alias_method :there?, :exists?
 
   def file?  
     File.file? self
   end
+  alias_method :is_file?, :file?
 
   def dir?  
     File.directory? self
   end
+  alias_method :is_dir?, :dir?
+  alias_method :directory?, :dir
 
   def symlink?  
     File.symlink? self
   end
+  alias_method :is_symlink?, :symlink?
   
   def up lv
     ('../' * lv) + self

data/lib/sugar-high/string.rb

@@ -11,7 +11,7 @@ class String
       raise ArgumentException, "last argument is the marker and must be a String, Symbol or even Hash with a :marker option pointing to the marker (String or Symbol)"
     end      
   
-    marker = Regexp.escape(marker.reverse)
+    marker = Regexp.escape(marker.to_s.reverse)
     nl = Regexp.escape("\n")
     # puts self
     # puts "marker: #{marker}"

data/spec/fixtures/class_file.rb

@@ -1,6 +1,4 @@
 class Abc
   def begin
   end
-
 end
-

data/spec/fixtures/search_file.txt

@@ -0,0 +1 @@
+Find this line right here!

data/spec/sugar-high/file/file_mutate_spec.rb

@@ -1,25 +1,85 @@
 require 'spec_helper'
-require 'sugar-high/file'
+require 'sugar-high/file_mutate'
 
 describe "SugarHigh::File" do
   let(:empty_file)      { fixture_file 'empty.txt' }
   let(:non_empty_file)  { fixture_file 'non-empty.txt'} 
   let(:class_file)      { fixture_file 'class_file.rb'} 
   let(:replace_file)    { fixture_file 'file.txt' }
+  let(:file_to_delete)    { fixture_file 'file_to_delete.txt' }
+
+  after do
+    File.overwrite class_file do
+      %q{class Abc
+  def begin
+  end
+end}
+    end   
+  end
 
   before :each do
     File.delete replace_file if File.file?(replace_file)
   end
 
+  describe '#delete! (class)' do      
+    it 'should delete file' do      
+      File.overwrite(file_to_delete) do
+        'Delete this!'
+      end
+      File.delete! file_to_delete
+      File.exist?(file_to_delete).should be_false 
+    end
+  end
+
+  describe '#delete_file! (class)' do      
+    it 'should delete file' do      
+      File.overwrite(file_to_delete) do
+        'Delete this!'
+      end
+      File.delete_file! file_to_delete
+      File.exist?(file_to_delete).should be_false 
+    end
+  end
+
+  describe '#delete! (instance)' do      
+    it 'should delete file' do      
+      File.overwrite(file_to_delete) do
+        'Delete this!'
+      end
+      File.new(file_to_delete).delete!
+      File.exist?(file_to_delete).should be_false 
+    end
+  end
+
+  describe '#delete_file! (instance)' do      
+    it 'should delete file' do      
+      File.overwrite(file_to_delete) do
+        'Delete this!'
+      end
+      File.new(file_to_delete).delete_file!
+      File.exist?(file_to_delete).should be_false 
+    end
+  end
+
   describe '#append with :content option' do    
     let(:append_file)    { fixture_file 'file.txt' }
   
-    it "should remove content from existing file" do      
+    it 'should append content to existing file - class method' do      
       File.overwrite(append_file) do
         'Hello You'
       end
       File.append append_file, :content => 'Appended'
-      content = File.read(replace_file)
+      content = File.read(append_file)
+      content.should match /Hello You/
+      content.should match /Appended/      
+    end
+
+    it 'should append content to existing file - instance method' do      
+      File.overwrite(append_file) do
+        'Hello You'
+      end
+      File.new(append_file).append :content => 'Appended'
+      content = File.read(append_file)
       content.should match /Hello You/
       content.should match /Appended/      
     end
@@ -28,7 +88,7 @@ describe "SugarHigh::File" do
   describe '#append with block' do    
     let(:append_file)    { fixture_file 'file.txt' }
   
-    it "should remove content from existing file" do      
+    it "should append content to existing file using block arg - class method" do      
       File.overwrite(append_file) do
         'Hello You'
       end
@@ -39,61 +99,106 @@ describe "SugarHigh::File" do
       content.should match /Hello You/
       content.should match /Appended/      
     end
-  end
-
 
+    it "should append content to existing file using block arg - instance method" do      
+      File.overwrite(append_file) do
+        'Hello You'
+      end
+      File.new(append_file).append do
+        'Appended'
+      end
+      content = File.read(replace_file)
+      content.should match /Hello You/
+      content.should match /Appended/      
+    end
+  end
+  
+  
   describe '#replace_content_from' do    
     let(:replace_file)    { fixture_file 'file.txt' }
   
-    it "should remove content from existing file" do      
+    it "should replace content from existing file - class method" do      
       File.overwrite(replace_file) do
         'Hello You'
       end
       File.replace_content_from replace_file, :where => 'You', :with => 'Me'
       File.read(replace_file).should_not match /You/              
     end
-  end
 
-  describe '#remove_content_from with :where option' do    
-    let(:replace_file)    { fixture_file 'file.txt' }    
+    it 'should remove content from existing file - instance method #replace_content' do
+      File.overwrite(replace_file) do
+        'Hello You'
+      end
+      File.new(replace_file).replace_content :where => 'You', :with => 'Me'
+      File.read(replace_file).should_not match /You/
+    end
+  end
   
-    it "should remove content from existing file" do      
+  describe '#remove_content_from with :where option' do
+    let(:replace_file)    { fixture_file 'file.txt' }
+  
+    it "should remove content from existing file - class method" do
       File.overwrite(replace_file) do
         'Hello You'
       end
       File.remove_content_from replace_file, :where => 'You'
       File.read(replace_file).should_not match /You/
     end
-  end
 
+    it "should remove content from existing file - instance method #remove_content" do      
+      File.overwrite(replace_file) do
+        'Hello You'
+      end
+      File.new(replace_file).remove_content :where => 'You'
+      File.read(replace_file).should_not match /You/
+    end
+
+  end
+  
   describe '#remove_content_from with :content option' do    
     let(:replace_file)    { fixture_file 'file.txt' }    
   
-    it "should remove content from existing file" do      
+    it "should remove content from existing file - class method" do      
       File.overwrite(replace_file) do
         'Hello You'
       end
       File.remove_content_from replace_file, :content => 'You'
       File.read(replace_file).should_not match /You/
     end
-  end
 
+    it "should remove content from existing file - instance method #remove_content" do      
+      File.overwrite(replace_file) do
+        'Hello You'
+      end
+      File.new(replace_file).remove_content 'You'
+      File.read(replace_file).should_not match /You/
+    end
+  end
+  
   describe '#remove_from with String/Regexp argument that is content to remove' do    
     let(:replace_file)    { fixture_file 'file.txt' }    
   
-    it "should remove content from existing file" do      
+    it "should remove content from existing file - class method" do      
       File.overwrite(replace_file) do
         'Hello You'
       end
       File.remove_from replace_file, 'You'
       File.read(replace_file).should_not match /You/
     end
+                                                
+    it "should remove content from existing file - instance method #remove" do      
+      File.overwrite(replace_file) do
+        'Hello You'
+      end
+      File.new(replace_file).remove_content 'You'
+      File.read(replace_file).should_not match /You/
+    end
   end
-
+  
   describe '#remove_from with block argument that is content to remove' do    
     let(:replace_file)    { fixture_file 'file.txt' }    
   
-    it "should remove content from existing file" do      
+    it "should remove content from existing file - class method" do      
       File.overwrite(replace_file) do
         'Hello You'
       end
@@ -102,22 +207,32 @@ describe "SugarHigh::File" do
       end
       File.read(replace_file).should_not match /You/
     end
-  end
-
 
+    it "should remove content from existing file - instance method #remove" do      
+      File.overwrite(replace_file) do
+        'Hello You'
+      end
+      File.new(replace_file).remove  do 
+        'You'
+      end
+      File.read(replace_file).should_not match /You/
+    end
+  end
+  
+  
   describe '#insert_into' do
     let(:insertion_file)    { fixture_file 'insertion.txt' }    
-
+  
     before :each do
       File.overwrite(insertion_file) do
         'Goodbye'
       end
     end
-
+  
     after :each do
       File.delete insertion_file if File.file?(insertion_file)
     end
-
+  
     it "should insert Hello before Goodbye using a block as content" do
       File.insert_into insertion_file, :before => 'Goodbye' do
         'Hello'
@@ -125,23 +240,31 @@ describe "SugarHigh::File" do
       File.read(insertion_file).should match /Hello\s+Goodbye/      
     end
 
+    it "should insert Hello before Goodbye using a block as content - instance method #insert" do
+      File.new(insertion_file).insert :before => 'Goodbye' do
+        'Hello'
+      end
+      File.read(insertion_file).should match /Hello\s+Goodbye/      
+    end
+
+  
     it "should insert Hello before Goodbye using a content string arg" do
       File.insert_into insertion_file, "Hello ", :before => 'Goodbye'
       File.read(insertion_file).should match /Hello\s+Goodbye/
     end
-
+  
     it "should insert Hello before Goodbye using a :content option" do
       File.insert_into insertion_file, :content => 'Hello', :before => 'Goodbye'
       File.read(insertion_file).should match /Hello\s+Goodbye/
     end
-
+  
     it "should insert Hello before Goodbye using a block as content to insert" do
       File.insert_into insertion_file, :before => 'Goodbye' do
         'Hello'
       end
       File.read(insertion_file).should match /Hello\s+Goodbye/
     end
-
+  
     it "should insert Hello after Goodbye using a :with option and a Regexp for the after expression" do
       File.insert_into insertion_file, :content => ' Hello', :after => /Goodbye/ 
       File.read(insertion_file).should match /Goodbye\s+Hello/
@@ -153,5 +276,21 @@ describe "SugarHigh::File" do
       File.read(class_file).should match /end\s+# Hello\s+end/
       File.remove_content_from class_file, :content => '  # Hello'
     end    
-  end
+  
+    it "should insert Hello before last end statement but don't repeat" do
+      File.insert_into class_file, :content => '  # Hello', :before_last => 'end', :repeat => true 
+      puts File.read(class_file)
+      File.read(class_file).should match /end\s+# Hello\s+end/
+      File.remove_content_from class_file, :content => '  # Hello'
+    end    
+  
+    it "should insert Hello before last end statement - block" do
+      File.insert_into class_file, :before_last => 'end' do
+        '  # Hello'
+      end
+      puts File.read(class_file)
+      File.read(class_file).should match /end\s+# Hello\s+end/
+      File.remove_content_from class_file, :content => '  # Hello'
+    end    
+  end 
 end

data/spec/sugar-high/file/file_spec.rb

@@ -1,17 +1,19 @@
 require 'spec_helper'
 require 'sugar-high/file'
+require 'sugar-high/file_mutate'
 
 describe "SugarHigh" do
   describe "File" do
     let(:empty_file)      { fixture_file 'empty.txt' }
     let(:non_empty_file)  { fixture_file 'non-empty.txt'} 
     let(:replace_file)    { fixture_file 'file.txt' }
+    let(:search_file)     { fixture_file 'search_file.txt' }
 
     before :each do
       File.delete replace_file if File.file?(replace_file)
     end
 
-    describe '#self.blank' do
+    describe '#self.blank?' do
       it "should return true for an empty file" do
         File.blank?(empty_file).should be_true 
       end
@@ -21,7 +23,7 @@ describe "SugarHigh" do
       end
     end
 
-    describe '#blank' do    
+    describe '#blank?' do    
       it "should return true for an empty file" do
         File.new(empty_file).blank?.should be_true
       end
@@ -30,54 +32,95 @@ describe "SugarHigh" do
         File.new(non_empty_file).blank?.should_not be_true
       end
     end
-  end
-
-  describe '#file_names' do 
-    let(:replace_file)    { fixture_file 'file.txt' }        
-    
-    before :each do
-      File.delete replace_file if File.file?(replace_file)
-    end    
-       
-    it "should return all file names of an array of paths to files" do
-      expr = fixtures_dir + '/*.txt'
-      Dir.glob(expr).file_names('txt').should == ['empty', 'non-empty']
-    end
-  end  
 
-  describe '#read_from' do
-    let(:non_empty_file)      { fixture_file 'non-empty.txt' }
-                
-    it "should read all the content into a block" do
-      File.read_from non_empty_file do |content|
-        content.should match /blip/
-        content.should match /blup/        
+    describe '#has_content?' do
+      it "should find content in file using String argument" do
+        File.overwrite(search_file) do
+          'Find this line right here!'
+        end                
+        File.has_content?(search_file, 'line right').should be_true
+        File.has_content?(search_file, 'line left').should be_false
       end
-    end
 
-    it "should read all the content before a given marker" do
-      content = File.read_from non_empty_file, :before => 'blap'
-      content.should match /blip/
-      content.should_not match /blap/
+      it "should find content in file using Regexp argument" do
+        File.overwrite(search_file) do
+          'Find this line right here!'
+        end                
+        File.has_content?(search_file, /line right/).should be_true
+        File.has_content?(search_file, /line left/).should be_false
+      end
     end
+    
+    describe '#read_from' do
 
-    it "should read all the content after a given marker" do
-      content = File.read_from non_empty_file, :after => 'blap'
-      content.should match /blup/
-      content.should_not match /blap/
-    end
+      it "should read all the content into a block" do
+        File.read_from non_empty_file do |content|
+          content.should match /blip/
+          content.should match /blup/        
+        end
+      end
 
-    it "should read all the content before a given marker into a block" do
-      File.read_from non_empty_file, :before => 'blap' do |content|
+      it "should read all the content before a given marker" do
+        content = File.read_from non_empty_file, :before => 'blap'
         content.should match /blip/
-        content.should_not match /blap/        
+        content.should_not match /blap/
       end
-    end
 
-    it "should read all the content after a given marker into a block" do
-      File.read_from non_empty_file, :after => 'blap' do |content|
+      it "should read all the content after a given marker" do
+        content = File.read_from non_empty_file, :after => 'blap'
         content.should match /blup/
-        content.should_not match /blap/        
+        content.should_not match /blap/
+      end
+
+      it "should read all the content before a given marker into a block" do
+        File.read_from non_empty_file, :before => 'blap' do |content|
+          content.should match /blip/
+          content.should_not match /blap/        
+        end
+      end
+
+      it "should read all the content after a given marker into a block" do
+        File.read_from non_empty_file, :after => 'blap' do |content|
+          content.should match /blup/
+          content.should_not match /blap/        
+        end
+      end
+    end  
+
+    describe '#read_content (instance)' do
+      let(:non_empty_file)      { fixture_file 'non-empty.txt' }
+
+      it "should read all the content into a block" do
+        File.new(non_empty_file).read_content do |content|
+          content.should match /blip/
+          content.should match /blup/        
+        end
+      end
+    end    
+    
+    describe '#read_from (class)' do
+      let(:non_empty_file)      { fixture_file 'non-empty.txt' }
+
+      it "should read all the content into a block" do
+        File.read_from(non_empty_file) do |content|
+          content.should match /blip/
+          content.should match /blup/        
+        end
+      end
+    end        
+  end
+  
+  describe "Array" do
+    describe '#file_names' do 
+      let(:replace_file)    { fixture_file 'file.txt' }        
+    
+      before :each do
+        File.delete replace_file if File.file?(replace_file)
+      end    
+       
+      it "should return all file names of an array of paths to files" do
+        expr = fixtures_dir + '/*.txt'
+        Dir.glob(expr).file_names('txt').should include('empty', 'non-empty')
       end
     end
   end  

data/sugar-high.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sugar-high}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2011-01-07}
+  s.date = %q{2011-01-18}
   s.description = %q{More Ruby sugar - inspired by the 'zuker' project}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "lib/sugar-high/array.rb",
     "lib/sugar-high/blank.rb",
     "lib/sugar-high/file.rb",
+    "lib/sugar-high/file_mutate.rb",
     "lib/sugar-high/hash.rb",
     "lib/sugar-high/includes.rb",
     "lib/sugar-high/kind_of.rb",
@@ -44,6 +45,7 @@ Gem::Specification.new do |s|
     "spec/fixtures/class_file.rb",
     "spec/fixtures/empty.txt",
     "spec/fixtures/non-empty.txt",
+    "spec/fixtures/search_file.txt",
     "spec/spec_helper.rb",
     "spec/sugar-high/alias_spec.rb",
     "spec/sugar-high/arguments_spec.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-07 00:00:00 +01:00
+date: 2011-01-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,6 +84,7 @@ files:
 - lib/sugar-high/array.rb
 - lib/sugar-high/blank.rb
 - lib/sugar-high/file.rb
+- lib/sugar-high/file_mutate.rb
 - lib/sugar-high/hash.rb
 - lib/sugar-high/includes.rb
 - lib/sugar-high/kind_of.rb
@@ -99,6 +100,7 @@ files:
 - spec/fixtures/class_file.rb
 - spec/fixtures/empty.txt
 - spec/fixtures/non-empty.txt
+- spec/fixtures/search_file.txt
 - spec/spec_helper.rb
 - spec/sugar-high/alias_spec.rb
 - spec/sugar-high/arguments_spec.rb