jackdempsey-beet 0.0.8 → 0.0.9

data/Rakefile

@@ -17,20 +17,28 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/*_test.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
 end
 
 
-task :default => :spec
+task :default => :test
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
@@ -42,7 +50,7 @@ Rake::RDocTask.new do |rdoc|
   end
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "beet #{version}"
+  rdoc.title = "beet_shoulda #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/beet.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{beet}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jack Dempsey"]
-  s.date = %q{2009-05-29}
+  s.date = %q{2009-05-30}
   s.default_executable = %q{beet}
   s.email = %q{jack.dempsey@gmail.com}
   s.executables = ["beet"]
@@ -42,8 +42,8 @@ Gem::Specification.new do |s|
      "lib/beet/scm.rb",
      "lib/beet/scm/git.rb",
      "lib/beet/scm/svn.rb",
-     "spec/beet_spec.rb",
-     "spec/spec_helper.rb"
+     "test/file_system_shoulda_test.rb",
+     "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/jackdempsey/beet}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -51,8 +51,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.3}
   s.summary = %q{A gem to help with easily generating projects}
   s.test_files = [
-    "spec/beet_spec.rb",
-     "spec/spec_helper.rb"
+    "test/file_system_shoulda_test.rb",
+     "test/test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/beet/file_system.rb

@@ -89,7 +89,11 @@ module Beet
     #
     def gsub_file(relative_destination, regexp, *args, &block)
       path = destination_path(relative_destination)
-      content = File.read(path).gsub(regexp, *args, &block)
+      content = File.read(path)
+      check_for = args.first || yield('')
+      regex = Regexp.new(regexp.source + Regexp.escape(check_for))
+      return if content =~ regex # if we can match the text and its leadin regex, don't add again
+      content = content.gsub(regexp, *args, &block)
       File.open(path, 'wb') { |file| file.write(content) }
     end
 
@@ -104,6 +108,20 @@ module Beet
       File.open(path, 'ab') { |file| file.write(data) }
     end
 
+    # Add text after matching line
+    #
+    # ==== Example
+    #
+    #    add_after 'config/environment.rb', '# config.gem "aws-s3", :lib => "aws/s3"'
+    #
+    def add_after(filename, matching_text, data=nil, &block)
+      gsub_file filename, /(#{Regexp.escape(matching_text)})/mi do |match|
+        "#{match}\n#{data || block.call}"
+      end
+    end
+
+    protected
+
     def destination_path(relative_destination)
       File.join(root, relative_destination)
     end

data/test/file_system_shoulda_test.rb

@@ -0,0 +1,59 @@
+require 'test_helper'
+
+include Beet::FileSystem
+
+# define some methods that file_system recipes expect to exist
+def root; '.'; end
+class FileSystemShouldaTest < Test::Unit::TestCase
+  context "#add_after" do
+    setup do
+      @filename = 'test.file'
+      File.open(@filename,'w') do |f|
+        f.puts "first line"
+        f.puts "second line"
+      end
+    end
+
+    teardown do
+      File.unlink(@filename)
+    end
+
+    should "add the given text after the specified text" do
+      add_after @filename, "first line", "middle line" 
+      assert_equal "first line\nmiddle line\nsecond line\n", File.read(@filename)
+    end
+
+    should "not add the given text if it already exists after the specified text" do
+      add_after @filename, "first line", "middle line" 
+      assert_equal "first line\nmiddle line\nsecond line\n", File.read(@filename)
+      add_after @filename, "first line", "middle line" 
+      assert_equal "first line\nmiddle line\nsecond line\n", File.read(@filename)
+    end
+
+    should "add the given text if it exists but only elsewhere in the specified text" do
+      add_after @filename, "first line", "middle line"
+      assert_equal "first line\nmiddle line\nsecond line\n", File.read(@filename)
+      add_after @filename, "first line", "second line"
+      assert_equal "first line\nsecond line\nmiddle line\nsecond line\n", File.read(@filename)
+    end
+  end
+
+  context "#append_file" do
+    setup do
+      @filename = 'test.file'
+      File.open(@filename,'w') do |f|
+        f.puts "first line"
+        f.puts "second line"
+      end
+    end
+
+    teardown do
+      File.unlink(@filename)
+    end
+
+    should "add text to the end of the file" do
+      append_file @filename, "third line"
+      assert_equal "first line\nsecond line\nthird line", File.read(@filename)
+    end
+  end
+end

data/{spec/spec_helper.rb → test/test_helper.rb}

@@ -1,9 +1,10 @@
-require 'spec'
+require 'rubygems'
+require 'test/unit'
+require 'shoulda'
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'beet'
-
-Spec::Runner.configure do |config|
-  
+require 'ruby-debug'
+class Test::Unit::TestCase
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jackdempsey-beet
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Jack Dempsey
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-29 00:00:00 -07:00
+date: 2009-05-30 00:00:00 -07:00
 default_executable: beet
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,8 +59,8 @@ files:
 - lib/beet/scm.rb
 - lib/beet/scm/git.rb
 - lib/beet/scm/svn.rb
-- spec/beet_spec.rb
-- spec/spec_helper.rb
+- test/file_system_shoulda_test.rb
+- test/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/jackdempsey/beet
 post_install_message: 
@@ -88,5 +88,5 @@ signing_key:
 specification_version: 3
 summary: A gem to help with easily generating projects
 test_files: 
-- spec/beet_spec.rb
-- spec/spec_helper.rb
+- test/file_system_shoulda_test.rb
+- test/test_helper.rb

data/spec/beet_spec.rb

@@ -1,7 +0,0 @@
-require File.dirname(__FILE__) + '/spec_helper'
-
-describe "beet" do
-  it "should do nothing" do
-    true.should == true
-  end
-end