ruboto 0.15.0 → 0.16.0

data/assets/rakelib/ruboto.rake

@@ -34,7 +34,7 @@ adb_version_str = `adb version`
 (puts "Unrecognized adb version: #$1"; exit 1) unless adb_version_str =~ /Android Debug Bridge version (\d+\.\d+\.\d+)/
 (puts "adb version 1.0.31 or later required.  Version found: #$1"; exit 1) unless Gem::Version.new($1) >= Gem::Version.new('1.0.31')
 android_home = ENV['ANDROID_HOME']
-android_home = android_home.gsub("\\", "/") unless android_home.nil?
+android_home = android_home.gsub("\\", '/') unless android_home.nil?
 if android_home.nil?
   if (adb_path = which('adb'))
     android_home = File.dirname(File.dirname(adb_path))
@@ -235,27 +235,25 @@ end
 
 file RUBOTO_CONFIG_FILE
 
+task :jruby_adapter => JRUBY_ADAPTER_FILE
 file JRUBY_ADAPTER_FILE => RUBOTO_CONFIG_FILE do
   require 'yaml'
-  if (heap_alloc = YAML.load(File.read(RUBOTO_CONFIG_FILE))['heap_alloc'])
-    config = <<EOF
-            // BEGIN Ruboto HeapAlloc
-            @SuppressWarnings("unused")
-            byte[] arrayForHeapAllocation = new byte[#{heap_alloc} * 1024 * 1024];
-            arrayForHeapAllocation = null;
-            // END Ruboto HeapAlloc
+  marker_topic ='Ruboto HeapAlloc'
+  begin_marker = "// BEGIN #{marker_topic}"
+  end_marker = "// END #{marker_topic}"
+  unless (heap_alloc = YAML.load(File.read(RUBOTO_CONFIG_FILE))['heap_alloc'])
+    heap_alloc = 13
+    comment = '// '
+  end
+  config = <<EOF
+            #{begin_marker}
+            #{comment}@SuppressWarnings("unused")
+            #{comment}byte[] arrayForHeapAllocation = new byte[#{heap_alloc} * 1024 * 1024];
+            #{comment}arrayForHeapAllocation = null;
+            #{end_marker}
 EOF
-  else
-    config = <<EOF
-            // BEGIN Ruboto HeapAlloc
-            // @SuppressWarnings("unused")
-            // byte[] arrayForHeapAllocation = new byte[13 * 1024 * 1024];
-            // arrayForHeapAllocation = null;
-            // END Ruboto HeapAlloc
-EOF
-  end
   source = File.read(JRUBY_ADAPTER_FILE)
-  heap_alloc_pattern = %r{^\s*// BEGIN Ruboto HeapAlloc\n.*^\s*// END Ruboto HeapAlloc\n}m
+  heap_alloc_pattern = %r{^\s*#{begin_marker}\n.*^\s*#{end_marker}\n}m
   File.open(JRUBY_ADAPTER_FILE, 'w') { |f| f << source.sub(heap_alloc_pattern, config) }
 end
 
@@ -281,6 +279,9 @@ task :update_scripts => %w(install:quick) do
   update_scripts
 end
 
+desc 'Copy scripts to emulator or device and reload'
+task :boing => %w(update_scripts:reload)
+
 namespace :update_scripts do
   desc 'Copy scripts to emulator and restart the app'
   task :restart => APK_DEPENDENCIES - RUBY_SOURCE_FILES do |t|
@@ -299,7 +300,7 @@ namespace :update_scripts do
     else
       update_scripts
     end
-    start_app # FIXME(uwe): Should trigger reload of updated scripts
+    start_app
   end
 
   desc 'Copy scripts to emulator and reload'
@@ -309,7 +310,13 @@ namespace :update_scripts do
       start_app
     else
       scripts = update_scripts
-      reload_scripts(scripts) if scripts
+      if scripts
+        if app_running?
+          reload_scripts(scripts)
+        else
+          start_app
+        end
+      end
     end
   end
 end
@@ -380,6 +387,10 @@ file BUNDLE_JAR => [GEM_FILE, GEM_LOCK_FILE] do
     definition = Bundler.definition
     definition.validate_ruby!
     Bundler::Installer.install(Bundler.root, definition)
+    unless Dir["#{BUNDLE_PATH}/bundler/gems/"].empty?
+      system("mkdir -p '#{BUNDLE_PATH}/gems'")
+      system("mv #{BUNDLE_PATH}/bundler/gems/* #{BUNDLE_PATH}/gems/")
+    end
 
     # Restore RUBY_ENGINE (limit the scope of this hack)
     old_verbose, $VERBOSE = $VERBOSE, nil
@@ -389,7 +400,7 @@ file BUNDLE_JAR => [GEM_FILE, GEM_LOCK_FILE] do
       $VERBOSE = old_verbose
     end
     Gem.platforms = platforms
-    Gem.paths = gem_paths["GEM_PATH"]
+    Gem.paths = gem_paths['GEM_PATH']
   else
     # Bundler.settings[:platform] = Gem::Platform::DALVIK
     sh "bundle install --gemfile #{GEM_FILE} --path=#{BUNDLE_PATH} --platform=dalvik#{sdk_level}"
@@ -527,6 +538,35 @@ Java::json.ext.ParserService.new.basicLoad(JRuby.runtime)
   FileUtils.rm_rf BUNDLE_PATH
 end
 
+desc 'Log activity execution, accepts optional logcat filter'
+task :log, [:filter] do |t, args|
+  puts '--- clearing logcat'
+  `adb logcat -c`
+  filter = args[:filter] ? args[:filter] : '' # filter log with filter-specs like TAG:LEVEL TAG:LEVEL ... '*:S'
+  logcat_cmd = "adb logcat ActivityManager #{filter}" # we always need ActivityManager logging to catch activity start
+  puts "--- starting logcat: #{logcat_cmd}"
+  IO.popen logcat_cmd do |logcat|
+    puts "--- waiting for activity #{package}/.#{main_activity} ..."
+    activity_started = false
+    started_regex = Regexp.new "^\\I/ActivityManager.+Start proc #{package} for activity #{package}/\\.#{main_activity}: pid=(?<pid>\\d+)"
+    restarted_regex = Regexp.new "^\\I/ActivityManager.+START u0 {cmp=#{package}/org.ruboto.RubotoActivity.+} from pid (?<pid>\\d+)"
+    related_regex = Regexp.new "#{package}|#{main_activity}"
+    pid_regex = nil
+    logcat.each_line do |line|
+      if (activity_start_match = started_regex.match(line) || restarted_regex.match(line))
+        activity_started = true
+        pid = activity_start_match[:pid]
+        pid_regex = Regexp.new "\\( *#{pid}\\): "
+        puts "--- activity PID=#{pid}"
+      end
+      if activity_started && (line =~ pid_regex || line =~ related_regex)
+        puts "#{Time.now.strftime('%Y%m%d %H%M%S.%6N')} #{line}"
+      end
+    end
+    puts '--- logcat closed'
+  end
+end
+
 # Methods
 
 def sdk_level
@@ -717,17 +757,20 @@ def update_scripts
   return nil
 end
 
+def app_running?
+  `adb shell ps | egrep -e " #{package}\r$"`.size > 0
+end
+
 def start_app
   `adb shell am start -a android.intent.action.MAIN -n #{package}/.#{main_activity}`
 end
 
 # Triggers reload of updated scripts and restart of the current activity
 def reload_scripts(scripts)
-  scripts.each.with_index do |s, i|
-    cmd = "adb shell am broadcast -a android.intent.action.VIEW -e file #{s} #{'-e restart YES' if i == (scripts.size - 1)}"
-    puts cmd
-    system cmd
-  end
+  s = scripts.map{|s| s.gsub(/[&;]/){|m| "&#{m[0]}"}}.join(';')
+  cmd = %Q{adb shell am broadcast -a android.intent.action.VIEW -e reload "#{s}"}
+  puts cmd
+  system cmd
 end
 
 def stop_app

data/assets/src/RubotoActivity.java

@@ -60,11 +60,24 @@ public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
         }
     }
 
-    // FIXME(uwe):  What is this for?
-    public boolean rubotoAttachable() {
-      return true;
+    public void onDestroy() {
+        if (ScriptLoader.isCalledFromJRuby()) {
+            super.onDestroy();
+            return;
+        }
+        if (!JRubyAdapter.isInitialized()) {
+            Log.i("Method called before JRuby runtime was initialized: RubotoActivity#onDestroy");
+            super.onDestroy();
+            return;
+        }
+        String rubyClassName = scriptInfo.getRubyClassName();
+        if (rubyClassName == null) {
+            super.onDestroy();
+            return;
+        }
+        ScriptLoader.callOnDestroy(this);
     }
-    // EMXIF
+
 
   /****************************************************************************************
    * 

data/assets/src/RubotoService.java

@@ -86,6 +86,24 @@ public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
     }
   }
 
+    public void onDestroy() {
+        if (ScriptLoader.isCalledFromJRuby()) {
+            super.onDestroy();
+            return;
+        }
+        if (!JRubyAdapter.isInitialized()) {
+            Log.i("Method called before JRuby runtime was initialized: RubotoActivity#onDestroy");
+            super.onDestroy();
+            return;
+        }
+        String rubyClassName = scriptInfo.getRubyClassName();
+        if (rubyClassName == null) {
+            super.onDestroy();
+            return;
+        }
+        ScriptLoader.callOnDestroy(this);
+    }
+
 
   /****************************************************************************************
    * 

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

@@ -35,7 +35,7 @@ public class EntryPointActivity extends org.ruboto.RubotoActivity {
     // The Intent to to call when done. Defaults to calling this Activity again.
     // Override to change.
     protected Intent futureIntent() {
-        if (getIntent().getAction().equals(Intent.ACTION_MAIN)) {
+        if (!getIntent().getAction().equals(Intent.ACTION_VIEW)) {
             return new Intent(getIntent()).setAction(Intent.ACTION_VIEW);
         } else {
             return getIntent();

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

@@ -272,6 +272,8 @@ public class JRubyAdapter {
                 addLoadPath(scriptsDirName(appContext));
                 put("$package_name", appContext.getPackageName());
 
+                runScriptlet("::RUBOTO_JAVA_PROXIES = {}");
+
                 initialized = true;
             } catch (ClassNotFoundException e) {
                 handleInitException(e);
@@ -353,7 +355,7 @@ public class JRubyAdapter {
     // FIXME(uwe):  Remove when we stop supporting Ruby 1.8
     @Deprecated public static boolean isRubyOneNine() {
     String rv = ((String)get("RUBY_VERSION"));
-        return rv.startsWith("2.0.") || rv.startsWith("1.9.");
+        return rv.startsWith("2.1.") || rv.startsWith("2.0.") || rv.startsWith("1.9.");
     }
 
     static void printStackTrace(Throwable t) {

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

@@ -1,6 +1,7 @@
 package org.ruboto;
 
 import java.io.IOException;
+import java.util.Map;
 
 import android.app.ProgressDialog;
 import android.content.Context;
@@ -12,7 +13,7 @@ public class ScriptLoader {
     */
     public static boolean isCalledFromJRuby() {
         StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
-        int maxLookBack = Math.min(9, stackTraceElements.length);
+        int maxLookBack = Math.min(8, stackTraceElements.length);
         for(int i = 0; i < maxLookBack ; i++){
             if (stackTraceElements[i].getClassName().startsWith("org.jruby.javasupport.JavaMethod")) {
                 return true;
@@ -52,7 +53,6 @@ public class ScriptLoader {
                                 JRubyAdapter.put("$java_instance", component);
                                 rubyClass = JRubyAdapter.runScriptlet("class << $java_instance; self; end");
                             } else if (JRubyAdapter.isRubyOneNine()) {
-                                JRubyAdapter.runScriptlet("Java::" + component.getClass().getName() + ".__persistent__ = true");
                                 rubyClass = JRubyAdapter.runRubyMethod(component, "singleton_class");
                             } else {
                                 throw new RuntimeException("Unknown Ruby version: " + JRubyAdapter.get("RUBY_VERSION"));
@@ -67,7 +67,6 @@ public class ScriptLoader {
                             Log.d("Script contains class definition");
                             if (rubyClass == null && hasBackingJavaClass) {
                                 Log.d("Script has separate Java class");
-                                JRubyAdapter.runScriptlet("Java::" + component.getClass().getName() + ".__persistent__ = true");
                                 rubyClass = JRubyAdapter.runScriptlet("Java::" + component.getClass().getName());
                             }
                             Log.d("Set class: " + rubyClass);
@@ -116,16 +115,40 @@ public class ScriptLoader {
     }
 
     public static final void callOnCreate(final RubotoComponent component, Object... args) {
+        persistObjectProxy(component);
         if (component instanceof android.content.Context) {
             Log.d("Call onCreate on: " + component.getScriptInfo().getRubyInstance());
             // FIXME(uwe):  Simplify when we stop support for snake case aliasing interface callback methods.
             if ((Boolean)JRubyAdapter.runScriptlet(component.getScriptInfo().getRubyClassName() + ".instance_methods(false).any?{|m| m.to_sym == :onCreate}")) {
                 JRubyAdapter.runRubyMethod(component.getScriptInfo().getRubyInstance(), "onCreate", args);
-            } else if ((Boolean)JRubyAdapter.runScriptlet(component.getScriptInfo().getRubyClassName() + ".instance_methods(false).any?{|m| m.to_sym == :on_create}")) {
+            } else if ((Boolean)JRubyAdapter.runScriptlet(component.getScriptInfo().getRubyClassName() + ".instance_methods(true).any?{|m| m.to_sym == :on_create}")) {
                 JRubyAdapter.runRubyMethod(component.getScriptInfo().getRubyInstance(), "on_create", args);
+            } else {
+                JRubyAdapter.runRubyMethod(component.getScriptInfo().getRubyInstance(), "onCreate", args);
             }
             // EMXIF
         }
     }
 
+    public static final void callOnDestroy(final RubotoComponent component) {
+        String rubyClassName = component.getScriptInfo().getRubyClassName();
+        if ((Boolean)JRubyAdapter.runScriptlet(rubyClassName + ".instance_methods(false).any?{|m| m.to_sym == :onDestroy}")) {
+            JRubyAdapter.runRubyMethod(component.getScriptInfo().getRubyInstance(), "onDestroy");
+        } else if ((Boolean)JRubyAdapter.runScriptlet(rubyClassName + ".instance_methods(true).any?{|m| m.to_sym == :on_destroy}")) {
+            JRubyAdapter.runRubyMethod(component.getScriptInfo().getRubyInstance(), "on_destroy");
+        } else {
+            JRubyAdapter.runRubyMethod(component.getScriptInfo().getRubyInstance(), "onDestroy");
+        }
+        releaseObjectProxy(component);
+    }
+
+    private static void persistObjectProxy(RubotoComponent component) {
+        JRubyAdapter.runScriptlet("Java::" + component.getClass().getName() + ".__persistent__ = true");
+        ((Map)JRubyAdapter.get("RUBOTO_JAVA_PROXIES")).put(component.getScriptInfo().getRubyInstance(), component.getScriptInfo().getRubyInstance());
+    }
+
+    private static void releaseObjectProxy(RubotoComponent component) {
+        ((Map)JRubyAdapter.get("RUBOTO_JAVA_PROXIES")).remove(component.getScriptInfo().getRubyInstance());
+    }
+
 }

data/assets/src/ruboto/activity.rb

@@ -62,8 +62,9 @@ module Ruboto
       raise "Unknown options: #{options}" unless options.empty?
 
       if class_name.nil? && block_given?
+        src_desc = source_descriptor(block)
         class_name =
-            "#{java_class.name.split('::').last}_#{source_descriptor(block)[0].split('/').last.gsub(/[.-]+/, '_')}_#{source_descriptor(block)[1]}"
+            "#{java_class.name.split('::').last}_#{src_desc[0].split('/').last.gsub(/[.-]+/, '_')}_#{src_desc[1]}"
       end
 
       class_name = class_name.to_s
@@ -85,8 +86,8 @@ module Ruboto
 
     private
 
-    def source_descriptor(proc)
-      if md = /^#<Proc:0x[0-9A-Fa-f]+@(.+):(\d+)(?: \(lambda\))?>$/.match(proc.inspect)
+    def source_descriptor(src_proc)
+      if (md = /^#<Proc:0x[0-9A-Fa-f-]+@(.+):(\d+)(?: \(lambda\))?>$/.match(src_proc.inspect))
         filename, line = md.captures
         return filename, line.to_i
       end

data/assets/src/ruboto/activity/reload.rb

@@ -1,14 +1,16 @@
+require 'ruboto/activity'
+
 module Ruboto::Activity::Reload
   import org.ruboto.Log
 
   def onResume
-    Log.d "Ruboto::Activity::Reload onResume"
+    Log.d 'Ruboto::Activity::Reload onResume'
     super
 
     @ruboto_activity_reload_receiver = ReloadReceiver.new(self)
     filter = android.content.IntentFilter.new(android.content.Intent::ACTION_VIEW)
     registerReceiver(@ruboto_activity_reload_receiver, filter)
-    Log.d "Ruboto::Activity::Reload registered reload receiver"
+    Log.d 'Ruboto::Activity::Reload registered reload receiver'
   rescue Exception
     Log.e "Exception registering reload listener: #{$!.message}"
     Log.e $!.backtrace.join("\n")
@@ -18,7 +20,7 @@ module Ruboto::Activity::Reload
     super
     unregisterReceiver(@ruboto_activity_reload_receiver)
     @ruboto_activity_reload_receiver = nil
-    Log.d "Ruboto::Activity::Reload unregistered reload receiver"
+    Log.d 'Ruboto::Activity::Reload unregistered reload receiver'
   rescue Exception
     Log.e "Exception unregistering reload listener: #{$!.message}"
     Log.e $!.backtrace.join("\n")
@@ -38,17 +40,20 @@ module Ruboto::Activity::Reload
     #              but have not found a way to do that.
     def onReceive(context, reload_intent)
       Log.d "Got reload intent: #{reload_intent.inspect}"
-      file = reload_intent.get_string_extra('file')
-      if file
-        Log.d "load file: #{file.inspect}"
-        load file
-      end
-      if (reload_intent.get_string_extra('restart'))
+      file_string = reload_intent.get_string_extra('reload')
+      if file_string
+        files = file_string.split(/(?<!&);/).map { |f| f.gsub(/&(.)/) { |m| m[1] } }
+        files.each do |file|
+          Log.d "load file: #{file.inspect}"
+          load file
+        end
         Log.d 'restart activity'
-        if @activity.intent.action == android.content.Intent::ACTION_MAIN
-           restart_intent = android.content.Intent.new(@activity.intent).setAction(android.content.Intent::ACTION_VIEW)
+        if @activity.intent.action == android.content.Intent::ACTION_MAIN ||
+            @activity.intent.action == android.hardware.usb.UsbManager::ACTION_USB_DEVICE_ATTACHED
+          restart_intent = android.content.Intent.new(@activity.intent).
+              setAction(android.content.Intent::ACTION_VIEW)
         else
-           restart_intent = @activity.intent
+          restart_intent = @activity.intent
         end
         @activity.startActivity(restart_intent)
         @activity.finish

data/assets/src/ruboto/widget.rb

@@ -109,7 +109,7 @@ def ruboto_import_widget(class_name, package_name='android.widget')
 
   return unless klass
 
-  RubotoActivity.class_eval "
+  method_str = "
      def #{(class_name.to_s.gsub(/([A-Z])/) { '_' + $1.downcase })[1..-1]}(params={})
         if force_style = params.delete(:default_style)
           rv = #{class_name}.new(self, nil, force_style)
@@ -134,6 +134,13 @@ def ruboto_import_widget(class_name, package_name='android.widget')
         rv
      end
    "
+  RubotoActivity.class_eval method_str
+
+  # FIXME(uwe): Remove condition when we stop support for api level < 11
+  if android.os.Build::VERSION::SDK_INT >= 11
+    android.app.Fragment.class_eval method_str.gsub('self', 'activity')
+  end
+  # EMXIF
 
   setup_list_view if class_name == :ListView
   setup_spinner if class_name == :Spinner
@@ -166,14 +173,12 @@ def setup_image_button
 end
 
 def setup_list_view
-  Java::android.widget.ListView.__persistent__ = true
-  Java::android.widget.ListView.class_eval do
+  android.widget.ListView.__persistent__ = true
+  android.widget.ListView.class_eval do
     def configure(context, params = {})
       if (list = params.delete(:list))
-        @adapter_list = Java::java.util.ArrayList.new
-        @adapter_list.addAll(list)
         item_layout = params.delete(:item_layout) || R::layout::simple_list_item_1
-        params[:adapter] = Java::android.widget.ArrayAdapter.new(context, item_layout, @adapter_list)
+        params[:adapter] = android.widget.ArrayAdapter.new(context, item_layout, list)
       end
       super(context, params)
     end
@@ -188,19 +193,14 @@ def setup_list_view
 end
 
 def setup_spinner
-  Java::android.widget.Spinner.__persistent__ = true
-  Java::android.widget.Spinner.class_eval do
-    attr_reader :adapter, :adapter_list
-
+  android.widget.Spinner.__persistent__ = true
+  android.widget.Spinner.class_eval do
     def configure(context, params = {})
-      if params.has_key? :list
-        @adapter_list = Java::java.util.ArrayList.new
-        @adapter_list.addAll(params[:list])
-        item_layout = params.delete(:item_layout) || R::layout::simple_spinner_item
-        @adapter = Java::android.widget.ArrayAdapter.new(context, item_layout, @adapter_list)
-        @adapter.setDropDownViewResource(params.delete(:dropdown_layout) || R::layout::simple_spinner_dropdown_item)
-        setAdapter @adapter
-        params.delete :list
+      if (list = params.delete(:list))
+        item_layout = params.delete(:item_layout)
+        params[:adapter] = android.widget.ArrayAdapter.new(context, item_layout || R::layout::simple_spinner_item, list)
+        dropdown_layout = params.delete(:dropdown_layout)
+        params[:adapter].setDropDownViewResource(dropdown_layout) if dropdown_layout
       end
       super(context, params)
     end