Renaming bin to avoid conflict with ImageMagick.

History.txt

@@ -21,6 +21,8 @@
 * Fix handling of files with no trailing newline when putting annotations at
   the end of the file.
 * Accept String or Symbol for :position (et al) options.
+* Rename "annotate" bin to "annotate_models" to avoid conflicting with
+  ImageMagick.
 
 == 2.1 2009-10-18
 

README.rdoc

@@ -61,19 +61,19 @@ Into environment gems from Github checkout:
 To annotate all your models, tests, fixtures, etc.:
 
   cd /path/to/app
-  annotate
+  annotate_models
 
 To annotate your models and tests:
 
-  annotate --exclude fixtures
+  annotate_models --exclude fixtures
 
 To annotate just your models:
 
-  annotate --exclude tests,fixtures
+  annotate_models --exclude tests,fixtures
 
 To annotate routes.rb:
 
-  annotate -r
+  annotate_models -r
 
 To automatically annotate after running 'rake db:migrate', ensure you've added
 annotate_models to your Rails project's Gemfile, and run this:
@@ -86,7 +86,7 @@ you can use to tailor the output.
 
 == OPTIONS
 
-    Usage: annotate [options] [model_file]*
+    Usage: annotate_models [options] [model_file]*
         -d, --delete                     Remove annotations from all model files
         -p, --position [before|after]    Place the annotations at the top (before) or the bottom (after) of the model file
         -r, --routes                     Annotate routes.rb with the output of 'rake routes'

annotate.gemspec

@@ -12,7 +12,6 @@ Gem::Specification.new do |s|
   s.date = "2012-03-01"
   s.description = "When run, inserts table descriptions from db.schema into a comment block of relevant source code."
   s.email = ["alex@stinky.com", "ctran@pragmaquest.com", "x@nofxx.com", "turadg@aleahmad.net"]
-  s.executables = ["annotate"]
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
@@ -25,7 +24,6 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION.yml",
     "annotate.gemspec",
-    "bin/annotate",
     "lib/annotate.rb",
     "lib/annotate/active_record_patch.rb",
     "lib/annotate/annotate_models.rb",

bin/annotate → bin/annotate_models

@@ -8,7 +8,7 @@ require 'rake'
 task = :annotate_models
 
 OptionParser.new do |opts|
-  opts.banner = "Usage: annotate [options] [model_file]*"
+  opts.banner = "Usage: annotate_models [options] [model_file]*"
 
   opts.on('-d', '--delete', 
   "Remove annotations from all model files") do