update to RSpec 2, get ready to release annotate_models 2.5.0, stop using Jeweler

.gitignore

@@ -4,3 +4,5 @@ rdoc/*
 coverage/*
 spec/debug.log
 pkg/*
+dist
+Gemfile.lock

Gemfile

+gem "rake"
+
+group :development do
+  gem "rspec"
+  gem "rdoc"
+  gem "mg"
+  gem 'activesupport', '>= 2.1.0'
+end

History.txt

+== 2.5.0 2011-06-27 ?
+
+*   85f6e53 (HEAD, master) Merge branch 'master' of github.com:ctran/annotate_models
+|\  
+
+| *   ddfba1f (ctran/master) Merge pull request #32 from JackDanger/master
+| |\  
+
+| | * 1d58ea1 not continually prepending newlines.
+| |/  
+
+| *   0076e08 Merge pull request #31 from wbharding/master
+| |\  
+
+f0c138c Recognize column+type, and don't change a file unless the column+type combination of the new schema are different than that of the old (i.e., don't regenerate if columns happen to be in a different order. That's just how life is sometimes)
+ Grab old specification even if it has \r\n as line endings rather than pure \ns 
+Remove gemspec line causing a warning
+
+| * |   8057b92 Merge pull request #29 from jeremyolliver/rake_compatibility
+| |\ \  
+| | * | 4d57e4f Explicitly require rake, fixing rake version compatibility
+| | |/  
+| * |   e2d3beb Merge pull request #30 from jeremyolliver/development_dependencies
+| |\ \  
+| | |/  
+| |/|   
+| | * 546524f Adding rake as a runtime dependency
+| | * 7403087 Correct homepage link to github project
+| | * 73a8432 Specify development dependencies and ensure correct loading of test libraries
+| |/  
+| *   3fae329 Merge pull request #21 from hopsoft/master
+| |\  
+| | * 02bad1e Updated require statements in tasks to use full path to lib files.
+| * |   9dbf6e5 Merge pull request #26 from cross/dont-move-schema
+| |\ \  
+| | |/  
+| |/|   
+| | * a7afaf3 Modify the model annontator so that if the schema is already in the model file, it will be replaced into the same location.  If it didn't previously exist, it'll be placed according to the "position", as before.
+
+
 == 2.4.0 2009-12-13
 
 * Incorporated lots of patches from the Github community, including support for Blueprints fixtures

Rakefile

 require 'rubygems'
 require 'rake'
-require 'lib/annotate'
+require './lib/annotate'
 
 # want other tests/tasks run by default? Add them to the list
 task :default => [:spec]
 
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "annotate"
-    gem.executables = "annotate"
-    gem.summary = "Annotates Rails Models, routes, fixtures, and others based on the database schema."
-    gem.description = gem.summary
-    gem.email = ["alex@stinky.com", 'ctran@pragmaquest.com', "x@nofxx.com"]
-    gem.homepage = "http://github.com/ctran/annotate"
-    gem.authors = ['Cuong Tran', "Alex Chaffee", "Marcos Piccinini"]
-    gem.files =  FileList["[A-Z]*.*", "{bin,lib,tasks,spec}/**/*"]
-    gem.rubyforge_project = "annotate"
-    
-    # note that Jeweler automatically reads the version from VERSION.yml
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  
-  Jeweler::RubyforgeTasks.new do |rubyforge|
-    rubyforge.doc_task = "rdoc"
-  end
-  
+  require 'mg'
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+  abort "Please `gem install mg`"
 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'
+# mg ("minimalist gems") defines rake tasks:
+#
+# rake gem
+#   Build gem into dist/
+# 
+# rake gem:publish
+#   Push the gem to RubyGems.org
+# 
+# rake gem:install
+#   Build and install as local gem
+# 
+# rake package
+#   Build gem and tarball into dist/
+ 
+MG.new("annotate_models.gemspec")
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
 end
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+task :default => :spec
+
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "annotate #{Annotate.version}"
   rdoc.rdoc_files.include('README*')

VERSION.yml

 --- 
   :major: 2
-  :minor: 4
+  :minor: 5
   :patch: 0

annotate.gemspec

@@ -4,12 +4,12 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{annotate}
+  s.name = %q{annotate_models}
   s.version = "2.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cuong Tran", "Alex Chaffee", "Marcos Piccinini"]
-  s.description = %q{Annotates Rails Models, routes, fixtures, and others based on the database schema.}
+  s.description = %q{Annotates Rails/ActiveRecord Models, routes, fixtures, and others based on the database schema.}
   s.email = ["alex@stinky.com", "ctran@pragmaquest.com", "x@nofxx.com"]
   s.executables = ["annotate"]
   s.extra_rdoc_files = [

annotate_models.gemspec

+require './lib/annotate'
+
+Gem::Specification.new do |s|
+  s.name = %q{annotate_models}
+  s.version = Annotate.version # "2.5.0"
+  s.description = %q{Annotates Rails/ActiveRecord Models, routes, fixtures, and others based on the database schema.}
+  s.summary = %q{Annotates Rails Models, routes, fixtures, and others based on the database schema.}
+  s.authors = ["Cuong Tran", "Alex Chaffee", "Marcos Piccinini"]
+  s.email = ["alex@stinky.com", "ctran@pragmaquest.com", "x@nofxx.com"]
+
+  s.executables = ["annotate"]# todo: change to annotate_models
+  s.extra_rdoc_files = ["README.rdoc"]
+  
+  s.files             = %w( README.rdoc VERSION.yml History.txt )
+  s.files            += Dir.glob("lib/**/*")
+  s.files            += Dir.glob("tasks/**/*")  
+  s.files            += ["bin/annotate"]  # todo: change to annotate_models
+
+  s.homepage = %q{http://github.com/ctran/annotate_models}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{annotate}
+
+  s.add_runtime_dependency 'rake'  # ?
+end

spec/spec_helper.rb

 begin
-  require 'spec'
+  require 'rspec'
 rescue LoadError
   require 'rubygems'
   gem 'rspec'
-  require 'spec'
+  require 'rspec'
 end
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')