<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>lib/merger/merge.rb</filename>
    </added>
    <added>
      <filename>test/db/database.yml</filename>
    </added>
    <added>
      <filename>test/db/schema.rb</filename>
    </added>
    <added>
      <filename>test/fixtures/people.yml</filename>
    </added>
    <added>
      <filename>test/fixtures/phones.yml</filename>
    </added>
    <added>
      <filename>test/merger/merge_test.rb</filename>
    </added>
    <added>
      <filename>test/merger_test.rb</filename>
    </added>
    <added>
      <filename>test/test_helper.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,11 +1,34 @@
 require 'rake'
-require 'spec/rake/spectask'
+require &quot;load_multi_rails_rake_tasks&quot; 
+require 'rake/testtask'
+require 'rake/rdoctask'
+require 'rcov/rcovtask'
 
-desc 'Default: run specs.'
-task :default =&gt; :spec
+desc 'Default: run unit tests.'
+task :default =&gt; :test
 
-desc 'Run the specs'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts = ['--colour --format progress --loadby mtime --reverse']
-  t.spec_files = FileList['spec/**/*_spec.rb']
+desc 'Test the plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs &lt;&lt; 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
 end
+
+namespace :test do
+  desc &quot;just rcov minus html output&quot;
+  Rcov::RcovTask.new(:coverage) do |t|
+    t.test_files = FileList['test/**/*_test.rb']
+    t.output_dir = 'coverage'
+    t.verbose = true
+    t.rcov_opts = %w(--exclude test,/usr/lib/ruby,/Library/Ruby --sort coverage)
+  end
+end
+
+desc 'Generate documentation for the plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Merger'
+  rdoc.options &lt;&lt; '--line-numbers' &lt;&lt; '--inline-source'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
\ No newline at end of file</diff>
      <filename>Rakefile</filename>
    </modified>
    <modified>
      <diff>@@ -1 +1,3 @@
-# Include hook code here
+require 'merger'
+
+ActiveRecord::Base.send(:include, Merger)
\ No newline at end of file</diff>
      <filename>init.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1 +1,13 @@
-# Merger
+require 'merger/merge'
+
+module Merger
+  def self.included(base)
+    base.send :include, InstanceMethods
+  end
+  
+  module InstanceMethods
+    def merge!(*others)
+      Merger.new(others.push(self)).merge!
+    end
+  end
+end
\ No newline at end of file</diff>
      <filename>lib/merger.rb</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>spec/merger_spec.rb</filename>
    </removed>
    <removed>
      <filename>spec/spec_helper.rb</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>c7e9f6c261fd6b6b39ea81ead0a5e0198f453552</id>
    </parent>
  </parents>
  <author>
    <name>Brandon Keepers</name>
    <email>brandon@collectiveidea.com</email>
  </author>
  <url>http://github.com/collectiveidea/merger/commit/6902dab810b1d542096687b4cd8ca83f40fe4be9</url>
  <id>6902dab810b1d542096687b4cd8ca83f40fe4be9</id>
  <committed-date>2008-08-17T15:03:35-07:00</committed-date>
  <authored-date>2008-08-17T15:03:35-07:00</authored-date>
  <message>minimal version of plugin for merging active record models together</message>
  <tree>498b993cacfb7f45290d03a03bcf5b8520f1b00a</tree>
  <committer>
    <name>Brandon Keepers</name>
    <email>brandon@collectiveidea.com</email>
  </committer>
</commit>
