sugarcube 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7de9b79d6c9521444c6a024c5140fe3fef3621c
-  data.tar.gz: 660e514ebe21e8611fcbb23195a82519c3d7cb04
+  metadata.gz: c75ac16d41d7e5691ef2a40da7a61177cf75a455
+  data.tar.gz: fed09b3470adcfb9181b15aa1489b0dc7341d697
 SHA512:
-  metadata.gz: 776e148cf8f779d7b61decd4e5ec33d743683dae12661327e0ae7fd64717cdea49c51a44062012351a23c1a781f69a48287b585ed036b79f075a9aa5c7eb2e62
-  data.tar.gz: 9c50db5d6a32087d1977ceb3250569dbf511bcf74baf2f44f149ec3469a26cdb693250e861f584a323c027a72719692f7eab0aa59785a8b4ca0b4e4cb1c00c47
+  metadata.gz: 0da49deca893aa7900505eadfb67bde0d39da3a8906a310020c57171a8d651957871ec7ec778e9a227a295158d93338633cef0484f494326591eec7ae86bd0a0
+  data.tar.gz: 0b676f6966874fa4d6e7e0ad48a38b8eb026a317813baa6d7890537322d892d99cb2bd69acf8c8fcdddea2882deca780cea58f1b1bf650154d01418a262d8552

data/lib/sugarcube-all.rb

@@ -9,11 +9,11 @@ exclude = [
   'sugarcube-uiimage.rb',
 ]
 
-if App.template == :ios
+if SugarCube.ios?
   exclude += [
     'sugarcube-appkit.rb',
   ]
-elsif App.template == :osx
+elsif SugarCube.osx?
   exclude += [
     'sugarcube-568.rb',
     'sugarcube-gestures.rb',

data/lib/sugarcube-animations.rb

@@ -11,7 +11,7 @@ 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__), App.template.to_s, 'sugarcube-animations/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), SugarCube.platform, '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|

data/lib/sugarcube-classic.rb

@@ -17,11 +17,11 @@ exclude = [
   'sugarcube-unholy.rb',
 ]
 
-if App.template == :ios
+if SugarCube.ios?
   exclude += [
     'sugarcube-appkit.rb',
   ]
-elsif App.template == :osx
+elsif SugarCube.osx?
   exclude += [
     'sugarcube-modal.rb',
     'sugarcube-uikit.rb',

data/lib/sugarcube-color.rb

@@ -11,7 +11,7 @@ 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__), App.template.to_s, 'sugarcube-color/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), SugarCube.platform, 'sugarcube-color/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-common.rb

@@ -12,11 +12,11 @@ exclude = [
   'sugarcube-unholy.rb',
 ]
 
-if App.template == :ios
+if SugarCube.ios?
   exclude += [
     'sugarcube-appkit.rb',
   ]
-elsif App.template == :osx
+elsif SugarCube.osx?
   exclude += [
     'sugarcube-568.rb',
     'sugarcube-gestures.rb',

data/lib/sugarcube-constants.rb

@@ -11,7 +11,7 @@ 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__), App.template.to_s, 'sugarcube-constants/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), SugarCube.platform, 'sugarcube-constants/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-coregraphics.rb

@@ -11,7 +11,7 @@ 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__), App.template.to_s, 'sugarcube-coregraphics/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), SugarCube.platform, 'sugarcube-coregraphics/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-events.rb

@@ -11,7 +11,7 @@ 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__), App.template.to_s, 'sugarcube-events/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), SugarCube.platform, 'sugarcube-events/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-factories.rb

@@ -11,7 +11,7 @@ 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__), App.template.to_s, 'sugarcube-factories/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), SugarCube.platform, 'sugarcube-factories/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-image.rb

@@ -11,7 +11,7 @@ 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__), App.template.to_s, 'sugarcube-image/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), SugarCube.platform, 'sugarcube-image/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-legacy.rb

@@ -11,7 +11,7 @@ Motion::Project::App.setup do |app|
   # the end of the list
   insert_point = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
 
-  if App.template == :ios
+  if SugarCube.ios?
     Dir.glob(File.join(File.dirname(__FILE__), 'ios/sugarcube/**/*.rb')).reverse.each do |file|
       app.files.insert(insert_point, file)
     end

data/lib/sugarcube-nsdata.rb

@@ -11,7 +11,7 @@ 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__), App.template.to_s, 'sugarcube-nsdata/**/*.rb')).reverse.each do |file|
+  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|

data/lib/sugarcube-numbers.rb

@@ -11,7 +11,7 @@ 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__), App.template.to_s, 'sugarcube-numbers/**/*.rb')).reverse.each do |file|
+  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|

data/lib/sugarcube-pipes.rb

@@ -11,7 +11,7 @@ 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__), App.template.to_s, 'sugarcube-pipes/**/*.rb')).reverse.each do |file|
+  Dir.glob(File.join(File.dirname(__FILE__), SugarCube.platform, 'sugarcube-pipes/**/*.rb')).reverse.each do |file|
     app.files.insert(insert_point, file)
   end
 end

data/lib/sugarcube-repl.rb

@@ -11,7 +11,7 @@ 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__), App.template.to_s, 'sugarcube-repl/**/*.rb')).reverse.each do |file|
+  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|

data/lib/sugarcube-spritekit.rb

@@ -11,7 +11,7 @@ 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__), App.template.to_s, '/sugarcube-spritekit/**/*.rb')).reverse.each do |file|
+  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|

data/lib/sugarcube-to_s.rb

@@ -11,7 +11,7 @@ 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__), App.template.to_s, 'sugarcube-to_s/**/*.rb')).reverse.each do |file|
+  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|

data/lib/sugarcube.rb

@@ -1,19 +1,76 @@
-require File.join(File.dirname(__FILE__), 'sugarcube-core.rb')
+unless defined?(Motion::Project::Config)
+  raise 'The sugarcube gem must be required within a RubyMotion project Rakefile.'
+end
 
 
 module SugarCube
   module_function
 
   def ios_only!(package)
-    unless App.template.to_s =~ /ios/
+    unless ios?
       raise "The '\033[0;1msugarcube-#{package}\033[0m' package is only available on iOS."
     end
   end
 
   def osx_only!(package)
-    unless App.template.to_s == /osx/
+    unless osx?
       raise "The '\033[0;1msugarcube-#{package}\033[0m' package is only available on OS X."
     end
   end
 
+  def cocoa_only!(package)
+    unless cocoa?
+      raise "The '\033[0;1msugarcube-#{package}\033[0m' package is only available on OS X or iOS."
+    end
+  end
+
+  def ios?
+    App.template.to_s =~ /ios/
+  end
+
+  def osx?
+    App.template.to_s =~ /osx/
+  end
+
+  def android?
+    App.template.to_s =~ /android/
+  end
+
+  def cocoa?
+    ios? || osx?
+  end
+
+  def platform
+    if ios?
+      'ios'
+    elsif osx?
+      'osx'
+    elsif android?
+      'android'
+    else
+      App.template.to_s
+    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
+
+  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
+end
+
+require File.join(File.dirname(__FILE__), 'sugarcube-coregraphics.rb')
+require File.join(File.dirname(__FILE__), 'sugarcube-to_s.rb')

data/lib/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '2.1.0'
+  Version = '2.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -172,7 +172,6 @@ files:
 - lib/sugarcube-color.rb
 - lib/sugarcube-common.rb
 - lib/sugarcube-constants.rb
-- lib/sugarcube-core.rb
 - lib/sugarcube-coregraphics.rb
 - lib/sugarcube-corelocation.rb
 - lib/sugarcube-events.rb

data/lib/sugarcube-core.rb

@@ -1,25 +0,0 @@
-unless defined?(Motion::Project::Config)
-  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 = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
-
-  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')