use motion-require

Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
+gem 'motion-require'
 # Specify your gem's dependencies in ProMotion.gemspec
 gemspec

Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    ProMotion (1.0.4)
+    ProMotion (1.1.0.rc1)
       methadone
+      motion-require (>= 0.0.6)
 
 GEM
   remote: https://rubygems.org/
@@ -11,7 +12,7 @@ GEM
     formotion (1.6)
       bubble-wrap (~> 1.4.0)
       motion-require (~> 0.0.3)
-    methadone (1.3.0)
+    methadone (1.3.1)
       bundler
     motion-redgreen (0.1.0)
     motion-require (0.0.7)
@@ -26,6 +27,7 @@ DEPENDENCIES
   ProMotion!
   formotion
   motion-redgreen
+  motion-require
   motion-stump
   rake
   webstub

ProMotion.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = ProMotion::VERSION
 
+  gem.add_dependency "motion-require", ">= 0.0.6"
   gem.add_development_dependency("webstub")
   gem.add_development_dependency("motion-stump")
   gem.add_development_dependency("motion-redgreen")

Rakefile

@@ -18,7 +18,7 @@ Motion::Project::App.setup do |app|
   app.deployment_target = "6.0"
   app.device_family = [:ipad] # so we can test split screen capability
 
-  app.detect_dependencies = true
+  app.detect_dependencies = false
 end
 
 def all_files

lib/ProMotion.rb

@@ -1,13 +1,3 @@
-unless defined?(Motion::Project::Config)
-  raise "This file must be required within a RubyMotion project Rakefile."
-end
+require 'motion-require'
 
-require "ProMotion/version"
-
-Motion::Project::App.setup do |app|
-  app.detect_dependencies = true
-  original_files = app.files
-  delegate = File.join(File.dirname(__FILE__), 'ProMotion/delegate/delegate.rb')
-  promotion_files = FileList[File.join(File.dirname(__FILE__), 'ProMotion/**/*.rb')].exclude(delegate).to_a
-  app.files = (promotion_files << delegate) + original_files
-end
+Motion::Require.all(Dir.glob(File.expand_path('../ProMotion/**/*.rb', __FILE__)))

lib/ProMotion/cocoatouch/table_view_cell.rb

@@ -1,3 +1,5 @@
+motion_require '../table/cell/table_view_cell_module'
+
 module ProMotion
   class TableViewCell < UITableViewCell
     include TableViewCellModule

lib/ProMotion/containers/tabs.rb

@@ -1,3 +1,5 @@
+motion_require '../extensions/conversions'
+
 module ProMotion
   module Tabs
     include Conversions

lib/ProMotion/delegate/delegate.rb

@@ -1,3 +1,6 @@
+motion_require 'delegate_module'
+motion_require 'delegate_parent'
+
 module ProMotion
   class Delegate < DelegateParent
     include ProMotion::DelegateModule

lib/ProMotion/delegate/delegate_module.rb

@@ -1,3 +1,7 @@
+motion_require '../containers/tabs'
+motion_require '../containers/split_screen'
+motion_require 'delegate_notifications'
+
 module ProMotion
   module DelegateModule
     include ProMotion::Tabs

lib/ProMotion/map/map_screen.rb

@@ -1,3 +1,7 @@
+motion_require '../cocoatouch/view_controller'
+motion_require '../screen/screen_module'
+motion_require 'map_screen_module'
+
 module ProMotion
   class MapScreen < ViewController
     include ProMotion::ScreenModule

lib/ProMotion/screen/screen.rb

@@ -1,3 +1,6 @@
+motion_require '../cocoatouch/view_controller'
+motion_require 'screen_module'
+
 module ProMotion
   class Screen < ViewController
     # You can inherit a screen from any UIViewController if you include the ScreenModule

lib/ProMotion/screen/screen_module.rb

@@ -1,3 +1,8 @@
+motion_require 'screen_navigation'
+motion_require '../view/styling'
+motion_require '../containers/tabs'
+motion_require '../containers/split_screen'
+
 module ProMotion
   module ScreenModule
     include ProMotion::ScreenNavigation

lib/ProMotion/table/cell/table_view_cell_module.rb

@@ -1,3 +1,5 @@
+motion_require '../../view/styling'
+
 module ProMotion
   module TableViewCellModule
     include Styling

lib/ProMotion/table/grouped_table_screen.rb

@@ -1,3 +1,8 @@
+motion_require '../cocoatouch/table_view_controller'
+motion_require '../screen/screen_module'
+motion_require 'table'
+motion_require 'grouped_table'
+
 module ProMotion
   class GroupedTableScreen < TableViewController
     include ProMotion::ScreenModule

lib/ProMotion/table/table.rb

@@ -1,3 +1,8 @@
+motion_require '../view/styling'
+motion_require 'extensions/searchable'
+motion_require 'extensions/refreshable'
+motion_require 'extensions/indexable'
+
 module ProMotion
   module Table
 

lib/ProMotion/table/table_screen.rb

@@ -1,3 +1,7 @@
+motion_require '../cocoatouch/table_view_controller'
+motion_require '../screen/screen_module'
+motion_require 'table'
+
 module ProMotion
   class TableScreen < TableViewController
     include ProMotion::ScreenModule

lib/ProMotion/thirdparty/formotion_screen.rb

@@ -1,3 +1,5 @@
+motion_require '../screen/screen_module'
+
 module ProMotion
   if defined?(Formotion) && defined?(Formotion::FormController)
     class FormotionScreen < Formotion::FormController

lib/ProMotion/view/styling.rb

@@ -1,3 +1,5 @@
+motion_require '../extensions/conversions'
+
 module ProMotion
   module Styling
     include Conversions

lib/ProMotion/web/web_screen.rb

@@ -1,3 +1,7 @@
+motion_require '../cocoatouch/view_controller'
+motion_require '../screen/screen_module'
+motion_require 'web_screen_module'
+
 module ProMotion
   class WebScreen < ViewController
     include ProMotion::ScreenModule