<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>VERSION.yml</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,28 +1,48 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
-require File.dirname(__FILE__) + '/lib/annotate'
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new('annotate', Annotate::VERSION) do |p|
-  p.developer('Cuong Tran', 'ctran@pragmaquest.com')
-  p.changes              = p.paragraphs_of(&quot;History.txt&quot;, 0..1).join(&quot;\n\n&quot;)
-  p.rubyforge_name       = 'annotate-models'
-  p.url                  = &quot;http://github.com/ctran/annotate_models&quot;
-  p.summary              = &quot;Annotates Rails Models, routes, and others&quot;
-  p.description          = &quot;Annotates Rails Models, routes, and others&quot;
-
-  p.extra_dev_deps = [
-    ['newgem', &quot;&gt;= #{::Newgem::VERSION}&quot;]
-  ]
-
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : &quot;\#{p.rubyforge_name}/\#{p.name}&quot;
-  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
-  p.rsync_args = '-av --delete --ignore-errors'
+require 'rubygems'
+require 'rake'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = &quot;annotate&quot;
+    gem.summary = &quot;Annotates Rails Models, routes, and others&quot;
+    gem.email = &quot;x@nofxx.com&quot;
+    gem.homepage = &quot;http://github.com/nofxx/annotate&quot;
+    gem.authors = ['Cuong Tran',&quot;Marcos Piccinini&quot;]
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+
+rescue LoadError
+  puts &quot;Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler&quot;
+end
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs &lt;&lt; 'lib' &lt;&lt; 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs &lt;&lt; 'lib' &lt;&lt; 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
-require 'newgem/tasks' # load /tasks/*.rake
-Dir['tasks/**/*.rake'].each { |t| load t }
 
-# TODO - want other tests/tasks run by default? Add them to the list
-# task :default =&gt; [:spec, :features]
+task :default =&gt; :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  if File.exist?('VERSION.yml')
+    config = YAML.load(File.read('VERSION.yml'))
+    version = &quot;#{config[:major]}.#{config[:minor]}.#{config[:patch]}&quot;
+  else
+    version = &quot;&quot;
+  end
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = &quot;annotate #{version}&quot;
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+</diff>
      <filename>Rakefile</filename>
    </modified>
    <modified>
      <diff>@@ -2,70 +2,53 @@
 
 Gem::Specification.new do |s|
   s.name = %q{annotate}
-&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD:annotate.gemspec
-  s.version = &quot;2.2.7&quot;
+  s.version = &quot;2.3.0&quot;
 
   s.required_rubygems_version = Gem::Requirement.new(&quot;&gt;= 0&quot;) if s.respond_to? :required_rubygems_version=
-  s.authors = [&quot;Marcos Piccinini&quot;]
-  s.date = %q{2009-03-21}
+  s.authors = [&quot;Cuong Tran&quot;, &quot;Marcos Piccinini&quot;]
+  s.date = %q{2009-06-11}
   s.default_executable = %q{annotate}
-  s.description = %q{Annotates Rails Models and Routes}
-  s.email = [&quot;x@nofxx.com&quot;]
+  s.email = %q{x@nofxx.com}
   s.executables = [&quot;annotate&quot;]
-  s.extra_rdoc_files = [&quot;History.txt&quot;, &quot;License.txt&quot;, &quot;Manifest.txt&quot;, &quot;README.rdoc&quot;]
-  s.files = [&quot;History.txt&quot;, &quot;License.txt&quot;, &quot;Manifest.txt&quot;, &quot;README.rdoc&quot;, &quot;Rakefile&quot;, &quot;annotate.gemspec&quot;, &quot;bin/annotate&quot;, &quot;lib/annotate.rb&quot;, &quot;lib/annotate/annotate_models.rb&quot;, &quot;lib/annotate/annotate_routes.rb&quot;, &quot;lib/tasks/annotate_models.rake&quot;, &quot;lib/tasks/annotate_routes.rake&quot;, &quot;script/console&quot;, &quot;script/destroy&quot;, &quot;script/generate&quot;, &quot;setup.rb&quot;, &quot;spec/annotate/annotate_models_spec.rb&quot;, &quot;spec/annotate/annotate_routes_spec.rb&quot;, &quot;spec/annotate_spec.rb&quot;, &quot;spec/spec.opts&quot;, &quot;spec/spec_helper.rb&quot;, &quot;tasks/rspec.rake&quot;]
-  s.has_rdoc = true
+  s.extra_rdoc_files = [
+    &quot;README.rdoc&quot;
+  ]
+  s.files = [
+    &quot;.gitignore&quot;,
+     &quot;History.txt&quot;,
+     &quot;README.rdoc&quot;,
+     &quot;Rakefile&quot;,
+     &quot;bin/annotate&quot;,
+     &quot;lib/annotate.rb&quot;,
+     &quot;lib/annotate/annotate_models.rb&quot;,
+     &quot;lib/annotate/annotate_routes.rb&quot;,
+     &quot;lib/tasks/annotate_models.rake&quot;,
+     &quot;lib/tasks/annotate_routes.rake&quot;,
+     &quot;spec/annotate/annotate_models_spec.rb&quot;,
+     &quot;spec/annotate/annotate_routes_spec.rb&quot;,
+     &quot;spec/annotate_spec.rb&quot;,
+     &quot;spec/spec.opts&quot;,
+     &quot;spec/spec_helper.rb&quot;
+  ]
   s.homepage = %q{http://github.com/nofxx/annotate}
-  s.rdoc_options = [&quot;--main&quot;, &quot;README.rdoc&quot;]
+  s.rdoc_options = [&quot;--charset=UTF-8&quot;]
   s.require_paths = [&quot;lib&quot;]
-  s.rubyforge_project = %q{annotate}
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{Annotates Rails Models and Routes}
-=======
-  s.version = &quot;2.0.2&quot;
-
-  s.required_rubygems_version = Gem::Requirement.new(&quot;&gt;= 0&quot;) if s.respond_to? :required_rubygems_version=
-  s.authors = [&quot;Cuong Tran&quot;]
-  s.date = %q{2009-05-06}
-  s.default_executable = %q{annotate}
-  s.description = %q{Annotates Rails Models, routes, and others}
-  s.email = [&quot;ctran@pragmaquest.com&quot;]
-  s.executables = [&quot;annotate&quot;]
-  s.extra_rdoc_files = [&quot;History.txt&quot;, &quot;README.rdoc&quot;]
-  s.files = [&quot;History.txt&quot;, &quot;README.rdoc&quot;, &quot;Rakefile&quot;, &quot;annotate_models.gemspec&quot;, &quot;bin/annotate&quot;, &quot;lib/annotate.rb&quot;, &quot;lib/annotate/annotate_models.rb&quot;, &quot;lib/annotate/annotate_routes.rb&quot;, &quot;lib/tasks/annotate_models.rake&quot;, &quot;lib/tasks/annotate_routes.rake&quot;]
-  s.has_rdoc = true
-  s.homepage = %q{http://github.com/ctran/annotate_models}
-  s.rdoc_options = [&quot;--main&quot;, &quot;README.rdoc&quot;]
-  s.require_paths = [&quot;lib&quot;]
-  s.rubyforge_project = %q{annotate-models}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.3}
   s.summary = %q{Annotates Rails Models, routes, and others}
-&gt;&gt;&gt;&gt;&gt;&gt;&gt; ctran/master:annotate.gemspec
+  s.test_files = [
+    &quot;spec/annotate/annotate_models_spec.rb&quot;,
+     &quot;spec/annotate/annotate_routes_spec.rb&quot;,
+     &quot;spec/spec_helper.rb&quot;,
+     &quot;spec/annotate_spec.rb&quot;
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) &gt;= Gem::Version.new('1.2.0') then
-&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD:annotate.gemspec
-      s.add_development_dependency(%q&lt;newgem&gt;, [&quot;&gt;= 1.3.0&quot;])
-      s.add_development_dependency(%q&lt;hoe&gt;, [&quot;&gt;= 1.8.0&quot;])
-    else
-      s.add_dependency(%q&lt;newgem&gt;, [&quot;&gt;= 1.3.0&quot;])
-      s.add_dependency(%q&lt;hoe&gt;, [&quot;&gt;= 1.8.0&quot;])
-    end
-  else
-    s.add_dependency(%q&lt;newgem&gt;, [&quot;&gt;= 1.3.0&quot;])
-=======
-      s.add_development_dependency(%q&lt;newgem&gt;, [&quot;&gt;= 1.4.1&quot;])
-      s.add_development_dependency(%q&lt;hoe&gt;, [&quot;&gt;= 1.8.0&quot;])
     else
-      s.add_dependency(%q&lt;newgem&gt;, [&quot;&gt;= 1.4.1&quot;])
-      s.add_dependency(%q&lt;hoe&gt;, [&quot;&gt;= 1.8.0&quot;])
     end
   else
-    s.add_dependency(%q&lt;newgem&gt;, [&quot;&gt;= 1.4.1&quot;])
-&gt;&gt;&gt;&gt;&gt;&gt;&gt; ctran/master:annotate.gemspec
-    s.add_dependency(%q&lt;hoe&gt;, [&quot;&gt;= 1.8.0&quot;])
   end
 end</diff>
      <filename>annotate.gemspec</filename>
    </modified>
    <modified>
      <diff>@@ -2,8 +2,6 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Annotate
-  VERSION = '2.3'
-
   def self.load_tasks
     if File.exists?('Rakefile')
       load 'Rakefile'</diff>
      <filename>lib/annotate.rb</filename>
    </modified>
  </modified>
  <removed type="array">
    <removed>
      <filename>annotate_models.gemspec</filename>
    </removed>
    <removed>
      <filename>script/console</filename>
    </removed>
    <removed>
      <filename>script/destroy</filename>
    </removed>
    <removed>
      <filename>script/generate</filename>
    </removed>
    <removed>
      <filename>tasks/rspec.rake</filename>
    </removed>
  </removed>
  <parents type="array">
    <parent>
      <id>9e3b638535e297f8f2b9696dd0aee63c1e9a33f4</id>
    </parent>
  </parents>
  <author>
    <name>Marcos Piccinini</name>
    <email>x@nofxx.com</email>
  </author>
  <url>http://github.com/nclark/annotate_models/commit/11b1951d87361c07bd319a2a8e1bd67158d09e50</url>
  <id>11b1951d87361c07bd319a2a8e1bd67158d09e50</id>
  <committed-date>2009-06-11T03:46:54-07:00</committed-date>
  <authored-date>2009-06-11T03:46:54-07:00</authored-date>
  <message>jeweler!!</message>
  <tree>536784e19e985756b6f3970e5b2db84f56ca60be</tree>
  <committer>
    <name>Marcos Piccinini</name>
    <email>x@nofxx.com</email>
  </committer>
</commit>
