sugar-high 0.1.6 → 0.1.7

data/Rakefile

@@ -7,8 +7,8 @@ begin
     gem.email = "kmandrup@gmail.com"
     gem.homepage = "http://github.com/kristianmandrup/sugar-high"
     gem.authors = ["Kristian Mandrup"]
-    gem.add_development_dependency "rspec", ">= 2.0.0.beta.19"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    gem.add_development_dependency "rspec", "~> 2.0.0"
+    gem.add_dependency "require_all", "~> 1.1.0"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/lib/sugar-high/alias.rb

@@ -52,6 +52,13 @@ class Module
     end
   end
 
+  def alias_for(original, *aliases)
+    aliases.each do |alias_meth|
+      class_eval "alias_method :#{alias_meth}, :#{original} if respond_to? :#{original}"  
+    end
+  end
+  alias_method :aliases_for, :alias_for
+
   protected
 
   def make_name name, alias_name, config_options

data/lib/sugar-high/file.rb

@@ -1,6 +1,17 @@
 require 'sugar-high/blank'
+require 'sugar-high/arguments'
 
-class File
+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
+  
   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)
@@ -57,10 +68,81 @@ class File
     true # signal success!
   end
 
-  # TODO: Needs spec
+
   def self.remove_content_from file_name, options = {}, &block
     replace_content_from file_name, options.merge(:with => ''), &block
-  end    
+  end   
+
+  # TODO: Needs spec
+  
+  # insert_into 'my_file.txt', :after => 'Blip', :content => 'Hello
+  # insert_into 'my_file.txt', :after => 'Blip', 'Hello
+  # 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? || (file.read =~ /#{content}/)
+
+    place, marker = if options[:before] 
+      [ :before, options[:before] ]
+      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 self.content options = {}, *args, &block
+       case args.first
+       when String
+         args.first
+       when Hash
+         options[:content]      
+       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 or :after key" if !marker 
+              
+       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 Array

data/lib/sugar-high.rb

@@ -0,0 +1,2 @@
+require 'require_all'
+require File.dirname(__FILE__) + '/sugar-high'

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

@@ -0,0 +1,71 @@
+require 'spec_helper'
+require 'sugar-high/file'
+
+describe "SugarHigh::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' }
+
+  before :each do
+    File.delete replace_file if File.file?(replace_file)
+  end
+
+  describe '#replace_content_from' do    
+    let(:replace_file)    { fixture_file 'file.txt' }
+  
+    it "should remove content from existing file" 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' do    
+    let(:replace_file)    { fixture_file 'file.txt' }    
+  
+    it "should remove content from existing file" 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
+
+  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'
+      end
+    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_not match /Hello 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_not match /Hello 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_not match /Goodbye Hello/
+    end
+  end
+end

data/spec/sugar-high/{file_spec.rb → file/file_spec.rb}

@@ -32,30 +32,6 @@ describe "SugarHigh" do
     end
   end
 
-  describe '#replace_content_from' do    
-    let(:replace_file)    { fixture_file 'file.txt' }
-    
-    it "should remove content from existing file" 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' do    
-    let(:replace_file)    { fixture_file 'file.txt' }    
-    
-    it "should remove content from existing file" 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
-
   describe '#file_names' do 
     let(:replace_file)    { fixture_file 'file.txt' }        
     

data/sugar-high.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sugar-high}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-08-28}
+  s.date = %q{2010-08-29}
   s.description = %q{More Ruby sugar - inspired by the 'zuker' project}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -33,12 +33,12 @@ Gem::Specification.new do |s|
      "lib/sugar-high/hash.rb",
      "lib/sugar-high/includes.rb",
      "lib/sugar-high/kind_of.rb",
-     "lib/sugar-high/matchers/have_aliases.rb",
      "lib/sugar-high/metaclass.rb",
      "lib/sugar-high/methods.rb",
      "lib/sugar-high/module.rb",
      "lib/sugar-high/not.rb",
-     "lib/sugar-high/rspec.rb",
+     "lib/sugar-high/rspec/configure.rb",
+     "lib/sugar-high/rspec/matchers/have_aliases.rb",
      "spec/fixtures/empty.txt",
      "spec/fixtures/non-empty.txt",
      "spec/spec_helper.rb",
@@ -46,7 +46,8 @@ Gem::Specification.new do |s|
      "spec/sugar-high/arguments_spec.rb",
      "spec/sugar-high/array_spec.rb",
      "spec/sugar-high/blank_spec.rb",
-     "spec/sugar-high/file_spec.rb",
+     "spec/sugar-high/file/file_mutate_spec.rb",
+     "spec/sugar-high/file/file_spec.rb",
      "spec/sugar-high/includes_spec.rb",
      "spec/sugar-high/kind_of_spec.rb",
      "spec/sugar-high/methods_spec.rb",
@@ -64,7 +65,8 @@ Gem::Specification.new do |s|
      "spec/sugar-high/arguments_spec.rb",
      "spec/sugar-high/array_spec.rb",
      "spec/sugar-high/blank_spec.rb",
-     "spec/sugar-high/file_spec.rb",
+     "spec/sugar-high/file/file_mutate_spec.rb",
+     "spec/sugar-high/file/file_spec.rb",
      "spec/sugar-high/includes_spec.rb",
      "spec/sugar-high/kind_of_spec.rb",
      "spec/sugar-high/methods_spec.rb",
@@ -76,12 +78,15 @@ Gem::Specification.new do |s|
     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_development_dependency(%q<rspec>, ["~> 2.0.0"])
+      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<rspec>, ["~> 2.0.0"])
+      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<rspec>, ["~> 2.0.0"])
+    s.add_dependency(%q<require_all>, ["~> 1.1.0"])
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-28 00:00:00 +02:00
+date: 2010-08-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,17 +23,30 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 2
         - 0
         - 0
-        - beta
-        - 19
-        version: 2.0.0.beta.19
+        version: 2.0.0
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: require_all
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
+  type: :runtime
+  version_requirements: *id002
 description: More Ruby sugar - inspired by the 'zuker' project
 email: kmandrup@gmail.com
 executables: []
@@ -60,12 +73,12 @@ files:
 - lib/sugar-high/hash.rb
 - lib/sugar-high/includes.rb
 - lib/sugar-high/kind_of.rb
-- lib/sugar-high/matchers/have_aliases.rb
 - lib/sugar-high/metaclass.rb
 - lib/sugar-high/methods.rb
 - lib/sugar-high/module.rb
 - lib/sugar-high/not.rb
-- lib/sugar-high/rspec.rb
+- lib/sugar-high/rspec/configure.rb
+- lib/sugar-high/rspec/matchers/have_aliases.rb
 - spec/fixtures/empty.txt
 - spec/fixtures/non-empty.txt
 - spec/spec_helper.rb
@@ -73,7 +86,8 @@ files:
 - spec/sugar-high/arguments_spec.rb
 - spec/sugar-high/array_spec.rb
 - spec/sugar-high/blank_spec.rb
-- spec/sugar-high/file_spec.rb
+- spec/sugar-high/file/file_mutate_spec.rb
+- spec/sugar-high/file/file_spec.rb
 - spec/sugar-high/includes_spec.rb
 - spec/sugar-high/kind_of_spec.rb
 - spec/sugar-high/methods_spec.rb
@@ -117,7 +131,8 @@ test_files:
 - spec/sugar-high/arguments_spec.rb
 - spec/sugar-high/array_spec.rb
 - spec/sugar-high/blank_spec.rb
-- spec/sugar-high/file_spec.rb
+- spec/sugar-high/file/file_mutate_spec.rb
+- spec/sugar-high/file/file_spec.rb
 - spec/sugar-high/includes_spec.rb
 - spec/sugar-high/kind_of_spec.rb
 - spec/sugar-high/methods_spec.rb