sugarcube 2.12.3 → 3.0.0

data/lib/sugarcube-gestures.rb

@@ -6,13 +6,6 @@ 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__), 'ios/sugarcube-gestures/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-gestures')
 end

data/lib/sugarcube-image.rb

@@ -5,13 +5,6 @@ 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.platform, 'sugarcube-image/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-image')
 end

data/lib/sugarcube-indexpath.rb

@@ -5,13 +5,6 @@ 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__), 'cocoa/sugarcube-indexpath/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-indexpath')
 end

data/lib/sugarcube-legacy.rb

@@ -5,22 +5,6 @@ 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
-
-  if SugarCube.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
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-legacy')
 end

data/lib/sugarcube-localized.rb

@@ -5,13 +5,6 @@ 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__), 'cocoa/sugarcube-localized/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-localized')
 end

data/lib/sugarcube-modal.rb

@@ -6,13 +6,6 @@ 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__), 'ios/sugarcube-modal/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-modal')
 end

data/lib/sugarcube-notifications.rb

@@ -5,13 +5,6 @@ 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__), 'cocoa/sugarcube-notifications/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-notifications')
 end

data/lib/sugarcube-nscoder.rb

@@ -4,14 +4,8 @@ end
 
 
 require 'sugarcube'
+SugarCube.cocoa_only!('nscoder')
 
-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__), 'cocoa/sugarcube-nscoder/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-nscoder')
 end

data/lib/sugarcube-nsdata.rb

@@ -4,17 +4,8 @@ end
 
 
 require 'sugarcube'
+SugarCube.cocoa_only!('nsdata')
 
-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.platform, '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
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-nsdata')
 end

data/lib/sugarcube-nsdate.rb

@@ -4,19 +4,8 @@ end
 
 
 require 'sugarcube'
+SugarCube.cocoa_only!('nsdate')
 
-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__), 'cocoa/sugarcube-nsdate/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
-
-  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
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-nsdate')
 end

data/lib/sugarcube-nsuserdefaults.rb

@@ -4,14 +4,8 @@ end
 
 
 require 'sugarcube'
+SugarCube.cocoa_only!('nsuserdefaults')
 
-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__), 'cocoa/sugarcube-nsuserdefaults/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-nsuserdefaults')
 end

data/lib/sugarcube-numbers.rb

@@ -5,19 +5,6 @@ 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.platform, '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
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-numbers')
 end

data/lib/sugarcube-pipes.rb

@@ -5,13 +5,6 @@ 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.platform, 'sugarcube-pipes/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-pipes')
 end

data/lib/sugarcube-pointer.rb

@@ -5,13 +5,6 @@ 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__), 'cocoa/sugarcube-pointer/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-pointer')
 end

data/lib/sugarcube-repl.rb

@@ -5,22 +5,8 @@ end
 
 require 'sugarcube'
 
-Motion::Project::App.setup do |app|
-  # This package is only available in development
+Motion::Project::App.pre_setup do |app|
   app.development do
-    # 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.platform, '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
+    SugarCube.add_app_files(app, 'sugarcube-repl')
   end
 end

data/lib/sugarcube-spritekit.rb

@@ -4,19 +4,13 @@ end
 
 
 require 'sugarcube'
+SugarCube.cocoa_only!('spritekit')
 
-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
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-spritekit')
+end
 
-  Dir.glob(File.join(File.dirname(__FILE__), SugarCube.platform, '/sugarcube-spritekit/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
-  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-spritekit/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
 
-  app.frameworks += ['SpriteKit']
+Motion::Project::App.post_setup do |app|
+  app.frameworks += %w{SpriteKit}
 end

data/lib/sugarcube-timer.rb

@@ -5,18 +5,6 @@ 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__), 'cocoa/sugarcube-timer/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
-
-  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
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-timer')
 end

data/lib/sugarcube-to_s.rb

@@ -5,19 +5,6 @@ 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.platform, 'sugarcube-to_s/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
-  Dir.glob(File.join(File.dirname(__FILE__), 'cocoa/sugarcube-to_s/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
-  Dir.glob(File.join(File.dirname(__FILE__), 'all/sugarcube-to_s/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-to_s')
 end

data/lib/sugarcube-uikit.rb

@@ -6,16 +6,7 @@ end
 require 'sugarcube'
 SugarCube.ios_only!('uikit')
 
-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__), 'ios/sugarcube-uikit/**/*.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
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-cocoakit')
+  SugarCube.add_app_files(app, 'sugarcube-uikit')
 end

data/lib/sugarcube-unholy.rb

@@ -5,13 +5,6 @@ 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__), 'all/sugarcube-unholy/**/*.rb')).reverse.each do |file|
-    app.files.insert(insert_point, file)
-  end
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-unholy')
 end

data/lib/sugarcube.rb

@@ -24,16 +24,22 @@ module SugarCube
     end
   end
 
+  def android_only!(package)
+    unless android?
+      raise "The '\033[0;1msugarcube-#{package}\033[0m' package is only available on Android."
+    end
+  end
+
   def ios?
-    App.template.to_s =~ /ios/
+    App.template.to_s =~ /\bios\b/
   end
 
   def osx?
-    App.template.to_s =~ /osx/
+    App.template.to_s =~ /\bosx\b/
   end
 
   def android?
-    App.template.to_s =~ /android/
+    App.template.to_s =~ /\bandroid\b/
   end
 
   def cocoa?
@@ -52,25 +58,33 @@ module SugarCube
     end
   end
 
+  def add_app_files(app, package_name)
+    # 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
+    platforms = ['all']
+    if SugarCube.cocoa?
+      platforms << 'cocoa'
+    end
+    platforms << SugarCube.platform  # ios, osx, or android specific files
+
+    platforms.each do |platform|
+      Dir.glob(File.join(File.dirname(__FILE__), platform, package_name, '**/*.rb')).each do |file|
+        app.files << file
+      end
+    end
+  end
+
 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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
+if ! App.respond_to?(:pre_setup)
+  require 'sugarcube_pre_setup'
+end
 
-  app.files.insert(insert_point, File.join(File.dirname(__FILE__), 'version.rb'))
-  Dir.glob(File.join(File.dirname(__FILE__), SugarCube.platform, '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
+Motion::Project::App.pre_setup do |app|
+  app.files << File.join(File.dirname(__FILE__), 'version.rb')
+
+  SugarCube.add_app_files(app, 'sugarcube')
 end
 
-require File.join(File.dirname(__FILE__), 'sugarcube-coregraphics.rb')
 require File.join(File.dirname(__FILE__), 'sugarcube-to_s.rb')