ruboto 0.10.0.rc.0 → 0.10.0.rc.1

data/Rakefile

@@ -2,6 +2,7 @@ $:.unshift('lib') unless $:.include?('lib')
 require 'rake/clean'
 require 'rexml/document'
 require 'ruboto/version'
+require 'ruboto/description'
 require 'ruboto/sdk_versions'
 require 'uri'
 require 'net/http'

data/assets/.gitignore

@@ -0,0 +1,5 @@
+/.idea
+bin
+gen
+tmp
+local.properties

data/assets/rakelib/ruboto.rake

@@ -194,9 +194,7 @@ namespace :test do
   task :quick => :update_scripts do
     Dir.chdir('test') do
       puts 'Running quick tests'
-      sh "#{ANT_CMD} instrument"
-      sh "#{ANT_CMD} installi"
-      sh "#{ANT_CMD} run-tests-quick"
+      sh "#{ANT_CMD} instrument install run-tests-quick"
     end
   end
 end

data/assets/src/org/ruboto/ScriptLoader.java

@@ -35,21 +35,28 @@ public class ScriptLoader {
                             + component.getScriptInfo().getRubyClassName() + ".*");
                     boolean hasBackingJavaClass = component.getScriptInfo().getRubyClassName()
                             .equals(component.getClass().getSimpleName());
-                    if (scriptContainsClass && !hasBackingJavaClass) {
-                        System.out.println("Script defines methods on meta class");
-
-                        // FIXME(uwe): Simplify when we stop support for RubotoCore 0.4.7
-                        if (JRubyAdapter.isJRubyPreOneSeven() || JRubyAdapter.isRubyOneEight()) {
-                            JRubyAdapter.put("$java_instance", component);
-                            rubyClass = JRubyAdapter.runScriptlet("class << $java_instance; self; end");
-                        } else if (JRubyAdapter.isJRubyOneSeven() && JRubyAdapter.isRubyOneNine()) {
-                            JRubyAdapter.runScriptlet("Java::" + component.getClass().getName() + ".__persistent__ = true");
-                            rubyClass = JRubyAdapter.runRubyMethod(component, "singleton_class");
+                    if (scriptContainsClass) {
+                        if (hasBackingJavaClass) {
+                            if (rubyClass != null && !rubyClass.toString().startsWith("Java::")) {
+                                System.out.println("Found Ruby class instead of Java class.  Reloading.");
+                                rubyClass = null;
+                            }
                         } else {
-                            throw new RuntimeException("Unknown JRuby/Ruby version: " + JRubyAdapter.get("JRUBY_VERSION") + "/" + JRubyAdapter.get("RUBY_VERSION"));
-                        }
-                        // EMXIF
+                            System.out.println("Script defines methods on meta class");
 
+                            // FIXME(uwe): Simplify when we stop support for RubotoCore 0.4.7
+                            if (JRubyAdapter.isJRubyPreOneSeven() || JRubyAdapter.isRubyOneEight()) {
+                                JRubyAdapter.put("$java_instance", component);
+                                rubyClass = JRubyAdapter.runScriptlet("class << $java_instance; self; end");
+                            } else if (JRubyAdapter.isJRubyOneSeven() && JRubyAdapter.isRubyOneNine()) {
+                                JRubyAdapter.runScriptlet("Java::" + component.getClass().getName() + ".__persistent__ = true");
+                                rubyClass = JRubyAdapter.runRubyMethod(component, "singleton_class");
+                            } else {
+                                throw new RuntimeException("Unknown JRuby/Ruby version: " + JRubyAdapter.get("JRUBY_VERSION") + "/" + JRubyAdapter.get("RUBY_VERSION"));
+                            }
+                            // EMXIF
+
+                        }
                     }
                     if (rubyClass == null || !hasBackingJavaClass) {
                         System.out.println("Loading script: " + component.getScriptInfo().getScriptName());

data/lib/DexClient.java

@@ -4,8 +4,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.OutputStreamWriter;
 
 import com.android.dx.cf.iface.ParseException;
-// import com.android.dx.dex.DexFormat;
-// import com.android.dx.dex.DexOptions;
+import com.android.dx.dex.DexFormat;
+import com.android.dx.dex.DexOptions;
 import com.android.dx.dex.cf.CfOptions;
 import com.android.dx.dex.cf.CfTranslator;
 import com.android.dx.dex.code.PositionList;
@@ -15,15 +15,14 @@ import com.android.dx.dex.file.DexFile;
 public class DexClient {
     /** {@code non-null;} output file in-progress */
     private static DexFile outputDex;
-    // private static DexOptions dexOptions = new DexOptions();
-    // static {
-    //     dexOptions.targetApiLevel = DexFormat.API_NO_EXTENDED_OPCODES;
-    // }
+    private static DexOptions dexOptions = new DexOptions();
+    static {
+        dexOptions.targetApiLevel = DexFormat.API_NO_EXTENDED_OPCODES;
+    }
     private final CfOptions cfOptions;
 
     public DexClient() {
-        outputDex = new DexFile();
-        // outputDex = new DexFile(dexOptions);
+        outputDex = new DexFile(dexOptions);
         cfOptions = new CfOptions();
 
         cfOptions.positionInfo = PositionList.LINES;
@@ -58,8 +57,7 @@ public class DexClient {
     private boolean processClass(String name, byte[] bytes) {
         try {
             ClassDefItem clazz;
-            clazz = CfTranslator.translate(name, bytes, cfOptions);
-            // clazz = CfTranslator.translate(name, bytes, cfOptions, dexOptions);
+            clazz = CfTranslator.translate(name, bytes, cfOptions, dexOptions);
             outputDex.add(clazz);
             return true;
         } catch (ParseException ex) {

data/lib/ruboto/description.rb

@@ -0,0 +1,8 @@
+module Ruboto
+  DESCRIPTION = <<EOF
+Ruboto (JRuby on Android) is a platform for developing full stand-alone apps for
+Android using the Ruby language and libraries.  It includes support libraries
+and generators for creating projects, classes, tests, and more.  The complete
+APIs of Android, Java, and Ruby is available to you using the Ruby language.
+EOF
+end

data/lib/ruboto/util/asset_copier.rb

@@ -24,4 +24,4 @@ module Ruboto
       end
     end
   end
-end
+end

data/lib/ruboto/util/update.rb

@@ -362,30 +362,26 @@ module Ruboto
               `jar -xf #{jruby_core}`
               raise "Unpacking jruby-core jar failed: #$?" unless $? == 0
               File.delete jruby_core
-              if jruby_core_version >= '1.7.0'
+              if Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.1.dev')
                 excluded_core_packages = [
                     '**/*Darwin*',
+                    '**/*Ruby20*',
                     '**/*Solaris*',
                     '**/*windows*',
                     '**/*Windows*',
-                    'META-INF', 'cext',
-                    'com/headius', # included since we are trying to use DexClient
-                    'com/headius/invokebinder',
+                    'META-INF',
+                    'com/headius',
                     'com/kenai/constantine', 'com/kenai/jffi', 'com/martiansoftware',
-                    'ext',
-                    'java',
                     'jline', 'jni',
                     'jnr/constants/platform/darwin', 'jnr/constants/platform/fake', 'jnr/constants/platform/freebsd',
-                    'jnr/constants/platform/openbsd', 'jnr/constants/platform/sunos', 'jnr/constants/platform/windows',
+                    'jnr/constants/platform/openbsd', 'jnr/constants/platform/sunos',
                     'jnr/ffi/annotations', 'jnr/ffi/byref',
                     'jnr/ffi/provider', 'jnr/ffi/util',
-                    'jnr/ffi/posix/util',
                     'jnr/ffi/Struct$*',
                     'jnr/ffi/types',
                     'jnr/posix/MacOS*',
                     'jnr/posix/OpenBSD*',
                     'org/apache',
-                    'org/bouncycastle', # TODO(uwe): Issue #154 Add back when we add jruby-openssl.  The bouncycastle included in Android is cripled.
                     'org/fusesource',
                     'org/jruby/ant',
                     'org/jruby/cext',
@@ -408,10 +404,44 @@ module Ruboto
 
                     # 'org/jruby/runtime/invokedynamic', # Should be excluded
                 ]
-
-                # TODO(uwe): Remove when we stop supporting jruby-jars < 1.7.0
-              else
-                print 'Retaining com.kenai.constantine and removing jnr for JRuby < 1.7.0...'
+              elsif Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.0')
+                # TODO(uwe): Remove when we stop supporting jruby-jars 1.7.0
+                excluded_core_packages = [
+                    '**/*Darwin*',
+                    '**/*Solaris*',
+                    '**/*windows*',
+                    '**/*Windows*',
+                    'META-INF',
+                    'com/headius',
+                    'com/kenai/constantine', 'com/kenai/jffi', '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/MacOS*',
+                    'jnr/posix/OpenBSD*',
+                    'org/apache',
+                    'org/bouncycastle',
+                    'org/fusesource',
+                    'org/jruby/ant',
+                    'org/jruby/cext',
+                    'org/jruby/compiler/util',
+                    'org/jruby/demo',
+                    'org/jruby/embed/bsf',
+                    'org/jruby/embed/jsr223',
+                    'org/jruby/embed/osgi',
+                    'org/jruby/ext/ffi/io',
+                    'org/jruby/ext/ffi/jffi',
+                    'org/jruby/ext/openssl',
+                    'org/jruby/javasupport/bsf',
+                ]
+                # ODOT
+              elsif Gem::Version.new(jruby_core_version) =~ Gem::Version.new('~>1.6.0')
+                # TODO(uwe): Remove when we stop supporting jruby-jars 1.6.x
+                print 'Retaining com.kenai.constantine and removing jnr for JRuby 1.6.x...'
                 excluded_core_packages = [
                     'META-INF', 'cext',
                     'com/kenai/jffi', 'com/martiansoftware', 'ext', 'java',
@@ -429,6 +459,8 @@ module Ruboto
                     'org/jruby/runtime/invokedynamic',
                 ]
                 # ODOT
+              else
+                raise "Unsupported JRuby version: #{jruby_core_version.inspect}."
               end
 
               excluded_core_packages.each do |i|
@@ -544,7 +576,7 @@ module Ruboto
               File.delete dx_jar
                 excluded_core_packages = [
                     'com/android/dx/command',
-                    'com/android/dx/ssa',
+                    # 'com/android/dx/ssa', # Tests run OK without this package, but we may loose some optimizations.
                     'junit',
                 ]
               excluded_core_packages.each do |i|

data/lib/ruboto/version.rb

@@ -1,10 +1,4 @@
 module Ruboto
-  DESCRIPTION = <<EOF
-Ruboto (JRuby on Android) is a platform for developing full stand-alone apps for
-Android using the Ruby language and libraries.  It includes support libraries
-and generators for creating projects, classes, tests, and more.  The complete
-APIs of Android, Java, and Ruby is available to you using the Ruby language.
-EOF
-  VERSION = '0.10.0.rc.0'
+  VERSION = '0.10.0.rc.1'
   UPDATE_VERSION_LIMIT = '0.7.0'
 end

data/test/activity/navigation_activity.rb

@@ -10,39 +10,40 @@ class NavigationActivity
 
     self.content_view =
         linear_layout :orientation => :vertical, :gravity => :center_horizontal do
-          text_view :text => 'What hath Matz wrought?', :id => 42, :width => :match_parent,
+          text_view :text => 'Navigation', :id => 42, :width => :match_parent,
                     :gravity => :center, :text_size => 48.0
-          button :text => 'Next by Java class', :width => :match_parent, :id => 43, :on_click_listener => proc { start_next_java_activity }
-          button :text => 'Next by Ruby class', :width => :match_parent, :id => 44, :on_click_listener => proc { start_next_ruby_activity }
-          button :text => 'Next by script name', :width => :match_parent, :id => 45, :on_click_listener => proc { start_activity_by_script_name }
+          button :text => 'Java backed by Java class', :width => :match_parent, :id => 43, :on_click_listener => proc { java_backed_by_java_class }
+          button :text => 'Java backed by Ruby class', :width => :match_parent, :id => 44, :on_click_listener => proc { java_backed_by_ruby_class }
+          button :text => 'Java backed by script name', :width => :match_parent, :id => 45, :on_click_listener => proc { java_backed_by_script_name }
           button :text => 'Inline block', :width => :match_parent, :id => 46, :on_click_listener => proc { start_inline_activity }
           button :text => 'Inline block with options', :width => :match_parent, :id => 47, :on_click_listener => proc { start_inline_activity_with_options }
           button :text => 'Infile class', :width => :match_parent, :id => 48, :on_click_listener => proc { start_infile_activity }
+          button :text => 'Ruby file activity', :width => :match_parent, :id => 49, :on_click_listener => proc { start_ruby_file_activity }
         end
   end
 
   private
 
-  def start_next_java_activity
+  def java_backed_by_java_class
     i = android.content.Intent.new
-    i.setClassName($package_name, 'org.ruboto.test_app.NavigationActivity')
+    i.setClassName($package_name, 'org.ruboto.test_app.NavigationTargetActivity')
     startActivity(i)
   end
 
-  def start_next_ruby_activity
+  def java_backed_by_ruby_class
     i = android.content.Intent.new
     i.setClassName($package_name, 'org.ruboto.RubotoActivity')
     configBundle = android.os.Bundle.new
-    configBundle.put_string('ClassName', 'NavigationActivity')
+    configBundle.put_string('ClassName', 'NavigationTargetActivity')
     i.putExtra('RubotoActivity Config', configBundle)
     startActivity(i)
   end
 
-  def start_activity_by_script_name
+  def java_backed_by_script_name
     i = android.content.Intent.new
     i.setClassName($package_name, 'org.ruboto.RubotoActivity')
     configBundle = android.os.Bundle.new
-    configBundle.put_string('Script', 'navigation_activity.rb')
+    configBundle.put_string('Script', 'navigation_target_activity.rb')
     i.putExtra('RubotoActivity Config', configBundle)
     startActivity(i)
   end
@@ -84,13 +85,21 @@ class NavigationActivity
     startActivity(i)
   end
 
+  def start_ruby_file_activity
+    i = android.content.Intent.new
+    i.setClassName($package_name, 'org.ruboto.RubotoActivity')
+    configBundle = android.os.Bundle.new
+    configBundle.put_string('ClassName', 'RubyFileActivity')
+    i.putExtra('RubotoActivity Config', configBundle)
+    startActivity(i)
+  end
+
 end
 
 class InfileActivity
   def on_create(bundle)
     super
     set_title 'Infile Activity'
-
     self.content_view =
         linear_layout :orientation => :vertical, :gravity => :center_horizontal do
           text_view :text => 'This is an infile activity.', :id => 42, :width => :match_parent,

data/test/activity/navigation_activity_test.rb

@@ -10,9 +10,17 @@ setup do |activity|
   assert @text_view
 end
 
+test('Java backed activity is reloaded if source already loaded', :ui => false) do |activity|
+  require 'navigation_target_activity'
+  #::NavigationTargetActivity = ::RubyFileActivity
+  #Object.const_set(:NavigationTargetActivity, RubyFileActivity)
+  #Kernel.const_set(:NavigationTargetActivity, RubyFileActivity)
+  button_activity_text 43, activity, 42, 'This is the navigation target activity.',
+                       'org.ruboto.test_app.NavigationTargetActivity'
+end
+
 test('button starts Java activity', :ui => false) do |activity|
-  assert_equal "What hath Matz wrought?", @text_view.text
-  monitor = add_monitor('org.ruboto.test_app.NavigationActivity', nil, false)
+  monitor = add_monitor('org.ruboto.test_app.NavigationTargetActivity', nil, false)
   begin
     activity.run_on_ui_thread { activity.find_view_by_id(43).perform_click }
     current_activity = wait_for_monitor_with_timeout(monitor, 5000)
@@ -27,7 +35,6 @@ test('button starts Java activity', :ui => false) do |activity|
 end
 
 test('button starts Ruby activity', :ui => false) do |activity|
-  assert_equal "What hath Matz wrought?", @text_view.text
   monitor = add_monitor('org.ruboto.RubotoActivity', nil, false)
   begin
     activity.run_on_ui_thread { activity.find_view_by_id(44).perform_click }
@@ -43,7 +50,6 @@ test('button starts Ruby activity', :ui => false) do |activity|
 end
 
 test('button starts activity by script name', :ui => false) do |activity|
-  assert_equal "What hath Matz wrought?", @text_view.text
   monitor = add_monitor('org.ruboto.RubotoActivity', nil, false)
   begin
     activity.run_on_ui_thread { activity.find_view_by_id(45).perform_click }
@@ -59,7 +65,6 @@ test('button starts activity by script name', :ui => false) do |activity|
 end
 
 test('button starts inline activity', :ui => false) do |activity|
-  assert_equal "What hath Matz wrought?", @text_view.text
   monitor = add_monitor('org.ruboto.RubotoActivity', nil, false)
   begin
     activity.run_on_ui_thread { activity.find_view_by_id(46).perform_click }
@@ -85,7 +90,6 @@ test('button starts inline activity', :ui => false) do |activity|
 end
 
 test('button starts inline activity with options', :ui => false) do |activity|
-  assert_equal "What hath Matz wrought?", @text_view.text
   monitor = add_monitor('org.ruboto.RubotoActivity', nil, false)
   begin
     activity.run_on_ui_thread { activity.find_view_by_id(47).perform_click }
@@ -111,7 +115,6 @@ test('button starts inline activity with options', :ui => false) do |activity|
 end
 
 test('button starts infile class activity', :ui => false) do |activity|
-  assert_equal "What hath Matz wrought?", @text_view.text
   monitor = add_monitor('org.ruboto.RubotoActivity', nil, false)
   begin
     activity.run_on_ui_thread { activity.find_view_by_id(48).perform_click }
@@ -135,3 +138,44 @@ test('button starts infile class activity', :ui => false) do |activity|
   # FIXME(uwe):  Replace sleep with proper monitor
   sleep 3
 end
+
+
+test("infile activity starts again", :ui => false) do |activity|
+  button_activity_text 48, activity, 42, 'This is an infile activity.'
+end
+
+test("start ruby file activity", :ui => false) do |activity|
+  button_activity_text 49, activity, 42, 'This is a Ruby file activity.'
+end
+
+test("start ruby file activity again", :ui => false) do |activity|
+  button_activity_text 49, activity, 42, 'This is a Ruby file activity.'
+end
+
+def button_activity_text button_id, activity, expected_text_id, expected_text_string,
+    activity_class_name = 'org.ruboto.RubotoActivity'
+  monitor = add_monitor(activity_class_name, nil, false)
+  begin
+    activity.run_on_ui_thread { activity.find_view_by_id(button_id).perform_click }
+    current_activity = wait_for_monitor_with_timeout(monitor, 5000)
+  ensure
+    removeMonitor(monitor)
+  end
+  puts "new activity: #{current_activity.inspect}"
+  assert current_activity.is_a? Java::OrgRuboto::RubotoActivity
+  start = Time.now
+  loop do
+    @text_view = current_activity.find_view_by_id(expected_text_id)
+    break if @text_view || (Time.now - start > 10)
+    puts 'wait for text'
+    sleep 1
+  end
+  assert @text_view
+  assert_equal expected_text_string, @text_view.text
+ensure
+  if current_activity
+    current_activity.run_on_ui_thread { current_activity.finish }
+    # FIXME(uwe):  Replace sleep with proper monitor
+    sleep 3
+  end
+end

data/test/activity/navigation_target_activity.rb

@@ -0,0 +1,12 @@
+class NavigationTargetActivity
+  def on_create(bundle)
+    super
+    set_title 'Navigation Target Activity'
+
+    self.content_view =
+        linear_layout :orientation => :vertical, :gravity => :center_horizontal do
+          text_view :text => 'This is the navigation target activity.', :id => 42, :width => :match_parent,
+                    :gravity => :center, :text_size => 48.0
+        end
+  end
+end

data/test/activity/{mytest_otherfile_activity.rb → ruby_file_activity.rb}

@@ -1,11 +1,11 @@
-class MytestOtherfileActivity
+class RubyFileActivity
   def on_create(bundle)
     super
-    set_title 'Otherfile Activity'
+    set_title 'Ruby file Activity'
 
     self.content_view =
         linear_layout :orientation => :vertical, :gravity => :center_horizontal do
-          text_view :text => 'This is an otherfile activity.', :id => 42, :width => :match_parent,
+          text_view :text => 'This is a Ruby file activity.', :id => 42, :width => :match_parent,
                     :gravity => :center, :text_size => 48.0
         end
   end

data/test/activity/subclass_activity_test.rb

@@ -24,9 +24,30 @@ class MyObject < java.lang.Object
     super()
     @my_param = my_param
   end
+
+  def equals(x)
+    !super
+  end
 end
 
 test('add constructor with parameter') do
   o = MyObject.new('It works!')
   assert_equal 'It works!', o.my_param
 end
+
+test('call instance method super') do
+  o = MyObject.new('It works!')
+  assert !o.equals(o)
+end
+
+class MyJRubyAdapter < org.ruboto.JRubyAdapter
+  def self.isDebugBuild
+    !super
+  end
+end
+
+test('call super from static subclass method') do
+  a = org.ruboto.JRubyAdapter
+  b = MyJRubyAdapter
+  assert a.isDebugBuild != b.isDebugBuild
+end

data/test/app_test_methods.rb

@@ -38,7 +38,7 @@ module AppTestMethods
   def run_activity_tests(activity_dir)
     Dir[File.expand_path("#{activity_dir}/*", File.dirname(__FILE__))].each do |file|
       # FIXME(uwe):  Remove when we stop testing JRuby < 1.7.0.rc1
-      next if file =~ /subclass/ && (RUBOTO_PLATFORM == 'CURRENT' || JRUBY_JARS_VERSION < Gem::Version.new('1.7.0.rc1'))
+      next if file =~ /subclass/ && (RUBOTO_PLATFORM == 'CURRENT' || JRUBY_JARS_VERSION < Gem::Version.new('1.7.1.dev'))
 
       if file =~ /_test.rb$/
         next unless file =~ /#{ENV['ACTIVITY_TEST_PATTERN']}/

data/test/broadcast_receiver_test.rb

@@ -13,7 +13,7 @@ class BroadcastReceiverTest < Test::Unit::TestCase
   end
 
   def test_generated_broadcast_receiver
-    action_name ='org.ruboto.example.click_broadcast'
+    action_name = 'org.ruboto.example.click_broadcast'
     message = 'Broadcast received!'
     Dir.chdir APP_DIR do
       activity_filename = 'src/ruboto_test_app_activity.rb'
@@ -57,7 +57,7 @@ EOF
     Log.d "RUBOTO TEST", "Changing UI text"
     context.run_on_ui_thread{$broadcast_test_activity.find_view_by_id(42).text = '#{message}'}
     Log.d "RUBOTO TEST", "UI text changed OK!"
-  rescue
+  rescue Exception
     Log.e "RUBOTO TEST", "Exception changing UI text: \#{$!.message}"
     Log.e "RUBOTO TEST", $!.message
     Log.e "RUBOTO TEST", $!.backtrace.join("\\n")

data/test/ruboto_gen_test.rb

@@ -13,6 +13,12 @@ class RubotoGenTest < Test::Unit::TestCase
     cleanup_app
   end
 
+  def test_gitignore_is_included_in_new_project
+    Dir.chdir APP_DIR do
+      assert File.exists? '.gitignore'
+    end
+  end
+
   def test_icons_are_updated
     Dir.chdir APP_DIR do
       assert_equal 4032, File.size('res/drawable-hdpi/ic_launcher.png')

data/test/test_helper.rb

@@ -39,7 +39,8 @@ module RubotoTest
       '2.3.3' => 'android-10', '2.3.4' => 'android-10',
       '3.0' => 'android-11', '3.1' => 'android-12', '3.2' => 'android-13',
       '4.0.1' => 'android-14', '4.0.3' => 'android-15', '4.0.4' => 'android-15',
-      '4.1' => 'android-16', '4.1.1' => 'android-16'
+      '4.1' => 'android-16', '4.1.1' => 'android-16',
+      '4.2' => 'android-17',
   }
 
   def self.version_from_device

data/test/update_test_methods.rb

@@ -29,35 +29,39 @@ module UpdateTestMethods
     end
   end
 
-  def test_broadcast_receiver
-    Dir.chdir APP_DIR do
-      puts "Adding a broadcast receiver"
-      install_ruboto_gem @old_ruboto_version
-      system "ruboto _#{@old_ruboto_version}_ gen class BroadcastReceiver --name DummyReceiver"
-      fail "Creation of broadcast receiver failed" if $? != 0
-      assert File.exists? 'src/org/ruboto/test_app/DummyReceiver.java'
-      assert File.exists? 'src/dummy_receiver.rb'
-      test_file = 'test/src/dummy_receiver_test.rb'
-      assert File.exists? test_file
-      update_app
+  # FIXME(uwe): Older projects generated code that is no longer compatible/correct
+  # FIXME(uwe): Remove check when we stop support for updating from Ruboto 0.10.0.rc.0 and older
+  unless Gem::Version.new(@old_ruboto_version) <= Gem::Version.new('0.10.0.rc.0')
+    def test_broadcast_receiver
+      Dir.chdir APP_DIR do
+        puts "Adding a broadcast receiver"
+        install_ruboto_gem @old_ruboto_version
+        system "ruboto _#{@old_ruboto_version}_ gen class BroadcastReceiver --name DummyReceiver"
+        fail "Creation of broadcast receiver failed" if $? != 0
+        assert File.exists? 'src/org/ruboto/test_app/DummyReceiver.java'
+        assert File.exists? 'src/dummy_receiver.rb'
+        test_file = 'test/src/dummy_receiver_test.rb'
+        assert File.exists? test_file
+        update_app
+      end
+      run_app_tests
     end
-    run_app_tests
-  end
 
-  def test_broadcast_receiver_updated_twice
-    Dir.chdir APP_DIR do
-      puts "Adding a broadcast receiver"
-      install_ruboto_gem @old_ruboto_version
-      system "ruboto _#{@old_ruboto_version}_ gen class BroadcastReceiver --name DummyReceiver"
-      fail "Creation of broadcast receiver failed" if $? != 0
-      assert File.exists? 'src/org/ruboto/test_app/DummyReceiver.java'
-      assert File.exists? 'src/dummy_receiver.rb'
-      test_file = 'test/src/dummy_receiver_test.rb'
-      assert File.exists? test_file
-      update_app
-      update_app
+    def test_broadcast_receiver_updated_twice
+      Dir.chdir APP_DIR do
+        puts "Adding a broadcast receiver"
+        install_ruboto_gem @old_ruboto_version
+        system "ruboto _#{@old_ruboto_version}_ gen class BroadcastReceiver --name DummyReceiver"
+        fail "Creation of broadcast receiver failed" if $? != 0
+        assert File.exists? 'src/org/ruboto/test_app/DummyReceiver.java'
+        assert File.exists? 'src/dummy_receiver.rb'
+        test_file = 'test/src/dummy_receiver_test.rb'
+        assert File.exists? test_file
+        update_app
+        update_app
+      end
+      run_app_tests
     end
-    run_app_tests
   end
 
   def test_subclass_is_updated
@@ -82,7 +86,7 @@ module UpdateTestMethods
   private
 
   def assert_code(code)
-    filename   = "src/ruboto_test_app_activity.rb"
+    filename = "src/ruboto_test_app_activity.rb"
     Dir.chdir APP_DIR do
       s = File.read(filename)
       raise "Code injection failed!" unless s.gsub!(/(require 'ruboto\/widget')/, "\\1\n#{code}")

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ruboto
 version: !ruby/object:Gem::Version 
-  hash: -86398566
+  hash: -2372293602
   prerelease: 7
   segments: 
   - 0
   - 10
   - 0
   - rc
-  - 0
-  version: 0.10.0.rc.0
+  - 1
+  version: 0.10.0.rc.1
 platform: ruby
 authors: 
 - Daniel Jackoway
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-21 00:00:00 Z
+date: 2012-11-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: main
@@ -59,9 +59,9 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- COPYING
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - Rakefile
 - README.md
 - assets/libs/dx.jar
@@ -107,6 +107,10 @@ files:
 - assets/src/RubotoBroadcastReceiver.java
 - assets/src/RubotoService.java
 - assets/test/src/test_helper.rb
+- assets/.DS_Store
+- assets/.gitignore
+- assets/res/.DS_Store
+- assets/res/drawable/.DS_Store
 - bin/ruboto
 - lib/DalvikProxyClassFactory.java
 - lib/DexClient.java
@@ -115,6 +119,7 @@ files:
 - lib/ruboto/commands/base.rb
 - lib/ruboto/core_ext/array.rb
 - lib/ruboto/core_ext/object.rb
+- lib/ruboto/description.rb
 - lib/ruboto/sdk_versions.rb
 - lib/ruboto/util/asset_copier.rb
 - lib/ruboto/util/build.rb
@@ -136,15 +141,15 @@ files:
 - test/activity/image_button_and_button_activity_test.rb
 - test/activity/margins_activity.rb
 - test/activity/margins_activity_test.rb
-- test/activity/mytest_activity.rb
-- test/activity/mytest_activity_test.rb
-- test/activity/mytest_otherfile_activity.rb
 - test/activity/navigation_activity.rb
 - test/activity/navigation_activity_test.rb
+- test/activity/navigation_target_activity.rb
+- test/activity/navigation_target_activity_test.rb
 - test/activity/option_menu_activity.rb
 - test/activity/option_menu_activity_test.rb
 - test/activity/psych_activity.rb
 - test/activity/psych_activity_test.rb
+- test/activity/ruby_file_activity.rb
 - test/activity/stack_activity.rb
 - test/activity/stack_activity_test.rb
 - test/activity/subclass_activity.rb

data/test/activity/mytest_activity.rb

@@ -1,56 +0,0 @@
-require 'ruboto/activity'
-require 'ruboto/widget'
-
-ruboto_import_widgets :Button, :LinearLayout, :TextView
-
-class MytestActivity < Java::OrgRuboto::EntryPointActivity
-  def on_create(bundle)
-    super
-    set_title File.basename(__FILE__).chomp('_activity.rb').split('_').
-                  map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
-
-    self.content_view =
-        linear_layout :orientation => :vertical, :gravity => :center_horizontal do
-          text_view :text => 'What hath Matz wrought?', :id => 42, :width => :match_parent,
-                    :gravity => :center, :text_size => 48.0
-          button :text => 'Infile class', :width => :match_parent, :id => 48,
-                 :on_click_listener => proc { start_infile_activity }
-          button :text => 'Otherfile class', :width => :match_parent, :id => 49,
-                 :on_click_listener => proc { start_otherfile_activity }
-        end
-  end
-
-  private
-
-  def start_infile_activity
-    i = android.content.Intent.new
-    i.setClassName($package_name, 'org.ruboto.RubotoActivity')
-    configBundle = android.os.Bundle.new
-    configBundle.put_string('ClassName', 'MytestInfileActivity')
-    i.putExtra('RubotoActivity Config', configBundle)
-    startActivity(i)
-  end
-
-  def start_otherfile_activity
-    i = android.content.Intent.new
-    i.setClassName($package_name, 'org.ruboto.RubotoActivity')
-    configBundle = android.os.Bundle.new
-    configBundle.put_string('ClassName', 'MytestOtherfileActivity')
-    i.putExtra('RubotoActivity Config', configBundle)
-    startActivity(i)
-  end
-
-end
-
-class MytestInfileActivity
-  def on_create(bundle)
-    super
-    set_title 'Infile Activity'
-
-    self.content_view =
-        linear_layout :orientation => :vertical, :gravity => :center_horizontal do
-          text_view :text => 'This is an infile activity.', :id => 42, :width => :match_parent,
-                    :gravity => :center, :text_size => 48.0
-        end
-  end
-end

data/test/activity/mytest_activity_test.rb

@@ -1,52 +0,0 @@
-activity org.ruboto.test_app.MytestActivity
-
-setup do |activity|
-  start = Time.now
-  loop do
-    @text_view = activity.findViewById(42)
-    break if @text_view || (Time.now - start > 60)
-    sleep 1
-  end
-  assert @text_view
-end
-
-def button_activity_text button_id, activity, expected_text_id, expected_text_string
-  monitor = add_monitor('org.ruboto.RubotoActivity', nil, false)
-  begin
-    activity.run_on_ui_thread { activity.find_view_by_id(button_id).perform_click }
-    current_activity = wait_for_monitor_with_timeout(monitor, 5000)
-  ensure
-    removeMonitor(monitor)
-  end
-  puts "new activity: #{current_activity.inspect}"
-  assert current_activity
-   assert current_activity.is_a? Java::OrgRuboto::RubotoActivity
-  start = Time.now
-  loop do
-    @text_view = current_activity.find_view_by_id(expected_text_id)
-    break if @text_view || (Time.now - start > 10)
-    puts 'wait for text'
-    sleep 1
-  end
-  assert @text_view
-  assert_equal expected_text_string, @text_view.text
-  current_activity.run_on_ui_thread { current_activity.finish }
-  # FIXME(uwe):  Replace sleep with proper monitor
-  sleep 3
-end
-
-test("infile activity starts once", :ui => false) do |activity|
-  button_activity_text 48, activity, 42, 'This is an infile activity.'
-end
-
-test("infile activity starts again", :ui => false) do |activity|
-  button_activity_text 48, activity, 42, 'This is an infile activity.'
-end
-
-test("otherfile activity starts once", :ui => false) do |activity|
-  button_activity_text 49, activity, 42, 'This is an otherfile activity.'
-end
-
-test("otherfile activity starts again", :ui => false) do |activity|
-  button_activity_text 49, activity, 42, 'This is an otherfile activity.'
-end