Add the ability to ignore subdirectories of the models dir

bin/annotate

@@ -48,6 +48,11 @@ OptionParser.new do |opts|
     ENV['model_dir'] = dir
   end
 
+  opts.on('--ignore-model-subdirectories',
+  "Ignore subdirectories of the models directory") do |dir|
+    ENV['ignore_model_sub_dir'] = "yes"
+  end
+
   opts.on('-R', '--require path',
   "Additional files to require before loading models") do |path|
     if ENV['require']

lib/annotate/annotate_models.rb

@@ -211,7 +211,11 @@ module AnnotateModels
       if models.empty?
         begin
           Dir.chdir(model_dir) do
-            models = Dir["**/*.rb"]
+            models = if ENV['ignore_model_sub_dir']
+              Dir["*.rb"]
+            else
+              Dir["**/*.rb"]
+            end
           end
         rescue SystemCallError
           puts "No models found in directory '#{model_dir}'."