sugarcube 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af8ff35d025712022d4072681b4e992bbdf35933
-  data.tar.gz: fa3313ebe914b87fc53dba1fefbbe7850b15f1c9
+  metadata.gz: 68747fa75c52e42414e7c2e28c5de5ca77373ed6
+  data.tar.gz: 02929645474fcb8e1e3422338f4d1dd7c528d6a9
 SHA512:
-  metadata.gz: 356bcc1d1b071d764f689f12a0b451e51923af1c45c58862c6a9bddff0fbec2b2c5ab9b4101dc9e2647ed35a3fcf714aab2faf45ac3b55626edca5ad498f2c2c
-  data.tar.gz: 3ebd09a8e365620ba204ed78ae0cc0f35c0af051b9f949cf095e407ff7b9bcec3cf72ba1dfd69eca62013b2ab369cf7382df367137f0e422e1f9f4b09f04746f
+  metadata.gz: 69d952eef9daa9121014004c70ffb77d4723709e8b8cfb85eb6f106fd81000b6fc3e3c243cb4e10270fc1604a07d089a0217c7fadc3214a4c23c2cbd8da932ab
+  data.tar.gz: 8580d434cf999780497468f68d7f206fa28aff31a8b50ea0c2b31dfbb058033fd5efd0757eaa5a64c6fa7cfec3934bf000dccaa4c637f085cb625a5132339a86

data/lib/all/sugarcube/log.rb

@@ -1,57 +1,52 @@
-module SugarCube
-  module_function
+def SugarCube.log(message=nil)
+  @log ||= []
 
-  def log(message=nil)
-    @log ||= []
-
-    if message.nil?
-      return @log
-    end
-
-    if suppress?
-      log << message
-    elsif log?
-      SugarCube.stderr(message)
-    end
+  if message.nil?
+    return @log
+  end
 
-    self
+  if suppress?
+    log << message
+  elsif log?
+    SugarCube.stderr(message)
   end
 
-  def flush_log(notification=nil)
-    return unless @log && ! @log.empty?
+  self
+end
 
-    output = "SugarCube recorded the following warnings:"
-    @log.uniq.each do |message|
-      output << "\n"
-      output << message
-    end
-    SugarCube.stderr(output)
-    @log = nil
-  end
+def SugarCube.flush_log(notification=nil)
+  return unless @log && ! @log.empty?
 
-  def log?(value=nil)
-    if value.nil?
-      if @logging.nil?
-        @logging = (RUBYMOTION_ENV == 'development')
-      end
-      @logging
-    else
-      @logging = value
-      unless @logging
-        @log = nil
-      end
+  output = "SugarCube recorded the following warnings:"
+  @log.uniq.each do |message|
+    output << "\n"
+    output << message
+  end
+  SugarCube.stderr(output)
+  @log = nil
+end
+
+def SugarCube.log?(value=nil)
+  if value.nil?
+    if @logging.nil?
+      @logging = (RUBYMOTION_ENV == 'development')
+    end
+    @logging
+  else
+    @logging = value
+    unless @logging
+      @log = nil
     end
   end
-
-  def suppress?(value=nil)
-    if value.nil?
-      @suppress
-    else
-      @suppress = value
-      unless @suppress
-        @log = nil
-      end
+end
+
+def SugarCube.suppress?(value=nil)
+  if value.nil?
+    @suppress
+  else
+    @suppress = value
+    unless @suppress
+      @log = nil
     end
   end
-
-end
+end

data/lib/all/sugarcube/look_in.rb

@@ -1,16 +1,11 @@
-module SugarCube
-  module_function
-
-  def look_in(where, here, here__deprecated={})
-    return here[where] if here.has_key? where
-    if here__deprecated[where]
-      translated = here__deprecated[where]
-      SugarCube.log("The symbol #{where.inspect} has been deprecated in favor of #{translated.inspect}")
-      return here[translated]
-    end
-    raise SugarCubeNotFoundException.new(where.inspect)
+def SugarCube.look_in(where, here, here__deprecated={})
+  return here[where] if here.has_key? where
+  if here__deprecated[where]
+    translated = here__deprecated[where]
+    SugarCube.log("The symbol #{where.inspect} has been deprecated in favor of #{translated.inspect}")
+    return here[translated]
   end
-
+  raise SugarCubeNotFoundException.new(where.inspect)
 end
 
 class SugarCubeNotFoundException < Exception

data/lib/all/sugarcube-repl/repl.rb

@@ -100,53 +100,56 @@ module SugarCube
       end
 
       def draw_tree(item, tab=nil, is_last=true, items_index=0)
+        line = ''
         space = ' '
         if items_index < 10
-          print '  '
+          line << '  '
         elsif items_index < 100
-          print ' '
+          line << ' '
         elsif items_index > 999  # good god, man!
           space = ''
         end
-        print items_index.to_s + ":" + space
+        line << items_index.to_s + ":" + space
 
         if tab
-          print tab
+          line << tab
           if @collapsed_items && @collapsed_items.include?(item)
-            print '<<< '
+            line << '<<< '
           else
             if is_last
-              print '`-- '
+              line << '`-- '
               tab += '    '
             else
-              print '+-- '
+              line << '+-- '
               tab += '|   '
             end
           end
         else
-          print '. '
+          line << '. '
           tab = ''
         end
 
         if self == item || @adjust_item == item
-          print "\033[1m"
+          line << "\033[1m"
         end
-        print draw_tree_item(item)
+        line << draw_tree_item(item)
         if self == item || @adjust_item == item
-          print "\033[0m"
+          line << "\033[0m"
         end
-        puts
+        puts line
 
         items = call_item_selector(item)
 
         unless @collapsed_items && @collapsed_items.include?(item)
-          items.each_with_index do |subitem, index|
+          index = 0
+          items.each do |subitem|
             items_index += 1
             if self.respond_to? :draw_tree
               items_index = draw_tree(subitem, tab, index == items.length - 1, items_index)
             else
               items_index = draw_tree(subitem, tab, index == items.length - 1, items_index)
             end
+            index += 1
           end
         end
 
@@ -159,8 +162,10 @@ module SugarCube
         ret = [item]
         return ret if @collapsed_items && @collapsed_items.include?(item)
 
-        items.each_with_index do |subitem, index|
+        index = 0
+        items.each do |subitem, index|
           ret.concat build_tree(subitem)
+          index += 1
         end
         ret
       end

data/lib/android/sugarcube/log.rb

@@ -1,8 +1,3 @@
-module SugarCube
-  module_function
-
-  def stderr(message)
-    puts message
-  end
-
+def SugarCube.stderr(message)
+  puts message
 end

data/lib/android/sugarcube-repl/kernel.rb

@@ -0,0 +1,20 @@
+module Kernel
+
+  def adjust(*args)
+    if self.nil?
+      super
+    else
+      SugarCube::Repl.adjust(*args)
+    end
+  end
+  alias a adjust
+
+  def tree(*args, &sel_blk)
+    if self.nil?
+      super
+    else
+      SugarCube::Repl.tree(*args, &sel_blk)
+    end
+  end
+
+end

data/lib/android/sugarcube-repl/repl.rb

@@ -6,24 +6,25 @@ module SugarCube
     end
 
     def adjust_init(item)
-      if item.is_a?(Android::View)
+      if item.is_a?(Android::View::View)
         @restore = {}
       end
     end
 
     def register_default_tree_selectors
-      register_tree_selector(Android::ViewLayout) do |view|
+      register_tree_selector(Android::ViewGroup) do |view|
         views = []
-        item.getChildCount.times do |index|
-          views << item.getChildAt(index)
-        end
+        # item.getChildCount.times do |index|
+        #   views << item.getChildAt(index)
+        # end
         views
       end
-      register_tree_selector(Android::View) { |view| [view] }
+      register_tree_selector(Android::View::View) { |view| [view] }
     end
 
     def draw_tree_item(item)
-      item.to_s
+      # item.to_s
+      'todo'
     end
 
     def get_tree_item(item)

data/lib/android/sugarcube-ui/android.view_group.rb

@@ -0,0 +1,15 @@
+module Android
+  class ViewGroup
+
+    def <<(view)
+      addView(view)
+    end
+
+    def [](index)
+      if index.is_a?(Numeric)
+        getChildAt(index)
+      end
+    end
+
+  end
+end

data/lib/sugarcube-all.rb

@@ -5,20 +5,21 @@ exclude = [
   'sugarcube-common.rb',
   'sugarcube-classic.rb',
   'sugarcube-legacy.rb',
-  'sugarcube-uicolor.rb',
-  'sugarcube-uiimage.rb',
+  'sugarcube-appkit.rb',  # renamed in 3.0.0 to 'sugarcube-ui'
+  'sugarcube-uikit.rb',   # renamed in 3.0.0 to 'sugarcube-ui'
 ]
 
 if SugarCube.ios?
   exclude += [
-    'sugarcube-appkit.rb',
   ]
 elsif SugarCube.osx?
   exclude += [
     'sugarcube-568.rb',
     'sugarcube-gestures.rb',
     'sugarcube-modal.rb',
-    'sugarcube-uikit.rb',
+  ]
+elsif SugarCube.android?
+  exclude += [
   ]
 end
 
@@ -26,6 +27,9 @@ dirname = File.dirname(__FILE__)
 Dir.glob(File.join(dirname, '*.rb')).each do |file|
   filename = File.basename(file)
   unless exclude.include? filename
-    require file
+    begin
+      require file
+    rescue SugarCube::PlatformException => e
+    end
   end
 end

data/lib/sugarcube-appkit.rb

@@ -1,12 +1,2 @@
-unless defined?(Motion::Project::Config)
-  raise "The sugarcube gem must be required within a RubyMotion project Rakefile."
-end
-
-
-require 'sugarcube'
-SugarCube.osx_only!('appkit')
-
-Motion::Project::App.pre_setup do |app|
-  SugarCube.add_app_files(app, 'sugarcube-cocoakit')
-  SugarCube.add_app_files(app, 'sugarcube-appkit')
-end
+puts "`sugarcube-appkit' has been renamed to (platform agnostic) `sugarcube-ui'"
+require 'sugarcube-ui'

data/lib/sugarcube-corelocation.rb

@@ -9,8 +9,3 @@ SugarCube.cocoa_only!('corelocation')
 Motion::Project::App.pre_setup do |app|
   SugarCube.add_app_files(app, 'sugarcube-corelocation')
 end
-
-
-Motion::Project::App.post_setup do |app|
-  app.frameworks += %w{CoreLocation}
-end

data/lib/sugarcube-ui.rb

@@ -0,0 +1,10 @@
+unless defined?(Motion::Project::Config)
+  raise "The sugarcube gem must be required within a RubyMotion project Rakefile."
+end
+
+
+require 'sugarcube'
+
+Motion::Project::App.pre_setup do |app|
+  SugarCube.add_app_files(app, 'sugarcube-ui')
+end

data/lib/sugarcube-uikit.rb

@@ -1,12 +1,2 @@
-unless defined?(Motion::Project::Config)
-  raise "The sugarcube gem must be required within a RubyMotion project Rakefile."
-end
-
-
-require 'sugarcube'
-SugarCube.ios_only!('uikit')
-
-Motion::Project::App.pre_setup do |app|
-  SugarCube.add_app_files(app, 'sugarcube-cocoakit')
-  SugarCube.add_app_files(app, 'sugarcube-uikit')
-end
+puts "`sugarcube-uikit' has been renamed to (platform agnostic) `sugarcube-ui'"
+require 'sugarcube-ui'

data/lib/sugarcube.rb

@@ -6,27 +6,30 @@ end
 module SugarCube
   module_function
 
+  class PlatformException < Exception
+  end
+
   def ios_only!(package)
     unless ios?
-      raise "The '\033[0;1msugarcube-#{package}\033[0m' package is only available on iOS."
+      raise PlatformException.new("The '\033[0;1msugarcube-#{package}\033[0m' package is only available on iOS.")
     end
   end
 
   def osx_only!(package)
     unless osx?
-      raise "The '\033[0;1msugarcube-#{package}\033[0m' package is only available on OS X."
+      raise PlatformException.new("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."
+      raise PlatformException.new("The '\033[0;1msugarcube-#{package}\033[0m' package is only available on OS X or iOS.")
     end
   end
 
   def android_only!(package)
     unless android?
-      raise "The '\033[0;1msugarcube-#{package}\033[0m' package is only available on Android."
+      raise PlatformException.new("The '\033[0;1msugarcube-#{package}\033[0m' package is only available on Android.")
     end
   end
 
@@ -62,13 +65,13 @@ module SugarCube
     # 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']
+    platforms = [SugarCube.platform]  # ios, osx, or android specific files
     if SugarCube.cocoa?
       platforms << 'cocoa'
     end
-    platforms << SugarCube.platform  # ios, osx, or android specific files
+    platforms << 'all'
 
-    platforms.each do |platform|
+    platforms.reverse.each do |platform|
       Dir.glob(File.join(File.dirname(__FILE__), platform, package_name, '**/*.rb')).each do |file|
         app.files << file
       end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module SugarCube
-  Version = '3.0.0'
+  Version = '3.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sugarcube
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Colin T.A. Gray
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-11 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies: []
 description: |
   == Description
@@ -40,7 +40,9 @@ files:
 - lib/all/sugarcube-repl/repl.rb
 - lib/all/sugarcube-unholy/ivar.rb
 - lib/android/sugarcube/log.rb
+- lib/android/sugarcube-repl/kernel.rb
 - lib/android/sugarcube-repl/repl.rb
+- lib/android/sugarcube-ui/android.view_group.rb
 - lib/cocoa/sugarcube/log.rb
 - lib/cocoa/sugarcube-animations/caanimation.rb
 - lib/cocoa/sugarcube-animations/calayer.rb
@@ -48,8 +50,6 @@ files:
 - lib/cocoa/sugarcube-anonymous/anonymous_array.rb
 - lib/cocoa/sugarcube-attributedstring/nsattributedstring.rb
 - lib/cocoa/sugarcube-awesome/awesome_exts.rb
-- lib/cocoa/sugarcube-cocoakit/calayer.rb
-- lib/cocoa/sugarcube-cocoakit/frameable.rb
 - lib/cocoa/sugarcube-corelocation/core_location.rb
 - lib/cocoa/sugarcube-files/nsarray.rb
 - lib/cocoa/sugarcube-files/nsdata.rb
@@ -92,6 +92,8 @@ files:
 - lib/cocoa/sugarcube-to_s/nsnotification.rb
 - lib/cocoa/sugarcube-to_s/nsset.rb
 - lib/cocoa/sugarcube-to_s/nsurl.rb
+- lib/cocoa/sugarcube-ui/calayer.rb
+- lib/cocoa/sugarcube-ui/frameable.rb
 - lib/ios/sugarcube-568/uiimage.rb
 - lib/ios/sugarcube-animations/animation_chain.rb
 - lib/ios/sugarcube-animations/uiview.rb
@@ -139,24 +141,19 @@ files:
 - lib/ios/sugarcube-to_s/uitouch.rb
 - lib/ios/sugarcube-to_s/uiview.rb
 - lib/ios/sugarcube-to_s/uiviewcontroller.rb
-- lib/ios/sugarcube-uikit/frameable.rb
-- lib/ios/sugarcube-uikit/nsattributedstring.rb
-- lib/ios/sugarcube-uikit/nsstring.rb
-- lib/ios/sugarcube-uikit/symbol.rb
-- lib/ios/sugarcube-uikit/uibutton.rb
-- lib/ios/sugarcube-uikit/uifont.rb
-- lib/ios/sugarcube-uikit/uiimage.rb
-- lib/ios/sugarcube-uikit/uilabel.rb
-- lib/ios/sugarcube-uikit/uipickerview.rb
-- lib/ios/sugarcube-uikit/uiview.rb
-- lib/ios/sugarcube-uikit/uiviewcontroller.rb
-- lib/ios/sugarcube-uikit/uiwebview.rb
+- lib/ios/sugarcube-ui/frameable.rb
+- lib/ios/sugarcube-ui/nsattributedstring.rb
+- lib/ios/sugarcube-ui/nsstring.rb
+- lib/ios/sugarcube-ui/symbol.rb
+- lib/ios/sugarcube-ui/uibutton.rb
+- lib/ios/sugarcube-ui/uifont.rb
+- lib/ios/sugarcube-ui/uiimage.rb
+- lib/ios/sugarcube-ui/uilabel.rb
+- lib/ios/sugarcube-ui/uipickerview.rb
+- lib/ios/sugarcube-ui/uiview.rb
+- lib/ios/sugarcube-ui/uiviewcontroller.rb
+- lib/ios/sugarcube-ui/uiwebview.rb
 - lib/osx/sugarcube-animations/nsview.rb
-- lib/osx/sugarcube-appkit/frameable.rb
-- lib/osx/sugarcube-appkit/nsfont.rb
-- lib/osx/sugarcube-appkit/nsstring.rb
-- lib/osx/sugarcube-appkit/nsview.rb
-- lib/osx/sugarcube-appkit/symbol.rb
 - lib/osx/sugarcube-attributedstring/nsattributedstring.rb
 - lib/osx/sugarcube-color/fixnum.rb
 - lib/osx/sugarcube-color/nsarray.rb
@@ -172,6 +169,11 @@ files:
 - lib/osx/sugarcube-spritekit/constants.rb
 - lib/osx/sugarcube-to_s/nscolor.rb
 - lib/osx/sugarcube-to_s/nsview.rb
+- lib/osx/sugarcube-ui/frameable.rb
+- lib/osx/sugarcube-ui/nsfont.rb
+- lib/osx/sugarcube-ui/nsstring.rb
+- lib/osx/sugarcube-ui/nsview.rb
+- lib/osx/sugarcube-ui/symbol.rb
 - lib/sugarcube-568.rb
 - lib/sugarcube-all.rb
 - lib/sugarcube-animations.rb
@@ -207,8 +209,7 @@ files:
 - lib/sugarcube-spritekit.rb
 - lib/sugarcube-timer.rb
 - lib/sugarcube-to_s.rb
-- lib/sugarcube-uicolor.rb
-- lib/sugarcube-uiimage.rb
+- lib/sugarcube-ui.rb
 - lib/sugarcube-uikit.rb
 - lib/sugarcube-unholy.rb
 - lib/sugarcube.rb
@@ -297,17 +298,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Extensions for Ruby to make Rubymotion development more enjoyable, and hopefully

data/lib/sugarcube-uicolor.rb

@@ -1 +0,0 @@
-raise "I changed the 'sugarcube-\033[0;1muicolor\033[0m' package to 'sugarcube-\033[0;1mcolor\033[0m'."

data/lib/sugarcube-uiimage.rb

@@ -1 +0,0 @@
-raise "I changed the 'sugarcube-\033[0;1muiimage\033[0m' package to 'sugarcube-\033[0;1mimage\033[0m'."