lib/dynamoid/tasks/database.rake in dynamoid-1.3.2 vs lib/dynamoid/tasks/database.rake in dynamoid-1.3.3

@@ -1,17 +1,19 @@
 require 'dynamoid'
 require 'dynamoid/tasks/database'
 
-MODELS ||= File.join(Rails.root, "app/models")
-
 namespace :dynamoid do
   desc "Creates DynamoDB tables, one for each of your Dynamoid models - does not modify pre-existing tables"
   task :create_tables => :environment do
     # Load models so Dynamoid will be able to discover tables expected.
-    Dir[ File.join(MODELS, "*.rb") ].sort.each { |file| require file }
-    tables = Dynamoid::Tasks::Database.create_tables
-    result = tables[:created].map{ |c| "#{c} created" } + tables[:existing].map{ |e| "#{e} already exists" }
-    result.sort.each{ |r| puts r }
+    Dir[ File.join(Dynamoid::Config.models_dir, "*.rb") ].sort.each { |file| require file }
+    if Dynamoid.included_models.any?
+      tables = Dynamoid::Tasks::Database.create_tables
+      result = tables[:created].map{ |c| "#{c} created" } + tables[:existing].map{ |e| "#{e} already exists" }
+      result.sort.each{ |r| puts r }
+    else
+      puts "Dynamoid models are not loaded, or you have no Dynamoid models."
+    end
   end
 
   desc 'Tests if the DynamoDB instance can be contacted using your configuration'
   task :ping => :environment do
     success = false