ruboto 0.13.0 → 0.14.0

data/lib/ruboto/util/update.rb

@@ -128,11 +128,11 @@ module Ruboto
       end
 
       def update_jruby(force=nil, explicit = false)
-        jruby_core = Dir.glob('libs/jruby-core-*.jar')[0]
-        jruby_stdlib = Dir.glob('libs/jruby-stdlib-*.jar')[0]
+        installed_jruby_core = Dir.glob('libs/jruby-core-*.jar')[0]
+        installed_jruby_stdlib = Dir.glob('libs/jruby-stdlib-*.jar')[0]
 
         unless force
-          if !jruby_core || !jruby_stdlib
+          if !installed_jruby_core || !installed_jruby_stdlib
             puts "Cannot find existing jruby jars in libs. Make sure you're in the root directory of your app." if explicit
             return false
           end
@@ -147,7 +147,7 @@ module Ruboto
         new_jruby_version = JRubyJars::VERSION
 
         unless force
-          current_jruby_version = jruby_core ? jruby_core[16..-5] : 'None'
+          current_jruby_version = installed_jruby_core ? installed_jruby_core[16..-5] : 'None'
           if current_jruby_version == new_jruby_version
             puts "JRuby is up to date at version #{new_jruby_version}. Make sure you 'gem update jruby-jars' if there is a new version."
             return false
@@ -158,10 +158,10 @@ module Ruboto
         end
 
         copier = AssetCopier.new Ruboto::ASSETS, File.expand_path('.')
-        log_action("Removing #{jruby_core}") { File.delete *Dir.glob('libs/jruby-core-*.jar') } if jruby_core
-        log_action("Removing #{jruby_stdlib}") { File.delete *Dir.glob('libs/jruby-stdlib-*.jar') } if jruby_stdlib
-        log_action("Copying #{JRubyJars::core_jar_path} to libs") { copier.copy_from_absolute_path JRubyJars::core_jar_path, 'libs' }
-        log_action("Copying #{JRubyJars::stdlib_jar_path} to libs") { copier.copy_from_absolute_path JRubyJars::stdlib_jar_path, 'libs' }
+        log_action("Removing #{installed_jruby_core}") { File.delete *Dir.glob('libs/jruby-core-*.jar') } if installed_jruby_core
+        log_action("Removing #{installed_jruby_stdlib}") { File.delete *Dir.glob('libs/jruby-stdlib-*.jar') } if installed_jruby_stdlib
+        log_action("Copying #{JRubyJars::core_jar_path} to libs") { FileUtils.cp JRubyJars::core_jar_path, "libs/jruby-core-#{new_jruby_version}.jar" }
+        log_action("Copying #{JRubyJars::stdlib_jar_path} to libs") { FileUtils.cp JRubyJars::stdlib_jar_path, "libs/jruby-stdlib-#{new_jruby_version}.jar" }
 
         unless File.read('project.properties') =~ /^dex.force.jumbo=/
           log_action('Setting JUMBO dex file format') do
@@ -301,6 +301,10 @@ module Ruboto
             app_element.add_element 'activity', {'android:name' => 'org.ruboto.RubotoActivity', 'android:exported' => 'false'}
           end
 
+          unless app_element.elements["activity[@android:name='org.ruboto.SplashActivity']"]
+            app_element.add_element 'activity', {'android:name' => 'org.ruboto.SplashActivity', 'android:exported' => 'false', 'android:configChanges' => (target.to_i >= 13 ? 'orientation|screenSize' : 'orientation')}
+          end
+
           unless app_element.elements["activity[@android:name='org.ruboto.RubotoDialog']"]
             app_element.add_element 'activity', {'android:name' => 'org.ruboto.RubotoDialog', 'android:exported' => 'false', 'android:theme' => '@android:style/Theme.Dialog'}
           end
@@ -329,6 +333,18 @@ module Ruboto
       end
 
       def update_ruboto(force=nil)
+        source_files_pattern = 'ruboto{.rb,/**/*}'
+        new_sources_dir = Ruboto::GEM_ROOT + "/assets/#{SCRIPTS_DIR}"
+        new_sources = Dir.chdir(new_sources_dir) { Dir[source_files_pattern] }.
+            select { |f| !(File.directory?("#{new_sources_dir}/#{f}") || File.basename(f) == '.' || File.basename(f) == '..') }
+        old_sources = Dir.chdir("#{SCRIPTS_DIR}") { Dir[source_files_pattern] }.
+            select { |f| !(File.directory?("#{SCRIPTS_DIR}/#{f}") || File.basename(f) == '.' || File.basename(f) == '..') }
+        obsolete_sources = old_sources - new_sources - %w(ruboto/version.rb)
+        obsolete_sources.each do |f|
+          log_action("Deleting obsolete script #{f}") do
+            FileUtils.rm_f f
+          end
+        end
         log_action('Copying ruboto/version.rb') do
           from = File.expand_path(Ruboto::GEM_ROOT + '/lib/ruboto/version.rb')
           to = File.expand_path("./#{SCRIPTS_DIR}/ruboto/version.rb")
@@ -336,10 +352,10 @@ module Ruboto
           FileUtils.cp from, to
         end
         log_action('Copying additional ruboto script components') do
-          Dir.glob(Ruboto::GEM_ROOT + "/assets/#{SCRIPTS_DIR}/ruboto/**/*.rb").each do |from|
-            to = File.expand_path("./#{from.slice /#{SCRIPTS_DIR}\/ruboto\/.*\.rb/}")
+          new_sources.each do |from|
+            to = File.expand_path(from, SCRIPTS_DIR)
             FileUtils.mkdir_p File.dirname(to)
-            FileUtils.cp from, to
+            FileUtils.cp "#{new_sources_dir}/#{from}", to
           end
         end
       end
@@ -353,8 +369,8 @@ module Ruboto
       # - Removes unneeded code from jruby-core
       # - Split into smaller jars that can be used separately
       def reconfigure_jruby_core(jruby_core_version)
-        jruby_core = JRubyJars::core_jar_path.split('/')[-1]
         Dir.chdir 'libs' do
+          jruby_core = Dir['jruby-core-*.jar'][-1]
           log_action("Removing unneeded classes from #{jruby_core}") do
             FileUtils.rm_rf 'tmp'
             Dir.mkdir 'tmp'
@@ -363,7 +379,7 @@ module Ruboto
               `jar -xf #{jruby_core}`
               raise "Unpacking jruby-core jar failed: #$?" unless $? == 0
               File.delete jruby_core
-              if Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.4.dev')
+              if Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.5.dev')
                 #noinspection RubyLiteralArrayInspection
                 excluded_core_packages = [
                     '**/*Darwin*',
@@ -376,7 +392,7 @@ module Ruboto
                     'com/kenai/jffi',
                     'com/kenai/jnr/x86asm',
                     'com/martiansoftware',
-                    'jline', 'jni',
+                    'jni',
                     'jnr/constants/platform/darwin',
                     'jnr/constants/platform/fake',
                     'jnr/constants/platform/freebsd',
@@ -394,8 +410,6 @@ module Ruboto
                     'jnr/posix/MacOS*',
                     'jnr/posix/OpenBSD*',
                     'jnr/x86asm',
-                    'org/apache',
-                    'org/fusesource',
                     'org/jruby/ant',
                     'org/jruby/cext',
                     # 'org/jruby/compiler',      # Needed for initialization, but should not be necessary
@@ -410,20 +424,16 @@ module Ruboto
                     'org/jruby/ext/ffi/AbstractMemory*',
                     'org/jruby/ext/ffi/io',
                     'org/jruby/ext/ffi/jffi',
-                    'org/jruby/ext/ripper',
                     'org/jruby/ext/tracepoint',
-                    #'org/jruby/ir/dataflow',
-                    #'org/jruby/ir/dataflow/analyses',
-                    #'org/jruby/ir/representations',
-                    #'org/jruby/ir/runtime',
-                    #'org/jruby/ir/targets',
-                    #'org/jruby/ir/transformations',
-                    #'org/jruby/ir/util',
                     'org/jruby/javasupport/bsf',
                     # 'org/jruby/management', # should be excluded
                     # 'org/jruby/runtime/invokedynamic', # Should be excluded
+                    # 'org/jruby/runtime/opto',              # What is this?
+                    # 'org/jruby/runtime/opto/OptoFactory*', # What is this?
                     'org/yecht',
                 ]
+              elsif Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.4')
+                excluded_core_packages = %w(**/*Darwin* **/*Solaris* **/*windows* **/*Windows* META-INF com/headius com/kenai/constantine com/kenai/jffi com/kenai/jnr/x86asm com/martiansoftware jline jni jnr/constants/platform/darwin jnr/constants/platform/fake jnr/constants/platform/freebsd jnr/constants/platform/openbsd jnr/constants/platform/sunos jnr/ffi/annotations jnr/ffi/byref jnr/ffi/mapper jnr/ffi/provider jnr/ffi/util jnr/ffi/Struct$* jnr/ffi/types jnr/posix/Aix* jnr/posix/FreeBSD* jnr/posix/MacOS* jnr/posix/OpenBSD* jnr/x86asm org/apache org/fusesource org/jruby/ant org/jruby/cext org/jruby/compiler/impl/BaseBodyCompiler* org/jruby/compiler/util org/jruby/demo org/jruby/embed/bsf org/jruby/embed/jsr223 org/jruby/embed/osgi org/jruby/ext/ffi/AbstractMemory* org/jruby/ext/ffi/io org/jruby/ext/ffi/jffi org/jruby/ext/ripper org/jruby/ext/tracepoint org/jruby/javasupport/bsf org/yecht)
               elsif Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.3')
                 excluded_core_packages = %w(**/*Darwin* **/*Solaris* **/*windows* **/*Windows* META-INF com/headius com/kenai/constantine com/kenai/jffi com/kenai/jnr/x86asm com/martiansoftware jline jni jnr/constants/platform/darwin jnr/constants/platform/fake jnr/constants/platform/freebsd jnr/constants/platform/openbsd jnr/constants/platform/sunos jnr/ffi/annotations jnr/ffi/byref jnr/ffi/provider jnr/ffi/util jnr/ffi/Struct$* jnr/ffi/types jnr/posix/FreeBSD* jnr/posix/MacOS* jnr/posix/OpenBSD* jnr/x86asm org/apache org/fusesource org/jruby/ant org/jruby/cext org/jruby/compiler/impl/BaseBodyCompiler* org/jruby/compiler/util org/jruby/demo org/jruby/embed/bsf org/jruby/embed/jsr223 org/jruby/embed/osgi org/jruby/ext/ffi/AbstractMemory* org/jruby/ext/ffi/io org/jruby/ext/ffi/jffi org/jruby/javasupport/bsf org/yecht)
               elsif Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.2')
@@ -469,7 +479,7 @@ module Ruboto
               #end
 
               # Add our proxy class factory
-              android_jar = Dir["#{ANDROID_HOME}/platforms/*/android.jar"][0]
+              android_jar = Dir["#{ANDROID_HOME.gsub("\\", "/")}/platforms/*/android.jar"][0]
               unless android_jar
                 puts
                 puts '*' * 80
@@ -500,7 +510,7 @@ module Ruboto
         included_stdlibs = verify_ruboto_config[:included_stdlibs]
         excluded_stdlibs = [*verify_ruboto_config[:excluded_stdlibs]].compact
         Dir.chdir 'libs' do
-          jruby_stdlib = JRubyJars::stdlib_jar_path.split('/')[-1]
+          jruby_stdlib = Dir['jruby-stdlib-*.jar'][-1]
           log_action("Reformatting #{jruby_stdlib}") do
             FileUtils.mkdir_p 'tmp'
             Dir.chdir 'tmp' do
@@ -513,8 +523,7 @@ module Ruboto
               FileUtils.move 'old/META-INF/jruby.home/lib', 'new/jruby.home/lib'
               FileUtils.rm_rf 'new/jruby.home/lib/ruby/gems'
 
-              raise "Unrecognized JRuby stdlib jar: #{jruby_stdlib}" unless jruby_stdlib =~ /jruby-stdlib-(.*).jar/
-              jruby_stdlib_version = Gem::Version.new($1)
+              jruby_stdlib_version = Gem::Version.new(JRubyJars::VERSION)
 
               if included_stdlibs
                 lib_dirs = %w(1.8 1.9 2.0 shared)
@@ -576,7 +585,7 @@ module Ruboto
                   # EMXIF
 
                   # FIXME(uwe): These should be included but break the 64K method count limit
-                  if j =~ /bcpkix-jdk15on-147|bcprov-jdk15on-147|jopenssl|kryptcore|kryptproviderjdk/
+                  if j =~ /bcpkix-jdk15on-1\.?47|bcprov-jdk15on-1\.?47|jopenssl|kryptcore|kryptproviderjdk/
                     FileUtils.rm j
                     next
                   end

data/lib/ruboto/version.rb

@@ -1,4 +1,4 @@
 module Ruboto
-  VERSION = '0.13.0'
+  VERSION = '0.14.0'
   UPDATE_VERSION_LIMIT = '0.7.0'
 end

data/test/activity/navigation_activity.rb

@@ -23,6 +23,7 @@ class NavigationActivity
               button :text => 'Ruby file activity', :width => :match_parent, :id => 49, :on_click_listener => proc { start_ruby_file_activity }
               button :text => 'RubotoActivity no config', :width => :match_parent, :id => 50, :on_click_listener => proc { start_ruboto_activity_no_config }
               button :text => 'RubotoActivity', :width => :match_parent, :id => 51, :on_click_listener => proc { start_ruboto_activity('RubyFileActivity') }
+              button :text => 'RubotoActivity with Extras', :width => :match_parent, :id => 52, :on_click_listener => proc { start_ruboto_activity('RubyFileActivity', :extras => {:extra_string => 'Started with string extra.'}) }
             end
           end
         end

data/test/activity/navigation_activity_test.rb

@@ -75,6 +75,10 @@ test('start ruboto activity with class name', :ui => false) do |activity|
   button_activity_text 51, activity, 42, 'This is a Ruby file activity.'
 end
 
+test('start ruboto activity with extras', :ui => false) do |activity|
+  button_activity_text 52, activity, 42, 'Started with string extra.'
+end
+
 def start_activity_by_button(activity, button_id, activity_class_name = 'org.ruboto.RubotoActivity')
   monitor = add_monitor(activity_class_name, nil, false)
   begin

data/test/activity/ruby_file_activity.rb

@@ -2,10 +2,11 @@ class RubyFileActivity
   def onCreate(bundle)
     super
     set_title 'Ruby file Activity'
+    display_text = intent.get_extra('extra_string') || 'This is a Ruby file activity.'
 
     self.content_view =
         linear_layout :orientation => :vertical, :gravity => :center_horizontal do
-          text_view :text => 'This is a Ruby file activity.', :id => 42, :width => :match_parent,
+          text_view :text => display_text, :id => 42, :width => :match_parent,
                     :gravity => :center, :text_size => 48.0
         end
   end

data/test/minimal_app_test.rb

@@ -12,12 +12,15 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
       cleanup_app
     end
 
-    # APK was 4.7MB.  JRuby: 1.7.0,     ANDROID_TARGET: 15
-    # APK was 4.5MB.  JRuby: 1.7.2,     ANDROID_TARGET: 10
-    # APK was 4.5MB.  JRuby: 1.7.2,     ANDROID_TARGET: 15
-    # APK was 4.3MB.  JRuby: 1.7.3,     ANDROID_TARGET: 10
-    # APK was 4.2MB.  JRuby: 1.7.3,     ANDROID_TARGET: 15
-    # APK was 4.4MB.  JRuby: 1.7.4.dev, ANDROID_TARGET: 10
+    # APK was 4.7MB.  JRuby: 1.7.0, ANDROID_TARGET: 15
+    # APK was 4.5MB.  JRuby: 1.7.2, ANDROID_TARGET: 10
+    # APK was 4.5MB.  JRuby: 1.7.2, ANDROID_TARGET: 15
+    # APK was 4.3MB.  JRuby: 1.7.3, ANDROID_TARGET: 10
+    # APK was 4.2MB.  JRuby: 1.7.3, ANDROID_TARGET: 15
+    # APK was 4.4MB.  JRuby: 1.7.4, ANDROID_TARGET: 10
+    # APK was 4.3MB.  JRuby: 1.7.5.dev, ANDROID_TARGET: 10
+    # APK was 4.2MB.  JRuby: 1.7.5.dev, ANDROID_TARGET: 15
+    # APK was 4.3MB.  JRuby: 1.7.5.dev, ANDROID_TARGET: 16
     def test_minimal_apk_is_within_limits
       apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / (1024 * 1024)
       upper_limit = {
@@ -25,7 +28,8 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
           '1.7.1' => ANDROID_TARGET < 15 ? 4.7 : 4.9,
           '1.7.2' => ANDROID_TARGET < 15 ? 4.6 : 4.9,
           '1.7.3' => ANDROID_TARGET < 15 ? 4.3 : 4.4,
-      }[JRUBY_JARS_VERSION.to_s] || 4.4
+          '1.7.4' => 4.4,
+      }[JRUBY_JARS_VERSION.to_s] || {10 => 4.3, 16 => 4.3}[ANDROID_TARGET] || 4.3
       lower_limit = upper_limit * 0.9
       version_message ="JRuby: #{JRUBY_JARS_VERSION}, ANDROID_TARGET: #{ANDROID_TARGET}"
       assert apk_size <= upper_limit, "APK was larger than #{'%.1f' % upper_limit}MB: #{'%.1f' % apk_size.ceil(1)}MB.  #{version_message}"
@@ -36,29 +40,5 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
       run_app_tests
     end
 
-    # APK was 4.7MB.  JRuby: 1.7.0,     ANDROID_TARGET: 15.
-    # APK was 4.5MB.  JRuby: 1.7.2,     ANDROID_TARGET: 10.
-    # APK was 4.5MB.  JRuby: 1.7.2,     ANDROID_TARGET: 15.
-    # APK was 4.5MB.  JRuby: 1.7.3, ANDROID_TARGET: 10
-    # APK was 4.6MB.  JRuby: 1.7.3.dev, ANDROID_TARGET: 10.
-    # APK was 4.5MB.  JRuby: 1.7.3.dev, ANDROID_TARGET: 15.
-    # APK was 5.0MB.  JRuby: 1.7.4.dev, ANDROID_TARGET: 10
-    # FIXME(uwe): Remove when we remove the exclude feature
-    def test_minimal_apk_with_excludes_is_less_than_5_mb
-      generate_app :excluded_stdlibs => %w{ant cgi digest dl drb ffi irb net optparse racc rbconfig rdoc rexml rinda rss
-        rubygems runit shell soap test uri webrick win32 wsdl xmlrpc xsd ../1.9}
-      apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / (1024 * 1024)
-      upper_limit = {
-          '1.7.0' => ANDROID_TARGET < 15 ? 4.7 : 4.9,
-          '1.7.1' => ANDROID_TARGET < 15 ? 4.7 : 4.9,
-          '1.7.2' => ANDROID_TARGET < 15 ? 4.6 : 4.9,
-          '1.7.3' => ANDROID_TARGET < 15 ? 4.6 : 4.9,
-      }[JRUBY_JARS_VERSION.to_s] || 5.0
-      lower_limit = upper_limit * 0.9
-      version_message ="JRuby: #{JRUBY_JARS_VERSION}, ANDROID_TARGET: #{ANDROID_TARGET}"
-      assert apk_size <= upper_limit, "APK was larger than #{'%.1f' % upper_limit}MB: #{'%.1f' % apk_size.ceil(1)}MB.  #{version_message}"
-      assert apk_size >= lower_limit, "APK was smaller than #{'%.1f' % lower_limit}MB: #{'%.1f' % apk_size.floor(1)}MB.  You should lower the limit.  #{version_message}"
-    end
-
   end
 end

data/test/ruboto_gen_test.rb

@@ -21,9 +21,9 @@ class RubotoGenTest < Test::Unit::TestCase
 
   def test_icons_are_updated
     Dir.chdir APP_DIR do
-      assert_equal 4032, File.size('res/drawable-hdpi/ic_launcher.png')
-      assert_equal 2548, File.size('res/drawable-mdpi/ic_launcher.png')
-      assert_equal 1748, File.size('res/drawable-ldpi/ic_launcher.png')
+      assert_equal 3834, File.size('res/drawable-hdpi/ic_launcher.png')
+      assert_equal 2513, File.size('res/drawable-mdpi/ic_launcher.png')
+      assert_equal 1689, File.size('res/drawable-ldpi/ic_launcher.png')
     end
   end
 
@@ -61,6 +61,7 @@ class RubotoGenTest < Test::Unit::TestCase
   # APK was  8428.4KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 10, JRuby: 1.7.4.dev
   # APK was  7405.8KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.4.dev
   # APK was  7420.9KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.4.dev
+  # APK was  8512.7KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.5.dev
   def test_new_apk_size_is_within_limits
     apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / 1024
     version = "  PLATFORM: #{RUBOTO_PLATFORM}"
@@ -71,14 +72,15 @@ class RubotoGenTest < Test::Unit::TestCase
           '1.7.1' => ANDROID_TARGET < 15 ? 7400.0 : 7600.0,
           '1.7.2' => 7400.0,
           '1.7.3' => 7400.0,
-      }[JRUBY_JARS_VERSION.to_s] || 8500.0
+          '1.7.4' => 8500.0,
+      }[JRUBY_JARS_VERSION.to_s] || 8600.0
       version << ", JRuby: #{JRUBY_JARS_VERSION.to_s}"
     else
       upper_limit = {
           10 => 58.0,
-          15 => 59.0,
-          16 => 74.0,
-      }[ANDROID_TARGET] || 74.0
+          15 => 59.1,
+          16 => 74.2,
+      }[ANDROID_TARGET] || 74.2
     end
     lower_limit = upper_limit * 0.9
     assert apk_size <= upper_limit, "APK was larger than #{'%.1f' % upper_limit}KB: #{'%.1f' % apk_size.ceil(1)}KB.#{version}"

data/test/ruboto_update_test.rb

@@ -9,24 +9,54 @@ require File.expand_path('updated_example_test_methods', File.dirname(__FILE__))
 require File.expand_path('update_test_methods', File.dirname(__FILE__))
 
 # TODO(uwe): Delete obsolete examples when we stop supporting updating from them.
-
 Dir.chdir "#{RubotoTest::PROJECT_DIR}/examples/" do
   example_archives = Dir["#{RubotoTest::APP_NAME}_*_tools_r*.tgz"]
   example_archives = example_archives.sort_by{|a| Gem::Version.new a[RubotoTest::APP_NAME.size + 1..-1].slice(/(.*)(?=_tools_)/)}
   example_archives = example_archives.last(example_limit) if example_limit
-  example_archives.each do |f|
-    next unless f =~ /^#{RubotoTest::APP_NAME}_(.*)_tools_r(.*)\.tgz$/
-    ruboto_version = $1
-    tools_version = $2
+
+  # TODO(gf): Track APIs compatible with update examples
+  EXAMPLE_COMPATIBLE_APIS = { (Gem::Version.new('0.7.0')..Gem::Version.new('0.10.99')) => [8],
+                              (Gem::Version.new('0.11.0')..Gem::Version.new('0.13.0')) => [10,11,12,13,14,15,16,17] }
+
+  installed_apis = `android list target --compact`.lines.grep(/^android-/) { |s| s.match(/\d+/).to_s.to_i }
+  examples = example_archives.collect { |f| f.match /^#{RubotoTest::APP_NAME}_(?<ruboto_version>.*)_tools_r(?<tools_version>.*)\.tgz$/ }.compact
+
+  missing_apis = false
+  puts "Backward compatibility update tests: #{examples.size}"
+  examples.each_with_index do |m,i|
+    example_gem_version = Gem::Version.new m[:ruboto_version]
+    compatible_apis = EXAMPLE_COMPATIBLE_APIS[ EXAMPLE_COMPATIBLE_APIS.keys.detect { |gem_range| gem_range.cover? example_gem_version } ]
+    if compatible_apis
+      if ( installed_apis & compatible_apis ).empty?
+        puts "Update test #{examples[i]} needs a missing compatible API: #{compatible_apis.join(',')}"
+        missing_apis = true
+      end
+    end
+  end
+
+  if missing_apis
+    puts '----------------------------------------------------------------------------------------------------'
+    puts 'Required android APIs are missing, resolution options are:'
+    puts '* Install a needed android API with "android update sdk --no-ui --all --filter android-XX"'
+    puts '* Skip all backward compatibility update tests with "SKIP_RUBOTO_UPDATE_TEST=DEFINED rake test"'
+    puts '* Limit number of backward compatibility update tests to N with "RUBOTO_UPDATE_EXAMPLES=N rake test"'
+    puts 'Quitting...'
+    exit false
+  end
+
+  examples.each do |m|
+    ruboto_version = m[:ruboto_version]
+    tools_version = m[:tools_version]
+    ruboto_version_no_dots = ruboto_version.gsub('.', '_')
     self.class.class_eval <<EOF
-class RubotoUpdatedExample#{ruboto_version.gsub('.', '_')}Tools#{tools_version}Test < Test::Unit::TestCase
+class RubotoUpdatedExample#{ruboto_version_no_dots}Tools#{tools_version}Test < Test::Unit::TestCase
   include UpdatedExampleTestMethods
   def setup
     super('#{ruboto_version}', '#{tools_version}')
   end
 end
 
-class RubotoUpdate#{ruboto_version.gsub('.', '_')}Tools#{tools_version}Test < Test::Unit::TestCase
+class RubotoUpdate#{ruboto_version_no_dots}Tools#{tools_version}Test < Test::Unit::TestCase
   include UpdateTestMethods
   def setup
     super('#{ruboto_version}', '#{tools_version}')
@@ -34,4 +64,5 @@ class RubotoUpdate#{ruboto_version.gsub('.', '_')}Tools#{tools_version}Test < Te
 end
 EOF
   end
+
 end

data/test/splash_test.rb

@@ -0,0 +1,50 @@
+require File.expand_path('test_helper', File.dirname(__FILE__))
+
+require 'bigdecimal'
+require 'test/app_test_methods'
+
+class SplashTest < Test::Unit::TestCase
+  def setup
+    generate_app
+  end
+
+  def teardown
+    cleanup_app
+  end
+
+  def test_splash
+    Dir.chdir APP_DIR do
+      File.open('res/layout/splash.xml', 'w'){|f| f << <<EOF}
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical"
+    android:gravity="center_horizontal|center_vertical"
+    android:background="#30587c"
+>
+<!--Specify your splash image here-->
+<ImageView
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:src="@drawable/logo"
+    android:scaleType="fitCenter"
+    android:layout_weight="1"
+/>
+  <TextView android:id="@+id/text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Please wait..."
+            android:color="#000000"
+  />
+</LinearLayout>
+EOF
+
+      FileUtils.cp '../../icons/ruboto-logo_512x512.png', 'res/drawable/logo.png'
+    end
+
+    run_app_tests
+  end
+
+end

data/test/test_helper.rb

@@ -164,6 +164,7 @@ class Test::Unit::TestCase
   end
 
   def generate_app(options = {})
+    package = options.delete(:package) || PACKAGE
     example = options.delete(:example) || false
     update = options.delete(:update) || false
     # FIXME(uwe): Remove exclusion feature
@@ -176,6 +177,7 @@ class Test::Unit::TestCase
 
     FileUtils.rm_rf APP_DIR if File.exists? APP_DIR
     template_dir = "#{APP_DIR}_template_#{$$}"
+    template_dir << "_package_#{package}" if package != PACKAGE
     template_dir << "_example_#{example}" if example
     template_dir << "_bundle_#{[*bundle].join('_')}" if bundle
     template_dir << '_updated' if update
@@ -207,7 +209,7 @@ class Test::Unit::TestCase
       else
         uninstall_jruby_jars_gem unless standalone
         puts "Generating app #{APP_DIR}"
-        system "#{RUBOTO_CMD} gen app --package #{PACKAGE} --path #{APP_DIR} --name #{APP_NAME} --target android-#{ANDROID_TARGET}"
+        system "#{RUBOTO_CMD} gen app --package #{package} --path #{APP_DIR} --name #{APP_NAME} --target android-#{ANDROID_TARGET}"
         if $? != 0
           FileUtils.rm_rf APP_DIR
           raise "gen app failed with return code #$?"
@@ -235,8 +237,12 @@ class Test::Unit::TestCase
 
       unless example && !update
         Dir.chdir APP_DIR do
-          system 'rake debug'
+          system 'rake patch_dex' # Ensure dx heap space is sufficient.
           assert_equal 0, $?
+          Dir.chdir 'test' do
+            system 'ant instrument' # This will also build the main project.
+            assert_equal 0, $?
+          end
         end
       end
       puts "Storing app as template #{template_dir}"

data/test/uppercase_package_name_test.rb

@@ -0,0 +1,16 @@
+require File.expand_path('test_helper', File.dirname(__FILE__))
+
+class UppercasePackageNameTest < Test::Unit::TestCase
+
+  def setup
+    generate_app :package => 'org.ruboto.TestApp'
+  end
+
+  def teardown
+    cleanup_app
+  end
+
+  def test_gen_package_with_uppercase_name
+    run_app_tests
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruboto
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Daniel Jackoway
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-09 00:00:00.000000000 Z
+date: 2013-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
@@ -108,6 +108,7 @@ files:
 - assets/src/org/ruboto/Script.java
 - assets/src/org/ruboto/ScriptInfo.java
 - assets/src/org/ruboto/ScriptLoader.java
+- assets/src/org/ruboto/SplashActivity.java
 - assets/src/org/ruboto/test/ActivityTest.java
 - assets/src/org/ruboto/test/InstrumentationTestRunner.java
 - assets/src/ruboto/activity.rb
@@ -188,10 +189,12 @@ files:
 - test/ruboto_gen_test.rb
 - test/ruboto_update_test.rb
 - test/service_test.rb
+- test/splash_test.rb
 - test/sqldroid_test.rb
 - test/test_helper.rb
 - test/update_test_methods.rb
 - test/updated_example_test_methods.rb
+- test/uppercase_package_name_test.rb
 homepage: http://ruboto.org/
 licenses:
 - MIT