jeweler!!

Rakefile

-%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("History.txt", 0..1).join("\n\n")
-  p.rubyforge_name       = 'annotate-models'
-  p.url                  = "http://github.com/ctran/annotate_models"
-  p.summary              = "Annotates Rails Models, routes, and others"
-  p.description          = "Annotates Rails Models, routes, and others"
-
-  p.extra_dev_deps = [
-    ['newgem', ">= #{::Newgem::VERSION}"]
-  ]
-
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-  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 = "annotate"
+    gem.summary = "Annotates Rails Models, routes, and others"
+    gem.email = "x@nofxx.com"
+    gem.homepage = "http://github.com/nofxx/annotate"
+    gem.authors = ['Cuong Tran',"Marcos Piccinini"]
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+
+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']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << '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 => [:spec, :features]
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  if File.exist?('VERSION.yml')
+    config = YAML.load(File.read('VERSION.yml'))
+    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
+  else
+    version = ""
+  end
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "annotate #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+

VERSION.yml

+--- 
+:major: 2
+:minor: 3
+:patch: 0

annotate.gemspec

@@ -2,70 +2,53 @@
 
 Gem::Specification.new do |s|
   s.name = %q{annotate}
-<<<<<<< HEAD:annotate.gemspec
-  s.version = "2.2.7"
+  s.version = "2.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Marcos Piccinini"]
-  s.date = %q{2009-03-21}
+  s.authors = ["Cuong Tran", "Marcos Piccinini"]
+  s.date = %q{2009-06-11}
   s.default_executable = %q{annotate}
-  s.description = %q{Annotates Rails Models and Routes}
-  s.email = ["x@nofxx.com"]
+  s.email = %q{x@nofxx.com}
   s.executables = ["annotate"]
-  s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "README.rdoc"]
-  s.files = ["History.txt", "License.txt", "Manifest.txt", "README.rdoc", "Rakefile", "annotate.gemspec", "bin/annotate", "lib/annotate.rb", "lib/annotate/annotate_models.rb", "lib/annotate/annotate_routes.rb", "lib/tasks/annotate_models.rake", "lib/tasks/annotate_routes.rake", "script/console", "script/destroy", "script/generate", "setup.rb", "spec/annotate/annotate_models_spec.rb", "spec/annotate/annotate_routes_spec.rb", "spec/annotate_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/rspec.rake"]
-  s.has_rdoc = true
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "README.rdoc",
+     "Rakefile",
+     "bin/annotate",
+     "lib/annotate.rb",
+     "lib/annotate/annotate_models.rb",
+     "lib/annotate/annotate_routes.rb",
+     "lib/tasks/annotate_models.rake",
+     "lib/tasks/annotate_routes.rake",
+     "spec/annotate/annotate_models_spec.rb",
+     "spec/annotate/annotate_routes_spec.rb",
+     "spec/annotate_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
   s.homepage = %q{http://github.com/nofxx/annotate}
-  s.rdoc_options = ["--main", "README.rdoc"]
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{annotate}
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{Annotates Rails Models and Routes}
-=======
-  s.version = "2.0.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Cuong Tran"]
-  s.date = %q{2009-05-06}
-  s.default_executable = %q{annotate}
-  s.description = %q{Annotates Rails Models, routes, and others}
-  s.email = ["ctran@pragmaquest.com"]
-  s.executables = ["annotate"]
-  s.extra_rdoc_files = ["History.txt", "README.rdoc"]
-  s.files = ["History.txt", "README.rdoc", "Rakefile", "annotate_models.gemspec", "bin/annotate", "lib/annotate.rb", "lib/annotate/annotate_models.rb", "lib/annotate/annotate_routes.rb", "lib/tasks/annotate_models.rake", "lib/tasks/annotate_routes.rake"]
-  s.has_rdoc = true
-  s.homepage = %q{http://github.com/ctran/annotate_models}
-  s.rdoc_options = ["--main", "README.rdoc"]
-  s.require_paths = ["lib"]
-  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}
->>>>>>> ctran/master:annotate.gemspec
+  s.test_files = [
+    "spec/annotate/annotate_models_spec.rb",
+     "spec/annotate/annotate_routes_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/annotate_spec.rb"
+  ]
 
   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) >= Gem::Version.new('1.2.0') then
-<<<<<<< HEAD:annotate.gemspec
-      s.add_development_dependency(%q<newgem>, [">= 1.3.0"])
-      s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
-    else
-      s.add_dependency(%q<newgem>, [">= 1.3.0"])
-      s.add_dependency(%q<hoe>, [">= 1.8.0"])
-    end
-  else
-    s.add_dependency(%q<newgem>, [">= 1.3.0"])
-=======
-      s.add_development_dependency(%q<newgem>, [">= 1.4.1"])
-      s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
     else
-      s.add_dependency(%q<newgem>, [">= 1.4.1"])
-      s.add_dependency(%q<hoe>, [">= 1.8.0"])
     end
   else
-    s.add_dependency(%q<newgem>, [">= 1.4.1"])
->>>>>>> ctran/master:annotate.gemspec
-    s.add_dependency(%q<hoe>, [">= 1.8.0"])
   end
 end

annotate_models.gemspec

-./annotate.gemspec
\ No newline at end of file

lib/annotate.rb

@@ -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'

script/console

-#!/usr/bin/env ruby
-# File: script/console
-irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-
-libs =  " -r irb/completion"
-# Perhaps use a console_lib to store any extra methods I may want available in the cosole
-# libs << " -r #{File.dirname(__FILE__) + '/../lib/console_lib/console_logger.rb'}"
-<<<<<<< HEAD:script/console
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/annotate.rb'}"
-puts "Loading annotate gem"
-=======
-libs <<  " -r #{File.dirname(__FILE__) + '/../lib/annotate_models.rb'}"
-puts "Loading annotate_models gem"
->>>>>>> ctran/master:script/console
-exec "#{irb} #{libs} --simple-prompt"
\ No newline at end of file

script/destroy

-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/destroy'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Destroy.new.run(ARGV)

script/generate

-#!/usr/bin/env ruby
-APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
-begin
-  require 'rubigen'
-rescue LoadError
-  require 'rubygems'
-  require 'rubigen'
-end
-require 'rubigen/scripts/generate'
-
-ARGV.shift if ['--help', '-h'].include?(ARGV[0])
-RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
-RubiGen::Scripts::Generate.new.run(ARGV)

tasks/rspec.rake

-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  require 'spec'
-end
-begin
-  require 'spec/rake/spectask'
-rescue LoadError
-  puts <<-EOS
-To use rspec for testing you must install rspec gem:
-    gem install rspec
-EOS
-  exit(0)
-end
-
-desc "Run the specs under spec/models"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
-end