lib/sugarcube.rb in sugarcube-0.2.3 vs lib/sugarcube.rb in sugarcube-0.2.5

@@ -1,10 +1,23 @@
 unless defined?(Motion::Project::Config)
-  raise "sugarcube must be required within a RubyMotion project Rakefile."
+  raise "The sugarcube gem must be required within a RubyMotion project Rakefile."
 end
 
 
 Motion::Project::App.setup do |app|
+  # scans app.files until it finds app/ (the default)
+  # if found, it inserts just before those files, otherwise it will insert to
+  # the end of the list
+  insert_point = 0
+  app.files.each_index do |index|
+    file = app.files[index]
+    if file =~ /^(?:\.\/)?app\//
+      # found app/, so stop looking
+      break
+    end
+    insert_point = index + 1
+  end
+
   Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube/**/*.rb')).reverse.each do |file|
-    app.files.unshift(file)
+    app.files.insert(insert_point, file)
   end
 end