sugarcube 1.7.0 → 2.0.0

data/lib/sugarcube-animations.rb

@@ -3,13 +3,18 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-animations/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), App.template.to_s, 'sugarcube-animations/**/*.rb')).reverse.each do |file|
+    app.files.insert(insert_point, file)
+  end
+  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-animations/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-anonymous.rb

@@ -3,13 +3,15 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-anonymous/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-anonymous/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/{sugarcube-uifont.rb → sugarcube-appkit.rb}

@@ -3,13 +3,19 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+SugarCube.osx_only!('appkit')
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-uifont/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), 'osx/sugarcube-appkit/**/*.rb')).reverse.each do |file|
+    app.files.insert(insert_point, file)
+  end
+  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-cocoakit/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-attributedstring.rb

@@ -3,13 +3,15 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-attributedstring/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-attributedstring/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-awesome.rb

@@ -3,13 +3,15 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-awesome/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-awesome/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-classic.rb

@@ -1,11 +1,11 @@
-ignore = [
+exclude = [
   'sugarcube-all.rb',
   'sugarcube-common.rb',
   'sugarcube-classic.rb',
-  'sugarcube-osx.rb',
   'sugarcube-legacy.rb',
   'sugarcube-uicolor.rb',
   'sugarcube-uiimage.rb',
+  'sugarcube-spritekit.rb',
 
   'sugarcube-568.rb',
   'sugarcube-anonymous.rb',
@@ -17,11 +17,21 @@ ignore = [
   'sugarcube-unholy.rb',
 ]
 
+if App.template == :ios
+  exclude += [
+    'sugarcube-appkit.rb',
+  ]
+elsif App.template == :osx
+  exclude += [
+    'sugarcube-modal.rb',
+    'sugarcube-uikit.rb',
+  ]
+end
+
 dirname = File.dirname(__FILE__)
 Dir.glob(File.join(dirname, '*.rb')).each do |file|
-  file = File.basename(file)
-  unless ignore.include? file
-    file = File.join(dirname, file)
+  filename = File.basename(file)
+  unless exclude.include? filename
     require file
   end
 end

data/lib/sugarcube-color.rb

@@ -3,13 +3,15 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-color/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), App.template.to_s, 'sugarcube-color/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-common.rb

@@ -1,8 +1,7 @@
-ignore = [
+exclude = [
   'sugarcube-all.rb',
   'sugarcube-common.rb',
   'sugarcube-classic.rb',
-  'sugarcube-osx.rb',
   'sugarcube-legacy.rb',
   'sugarcube-uicolor.rb',
   'sugarcube-uiimage.rb',
@@ -13,11 +12,23 @@ ignore = [
   'sugarcube-unholy.rb',
 ]
 
+if App.template == :ios
+  exclude += [
+    'sugarcube-appkit.rb',
+  ]
+elsif App.template == :osx
+  exclude += [
+    'sugarcube-568.rb',
+    'sugarcube-gestures.rb',
+    'sugarcube-modal.rb',
+    'sugarcube-uikit.rb',
+  ]
+end
+
 dirname = File.dirname(__FILE__)
 Dir.glob(File.join(dirname, '*.rb')).each do |file|
-  file = File.basename(file)
-  unless ignore.include? file
-    file = File.join(dirname, file)
+  filename = File.basename(file)
+  unless exclude.include? filename
     require file
   end
 end

data/lib/sugarcube-constants.rb

@@ -3,13 +3,15 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-constants/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), App.template.to_s, 'sugarcube-constants/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-core.rb

@@ -1,5 +1,5 @@
 unless defined?(Motion::Project::Config)
-  raise "The sugarcube gem must be required within a RubyMotion project Rakefile."
+  raise 'The sugarcube gem must be required within a RubyMotion project Rakefile.'
 end
 
 
@@ -9,10 +9,17 @@ Motion::Project::App.setup do |app|
   # the end of the list
   insert_point = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube/**/*.rb')).reverse.each do |file|
+  app.files.insert(insert_point, File.join(File.dirname(__FILE__), 'version.rb'))
+  Dir.glob(File.join(File.dirname(__FILE__), App.template.to_s, 'sugarcube/**/*.rb')).reverse.each do |file|
+    app.files.insert(insert_point, file)
+  end
+  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube/**/*.rb')).reverse.each do |file|
+    app.files.insert(insert_point, file)
+  end
+  Dir.glob(File.join(File.dirname(__FILE__), 'all/sugarcube/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end
 
-require File.join(File.dirname(__FILE__), "sugarcube-coregraphics.rb")
-require File.join(File.dirname(__FILE__), "sugarcube-to_s.rb")
+require File.join(File.dirname(__FILE__), 'sugarcube-coregraphics.rb')
+require File.join(File.dirname(__FILE__), 'sugarcube-to_s.rb')

data/lib/sugarcube-coregraphics.rb

@@ -3,13 +3,15 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-coregraphics/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), App.template.to_s, 'sugarcube-coregraphics/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-corelocation.rb

@@ -3,13 +3,15 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-corelocation/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-corelocation/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 

data/lib/sugarcube-events.rb

@@ -3,13 +3,15 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-events/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), App.template.to_s, 'sugarcube-events/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-factories.rb

@@ -3,13 +3,15 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-factories/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), App.template.to_s, 'sugarcube-factories/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-files.rb

@@ -3,13 +3,15 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-files/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-files/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-foundation.rb

@@ -3,13 +3,15 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-foundation/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-foundation/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-gestures.rb

@@ -3,13 +3,16 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+SugarCube.ios_only!('gestures')
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-gestures/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), 'ios/sugarcube-gestures/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-image.rb

@@ -3,13 +3,15 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-image/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), App.template.to_s, 'sugarcube-image/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-indexpath.rb

@@ -3,13 +3,15 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-indexpath/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-indexpath/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-legacy.rb

@@ -3,13 +3,24 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-legacy/**/*.rb')).reverse.each do |file|
+  if App.template == :ios
+    Dir.glob(File.join(File.dirname(__FILE__), 'ios/sugarcube/**/*.rb')).reverse.each do |file|
+      app.files.insert(insert_point, file)
+    end
+  end
+
+  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-legacy/**/*.rb')).reverse.each do |file|
+    app.files.insert(insert_point, file)
+  end
+  Dir.glob(File.join(File.dirname(__FILE__), 'all/sugarcube-legacy/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-localized.rb

@@ -3,13 +3,15 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-localized/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-localized/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-modal.rb

@@ -3,13 +3,16 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+SugarCube.ios_only!('modal')
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-modal/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), 'ios/sugarcube-modal/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-notifications.rb

@@ -3,13 +3,15 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-notifications/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-notifications/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-nscoder.rb

@@ -3,13 +3,15 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-nscoder/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-nscoder/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-nsdata.rb

@@ -3,13 +3,18 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-nsdata/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), App.template.to_s, 'sugarcube-nsdata/**/*.rb')).reverse.each do |file|
+    app.files.insert(insert_point, file)
+  end
+  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-nsdata/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-nsdate.rb

@@ -3,16 +3,20 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-nsdate/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-nsdate/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 
-  time = File.join(File.dirname(__FILE__), 'sugarcube-numbers/time.rb')
-  app.files.insert(insert_point, time)
+  time_rb = File.join(File.dirname(__FILE__), 'all/sugarcube-numbers/time.rb')
+  unless app.files.include?(time_rb)
+    app.files.insert(insert_point, time_rb)
+  end
 end

data/lib/sugarcube-nsuserdefaults.rb

@@ -3,13 +3,15 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-nsuserdefaults/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-nsuserdefaults/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-numbers.rb

@@ -3,13 +3,21 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-numbers/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), App.template.to_s, 'sugarcube-numbers/**/*.rb')).reverse.each do |file|
+    app.files.insert(insert_point, file)
+  end
+  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-numbers/**/*.rb')).reverse.each do |file|
+    app.files.insert(insert_point, file)
+  end
+  Dir.glob(File.join(File.dirname(__FILE__), 'all/sugarcube-numbers/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-pipes.rb

@@ -3,13 +3,15 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-pipes/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), App.template.to_s, 'sugarcube-pipes/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-pointer.rb

@@ -3,13 +3,15 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-pointer/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-pointer/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-repl.rb

@@ -3,13 +3,21 @@ unless defined?(Motion::Project::Config)
 end
 
 
+require 'sugarcube'
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  Dir.glob(File.join(File.dirname(__FILE__), 'sugarcube-repl/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), App.template.to_s, 'sugarcube-repl/**/*.rb')).reverse.each do |file|
+    app.files.insert(insert_point, file)
+  end
+  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-repl/**/*.rb')).reverse.each do |file|
+    app.files.insert(insert_point, file)
+  end
+  Dir.glob(File.join(File.dirname(__FILE__), 'all/sugarcube-repl/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end