Merge branch 'ctran'

* ctran: (23 commits)
  Inserting newline requires double-quoted string
  Annotation position defaulted to 'before'. Bugfix: annotate_models.rake uses string instead of symbol.
  include ActiveSupport to finish build #45
  include lib specs
  specify :rubygems source in Gemfile for Travis
  Gemfile for dependencies for Travis CI rake
  make the specs pass (one pending)
  fix column pattern
  Allow task loading from Rakefile for gems (plugin installation already auto-detects). Add skip_on_db_migrate option as well for people that don't want it.
  Fix options parsing to convert strings to proper booleans. Change annotate to use options hash instead of ENV.
  Update README.rdoc to mention Fabrication support
  Add support for Fabrication fabricators
  We had stripped the trailing newlines from our Schema Information section. This small fix supports that case.
  rake task is 'build', not 'gem'
  match indexes and column options too when comparing annotation headers
  Leave magic encoding comment intact
  Fixes issue #14 - RuntimeError: Already memoized
  Count a model as 'annotated' if any of its tests/fixtures are annotated
  Implement FactoryGirl (#47)
  fix gemspec and get rspecs partly working again
  ...

Conflicts:
	Gemfile
	Rakefile
	VERSION.yml
	annotate.gemspec
	lib/tasks/annotate_models.rake
	spec/annotate/annotate_models_spec.rb
	spec/spec_helper.rb

Author: alexch

Gemfile.lock

@@ -0,0 +1,64 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    ParseTree (3.0.8)
+      RubyInline (>= 3.7.0)
+      sexp_processor (>= 3.0.0)
+    RubyInline (3.11.2)
+      ZenTest (~> 4.3)
+    ZenTest (4.7.0)
+    activesupport (3.2.2)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    diff-lcs (1.1.3)
+    file-tail (1.0.8)
+      tins (~> 0.3)
+    i18n (0.6.0)
+    json (1.6.5)
+    mg (0.0.8)
+      rake
+    multi_json (1.1.0)
+    predicated (0.2.6)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    ruby2ruby (1.3.1)
+      ruby_parser (~> 2.0)
+      sexp_processor (~> 3.0)
+    ruby_parser (2.0.6)
+      sexp_processor (~> 3.0)
+    sexp_processor (3.1.0)
+    sourcify (0.5.0)
+      file-tail (>= 1.0.5)
+      ruby2ruby (>= 1.2.5)
+      ruby_parser (>= 2.0.5)
+      sexp_processor (>= 3.0.5)
+    tins (0.3.12)
+    wrong (0.6.1)
+      ParseTree (~> 3.0)
+      diff-lcs (~> 1.1.2)
+      file-tail (~> 1.0)
+      predicated (>= 0.2.3)
+      ruby2ruby (~> 1.2)
+      ruby_parser (~> 2.0.4)
+      sexp_processor (~> 3.0)
+      sourcify (>= 0.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (>= 2.1.0)
+  mg
+  rake
+  rdoc
+  rspec
+  wrong

README.rdoc

@@ -7,6 +7,7 @@ Add a comment summarizing the current schema to the top or bottom of each of you
   * Tests and Specs
   * Object Daddy exemplars
   * Machinist blueprints
+  * Fabrication fabricators
 
 The schema comment looks like this:
 
@@ -38,19 +39,25 @@ Also, if you pass the -r option, it'll annotate routes.rb with the output of "ra
 
 == INSTALL
 
-From rubyforge:
+Into Gemfile from Github:
 
-  sudo gem install annotate
+    gem 'annotate', :git => 'git://github.com/ctran/annotate_models.git'    
 
-From github:
+Into environment gems From rubygems.org:
+
+    gem install annotate
+
+Into environment gems from Github checkout:
 
   git clone git://github.com/ctran/annotate_models.git annotate
   cd annotate
-  rake gem
-  sudo gem install pkg/annotate-*.gem
+  rake build
+  gem install pkg/annotate-*.gem
 
 == USAGE
 
+(If you used the Gemfile install, prefix the below commands with `bundle exec`.)
+
 To annotate all your models, tests, fixtures, etc.:
 
   cd /path/to/app
@@ -70,12 +77,26 @@ To annotate routes.rb:
 
 To automatically annotate after running 'rake db:migrate':
 
-  [needs more clarity] unpack the gem into vendor/plugins, or maybe vendor/gems, or maybe just require tasks/migrate.rake.
+  [*needs more clarity*] unpack the gem into vendor/plugins, or maybe vendor/gems, or maybe just require tasks/migrate.rake.
 
 If you install annotate_models as a plugin, it will automatically
 adjust your <tt>rake db:migrate</tt> tasks so that they update the
 annotations in your model files for you once the migration is
-completed.
+completed. To get the same behavior from a gem, add the following to
+your Rakefile:
+
+  require 'annotate/tasks'
+
+To customize the behavior of annotate when it is running as a Rake
+task, use the following (in your Rakefile or wherever):
+
+  ENV['position_in_class']   = "before"
+  ENV['position_in_fixture'] = "before"
+  ENV['show_indexes']        = "false"
+  ENV['include_version']     = "false"
+  ENV['exclude_tests']       = "false"
+  ENV['exclude_fixtures']    = "false"
+  ENV['skip_on_db_migrate']  = "false"
 
 Warning: ImageMagick installs a tool called `annotate` too (if you're using MacPorts it's in `/opt/local/bin/annotate`. So if you see Usage: annotate imagein.jpg imageout.jpg then put `/usr/bin` ahead on the path and you'll get ours instead. 
 
@@ -108,6 +129,8 @@ to an automatically created comment block.
 
 * Factory Girl => http://github.com/thoughtbot/factory_girl (NOT IMPLEMENTED)
 * Object Daddy => http://github.com/flogic/object_daddy
+* Machinist => http://github.com/notahat/machinist
+* Fabrication => http://github.com/paulelliott/fabrication
 * SpatialAdapter => http://github.com/pdeffendol/spatial_adapter
 * PostgisAdapter => http://github.com/nofxx/postgis_adapter
 
@@ -142,5 +165,6 @@ Modifications by:
  - Bob Potter - http://github.com/bpot
  - Gavin Montague - http://github.com/govan/
  - Alexander Semyonov - http://github.com/rotuka/
+ - Ian Duggan http://github.com/ijcd/
 
 and many others that I may have missed to add.

Rakefile

@@ -34,10 +34,23 @@ end
 
 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*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+require "rspec/core/rake_task" # RSpec 2.0
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = ['spec/*_spec.rb', 'spec/**/*_spec.rb']
 end
+
+# FIXME not working yet
+RSpec::Core::RakeTask.new(:rcov) do |t|
+  t.pattern = 'spec/**/*_spec.rb'
+  t.rcov = true
+end
+
+# FIXME warns "already initialized constant Task"
+# FIXME throws "uninitialized constant RDoc::VISIBILITIES"
+# require 'rdoc/task'
+# RDoc::Task.new do |rdoc|
+#   rdoc.main = "README.rdoc"
+#   rdoc.rdoc_files.include("README.rdoc", "lib/**/*.rb")
+#   # require 'lib/annotate'
+#   # rdoc.title = "annotate #{Annotate.version}"
+# end

VERSION.yml

@@ -2,3 +2,5 @@
   :major: 2
   :minor: 5
   :patch: 0
+  :build: 'beta1'
+

annotate.gemspec

@@ -2,13 +2,13 @@ require './lib/annotate'
 
 Gem::Specification.new do |s|
   s.name = %q{annotate}
-  s.version = Annotate.version # "2.5.0"
+  s.version = Annotate.version
   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 = ["[email protected]", "[email protected]", "[email protected]"]
+  s.authors = ["Cuong Tran", "Alex Chaffee", "Marcos Piccinini", "Turadg Aleahmad"]
+  s.email = ["[email protected]", "[email protected]", "[email protected]", "[email protected]"]
 
-  s.executables = ["annotate"] # todo: annotate_models
+  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.extra_rdoc_files = ["README.rdoc"]
 
   s.files             = %w( README.rdoc VERSION.yml History.txt )
@@ -23,3 +23,4 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'rake'  # ?
 end
+

annotate_models.gemspec

@@ -2,13 +2,13 @@ require './lib/annotate'
 
 Gem::Specification.new do |s|
   s.name = %q{annotate_models}
-  s.version = Annotate.version # "2.5.0"
+  s.version = Annotate.version
   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 = ["[email protected]", "[email protected]", "[email protected]"]
+  s.authors = ["Cuong Tran", "Alex Chaffee", "Marcos Piccinini", "Turadg Aleahmad"]
+  s.email = ["[email protected]", "[email protected]", "[email protected]", "[email protected]"]
 
-  s.executables = ["annotate"]# todo: change to annotate_models
+  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.extra_rdoc_files = ["README.rdoc"]
 
   s.files             = %w( README.rdoc VERSION.yml History.txt )