ruboto 0.6.0 → 0.7.0

data/assets/src/org/ruboto/test/ActivityTest.java

@@ -13,7 +13,7 @@ import junit.framework.AssertionFailedError;
 import junit.framework.Test;
 import junit.framework.TestResult;
 import junit.framework.TestSuite;
-import org.ruboto.Script;
+import org.ruboto.JRubyAdapter;
 
 public class ActivityTest extends ActivityInstrumentationTestCase2 {
     private final Object setup;
@@ -38,16 +38,16 @@ public class ActivityTest extends ActivityInstrumentationTestCase2 {
             Log.i(getClass().getName(), "Activity OK");
             Runnable testRunnable = new Runnable() {
                 public void run() {
-                    String oldFile = Script.getScriptFilename();
+                    String oldFile = JRubyAdapter.getScriptFilename();
 
                     Log.i(getClass().getName(), "calling setup");
-                    Script.setScriptFilename(filename);
-                    Script.callMethod(setup, "call", activity);
+                    JRubyAdapter.setScriptFilename(filename);
+                    JRubyAdapter.callMethod(setup, "call", activity);
                     Log.i(getClass().getName(), "setup ok");
                     
-                    Script.setScriptFilename(filename);
-                    Script.callMethod(block, "call", activity);
-                    Script.setScriptFilename(oldFile);
+                    JRubyAdapter.setScriptFilename(filename);
+                    JRubyAdapter.callMethod(block, "call", activity);
+                    JRubyAdapter.setScriptFilename(oldFile);
                 }
             };
             if (onUiThread) {

data/assets/src/org/ruboto/test/InstrumentationTestRunner.java

@@ -24,7 +24,7 @@ import java.util.Map;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
-import org.ruboto.Script;
+import org.ruboto.JRubyAdapter;
 import java.util.Set;
 import java.util.HashSet;
 
@@ -45,7 +45,7 @@ public class InstrumentationTestRunner extends android.test.InstrumentationTestR
             // TODO(uwe):  Simplify when we stop support for JRuby 1.7.0 or android-10
             Thread t = new Thread(null, new Runnable() {
                 public void run() {
-                    JRubyLoadedOk.set(Script.setUpJRuby(getTargetContext()));
+                    JRubyLoadedOk.set(JRubyAdapter.setUpJRuby(getTargetContext()));
                 }
             }, "Setup JRuby from instrumentation test runner", 64 * 1024);
             try {
@@ -59,9 +59,24 @@ public class InstrumentationTestRunner extends android.test.InstrumentationTestR
 
             if (JRubyLoadedOk.get()) {
                 loadStep = "Setup global variables";
-                Script.defineGlobalVariable("$runner", this);
-                Script.defineGlobalVariable("$test", this);
-                Script.defineGlobalVariable("$suite", suite);
+
+                // TODO(uwe):  Running with large stack is currently only needed when running with JRuby 1.7.0 and android-10
+                // TODO(uwe):  Simplify when we stop support for JRuby 1.7.0 or android-10
+                Thread t2 = new Thread(null, new Runnable() {
+                    public void run() {
+                        JRubyAdapter.put("$runner", InstrumentationTestRunner.this);
+                        JRubyAdapter.put("$test", InstrumentationTestRunner.this);
+                        JRubyAdapter.put("$suite", suite);
+                    }
+                }, "Setup JRuby from instrumentation test runner", 64 * 1024);
+                try {
+                    t2.start();
+                    t2.join();
+                } catch(InterruptedException ie) {
+                    Thread.currentThread().interrupt();
+                    throw new RuntimeException("Interrupted starting JRuby", ie);
+                }
+                // TODO end
 
                 loadStep = "Load test helper";
                 loadScript("test_helper.rb");
@@ -114,7 +129,7 @@ public class InstrumentationTestRunner extends android.test.InstrumentationTestR
 
         boolean runOnUiThread = options == null || options.get("ui") == "true";
 
-        Test test = new ActivityTest(activityClass, Script.getScriptFilename(), setup, name, runOnUiThread, block);
+        Test test = new ActivityTest(activityClass, JRubyAdapter.getScriptFilename(), setup, name, runOnUiThread, block);
         suite.addTest(test);
         Log.d(getClass().getName(), "Made test instance: " + test);
     }
@@ -147,12 +162,12 @@ public class InstrumentationTestRunner extends android.test.InstrumentationTestR
         }
         buffer.close();
 
-        String oldFilename = Script.getScriptFilename();
-        Script.setScriptFilename(f);
-        Script.put("$script_code", source.toString());
-        Script.setScriptFilename(f);
-        Script.execute("$test.instance_eval($script_code)");
-        Script.setScriptFilename(oldFilename);
+        String oldFilename = JRubyAdapter.getScriptFilename();
+        JRubyAdapter.setScriptFilename(f);
+        JRubyAdapter.put("$script_code", source.toString());
+        JRubyAdapter.setScriptFilename(f);
+        JRubyAdapter.execute("$test.instance_eval($script_code)");
+        JRubyAdapter.setScriptFilename(oldFilename);
         Log.d(getClass().getName(), "Test script " + f + " loaded");
     }
 

data/assets/src/ruboto.rb

@@ -12,6 +12,7 @@
 #
 #######################################################
 
+require 'ruboto/base'
 require 'ruboto/activity'
 require 'ruboto/service'
 require 'ruboto/broadcast_receiver'
@@ -21,4 +22,3 @@ require 'ruboto/menu'
 require 'ruboto/util/stack'
 require 'ruboto/util/toast'
 require 'ruboto/legacy'
-

data/assets/src/ruboto/activity.rb

@@ -1,4 +1,5 @@
 require 'ruboto/base'
+require 'ruboto/package'
 
 #######################################################
 #
@@ -31,7 +32,7 @@ module Ruboto
       start_ruboto_activity(remote_variable, RubotoDialog, theme, &block)
     end
   
-    def start_ruboto_activity(global_variable_name, klass=RubotoActivity, theme=nil, &block)
+    def start_ruboto_activity(global_variable_name = '$activity', klass=RubotoActivity, theme=nil, &block)
       $context_init_block = block
       $new_context_global = global_variable_name
   
@@ -65,6 +66,14 @@ end
 
 module Ruboto
   module Activity
+    def initialize(java_instance)
+      @java_instance = java_instance
+    end
+
+    def method_missing(method, *args, &block)
+      return @java_instance.send(method, *args, &block) if @java_instance.respond_to?(method)
+      super
+    end
   end
 end
   

data/assets/src/ruboto/base.rb

@@ -17,9 +17,6 @@ end
 
 require 'java'
 
-$package_name = ($activity || $service || $broadcast_receiver).package_name
-$package      = eval("Java::#{$package_name}")
-
 # Create convenience method for top-level android package so we do not need to prefix with 'Java::'.
 module Kernel
   def android
@@ -28,15 +25,6 @@ module Kernel
 end
 
 java_import "android.R"
-
-module Ruboto
-  java_import "#{$package_name}.R"
-  begin
-    Id = JavaUtilities.get_proxy_class("#{$package_name}.R$id")
-  rescue NameError
-    Java::android.util.Log.d "RUBOTO", "no R$id"
-  end
-end
 AndroidIds = JavaUtilities.get_proxy_class("android.R$id")
 
 #

data/assets/src/ruboto/broadcast_receiver.rb

@@ -29,3 +29,15 @@ RubotoBroadcastReceiver.class_eval do
     end
 end
 
+module Ruboto
+  module BroadcastReceiver
+    def initialize(java_instance)
+      @java_instance = java_instance
+    end
+
+    def method_missing(method, *args, &block)
+      return @java_instance.send(method, *args, &block) if @java_instance.respond_to?(method)
+      super
+    end
+  end
+end

data/assets/src/ruboto/menu.rb

@@ -34,7 +34,6 @@ module Ruboto
 
       p = Proc.new do |num, menu_item|
         # handles a problem where this is called for context items
-        # TODO(uwe): JRUBY-5866 JRuby can't access nested Java class if the class is called 'id'
         # TODO(uwe): Remove check for SDK version when we stop supporting api level < 11
         unless @just_processed_context_item == menu_item || (android.os.Build::VERSION::SDK_INT >= 11 && menu_item.item_id == AndroidIds.home)
           instance_eval &(menu_item.on_click)

data/assets/src/ruboto/package.rb

@@ -0,0 +1,11 @@
+$package_name = ($activity || $service).package_name
+$package      = eval("Java::#{$package_name}")
+
+module Ruboto
+  java_import "#{$package_name}.R"
+  begin
+    Id = JavaUtilities.get_proxy_class("#{$package_name}.R$id")
+  rescue NameError
+    Java::android.util.Log.d "RUBOTO", "no R$id"
+  end
+end

data/assets/src/ruboto/service.rb

@@ -1,4 +1,5 @@
 require 'ruboto/base'
+require 'ruboto/package'
 
 #######################################################
 #
@@ -53,6 +54,14 @@ end
 
 module Ruboto
   module Service
+    def initialize(java_instance)
+      @java_instance = java_instance
+    end
+
+    def method_missing(method, *args, &block)
+      return @java_instance.send(method, *args, &block) if @java_instance.respond_to?(method)
+      super
+    end
   end
 end
 

data/lib/ruboto/commands/base.rb

@@ -346,10 +346,10 @@ module Ruboto
                 update_test force
                 update_assets
                 update_ruboto force
-                update_icons force
                 update_classes force
                 update_jruby force
                 update_manifest nil, nil, force
+                update_icons force
                 update_core_classes "exclude"
                 update_bundle
               when "jruby" then

data/lib/ruboto/util/build.rb

@@ -165,7 +165,7 @@ module Ruboto
         text = File.read(File.join(Ruboto::ASSETS, "src/Inheriting#{klass}.java"))
         file_existed = File.exists?(file)
         File.open(file, 'w') do |f|
-          f << text.gsub("THE_PACKAGE", package).gsub("Inheriting#{klass}", name).gsub("start.rb", script_name)
+          f << text.gsub("THE_PACKAGE", package).gsub("Sample#{klass}", name).gsub("Inheriting#{klass}", name).gsub("sample_#{underscore(klass)}.rb", script_name)
         end
         puts "#{file_existed ? 'Updated' : 'Added'} file #{file}."
 

data/lib/ruboto/util/update.rb

@@ -17,15 +17,15 @@ module Ruboto
         name = REXML::Document.new(File.read(build_xml_file)).root.attributes['name']
 
         # FIXME(uwe): Remove build.xml file to force regeneration.
-        # FIXME(uwe): Needed when updating from Android SDK <= 13 to 14
-        # FIXME(uwe): Remove when we stop supporting upgrading from Android SDK <= 13
+        # FIXME(uwe): Needed when updating apps from Android SDK <= 13 to 14
+        # FIXME(uwe): Remove when we stop supporting upgrading apps from Android SDK <= 13
         if File.read(build_xml_file) !~ /<!-- version-tag: 1 -->/
           puts "Forcing generation of new build.xml since upgrading a project generated with Android SDK 13 or older."
           FileUtils.rm_f build_xml_file
         end
         # FIXME end
 
-        # FIXME(uwe):  Simplify when we stop supporting upgrading from Android ASK <= 13
+        # FIXME(uwe):  Simplify when we stop supporting upgrading apps from Android SDK <= 13
         prop_file = File.exists?(new_prop_file) ? new_prop_file : old_prop_file
         version_regexp = /^(target=android-)(\d+)$/
         if (project_property_file = File.read(prop_file)) =~ version_regexp
@@ -50,7 +50,7 @@ module Ruboto
           puts "Done"
         else
           # FIXME(uwe): Remove build.xml file to force regeneration.
-          # FIXME(uwe): Needed when updating from Android SDK <=13 to 14
+          # FIXME(uwe): Needed when updating apps from Android SDK <= 13 to 14
           FileUtils.rm_f "#{root}/test/build.xml"
           # FIXME end
 
@@ -61,7 +61,7 @@ module Ruboto
 
         Dir.chdir File.join(root, 'test') do
           test_manifest = REXML::Document.new(File.read('AndroidManifest.xml')).root
-          test_manifest.elements['application'].attributes['android:icon'] = '@drawable/icon'
+          test_manifest.elements['application'].attributes['android:icon'] ||= '@drawable/ic_launcher'
           test_manifest.elements['instrumentation'].attributes['android:name'] = 'org.ruboto.test.InstrumentationTestRunner'
 
           # TODO(uwe): Trying to push test scripts for faster test cycle, but failing...
@@ -81,7 +81,7 @@ module Ruboto
           File.open("AndroidManifest.xml", 'w') { |f| test_manifest.document.write(f, 4) }
           instrumentation_property = "test.runner=org.ruboto.test.InstrumentationTestRunner\n"
 
-          # FIXME(uwe): Cleanup when we stop supporting Android SDK <= 13
+          # FIXME(uwe): Cleanup when we stop supporting updating apps generated with Android SDK <= 13
           prop_file = %w{ant.properties build.properties}.find { |f| File.exists?(f) }
           prop_lines = File.readlines(prop_file)
           File.open(prop_file, 'a') { |f| f << instrumentation_property } unless prop_lines.include?(instrumentation_property)
@@ -119,7 +119,7 @@ module Ruboto
               <contains string="${tests.output}" substring="INSTRUMENTATION_FAILED"/>
               <contains string="${tests.output}" substring="FAILURES"/>
               <not>
-                <matches string="${tests.output}" pattern="OK \\(\\d+ tests\\)" multiline="true"/>
+                <matches string="${tests.output}" pattern="OK \\(\\d+ tests?\\)" multiline="true"/>
               </not>
             </or>
           </condition>
@@ -190,7 +190,7 @@ module Ruboto
         log_action("Copying #{JRubyJars::stdlib_jar_path} to libs") { copier.copy_from_absolute_path JRubyJars::stdlib_jar_path, "libs" }
 
         # FIXME(uwe):  Try keeping the class count low to enable installation on Android 2.3 devices
-        unless new_jruby_version == '1.7.0.dev' && verify_target_sdk < 15
+        unless new_jruby_version =~ /^1.7.0/ && verify_target_sdk < 15
           log_action("Copying dexmaker.jar to libs") { copier.copy 'libs' }
         end
 
@@ -228,11 +228,23 @@ module Ruboto
       end
 
       def update_icons(force = nil)
-        copier = Ruboto::Util::AssetCopier.new Ruboto::ASSETS, '.', force
-        log_action('icons') do
-          copier.copy 'res/drawable*/icon.png'
-          copier.copy 'res/drawable/get_ruboto_core.png'
-          copier.copy 'res/drawable*/icon.png', 'test'
+        log_action('Copying icons') do
+          Ruboto::Util::AssetCopier.new(Ruboto::ASSETS, '.', force).copy 'res/drawable/get_ruboto_core.png'
+          icon_path = verify_manifest.elements['application'].attributes['android:icon']
+          test_icon_path = verify_test_manifest.elements['application'].attributes['android:icon']
+          Dir["#{Ruboto::ASSETS}/res/drawable*/ic_launcher.png"].each do |f|
+            src_dir = f.slice(/res\/drawable.*\//)
+            dest_file = icon_path.sub('@drawable/', src_dir) + '.png'
+            if force || !File.exists?(dest_file)
+              FileUtils.mkdir_p File.dirname(dest_file)
+              FileUtils.cp(f, dest_file)
+            end
+            test_dest_file = 'test/' + test_icon_path.sub('@drawable/', src_dir) + '.png'
+            if force || !File.exists?(test_dest_file)
+              FileUtils.mkdir_p File.dirname(test_dest_file)
+              FileUtils.cp(f, test_dest_file)
+            end
+          end
         end
       end
 
@@ -251,14 +263,17 @@ module Ruboto
               script_file = File.expand_path("#{SCRIPTS_DIR}/#{underscore(subclass_name)}.rb")
               script_content = File.read(script_file)
               if script_content !~ /\$broadcast_receiver.handle_receive do \|context, intent\|/ &&
-                  script_content !~ /RubotoBroadcastReceiver.new_with_callbacks/
+                  script_content !~ /RubotoBroadcastReceiver.new_with_callbacks/ &&
+                  script_content !~ /class \w+\s+include Ruboto::BroadcastReceiver/
                 puts "Putting receiver script in a block in #{script_file}"
                 script_content.gsub! '$broadcast_context', 'context'
                 File.open(script_file, 'w') do |of|
-                  of.puts 'RubotoBroadcastReceiver.new_with_callbacks do
-  def on_receive(context, intent)'
+                  of.puts "class #{subclass_name}
+  include Ruboto::BroadcastReceiver
+
+  def on_receive(context, intent)"
                   of << script_content
-                  of.puts 'end'
+                  of.puts '  end\nend'
                 end
               end
             end
@@ -287,7 +302,7 @@ module Ruboto
           end
 
           app_element = verify_manifest.elements['application']
-          app_element.attributes['android:icon'] ||= '@drawable/icon'
+          app_element.attributes['android:icon'] ||= '@drawable/ic_launcher'
 
           if min_sdk.to_i >= 11
             app_element.attributes['android:hardwareAccelerated'] ||= 'true'
@@ -431,13 +446,6 @@ module Ruboto
                     'org/jruby/runtime/invokedynamic',
                 ]
                 # TODO end
-
-                # TODO(uwe): Remove when we stop supporting jruby-jars-1.6.2
-                if jruby_core_version == '1.6.2'
-                  print 'Retaining FFI for JRuby 1.6.2...'
-                  excluded_core_packages.delete('org/jruby/ext/ffi')
-                end
-                # TODO end
               end
 
               excluded_core_packages.each do |i|
@@ -447,7 +455,7 @@ module Ruboto
               # FIXME(uwe):  Add a Ruboto.yml config for this if it works
               # Reduces the installation footprint, but also reduces performance and stack usage
               # FIXME(uwe):  Measure the performance change
-              if false && jruby_core_version == '1.7.0.dev' && Dir.chdir('../..'){verify_target_sdk < 15}
+              if false && jruby_core_version =~ /^1.7.0/ && Dir.chdir('../..'){verify_target_sdk < 15}
                 invokers = Dir['**/*${INVOKER$*,POPULATOR}.class']
                 log_action("Removing invokers & populators(#{invokers.size})") do
                   FileUtils.rm invokers
@@ -489,7 +497,7 @@ module Ruboto
                 # TODO(uwe): Simplify when we stop supporting JRuby < 1.7.0
                 raise "Unrecognized JRuby stdlib jar: #{jruby_stdlib}" unless jruby_stdlib =~ /jruby-stdlib-(.*).jar/
                 jruby_version = Gem::Version.new($1)
-                if Gem::Requirement.new('< 1.7.0.dev') =~ jruby_version
+                if Gem::Requirement.new('< 1.7.0.preview1') =~ jruby_version
                   lib_dirs = ['1.8', '1.9', 'site_ruby/1.8', 'site_ruby/1.9', 'site_ruby/shared']
                 else
                   lib_dirs = ['1.8', '1.9', 'shared']

data/lib/ruboto/util/xml_element.rb

@@ -151,9 +151,7 @@ module Ruboto
         rv ? "return #{rv}" : default_return
       end
 
-      def ruby_call
-        rv = []
-
+      def ruby_call(on_ruby_instance = false, camelize = false)
         params = parameters
         args = ""
         if params.size > 1
@@ -176,19 +174,34 @@ module Ruboto
           convert_return = ", #{return_class}.class"
         end
 
-        rv << "#{return_cast}Script.callMethod(callbackProcs[#{constant_string}], \"call\" #{args}#{convert_return});"
-        rv
+        if on_ruby_instance
+          ["#{return_cast}JRubyAdapter.callMethod(rubyInstance, \"#{camelize ? attribute("name") : snake_case_attribute}\" #{args}#{convert_return});"]
+        else
+          ["#{return_cast}JRubyAdapter.callMethod(callbackProcs[#{constant_string}], \"call\" #{args}#{convert_return});"]
+        end
+      end
+
+      def snake_case_attribute
+        attribute("name").gsub(/[A-Z]/) { |i| "_#{i}" }.downcase
       end
 
       def method_definition
         method_call(
-          (attribute("return") ? attribute("return") : "void"),
-          attribute("name"), parameters,
-          if_else(
-              "callbackProcs != null && callbackProcs[#{constant_string}] != null",
-              [super_string] + ruby_call,
-              [super_return]
-          )
+            (attribute("return") ? attribute("return") : "void"),
+            attribute("name"), parameters,
+            if_else(
+                "rubyInstance != null && JRubyAdapter.callMethod(rubyInstance, \"respond_to?\" , new Object[]{\""+ snake_case_attribute + "\"}, Boolean.class)",
+                [super_string] + ruby_call(true),
+                if_else(
+                    "rubyInstance != null && JRubyAdapter.callMethod(rubyInstance, \"respond_to?\" , new Object[]{\""+ attribute("name") +"\"}, Boolean.class)",
+                    [super_string] + ruby_call(true, true),
+                    if_else(
+                        "callbackProcs != null && callbackProcs[#{constant_string}] != null",
+                        [super_string] + ruby_call,
+                        [super_return]
+                    )
+                )
+            )
         ).indent.join("\n")
       end