ruboto 0.10.1 → 0.10.2.rc.0

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

@@ -322,9 +322,13 @@ public class JRubyAdapter {
 
                 Thread.currentThread().setContextClassLoader(classLoader);
 
-                String defaultCurrentDir = appContext.getFilesDir().getPath();
-                Log.d("Setting JRuby current directory to " + defaultCurrentDir);
-                callScriptingContainerMethod(Void.class, "setCurrentDirectory", defaultCurrentDir);
+                if (appContext.getFilesDir() != null) {
+                    String defaultCurrentDir = appContext.getFilesDir().getPath();
+                    Log.d("Setting JRuby current directory to " + defaultCurrentDir);
+                    callScriptingContainerMethod(Void.class, "setCurrentDirectory", defaultCurrentDir);
+                } else {
+                    Log.e("Unable to find app files dir!");
+                }
 
                 if (out != null) {
                   output = out;

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

@@ -4,6 +4,7 @@ import java.io.IOException;
 
 import android.app.ProgressDialog;
 import android.content.Context;
+import android.os.Bundle;
 
 public class ScriptLoader {
    /**
@@ -106,7 +107,7 @@ public class ScriptLoader {
                 }
                 if (rubyClass != null) {
                     if (component instanceof android.content.Context) {
-                        callOnCreate(rubyInstance, args);
+                        callOnCreate(rubyInstance, args, component.getScriptInfo().getRubyClassName());
                     }
                 }
                 component.getScriptInfo().setRubyInstance(rubyInstance);
@@ -119,8 +120,8 @@ public class ScriptLoader {
         }
     }
 
-    private static final void callOnCreate(Object rubyInstance, Object[] args) {
-        System.out.println("Call on_create on: " + rubyInstance + ", " + JRubyAdapter.get("JRUBY_VERSION"));
+    private static final void callOnCreate(Object rubyInstance, Object[] args, String rubyClassName) {
+        System.out.println("Call onCreate on: " + rubyInstance + ", " + JRubyAdapter.get("JRUBY_VERSION"));
         // FIXME(uwe): Simplify when we stop support for RubotoCore 0.4.7
         if (JRubyAdapter.isJRubyPreOneSeven()) {
             if (args.length > 0) {
@@ -129,10 +130,17 @@ public class ScriptLoader {
             JRubyAdapter.put("$ruby_instance", rubyInstance);
             JRubyAdapter.runScriptlet("$ruby_instance.on_create(" + (args.length > 0 ? "$bundle" : "") + ")");
         } else if (JRubyAdapter.isJRubyOneSeven()) {
-            JRubyAdapter.runRubyMethod(rubyInstance, "on_create", (Object[]) args);
+            // FIXME(uwe):  Simplify when we stop support for snake case aliasing interface callback methods.
+            if ((Boolean)JRubyAdapter.runScriptlet(rubyClassName + ".instance_methods(false).any?{|m| m.to_sym == :onCreate}")) {
+                JRubyAdapter.runRubyMethod(rubyInstance, "onCreate", args);
+            } else if ((Boolean)JRubyAdapter.runScriptlet(rubyClassName + ".instance_methods(false).any?{|m| m.to_sym == :on_create}")) {
+                JRubyAdapter.runRubyMethod(rubyInstance, "on_create", args);
+            }
+            // EMXIF
         } else {
             throw new RuntimeException("Unknown JRuby version: " + JRubyAdapter.get("JRUBY_VERSION"));
         }
+        // EMXIF
     }
 
 }

data/assets/src/ruboto/widget.rb

@@ -15,51 +15,60 @@ require 'ruboto/activity'
 # Prepare View
 #
 
-java_import "android.view.View"
+java_import 'android.view.View'
+
+def invoke_with_converted_arguments(target, method_name, values)
+  converted_values = [*values].map { |i| @@convert_constants[i] || i }
+  scaled_values = converted_values.map.with_index do |v, i|
+    v.is_a?(Integer) && v >= 0x80000000 && v <= 0xFFFFFFFF ?
+        v.to_i - 0x100000000 : v
+  end
+  target.send(method_name, *scaled_values)
+end
 
 View.class_eval do
-    @@convert_constants ||= {}
+  @@convert_constants ||= {}
 
-    def self.add_constant_conversion(from, to)
-      @@convert_constants[from] = to
-    end
+  def self.add_constant_conversion(from, to)
+    @@convert_constants[from] = to
+  end
 
-    def self.convert_constant(from)
-      @@convert_constants[from] or from
+  def self.convert_constant(from)
+    @@convert_constants[from] or from
+  end
+
+  def self.setup_constant_conversion
+    (self.constants - self.superclass.constants).each do |i|
+      View.add_constant_conversion i.downcase.to_sym, self.const_get(i)
     end
+  end
 
-    def self.setup_constant_conversion
-      (self.constants - self.superclass.constants).each do |i|
-        View.add_constant_conversion i.downcase.to_sym, self.const_get(i)
-      end
+  def configure(context, params = {})
+    if width = params.delete(:width)
+      getLayoutParams.width = View.convert_constant(width)
     end
 
-    def configure(context, params = {})
-      if width = params.delete(:width)
-        getLayoutParams.width = View.convert_constant(width)
-      end
+    if height = params.delete(:height)
+      getLayoutParams.height = View.convert_constant(height)
+    end
 
-      if height = params.delete(:height)
-        getLayoutParams.height = View.convert_constant(height)
-      end
-      
-      if margins = params.delete(:margins)
-        getLayoutParams.set_margins(*margins)
-      end
+    if margins = params.delete(:margins)
+      getLayoutParams.set_margins(*margins)
+    end
 
-      if layout = params.delete(:layout)
-        lp = getLayoutParams
-        layout.each do |k, v|
-          values = (v.is_a?(Array) ? v : [v]).map { |i| @@convert_constants[i] or i }
-          lp.send("#{k.to_s.gsub(/_([a-z])/) { $1.upcase }}", *values)
-        end
+    if layout = params.delete(:layout)
+      lp = getLayoutParams
+      layout.each do |k, v|
+        method_name = k.to_s.gsub(/_([a-z])/) { $1.upcase }
+        invoke_with_converted_arguments(lp, method_name, v)
       end
+    end
 
-      params.each do |k, v|
-        values = (v.is_a?(Array) ? v : [v]).map { |i| @@convert_constants[i] or i }
-        self.send("set#{k.to_s.gsub(/(^|_)([a-z])/) { $2.upcase }}", *values)
-      end
+    params.each do |k, v|
+      method_name = "set#{k.to_s.gsub(/(^|_)([a-z])/) { $2.upcase }}"
+      invoke_with_converted_arguments(self, method_name, v)
     end
+  end
 end
 
 #
@@ -96,7 +105,7 @@ def ruboto_import_widget(class_name, package_name="android.widget")
     java_import klass
     class_name = klass.java_class.name.split('.')[-1]
   end
-  
+
   return unless klass
 
   RubotoActivity.class_eval "
@@ -185,7 +194,7 @@ def setup_spinner
         @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 = 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

data/bin/ruboto

@@ -1,12 +1,17 @@
 #!/usr/bin/env ruby
 
-`android list`
+output = `android list 2>&1`
 if $? != 0
-  puts "Android SDK not in path"
+  puts "Android SDK not in path\n#{output}"
   exit 1
 end
 
-require 'ruboto/commands/base'
+begin
+  require 'ruboto/commands/base'
+rescue RuntimeError
+  puts $!.message
+  exit 1
+end
 
 # Run Base, which will handle actual commands
-Ruboto::Commands::Base.main
+Ruboto::Commands::Base.main

data/lib/ruboto/sdk_versions.rb

@@ -9,9 +9,18 @@ module Ruboto
     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?
+      adb_location = `#{RUBY_PLATFORM =~ /mingw|mswin/ ? 'where' : 'which'} adb`.chomp
+      if adb_location.empty?
+        raise 'Unable to locate the "adb" command.  Either set the ANDROID_HOME environment variable or add the location of the "adb" command to your path.'
+      end
       ANDROID_HOME = File.dirname(File.dirname(Pathname.new(adb_location).realpath))
+      unless File.exists? "#{ANDROID_HOME}/tools"
+        puts "Found '#{adb_location}' but it is not in a proper Android SDK installation."
+      end
+    end
+    unless File.exists? "#{ANDROID_HOME}/tools"
+      raise "The '<ANDROID_HOME>/tools' directory is missing.
+Please set the ANDROID_HOME environment variable to a proper Android SDK installation."
     end
     ANDROID_TOOLS_REVISION = File.read("#{ANDROID_HOME}/tools/source.properties").slice(/Pkg.Revision=\d+/).slice(/\d+$/).to_i
   end

data/lib/ruboto/util/build.rb

@@ -56,7 +56,7 @@ module Ruboto
 
         # Remove methods changed outside of the scope of the sdk versions
         methods = methods.select{|i| !i.attribute('api_added') || (i.attribute('api_added').to_i <= target_api)}
-        methods = methods.select{|i| !i.attribute('deprecated') || (i.attribute('deprecated').to_i > min_api)}
+        # methods = methods.select{|i| !i.attribute('deprecated') || (i.attribute('deprecated').to_i > min_api)}
         methods = methods.select{|i| !i.attribute('api_removed') || (i.attribute('api_removed').to_i > min_api)}
 
         # Inform and remove methods that do not exist in one of the sdk versions

data/lib/ruboto/util/update.rb

@@ -161,10 +161,14 @@ 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" }
 
-        log_action("Copying dx.jar to libs") do
+        unless File.read('project.properties') =~ /^dex.force.jumbo=/
+          log_action('Setting JUMBO dex file format') do
+            File.open('project.properties', 'a') { |f| f << "dex.force.jumbo=true\n" }
+          end
+        end
+
+        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
 
         reconfigure_jruby_libs(new_jruby_version)
@@ -357,7 +361,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.2.dev')
+              if Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.3.dev')
                 excluded_core_packages = [
                     '**/*Darwin*',
                     '**/*Ruby20*',
@@ -376,6 +380,7 @@ module Ruboto
                     'jnr/ffi/types',
                     'jnr/posix/MacOS*',
                     'jnr/posix/OpenBSD*',
+                    'jnr/x86asm',
                     'org/apache',
                     'org/fusesource',
                     'org/jruby/ant',
@@ -390,16 +395,43 @@ module Ruboto
                     # '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.1.dev')
+                elsif Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.2')
+                  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/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/javasupport/bsf',
+                  ]
+                elsif Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.1')
                   excluded_core_packages = [
                       '**/*Darwin*',
                       '**/*Ruby20*',
@@ -422,24 +454,16 @@ module Ruboto
                       '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
@@ -476,7 +500,7 @@ module Ruboto
                     'org/jruby/javasupport/bsf',
                 ]
                 # ODOT
-              elsif Gem::Version.new(jruby_core_version) =~ Gem::Version.new('~>1.6.0')
+              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 = [
@@ -504,7 +528,7 @@ module Ruboto
                 if File.directory? i
                   FileUtils.remove_dir(i, true) rescue puts "Failed to remove package: #{i} (#{$!})"
                 elsif Dir[i].each { |f| FileUtils.rm_rf f }.empty?
-                  puts "Exclude pattern #{i.inspect} found no files."
+                  print "exclude pattern #{i.inspect} found no files..."
                 end
               end
 
@@ -542,6 +566,7 @@ module Ruboto
 
       # - Moves ruby stdlib to the root of the jruby-stdlib jar
       def reconfigure_jruby_stdlib
+        min_sdk_version = verify_manifest.elements['uses-sdk'].attributes["android:minSdkVersion"].to_i
         excluded_stdlibs = [*verify_ruboto_config[:excluded_stdlibs]].compact
         Dir.chdir 'libs' do
           jruby_stdlib = JRubyJars::stdlib_jar_path.split('/')[-1]
@@ -557,12 +582,13 @@ module Ruboto
               FileUtils.move 'old/META-INF/jruby.home/lib', 'new/jruby.home/lib'
               FileUtils.rm_rf 'new/jruby.home/lib/ruby/gems'
 
+              raise "Unrecognized JRuby stdlib jar: #{jruby_stdlib}" unless jruby_stdlib =~ /jruby-stdlib-(.*).jar/
+              jruby_stdlib_version = Gem::Version.new($1)
+
               if excluded_stdlibs.any?
 
                 # 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.preview1') =~ jruby_version
+                if jruby_stdlib_version < Gem::Version.new('1.7.0.preview1')
                   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']
@@ -580,14 +606,60 @@ module Ruboto
                 print "excluded #{excluded_stdlibs.join(' ')}..."
               end
 
-              Dir.chdir "new" do
-                # Uncomment this part to split the stdlib into one jar per directory
-                # Dir['jruby.home/lib/ruby/*/*'].select { |f| File.directory? f }.each do |d|
-                #   file = "#{d}.rb"
-                #   `jar -cf ../../jruby-stdlib-#{d.gsub('/', '-')}-#{JRubyJars::VERSION}.jar #{d} #{file if File.exists?(file)}`
-                #   FileUtils.rm_rf d
-                #   FileUtils.rm_rf file if File.exists?(file)
-                # end
+              Dir.chdir 'new' do
+                Dir['**/*.jar'].each do |j|
+
+                  # FIXME(uwe):  Installing bcmail-jdk15-146.jar + bcprov-jdk15-146.jar fails due to
+                  # http://code.google.com/p/android/issues/detail?id=40409
+                  # This breaks ssl and https. Remove when we stop supporting JRuby <= 1.7.2
+                  if j =~ /bcmail|bcprov-jdk15-146/
+                    FileUtils.rm j
+                    next
+                  end
+                  # EMXIF
+
+                  # FIXME(uwe): Adding the jars triggers the "LinearAlloc exceeded capacity"
+                  # bug in Android 2.3.  Remove when we stop supporting android-10 and older
+                  if min_sdk_version <= 10
+                    FileUtils.rm j
+                    next
+                  end
+                  # EMXIF
+
+                  # FIXME(uwe): These should be included but break the 64K method count limit
+                  if j =~ /bcpkix-jdk15on-147|bcprov-jdk15on-147|jopenssl|kryptcore|kryptproviderjdk/
+                    FileUtils.rm j
+                    next
+                  end
+                  # EMXIF
+
+                  print "#{File.basename(j).chomp('.jar')}..."
+                  system "jar xf #{j}"
+                  FileUtils.rm j
+
+                  if j =~ %r{json/ext/generator.jar$}
+                    jar_load_code = <<-END_CODE
+        require 'jruby'
+        puts 'Starting JSON Generator Service'
+        public
+        Java::json.ext.GeneratorService.new.basicLoad(JRuby.runtime)
+                    END_CODE
+                  elsif j =~ %r{json/ext/parser.jar$}
+                    jar_load_code = <<-END_CODE
+        require 'jruby'
+        puts 'Starting JSON Parser Service'
+        public
+        Java::json.ext.ParserService.new.basicLoad(JRuby.runtime)
+                    END_CODE
+                  else
+                    jar_load_code = ''
+                  end
+
+                  File.open("#{j}.rb", 'w'){|f| f << jar_load_code}
+                  File.open("#{j}.jar.rb", 'w'){|f| f << jar_load_code}
+                  #FileUtils.rm Dir['**/*$POPULATOR.class']
+                  #FileUtils.rm Dir['**/*$INVOKER$*.class']
+                end
 
                 `jar -cf ../../#{jruby_stdlib} .`
                 raise "Creating repackaged jruby-stdlib jar failed: #$?" unless $? == 0
@@ -595,7 +667,7 @@ module Ruboto
             end
           end
 
-          FileUtils.remove_dir "tmp", true
+          FileUtils.remove_dir 'tmp', true
         end
       end