ruboto 0.10.0 → 0.10.1

data/README.md

@@ -16,6 +16,7 @@ Before you use Ruboto, you should do the following things:
 * Install the JDK if it's not on your system already
 * Install [jruby](http://jruby.org/) if you don't already have it. JRuby has a [very easy install process](http://jruby.org/#2), or you can use [rvm](http://rvm.beginrescueend.com/)
 * Install [the Android SDK](http://developer.android.com/sdk/index.html)
+* Add the sdk to `$ANDROID_HOME` as an absolute path (Java does not expand tildes `~`)
 * Add the sdk's `tools/` and `platform-tools/` directory to your `$PATH`
 * Generate an [Emulator](http://developer.android.com/guide/developing/tools/emulator.html) image unless you want to develop using your phone.
 
@@ -241,9 +242,9 @@ If you have an "eclair" emulator that runs Android 2.1 and a "froyo" one that ru
 Alternatives
 ------------
 
-If Ruboto's performance is a problem for you, or you want something that gives you total access to the android API (as Ruboto does not yet do), check out [Mirah](http://mirah.org/) and [Garrett](http://github.com/technomancy/Garrett).
+If Ruboto's performance is a problem for you, check out [Mirah](http://mirah.org/) and [Garrett](http://github.com/technomancy/Garrett).
 
-Mirah, formerly known as Duby, is a language with Ruby-like syntax that compiles to java files. This means that it adds no big runtime dependencies and has essentially the same performance as writing Java code because it essentially generates the same Java code that you would write. This makes it extremely well-suited for mobile devices where performance is a much bigger consideration.
+Mirah is a language with Ruby-like syntax that compiles to java files. This means that it adds no big runtime dependencies and has essentially the same performance as writing Java code because it essentially generates the same Java code that you would write. This makes it extremely well-suited for mobile devices where performance is a much bigger consideration.
 
 Garrett is a "playground for Mirah exploration on Android."
 

data/Rakefile

@@ -5,7 +5,7 @@ require 'ruboto/version'
 require 'ruboto/description'
 require 'ruboto/sdk_versions'
 require 'uri'
-require 'net/http'
+require 'net/https'
 
 PLATFORM_PROJECT = File.expand_path('tmp/RubotoCore', File.dirname(__FILE__))
 PLATFORM_DEBUG_APK = "#{PLATFORM_PROJECT}/bin/RubotoCore-debug.apk"
@@ -293,15 +293,9 @@ namespace :platform do
   task :project => PLATFORM_PROJECT
 
   file PLATFORM_PROJECT do
-    sh "ruby -rubygems -I#{File.expand_path('lib', File.dirname(__FILE__))} bin/ruboto gen app --package org.ruboto.core --name RubotoCore --with-jruby --path #{PLATFORM_PROJECT} --min-sdk #{Ruboto::SdkVersions::MINIMUM_SUPPORTED_SDK} --target #{Ruboto::SdkVersions::DEFAULT_TARGET_SDK}"
-    Dir.chdir(PLATFORM_PROJECT) do
-      manifest = REXML::Document.new(File.read(MANIFEST_FILE))
-      manifest.root.attributes['android:versionCode'] = '409'
-      manifest.root.attributes['android:versionName'] = '0.4.9'
-      manifest.root.attributes['android:installLocation'] = 'auto' # or 'preferExternal' ?
-      File.open(MANIFEST_FILE, 'w') { |f| manifest.document.write(f, 4) }
-      File.open('Gemfile.apk', 'w'){|f| f << "source :rubygems\n\ngem 'activerecord-jdbc-adapter'\n"}
-      File.open('ant.properties', 'a'){|f| f << "key.store=${user.home}/ruboto_core.keystore\nkey.alias=Ruboto\n"}
+    sh "git clone --depth 1 https://github.com/ruboto/ruboto-core.git #{PLATFORM_PROJECT}"
+    Dir.chdir PLATFORM_PROJECT do
+      sh "ruby -rubygems -I#{File.expand_path('lib', File.dirname(__FILE__))} ../../bin/ruboto update app"
     end
   end
 
@@ -335,9 +329,13 @@ namespace :platform do
   desc 'Download the current RubotoCore platform release apk'
   file PLATFORM_CURRENT_RELEASE_APK do
     puts 'Downloading the current RubotoCore platform release apk'
-    url = 'http://cloud.github.com/downloads/ruboto/ruboto/RubotoCore-release.apk'
+    uri = URI('https://raw.github.com/ruboto/ruboto-core/master/dist/RubotoCore-release.apk')
     begin
-      File.open(PLATFORM_CURRENT_RELEASE_APK, 'w') { |f| f << Net::HTTP.get(URI.parse url) }
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      content = http.request(Net::HTTP::Get.new(uri.request_uri)).body
+      File.open(PLATFORM_CURRENT_RELEASE_APK, 'w') { |f| f << content }
     rescue Exception, SystemExit
       FileUtils.rm(PLATFORM_CURRENT_RELEASE_APK) if File.exists?(PLATFORM_CURRENT_RELEASE_APK)
       raise

data/assets/.gitignore

@@ -1,4 +1,6 @@
-/.idea
+.bundle
+.DS_Store
+.idea
 bin
 gen
 tmp

data/assets/rakelib/ruboto.rake

@@ -1,4 +1,8 @@
 require 'rbconfig'
+require 'rubygems'
+require 'time'
+require 'rake/clean'
+require 'rexml/document'
 
 ANT_CMD = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw/i) ? "ant.bat" : "ant"
 
@@ -7,7 +11,21 @@ if `#{ANT_CMD} -version` !~ /version (\d+)\.(\d+)\.(\d+)/ || $1.to_i < 1 || ($1.
   exit 1
 end
 
-require 'time'
+adb_version_str = `adb version`
+(puts "Android SDK platform tools not in PATH (adb command not found).";exit 1) unless $? == 0
+(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')
+adb_path = `which adb`
+ENV['ANDROID_HOME'] ||= File.dirname(File.dirname(adb_path)) if $? == 0
+
+dx_filename = "#{ENV['ANDROID_HOME']}/platform-tools/dx"
+old_dx_content = File.read(dx_filename)
+new_dx_content = old_dx_content.dup
+if new_dx_content =~ /^defaultMx="-Xmx(\d+)(M|G)"/ &&
+    ($1.to_i * 1024 ** {'M' => 2, 'G' => 3, 'T' => 4}[$2]) < 3*1024**3
+  new_dx_content.sub(/^defaultMx="-Xmx\d+(M|G)"/, 'defaultMx="-Xmx3G"')
+  File.open(dx_filename, 'w') { |f| f << new_dx_content }
+end
 
 def manifest() @manifest ||= REXML::Document.new(File.read(MANIFEST_FILE)) end
 def package() manifest.root.attribute('package') end
@@ -15,9 +33,6 @@ def build_project_name() @build_project_name ||= REXML::Document.new(File.read('
 def scripts_path() @sdcard_path ||= "/mnt/sdcard/Android/data/#{package}/files/scripts" end
 def app_files_path() @app_files_path ||= "/data/data/#{package}/files" end
 
-require 'rake/clean'
-require 'rexml/document'
-
 PROJECT_DIR        = File.expand_path('..', File.dirname(__FILE__))
 UPDATE_MARKER_FILE = File.join(PROJECT_DIR, 'bin', 'LAST_UPDATE')
 BUNDLE_JAR         = File.expand_path 'libs/bundle.jar'
@@ -38,7 +53,7 @@ APK_DEPENDENCIES   = [MANIFEST_FILE, RUBOTO_CONFIG_FILE, BUNDLE_JAR] + JRUBY_JAR
 KEYSTORE_FILE      = (key_store = File.readlines('ant.properties').grep(/^key.store=/).first) ? File.expand_path(key_store.chomp.sub(/^key.store=/, '').sub('${user.home}', '~')) : "#{build_project_name}.keystore"
 KEYSTORE_ALIAS     = (key_alias = File.readlines('ant.properties').grep(/^key.alias=/).first) ? key_alias.chomp.sub(/^key.alias=/, '') : build_project_name
 
-CLEAN.include('bin')
+CLEAN.include('bin', 'gen')
 
 task :default => :debug
 
@@ -74,9 +89,15 @@ task :install => APK_FILE do
   install_apk
 end
 
+desc 'uninstall, build, and install the application'
+task :reinstall => [:uninstall, APK_FILE, :install]
+
 namespace :install do
-  desc 'uninstall, build, and install the application'
-  task :clean => [:uninstall, APK_FILE, :install]
+  # FIXME(uwe):  Remove in 2013
+  desc 'Deprecated:  use "reinstall" instead.'
+  task :clean => :reinstall do
+    puts '"rake install:clean" is deprecated.  Use "rake reinstall" instead.'
+  end
 
   desc 'Install the application, but only if compiled files are changed.'
   task :quick => 'debug:quick' do
@@ -85,13 +106,15 @@ namespace :install do
 end
 
 desc 'Build APK for release'
-task :release => RELEASE_APK_FILE
+task :release => [:tag, RELEASE_APK_FILE]
 
 file RELEASE_APK_FILE => [KEYSTORE_FILE] + APK_DEPENDENCIES do |t|
   build_apk(t, true)
 end
 
 desc 'Create a keystore for signing the release APK'
+task :keystore => KEYSTORE_FILE
+
 file KEYSTORE_FILE do
   unless File.read('ant.properties') =~ /^key.store=/
     File.open('ant.properties', 'a'){|f| f << "\nkey.store=#{KEYSTORE_FILE}\n"}
@@ -103,30 +126,19 @@ file KEYSTORE_FILE do
 end
 
 desc 'Tag this working copy with the current version'
-task :tag => :release do
+task :tag do
+  next unless File.exists?('.git') && `git --version` =~ /git version /
   unless `git branch` =~ /^\* master$/
     puts "You must be on the master branch to release!"
     exit!
   end
   # sh "git commit --allow-empty -a -m 'Release #{version}'"
   output = `git status --porcelain`
-  raise "Workspace not clean!\n#{output}" unless output.empty?
+  raise "\nWorkspace not clean!\n#{output}" unless output.empty?
   sh "git tag #{version}"
   sh "git push origin master --tags"
 end
 
-task :sign => :release do
-  sh "jarsigner -keystore #{ENV['RUBOTO_KEYSTORE']} -signedjar bin/#{build_project_name}.apk bin/#{build_project_name}-unsigned.apk #{ENV['RUBOTO_KEY_ALIAS']}"
-end
-
-task :align => :sign do
-  sh "zipalign 4 bin/#{build_project_name}.apk #{build_project_name}.apk"
-end
-
-task :publish => :align do
-  puts "#{build_project_name}.apk is ready for the market!"
-end
-
 desc 'Start the emulator with larger disk'
 task :emulator do
   sh 'emulator -partition-size 1024 -avd Android_3.0'
@@ -332,15 +344,15 @@ def strings(name)
   value.text
 end
 
-def version()
+def version
   strings :version_name
 end
 
-def app_name()
+def app_name
   strings :app_name
 end
 
-def main_activity()
+def main_activity
   manifest.root.elements['application'].elements["activity[@android:label='@string/app_name']"].attribute('android:name')
 end
 

data/assets/src/RubotoActivity.java

@@ -11,7 +11,6 @@ public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
     private final ScriptInfo scriptInfo = new ScriptInfo();
     private String remoteVariable = null;
     Bundle[] args;
-    private Bundle configBundle = null;
 
     public THE_RUBOTO_CLASS setRemoteVariable(String var) {
         remoteVariable = var;
@@ -40,29 +39,15 @@ public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
         args = new Bundle[1];
         args[0] = bundle;
 
-        configBundle = getIntent().getBundleExtra("RubotoActivity Config");
-
+        Bundle configBundle = getIntent().getBundleExtra("Ruboto Config");
         if (configBundle != null) {
             if (configBundle.containsKey("Theme")) {
                 setTheme(configBundle.getInt("Theme"));
             }
-            if (configBundle.containsKey("ClassName")) {
-                if (this.getClass().getName() == THE_RUBOTO_CLASS.class.getName()) {
-                    scriptInfo.setRubyClassName(configBundle.getString("ClassName"));
-                } else {
-                    throw new IllegalArgumentException("Only local Intents may set class name.");
-                }
-            }
-            if (configBundle.containsKey("Script")) {
-                if (this.getClass().getName() == THE_RUBOTO_CLASS.class.getName()) {
-                    scriptInfo.setScriptName(configBundle.getString("Script"));
-                } else {
-                    throw new IllegalArgumentException("Only local Intents may set script name.");
-                }
-            }
+            scriptInfo.setFromIntent(getIntent());
         }
 
-        if (JRubyAdapter.isInitialized()) {
+        if (JRubyAdapter.isInitialized() && scriptInfo.isReadyToLoad()) {
     	    ScriptLoader.loadScript(this, (Object[]) args);
         } else {
             super.onCreate(bundle);

data/assets/src/RubotoService.java

@@ -17,18 +17,121 @@ public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
      */
     @Override
     public void onCreate() {
-        if (ScriptLoader.isCalledFromJRuby()) {
-            super.onCreate();
-            return;
+      System.out.println("RubotoService onCreate(): " + getClass().getName());
+
+      if (ScriptLoader.isCalledFromJRuby()) {
+        super.onCreate();
+        return;
+      }
+
+      if (JRubyAdapter.isInitialized() && scriptInfo.isReadyToLoad()) {
+  	    ScriptLoader.loadScript(this);
+      } else {
+        super.onCreate();
+      }
+    }
+
+  @Override
+  public int onStartCommand(android.content.Intent intent, int flags, int startId) {
+	  if (ScriptLoader.isCalledFromJRuby()) return super.onStartCommand(intent, flags, startId);
+
+    if (!JRubyAdapter.isInitialized()) {
+      Log.i("Method called before JRuby runtime was initialized: RubotoService#onStartCommand");
+      return super.onStartCommand(intent, flags, startId);
+    }
+	
+    if (JRubyAdapter.isInitialized() && !scriptInfo.isLoaded()) {
+      scriptInfo.setFromIntent(intent);
+ 	    ScriptLoader.loadScript(this);
+    }
+	  
+	  String rubyClassName = scriptInfo.getRubyClassName();
+	  if (rubyClassName == null) return super.onStartCommand(intent, flags, startId);
+	  if ((Boolean)JRubyAdapter.runScriptlet(rubyClassName + ".instance_methods(false).any?{|m| m.to_sym == :on_start_command}")) {
+		  // FIXME(uwe): Simplify when we stop support for RubotoCore 0.4.7
+      if (JRubyAdapter.isJRubyPreOneSeven()) {
+        JRubyAdapter.put("$arg_intent", intent);
+        JRubyAdapter.put("$arg_flags", flags);
+        JRubyAdapter.put("$arg_startId", startId);
+        JRubyAdapter.put("$ruby_instance", scriptInfo.getRubyInstance());
+        return (Integer) ((Number)JRubyAdapter.runScriptlet("$ruby_instance.on_start_command($arg_intent, $arg_flags, $arg_startId)")).intValue();
+      } else {
+        if (JRubyAdapter.isJRubyOneSeven()) {
+          return (Integer) JRubyAdapter.runRubyMethod(Integer.class, scriptInfo.getRubyInstance(), "on_start_command", new Object[]{intent, flags, startId});
+        } else {
+          throw new RuntimeException("Unknown JRuby version: " + JRubyAdapter.get("JRUBY_VERSION"));
         }
-	    System.out.println("RubotoService.onCreate()");
+      }
+    } else {
+      if ((Boolean)JRubyAdapter.runScriptlet(rubyClassName + ".instance_methods(false).any?{|m| m.to_sym == :onStartCommand}")) {
+        // FIXME(uwe): Simplify when we stop support for RubotoCore 0.4.7
+        if (JRubyAdapter.isJRubyPreOneSeven()) {
+          JRubyAdapter.put("$arg_intent", intent);
+          JRubyAdapter.put("$arg_flags", flags);
+          JRubyAdapter.put("$arg_startId", startId);
+          JRubyAdapter.put("$ruby_instance", scriptInfo.getRubyInstance());
+          return (Integer) ((Number)JRubyAdapter.runScriptlet("$ruby_instance.onStartCommand($arg_intent, $arg_flags, $arg_startId)")).intValue();
+        } else {
+          if (JRubyAdapter.isJRubyOneSeven()) {
+            return (Integer) JRubyAdapter.runRubyMethod(Integer.class, scriptInfo.getRubyInstance(), "onStartCommand", new Object[]{intent, flags, startId});
+          } else {
+            throw new RuntimeException("Unknown JRuby version: " + JRubyAdapter.get("JRUBY_VERSION"));
+          }
+        }
+      } else {
+        return super.onStartCommand(intent, flags, startId);
+      }
+    }
+  }
+
+  @Override
+  public android.os.IBinder onBind(android.content.Intent intent) {
+    if (ScriptLoader.isCalledFromJRuby()) return null;
+    if (!JRubyAdapter.isInitialized()) {
+      Log.i("Method called before JRuby runtime was initialized: RubotoService#onBind");
+      return null;
+    }
 
-        if (JRubyAdapter.setUpJRuby(this)) {
-            ScriptLoader.loadScript(this);
+    if (JRubyAdapter.isInitialized() && !scriptInfo.isLoaded()) {
+      scriptInfo.setFromIntent(intent);
+      ScriptLoader.loadScript(this);
+    }
+      
+    String rubyClassName = scriptInfo.getRubyClassName();
+    if (rubyClassName == null) return null;
+    if ((Boolean)JRubyAdapter.runScriptlet(rubyClassName + ".instance_methods(false).any?{|m| m.to_sym == :on_bind}")) {
+      // FIXME(uwe): Simplify when we stop support for RubotoCore 0.4.7
+      if (JRubyAdapter.isJRubyPreOneSeven()) {
+        JRubyAdapter.put("$arg_intent", intent);
+        JRubyAdapter.put("$ruby_instance", scriptInfo.getRubyInstance());
+        return (android.os.IBinder) JRubyAdapter.runScriptlet("$ruby_instance.on_bind($arg_intent)");
+      } else {
+        if (JRubyAdapter.isJRubyOneSeven()) {
+          return (android.os.IBinder) JRubyAdapter.runRubyMethod(android.os.IBinder.class, scriptInfo.getRubyInstance(), "on_bind", intent);
+        } else {
+          throw new RuntimeException("Unknown JRuby version: " + JRubyAdapter.get("JRUBY_VERSION"));
+        }
+      }
+    } else {
+      if ((Boolean)JRubyAdapter.runScriptlet(rubyClassName + ".instance_methods(false).any?{|m| m.to_sym == :onBind}")) {
+        // FIXME(uwe): Simplify when we stop support for RubotoCore 0.4.7
+        if (JRubyAdapter.isJRubyPreOneSeven()) {
+          JRubyAdapter.put("$arg_intent", intent);
+          JRubyAdapter.put("$ruby_instance", scriptInfo.getRubyInstance());
+          return (android.os.IBinder) JRubyAdapter.runScriptlet("$ruby_instance.onBind($arg_intent)");
         } else {
-            // FIXME(uwe):  What to do if the Ruboto Core platform cannot be found?
+          if (JRubyAdapter.isJRubyOneSeven()) {
+            return (android.os.IBinder) JRubyAdapter.runRubyMethod(android.os.IBinder.class, scriptInfo.getRubyInstance(), "onBind", intent);
+          } else {
+            throw new RuntimeException("Unknown JRuby version: " + JRubyAdapter.get("JRUBY_VERSION"));
+          }
         }
+      } else {
+        return null;
+      }
     }
+  }
+
 
   /****************************************************************************************
    * 

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

@@ -131,7 +131,7 @@ public class EntryPointActivity extends org.ruboto.RubotoActivity {
     }
 
 	private static final String RUBOTO_APK = "RubotoCore-release.apk";
-	private static final String RUBOTO_URL = "https://github.com/downloads/ruboto/ruboto/" + RUBOTO_APK;
+	private static final String RUBOTO_URL = "https://raw.github.com/ruboto/ruboto-core/master/dist/" + RUBOTO_APK;
 
     // Called when the button is pressed.
     public void getRubotoCore(View view) {

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

@@ -262,6 +262,11 @@ public class JRubyAdapter {
             System.setProperty("jruby.ji.proxyClassFactory", "org.ruboto.DalvikProxyClassFactory");
             System.setProperty("jruby.class.cache.path", appContext.getDir("dex", 0).getAbsolutePath());
 
+            // Workaround for bug in Android 2.2
+            // http://code.google.com/p/android/issues/detail?id=9431
+            // System.setProperty("java.net.preferIPv4Stack", "true");
+    		// System.setProperty("java.net.preferIPv6Addresses", "false");
+
             ClassLoader classLoader;
             Class<?> scriptingContainerClass;
             String apkName = null;
@@ -439,14 +444,15 @@ public class JRubyAdapter {
 
     static void printStackTrace(Throwable t) {
         // TODO(uwe):  Simplify this when Issue #144 is resolved
-        try {
-            t.printStackTrace(output);
-        } catch (NullPointerException npe) {
+        // TODO(scott):  printStackTrace is causing too many problems
+        //try {
+        //    t.printStackTrace(output);
+        //} catch (NullPointerException npe) {
             // TODO(uwe): printStackTrace should not fail
             for (java.lang.StackTraceElement ste : t.getStackTrace()) {
                 output.append(ste.toString() + "\n");
             }
-        }
+        //}
     }
 
     private static String scriptsDirName(Context context) {

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

@@ -128,6 +128,16 @@ public class Script {
         return null;
     }
 
+    public File getFile() {
+        for (String dir : scriptsDir) {
+            File f = new File(dir, name);
+            if (f.exists()) {
+                return f;
+            }
+        }
+        return new File(scriptsDir[0], name);
+    }
+		
     public String getContents() throws IOException {
         InputStream is = null;
         BufferedReader buffer = null;
@@ -152,16 +162,6 @@ public class Script {
 		}
 	}
 
-  public File getFile() {
-    for (String dir : scriptsDir) {
-      File f = new File(dir, name);
-      if (f.exists()) {
-        return f;
-      }
-    }
-    return new File(scriptsDir[0], name);
-  }
-
     public String getName() {
         return name;
     }

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

@@ -5,6 +5,27 @@ public class ScriptInfo {
     private String scriptName;
     private Object rubyInstance;
 
+    public boolean isReadyToLoad() {
+      return rubyClassName != null || scriptName != null;
+    }
+
+    public boolean isLoaded() {
+      return rubyInstance != null;
+    }
+
+    public void setFromIntent(android.content.Intent intent) {
+      android.os.Bundle configBundle = intent.getBundleExtra("Ruboto Config");
+
+      if (configBundle != null) {
+        if (configBundle.containsKey("ClassName")) {
+          setRubyClassName(configBundle.getString("ClassName"));
+        }
+        if (configBundle.containsKey("Script")) {
+          setScriptName(configBundle.getString("Script"));
+        }
+      }
+    }
+
     public String getRubyClassName() {
         if (rubyClassName == null && scriptName != null) {
             return Script.toCamelCase(scriptName);

data/assets/src/ruboto/activity.rb

@@ -40,9 +40,10 @@ module Ruboto
       b = Java::android.os.Bundle.new
       b.putInt("Theme", theme) if theme
       b.putString("ClassName", class_name)
+      b.putString("Script", options[:script]) if options[:script]
       i = android.content.Intent.new
       i.setClass self, klass.java_class
-      i.putExtra("RubotoActivity Config", b)
+      i.putExtra("Ruboto Config", b)
       startActivity i
       self
     end

data/assets/src/ruboto/service.rb

@@ -14,7 +14,18 @@ java_import "org.ruboto.RubotoService"
 
 module Ruboto
   module Context
-    def start_ruboto_service(global_variable_name = '$service', klass=RubotoService, &block)
+    def start_ruboto_service(global_variable_name='$service', klass=RubotoService, options={}, &block)
+      # FIXME(uwe): Translate old positional signature to new options-based signature.
+      # FIXME(uwe): Remove when we stop supporting Ruboto 0.8.0 or older.
+      if options.nil?
+        if global_variable_name.is_a?(Hash)
+          options = global_variable_name
+        else
+          options = {}
+        end
+        global_variable_name = nil
+      end
+
       class_name = options[:class_name] || "#{klass.name.split('::').last}_#{source_descriptor(block)[0].split("/").last.gsub(/[.-]+/, '_')}_#{source_descriptor(block)[1]}"
       if !Object.const_defined?(class_name)
         Object.const_set(class_name, Class.new(&block))
@@ -22,12 +33,12 @@ module Ruboto
         Object.const_get(class_name).class_eval(&block) if block_given?
       end
       b = Java::android.os.Bundle.new
-      b.putInt("Theme", theme) if theme
       b.putString("ClassName", class_name)
+      b.putString("Script", options[:script]) if options[:script]
       i = android.content.Intent.new
       i.setClass self, klass.java_class
-      i.putExtra("RubotoActivity Config", b)
-      self.startService Java::android.content.Intent.new(self, klass.java_class)
+      i.putExtra("Ruboto Config", b)
+      self.startService i
       self
     end
   end

data/assets/src/ruboto/widget.rb

@@ -159,10 +159,10 @@ def setup_list_view
   Java::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)
+        @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] = Java::android.widget.ArrayAdapter.new(context, item_layout, @adapter_list)
       end
       super(context, params)
     end
@@ -170,7 +170,7 @@ def setup_list_view
     def reload_list(list)
       @adapter_list.clear
       @adapter_list.addAll(list)
-      @adapter.notifyDataSetChanged
+      adapter.notifyDataSetChanged
       invalidate
     end
   end

data/lib/ruboto/commands/base.rb

@@ -104,7 +104,7 @@ module Ruboto
                   update_icons true
                   update_classes nil, true
                   update_jruby true if with_jruby
-                  update_dx_jar true unless params['with-jruby'].value
+                  update_dx_jar true if with_jruby
                   update_core_classes 'include'
 
                   log_action("Generating the default Activity and script") do
@@ -312,25 +312,6 @@ module Ruboto
                 generate_core_classes [:class, :method_base, :method_include, :method_exclude, :implements, :force].inject({}) {|h, i| h[i] = params[i.to_s].value; h}
               end
             end
-
-            mode "key" do
-              option("keystore"){
-                default "~/.android/production.keystore"
-                description "path to where the keystore will be saved. defaults to ~/.android/production.keystore"
-              }
-
-              option("alias"){
-                required
-                description "The 'alias' for the key. Identifies the key within the keystore. Required"
-              }
-
-              def run
-                keystore = params['keystore'].value
-                key_alias = params['alias'].value
-
-                `keytool -genkey -keyalg rsa -keysize 4096 -validity 1000000 -keystore #{keystore} -alias #{key_alias}`
-              end
-            end
           end
 
           mode "update" do

data/lib/ruboto/core_ext/rexml.rb

@@ -0,0 +1,15 @@
+class REXML::Formatters::OrderedAttributes < REXML::Formatters::Pretty
+  def write_element(elm, out)
+    att = elm.attributes
+
+    class <<att
+      alias _each_attribute each_attribute
+
+      def each_attribute(&b)
+        to_enum(:_each_attribute).sort_by { |x| [x.prefix, x.name] }.each(&b)
+      end
+    end
+
+    super(elm, out)
+  end
+end

data/lib/ruboto/sdk_versions.rb

@@ -6,7 +6,13 @@ module Ruboto
     MINIMUM_SUPPORTED_SDK = "android-#{MINIMUM_SUPPORTED_SDK_LEVEL}"
     DEFAULT_TARGET_SDK_LEVEL = 8
     DEFAULT_TARGET_SDK = "android-#{DEFAULT_TARGET_SDK_LEVEL}"
-    ANDROID_HOME = ENV['ANDROID_HOME'] || File.dirname(File.dirname(Pathname.new(`#{RUBY_PLATFORM =~ /mingw|mswin/ ? "where" : "which"} adb`.chomp).realpath))
+    if ENV['ANDROID_HOME']
+      ANDROID_HOME = ENV['ANDROID_HOME']
+    else
+      adb_location = `#{RUBY_PLATFORM =~ /mingw|mswin/ ? "where" : "which"} adb`.chomp
+      raise 'Unable to locate ANDROID_HOME.  Either set the ANDROID_HOME environment variable or add the location of the "adb" command to your path.' if adb_location.empty?
+      ANDROID_HOME = File.dirname(File.dirname(Pathname.new(adb_location).realpath))
+    end
     ANDROID_TOOLS_REVISION = File.read("#{ANDROID_HOME}/tools/source.properties").slice(/Pkg.Revision=\d+/).slice(/\d+$/).to_i
   end
 end

data/lib/ruboto/util/build.rb

@@ -135,7 +135,7 @@ module Ruboto
       def generate_core_classes(params)
         hash = {:package => "org.ruboto"}
         %w(method_base method_include implements force).inject(hash) {|h, i| h[i.to_sym] = params[i.to_sym]; h}
-        hash[:method_exclude] = params[:method_exclude].split(",").push("onCreate").join(",")
+        hash[:method_exclude] = params[:method_exclude].split(",").push("onCreate").push("onBind").push("onStartCommand").join(",")
 
         %w(android.app.Activity android.app.Service android.content.BroadcastReceiver).each do |i|
           name = i.split(".")[-1]

data/lib/ruboto/util/update.rb

@@ -1,4 +1,5 @@
 require 'ruboto/version'
+require 'ruboto/core_ext/rexml'
 
 module Ruboto
   module Util
@@ -66,7 +67,7 @@ module Ruboto
           #   puts 'Added external permission tag'
           # end
 
-          File.open("AndroidManifest.xml", 'w') { |f| test_manifest.document.write(f, 4) }
+          File.open("AndroidManifest.xml", 'w') { |f| REXML::Formatters::OrderedAttributes.new(4).write(test_manifest.document, f) }
 
           run_tests_override = <<-EOF
 <!-- BEGIN added by Ruboto -->
@@ -160,13 +161,11 @@ module Ruboto
         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" }
 
-        # FIXME(uwe):  Try keeping the class count low to enable installation on Android 2.3 devices
-        # unless new_jruby_version =~ /^1.7.0/ && verify_target_sdk < 15
         log_action("Copying dx.jar to libs") do
           copier.copy 'libs'
+          # FIXME(uwe): We may need this for newer Android SDK versions.  Keeping as reminder.
           # File.open('project.properties', 'a'){|f| f << "dex.force.jumbo=true\n"}
         end
-        # end
 
         reconfigure_jruby_libs(new_jruby_version)
 
@@ -181,19 +180,15 @@ module Ruboto
 
         jar_file = Dir.glob("libs/dx.jar")[0]
 
-        # FIXME(uwe):  Skip copying dx.jar to apps using RubotoCore when we include dx.jar in RubotoCore
+        # FIXME(uwe): Remove when we stop updating from Ruboto 0.10.0 and older.
+        jruby_present = !!Dir.glob("libs/jruby-core-*.jar")[0]
+        log_action("Removing #{jar_file}") { File.delete jar_file } if jar_file && !jruby_present
+        # EMXIF
+
         return if !jar_file && !force
 
         copier = AssetCopier.new Ruboto::ASSETS, File.expand_path(".")
-        # FIXME(uwe):  Skip copying dx.jar to apps using RubotoCore when we include dx.jar in RubotoCore
-        log_action("Removing #{jar_file}") { File.delete jar_file } if jar_file
-
-        # FIXME(uwe):  Try keeping the class count low to enable installation on Android 2.3 devices
-        # FIXME(uwe):  Skip copying dx.jar to apps using RubotoCore when we include dx.jar in RubotoCore
-        #if verify_target_sdk < 15
-        #  log_action("Copying dx.jar to libs") { copier.copy 'libs' }
-        #end
-        # EMXIF
+        log_action("Copying dx.jar to libs") { copier.copy 'libs' }
       end
 
       def update_assets
@@ -362,7 +357,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.1.dev')
+              if Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.2.dev')
                 excluded_core_packages = [
                     '**/*Darwin*',
                     '**/*Ruby20*',
@@ -404,6 +399,48 @@ module Ruboto
 
                     # 'org/jruby/runtime/invokedynamic', # Should be excluded
                 ]
+                elsif Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.1.dev')
+                  excluded_core_packages = [
+                      '**/*Darwin*',
+                      '**/*Ruby20*',
+                      '**/*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/fusesource',
+                      'org/jruby/ant',
+                      'org/jruby/cext',
+                      # 'org/jruby/compiler',      # Needed for initialization, but shoud not be necessary
+                      # 'org/jruby/compiler/impl', # Needed for initialization, but shoud not be necessary
+                      'org/jruby/compiler/util',
+                      'org/jruby/demo',
+                      'org/jruby/embed/bsf',
+                      'org/jruby/embed/jsr223',
+                      'org/jruby/embed/osgi',
+                      # 'org/jruby/ext/ffi', # Used by several JRuby core classes, but should not be needed unless we add FFI support
+                      'org/jruby/ext/ffi/io',
+                      'org/jruby/ext/ffi/jffi',
+                      'org/jruby/ext/openssl', # TODO(uwe): Issue #154 Add back when we add jruby-openssl.
+                      'org/jruby/javasupport/bsf',
+
+                      # 'org/jruby/management', # should be excluded
+
+                      'org/jruby/org/bouncycastle', # TODO(uwe): Issue #154 Add back when we add jruby-openssl.  The bouncycastle included in Android is cripled.
+
+                      # 'org/jruby/runtime/invokedynamic', # Should be excluded
+                  ]
               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 = [

data/lib/ruboto/util/verify.rb

@@ -17,7 +17,7 @@ module Ruboto
       end
 
       def save_manifest
-        File.open("AndroidManifest.xml", 'w') {|f| verify_manifest.document.write(f, 4)}
+        File.open("AndroidManifest.xml", 'w') {|f| REXML::Formatters::OrderedAttributes.new(4).write(verify_manifest.document, f)}
       end
       
       def verify_test_manifest

data/lib/ruboto/version.rb

@@ -1,4 +1,4 @@
 module Ruboto
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
   UPDATE_VERSION_LIMIT = '0.7.0'
 end

data/test/activity/navigation_activity.rb

@@ -19,6 +19,7 @@ class NavigationActivity
           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 }
+          button :text => 'RubotoActivity no config', :width => :match_parent, :id => 50, :on_click_listener => proc { start_ruboto_activity_no_config }
         end
   end
 
@@ -35,7 +36,7 @@ class NavigationActivity
     i.setClassName($package_name, 'org.ruboto.RubotoActivity')
     configBundle = android.os.Bundle.new
     configBundle.put_string('ClassName', 'NavigationTargetActivity')
-    i.putExtra('RubotoActivity Config', configBundle)
+    i.putExtra('Ruboto Config', configBundle)
     startActivity(i)
   end
 
@@ -44,7 +45,7 @@ class NavigationActivity
     i.setClassName($package_name, 'org.ruboto.RubotoActivity')
     configBundle = android.os.Bundle.new
     configBundle.put_string('Script', 'navigation_target_activity.rb')
-    i.putExtra('RubotoActivity Config', configBundle)
+    i.putExtra('Ruboto Config', configBundle)
     startActivity(i)
   end
 
@@ -81,7 +82,7 @@ class NavigationActivity
     i.setClassName($package_name, 'org.ruboto.RubotoActivity')
     configBundle = android.os.Bundle.new
     configBundle.put_string('ClassName', 'InfileActivity')
-    i.putExtra('RubotoActivity Config', configBundle)
+    i.putExtra('Ruboto Config', configBundle)
     startActivity(i)
   end
 
@@ -90,7 +91,13 @@ class NavigationActivity
     i.setClassName($package_name, 'org.ruboto.RubotoActivity')
     configBundle = android.os.Bundle.new
     configBundle.put_string('ClassName', 'RubyFileActivity')
-    i.putExtra('RubotoActivity Config', configBundle)
+    i.putExtra('Ruboto Config', configBundle)
+    startActivity(i)
+  end
+
+  def start_ruboto_activity_no_config
+    i = android.content.Intent.new
+    i.setClassName($package_name, 'org.ruboto.RubotoActivity')
     startActivity(i)
   end
 

data/test/activity/navigation_activity_test.rb

@@ -12,134 +12,35 @@ 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|
-  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)
-    assert current_activity
-    current_activity.run_on_ui_thread { current_activity.finish }
-    # FIXME(uwe):  Replace sleep with proper monitor
-    sleep 3
-  ensure
-    puts "Removing monitor"
-    removeMonitor(monitor)
-  end
+  button_activity_text 43, activity, 42, 'This is the navigation target activity.',
+                       'org.ruboto.test_app.NavigationTargetActivity'
 end
 
 test('button starts Ruby activity', :ui => false) do |activity|
-  monitor = add_monitor('org.ruboto.RubotoActivity', nil, false)
-  begin
-    activity.run_on_ui_thread { activity.find_view_by_id(44).perform_click }
-    current_activity = wait_for_monitor_with_timeout(monitor, 5000)
-    assert current_activity
-    current_activity.run_on_ui_thread { current_activity.finish }
-    # FIXME(uwe):  Replace sleep with proper monitor
-    sleep 3
-  ensure
-    puts "Removing monitor"
-    removeMonitor(monitor)
-  end
+  button_activity_text 44, activity, 42, 'This is the navigation target activity.'
 end
 
 test('button starts activity by script name', :ui => false) do |activity|
-  monitor = add_monitor('org.ruboto.RubotoActivity', nil, false)
-  begin
-    activity.run_on_ui_thread { activity.find_view_by_id(45).perform_click }
-    current_activity = wait_for_monitor_with_timeout(monitor, 5000)
-    assert current_activity
-    current_activity.run_on_ui_thread { current_activity.finish }
-    # FIXME(uwe):  Replace sleep with proper monitor
-    sleep 3
-  ensure
-    puts "Removing monitor"
-    removeMonitor(monitor)
-  end
+  button_activity_text 45, activity, 42, 'This is the navigation target activity.'
 end
 
 test('button starts inline activity', :ui => false) do |activity|
-  monitor = add_monitor('org.ruboto.RubotoActivity', nil, false)
-  begin
-    activity.run_on_ui_thread { activity.find_view_by_id(46).perform_click }
-    current_activity = wait_for_monitor_with_timeout(monitor, 5000)
-    assert current_activity
-    current_activity.run_on_ui_thread { current_activity.finish }
-    # FIXME(uwe):  Replace sleep with proper monitor
-    sleep 3
-  ensure
-    puts "Removing monitor"
-    removeMonitor(monitor)
-  end
-
-  start = Time.now
-  loop do
-    @text_view = current_activity.find_view_by_id(42)
-    break if (@text_view && @text_view.text == 'This is an inline activity.') || (Time.now - start > 10)
-    puts 'wait for text'
-    sleep 0.5
-  end
-  assert @text_view
-  assert_equal 'This is an inline activity.', @text_view.text
+  button_activity_text 46, activity, 42, 'This is an inline activity.'
 end
 
 test('button starts inline activity with options', :ui => false) do |activity|
-  monitor = add_monitor('org.ruboto.RubotoActivity', nil, false)
-  begin
-    activity.run_on_ui_thread { activity.find_view_by_id(47).perform_click }
-    current_activity = wait_for_monitor_with_timeout(monitor, 5000)
-    assert current_activity
-    current_activity.run_on_ui_thread { current_activity.finish }
-    # FIXME(uwe):  Replace sleep with proper monitor
-    sleep 3
-  ensure
-    puts "Removing monitor"
-    removeMonitor(monitor)
-  end
-
-  start = Time.now
-  loop do
-    @text_view = current_activity.find_view_by_id(42)
-    break if (@text_view && @text_view.text == 'This is an inline activity.') || (Time.now - start > 10)
-    puts 'wait for text'
-    sleep 0.5
-  end
-  assert @text_view
-  assert_equal 'This is an inline activity.', @text_view.text
+  button_activity_text 47, activity, 42, 'This is an inline activity.'
 end
 
 test('button starts infile class activity', :ui => false) do |activity|
-  monitor = add_monitor('org.ruboto.RubotoActivity', nil, false)
-  begin
-    activity.run_on_ui_thread { activity.find_view_by_id(48).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(42)
-    break if @text_view || (Time.now - start > 10)
-    puts 'wait for text'
-    sleep 1
-  end
-  assert @text_view
-  assert_equal 'This is an infile activity.', @text_view.text
-  current_activity.run_on_ui_thread { current_activity.finish }
-  # FIXME(uwe):  Replace sleep with proper monitor
-  sleep 3
+  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
@@ -152,17 +53,31 @@ 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'
+test("start ruboto activity without config", :ui => false) do |activity|
+  a = start_activity_by_button activity, 50
+  assert_equal 'Ruboto Test App', a.title
+end
+
+def start_activity_by_button(activity, button_id, 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 }
+    activity.run_on_ui_thread do
+      btn = activity.find_view_by_id(button_id)
+      btn.request_focus
+      btn.perform_click
+    end
     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
+  current_activity
+end
+
+def button_activity_text button_id, activity, expected_text_id, expected_text_string,
+    activity_class_name = 'org.ruboto.RubotoActivity'
+  current_activity = start_activity_by_button(activity, button_id, activity_class_name)
   start = Time.now
   loop do
     @text_view = current_activity.find_view_by_id(expected_text_id)
@@ -174,8 +89,13 @@ def button_activity_text button_id, activity, expected_text_id, expected_text_st
   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
+    finish_at = Time.now
+    finished = false
+    current_activity.run_on_ui_thread { current_activity.finish ; finished = true }
+    loop do
+      break if finished || (Time.now - finish_at > 10)
+      puts 'wait for finish'
+      sleep 0.1
+    end
   end
 end

data/test/activity/stack_activity_test.rb

@@ -21,23 +21,19 @@ test('stack depth') do |activity|
   }[android.os.Build::VERSION::SDK_INT] || [0, 0, 0, 0]
   if org.ruboto.JRubyAdapter.uses_platform_apk?
     jruby_offset = {
-        '0.4.7' => [0, 0, 0, 0],
-        '0.4.8.dev' => [0, 0, -4, -4],
-        '0.4.8' => [0, 0, -4, -4],
-        '0.4.9' => [0, 0, -4, -4],
+        '0.4.7' => [0, 0, 4, 4],
     }[org.ruboto.JRubyAdapter.platform_version_name] || [0, 0, 0, 0]
   else # STANDALONE
     jruby_offset = {
-        '1.7.0.dev' => [1, 1, 1, 1],
-        '1.7.0' => [0, 0, -4, -4],
-        '1.7.1.dev' => [0, 0, -4, -4],
-    }[org.jruby.runtime.Constants::VERSION] || [0, 0, 0, 0]
+        /^1\.6/ => [0, 0, 4, 4],
+        // => [0, 0, 0, 0],
+    }.find{|k,v| org.jruby.runtime.Constants::VERSION =~ k}[1]
   end
   version_message ="ANDROID: #{android.os.Build::VERSION::SDK_INT}, PLATFORM: #{org.ruboto.JRubyAdapter.uses_platform_apk ? org.ruboto.JRubyAdapter.platform_version_name : 'STANDALONE'}, JRuby: #{org.jruby.runtime.Constants::VERSION}"
   assert_equal [28 + os_offset[0] + jruby_offset[0],
                 33 + os_offset[1] + jruby_offset[1],
-                50 + os_offset[2] + jruby_offset[2],
-                67 + os_offset[3] + jruby_offset[3]], [activity.find_view_by_id(42).text.to_i,
+                46 + os_offset[2] + jruby_offset[2],
+                63 + os_offset[3] + jruby_offset[3]], [activity.find_view_by_id(42).text.to_i,
                                                     activity.find_view_by_id(43).text.to_i,
                                                     activity.find_view_by_id(44).text.to_i,
                                                     activity.find_view_by_id(45).text.to_i], version_message

data/test/minimal_app_test.rb

@@ -13,11 +13,12 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
       cleanup_app
     end
 
+    # APK was larger than 3.2MB: 3.5MB.  JRuby: 1.6.7,          ANDROID_TARGET: 15.
     # APK was larger than 3.2MB: 3.3MB.  JRuby: 1.6.7.2,        ANDROID_TARGET: 10.
     # APK was larger than 4.4MB: 4.7MB.  JRuby: 1.7.0.preview2, ANDROID_TARGET: 10.
-    # APK was larger than 3.2MB: 3.5MB.  JRuby: 1.6.7,          ANDROID_TARGET: 15.
     # APK was larger than 4.6MB: 4.9MB.  JRuby: 1.7.0.preview2, ANDROID_TARGET: 15.
     # APK was larger than 3.2MB: 4.7MB.  JRuby: 1.7.0,          ANDROID_TARGET: 15.
+    # APK was larger than 4.9MB: 7.2MB.  JRuby: 1.7.2.dev,      ANDROID_TARGET: 10.
 
     def test_minimal_apk_is_less_than_3_mb
       apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / (1024 * 1024)
@@ -27,6 +28,7 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
           '1.6.8' => 3.5,
           '1.7.0' => ANDROID_TARGET < 15 ? 4.7 : 4.9,
           '1.7.1.dev' => ANDROID_TARGET < 15 ? 4.7 : 4.9,
+          '1.7.2.dev' => 7.2,
       }[JRUBY_JARS_VERSION.to_s] || 4.9
       lower_limit = upper_limit * 0.9
       version_message ="JRuby: #{JRUBY_JARS_VERSION}, ANDROID_TARGET: #{ANDROID_TARGET}"

data/test/ruboto_gen_test.rb

@@ -50,11 +50,12 @@ class RubotoGenTest < Test::Unit::TestCase
   end
 
   # APK was smaller than 277.2KB:   61.9KB.  PLATFORM: CURRENT,    ANDROID_TARGET: 10.
-  # APK was larger than 7100.0KB: 7341.1KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 10, JRuby: 1.7.0.preview2.
   # APK was smaller than 278.1KB:   67.2KB.  PLATFORM: CURRENT,    ANDROID_TARGET: 15.
   # APK was larger than 5800.0KB: 5879.2KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.6.7.
+  # APK was larger than 7100.0KB: 7341.1KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 10, JRuby: 1.7.0.preview2.
   # APK was larger than 7308.0KB: 7558.3KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.0.preview2.
   # APK was larger than 4200.0KB: 7380.0KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.0.
+  # APK was larger than 7600.0KB: 9962.1KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 10, JRuby: 1.7.2.dev.
 
   def test_new_apk_size_is_within_limits
     apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / 1024
@@ -66,6 +67,7 @@ class RubotoGenTest < Test::Unit::TestCase
           '1.6.8' => 5900.0,
           '1.7.0' => ANDROID_TARGET < 15 ? 7400.0 : 7600.0,
           '1.7.1.dev' => ANDROID_TARGET < 15 ? 7400.0 : 7600.0,
+          '1.7.2.dev' => 9970.0,
       }[JRUBY_JARS_VERSION.to_s] || 7600.0
       version << ", JRuby: #{JRUBY_JARS_VERSION.to_s}"
     else

data/test/test_helper.rb

@@ -302,8 +302,7 @@ class Test::Unit::TestCase
       fail "Unknown Ruboto platform: #{RUBOTO_PLATFORM.inspect}"
     end
     if $? != 0
-      # FIXME(uwe): Delete failed RubotoCore.  Kept temporarily for debuging.
-      # FileUtils.rm_rf 'tmp/RubotoCore'
+      FileUtils.rm_rf 'tmp/RubotoCore'
       fail 'Error (un)installing RubotoCore'
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruboto
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 0
   - 10
-  - 0
-  version: 0.10.0
+  - 1
+  version: 0.10.1
 platform: ruby
 authors: 
 - Daniel Jackoway
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-01 00:00:00 Z
+date: 2013-01-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: main
@@ -117,6 +117,7 @@ files:
 - lib/ruboto/commands/base.rb
 - lib/ruboto/core_ext/array.rb
 - lib/ruboto/core_ext/object.rb
+- lib/ruboto/core_ext/rexml.rb
 - lib/ruboto/description.rb
 - lib/ruboto/sdk_versions.rb
 - lib/ruboto/util/asset_copier.rb