ruboto 0.9.0 → 0.10.0.rc.0

data/assets/src/ruboto/widget.rb

@@ -90,10 +90,10 @@ end
 
 def ruboto_import_widget(class_name, package_name="android.widget")
   if class_name.is_a?(String) or class_name.is_a?(Symbol)
-    klass = ruboto_import("#{package_name}.#{class_name}") || eval("Java::#{package_name}.#{class_name}")
+    klass = java_import("#{package_name}.#{class_name}") || eval("Java::#{package_name}.#{class_name}")
   else
     klass = class_name
-    ruboto_import klass
+    java_import klass
     class_name = klass.java_class.name.split('.')[-1]
   end
   

data/lib/DexClient.java

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

data/lib/ruboto/util/build.rb

@@ -112,9 +112,6 @@ module Ruboto
         methods = check_methods(methods, params[:force])
         puts "Done. Methods created: #{methods.count}"
 
-        # Remove any duplicate constants (use *args handle multiple parameter lists)
-        constants = methods.map(&:constant_string).uniq
-
         params[:implements] = params[:implements].split(",").push('org.ruboto.RubotoComponent').join(",")
 
         action = class_desc.name == "class" ? "extends" : "implements"
@@ -125,8 +122,6 @@ module Ruboto
             "THE_ANDROID_CLASS" => (params[:class] || params[:interface]) +
                 (params[:implements] == "" ? "" : ((action != 'implements' ? " implements " : ', ') + params[:implements].split(",").join(", "))),
             "THE_RUBOTO_CLASS" => params[:name],
-            "THE_CONSTANTS" => constants.map { |i| "public static final int #{i} = #{constants.index(i)};" }.indent.join("\n"),
-            "CONSTANTS_COUNT" => methods.count.to_s,
             "THE_CONSTRUCTORS" => class_desc.name == "class" ?
                 class_desc.get_elements("constructor").map { |i| i.constructor_definition(params[:name]) }.join("\n\n") : "",
             "THE_METHODS" => methods.map { |i| i.method_definition(params[:name]) }.join("\n\n")

data/lib/ruboto/util/code_formatting.rb

@@ -10,7 +10,7 @@ module Ruboto
         body_clause.indent, "}"]
       end
 
-      def if_else(condition, if_clause, else_clause)
+      def if_else(condition, if_clause, else_clause = [])
         ["if (#{condition}) {", if_clause.indent, else_clause.compact.empty? ? nil : "} else {", else_clause.indent, "}"]
       end
 

data/lib/ruboto/util/update.rb

@@ -10,7 +10,6 @@ module Ruboto
       #
       # Updating components
       #
-
       def update_android
         root = Dir.getwd
         build_xml_file = "#{root}/build.xml"
@@ -122,15 +121,6 @@ module Ruboto
           ant_script.gsub!(/\s*<!-- BEGIN added by Ruboto -->.*?<!-- END added by Ruboto -->\s*/m, '')
           raise "Bad ANT script" unless ant_script.gsub!(/\s*(<\/project>)/, "\n\n#{run_tests_override}\n\n\\1")
           File.open('build.xml', 'w') { |f| f << ant_script }
-
-          # FIXME(uwe): Remove when we stop supporting update from Ruboto < 0.5.3
-          if File.directory? 'assets/scripts'
-            log_action 'Moving test scripts to the "src" directory.' do
-              FileUtils.mv Dir['assets/scripts/*'], 'src'
-              FileUtils.rm_rf 'assets/scripts'
-            end
-          end
-          # EMXIF
         end
       end
 
@@ -172,7 +162,10 @@ module Ruboto
 
         # 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") { copier.copy 'libs' }
+        log_action("Copying dx.jar to libs") do
+          copier.copy 'libs'
+          # File.open('project.properties', 'a'){|f| f << "dex.force.jumbo=true\n"}
+        end
         # end
 
         reconfigure_jruby_libs(new_jruby_version)
@@ -205,13 +198,6 @@ module Ruboto
 
       def update_assets
         puts "\nCopying files:"
-
-        # FIXME(uwe):  Remove when we stop supporting updating from Ruboto < 0.6.0
-        if File.exists?('Rakefile') && !File.exists?('rakelib/ruboto.rake')
-          FileUtils.rm 'Rakefile'
-        end
-        # EMXIF
-
         weak_copier = Ruboto::Util::AssetCopier.new Ruboto::ASSETS, '.', false
         %w{.gitignore Rakefile}.each { |f| log_action(f) { weak_copier.copy f } }
 
@@ -333,11 +319,6 @@ module Ruboto
       end
 
       def update_core_classes(force = nil)
-        # FIXME(uwe): Remove when we stop supporting updating from Ruboto 0.5.5 and older.
-        FileUtils.rm_rf 'src/org/ruboto/callbacks'
-        FileUtils.rm_f 'src/org/ruboto/RubotoView.java'
-        # EMXIF
-
         generate_core_classes(:class => "all", :method_base => "on", :method_include => "", :method_exclude => "", :force => force, :implements => "")
       end
 
@@ -347,11 +328,6 @@ module Ruboto
       end
 
       def update_ruboto(force=nil)
-        log_action("Copying ruboto.rb") do
-          from = File.expand_path(Ruboto::GEM_ROOT + "/assets/#{SCRIPTS_DIR}/ruboto.rb")
-          to = File.expand_path("./#{SCRIPTS_DIR}/ruboto.rb")
-          FileUtils.cp from, to
-        end
         log_action("Copying ruboto/version.rb") do
           from = File.expand_path(Ruboto::GEM_ROOT + "/lib/ruboto/version.rb")
           to = File.expand_path("./#{SCRIPTS_DIR}/ruboto/version.rb")
@@ -370,6 +346,7 @@ module Ruboto
       def reconfigure_jruby_libs(jruby_core_version)
         reconfigure_jruby_core(jruby_core_version)
         reconfigure_jruby_stdlib
+        reconfigure_dx_jar
       end
 
       # - Removes unneeded code from jruby-core
@@ -383,20 +360,33 @@ module Ruboto
             Dir.chdir 'tmp' do
               FileUtils.move "../#{jruby_core}", "."
               `jar -xf #{jruby_core}`
+              raise "Unpacking jruby-core jar failed: #$?" unless $? == 0
               File.delete jruby_core
               if jruby_core_version >= '1.7.0'
                 excluded_core_packages = [
+                    '**/*Darwin*',
+                    '**/*Solaris*',
+                    '**/*windows*',
+                    '**/*Windows*',
                     'META-INF', 'cext',
                     'com/headius', # included since we are trying to use DexClient
                     'com/headius/invokebinder',
-                    'com/kenai/constantine', 'com/kenai/jffi', 'com/martiansoftware', 'ext', 'java',
+                    'com/kenai/constantine', 'com/kenai/jffi', 'com/martiansoftware',
+                    'ext',
+                    'java',
                     'jline', 'jni',
                     'jnr/constants/platform/darwin', 'jnr/constants/platform/fake', 'jnr/constants/platform/freebsd',
                     'jnr/constants/platform/openbsd', 'jnr/constants/platform/sunos', 'jnr/constants/platform/windows',
-                    'jnr/ffi/annotations', 'jnr/ffi/byref', 'jnr/ffi/provider', 'jnr/ffi/util',
+                    'jnr/ffi/annotations', 'jnr/ffi/byref',
+                    'jnr/ffi/provider', 'jnr/ffi/util',
                     'jnr/ffi/posix/util',
+                    'jnr/ffi/Struct$*',
+                    'jnr/ffi/types',
+                    'jnr/posix/MacOS*',
+                    'jnr/posix/OpenBSD*',
                     'org/apache',
                     'org/bouncycastle', # TODO(uwe): Issue #154 Add back when we add jruby-openssl.  The bouncycastle included in Android is cripled.
+                    'org/fusesource',
                     'org/jruby/ant',
                     'org/jruby/cext',
                     # 'org/jruby/compiler',      # Needed for initialization, but shoud not be necessary
@@ -410,23 +400,13 @@ module Ruboto
                     '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.
-
-                    # FIXME(uwe):  IR is the future.  We should try using it.
-                    # 'org/jruby/ir',
-                    'org/jruby/ir/dataflow',
-                    # 'org/jruby/ir/instructions',
-                    # 'org/jruby/ir/interpreter',
-                    # 'org/jruby/ir/operands',
-                    # 'org/jruby/ir/passes',
-                    'org/jruby/ir/representations',
-                    'org/jruby/ir/targets',
-                    'org/jruby/ir/transformations',
-                    'org/jruby/ir/util',
-
                     'org/jruby/javasupport/bsf',
-                    # 'org/jruby/runtime/invokedynamic', # Should be excluded
 
                     # '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
                 ]
 
                 # TODO(uwe): Remove when we stop supporting jruby-jars < 1.7.0
@@ -452,17 +432,25 @@ module Ruboto
               end
 
               excluded_core_packages.each do |i|
-                FileUtils.remove_dir(i, true) rescue puts "Failed to remove package: #{i} (#{$!})"
+                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."
+                end
               end
 
               # FIXME(uwe):  Add a Ruboto.yml config for this if it works
-              # Reduces the installation footprint, but also reduces performance and stack usage
+              # Reduces the installation footprint, but also reduces performance and increases stack
               # FIXME(uwe):  Measure the performance change
-              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
+              if false && jruby_core_version =~ /^1.7./ && Dir.chdir('../..') { verify_min_sdk < 15 }
+                invokers = Dir['**/*$INVOKER$*.class']
+                log_action("Removing invokers(#{invokers.size})") do
                   FileUtils.rm invokers
                 end
+                populators = Dir['**/*$POPULATOR.class']
+                log_action("Removing populators(#{populators.size})") do
+                  FileUtils.rm populators
+                end
               end
 
               # Uncomment this section to get a jar for each top level package in the core
@@ -472,10 +460,11 @@ module Ruboto
               #end
 
               # Add our proxy class factory
-              `javac -source 1.6 -target 1.6 -cp .:#{Ruboto::ASSETS}/libs/dx.jar:#{Dir["#{Ruboto::SdkVersions::ANDROID_HOME}/platforms/android-*/android.jar"][0]} -d . #{Ruboto::GEM_ROOT}/lib/*.java`
+              `javac -source 1.6 -target 1.6 -cp .:#{Ruboto::ASSETS}/libs/dx.jar -bootclasspath #{Dir["#{Ruboto::SdkVersions::ANDROID_HOME}/platforms/android-*/android.jar"][0]} -d . #{Ruboto::GEM_ROOT}/lib/*.java`
               raise "Compile failed" unless $? == 0
 
               `jar -cf ../#{jruby_core} .`
+              raise "Creating repackaged jruby-core jar failed: #$?" unless $? == 0
             end
             FileUtils.remove_dir "tmp", true
           end
@@ -494,6 +483,7 @@ module Ruboto
               FileUtils.mkdir_p 'new/jruby.home'
               Dir.chdir 'old' do
                 `jar -xf ../../#{jruby_stdlib}`
+                raise "Unpacking jruby-stdlib jar failed: #$?" unless $? == 0
               end
               FileUtils.move 'old/META-INF/jruby.home/lib', 'new/jruby.home/lib'
               FileUtils.rm_rf 'new/jruby.home/lib/ruby/gems'
@@ -531,6 +521,7 @@ module Ruboto
                 # end
 
                 `jar -cf ../../#{jruby_stdlib} .`
+                raise "Creating repackaged jruby-stdlib jar failed: #$?" unless $? == 0
               end
             end
           end
@@ -539,6 +530,34 @@ module Ruboto
         end
       end
 
+      # - Removes unneeded code from dx.jar
+      def reconfigure_dx_jar
+        dx_jar = 'dx.jar'
+        Dir.chdir 'libs' do
+          log_action("Removing unneeded classes from #{dx_jar}") do
+            FileUtils.rm_rf 'tmp'
+            Dir.mkdir 'tmp'
+            Dir.chdir 'tmp' do
+              FileUtils.move "../#{dx_jar}", "."
+              `jar -xf #{dx_jar}`
+              raise "Unpacking dx.jar jar failed: #$?" unless $? == 0
+              File.delete dx_jar
+                excluded_core_packages = [
+                    'com/android/dx/command',
+                    'com/android/dx/ssa',
+                    'junit',
+                ]
+              excluded_core_packages.each do |i|
+                FileUtils.remove_dir(i, true) rescue puts "Failed to remove package: #{i} (#{$!})"
+              end
+              `jar -cf ../#{dx_jar} .`
+              raise "Creating repackaged dx.jar failed: #$?" unless $? == 0
+            end
+            FileUtils.remove_dir "tmp", true
+          end
+        end
+      end
+
       def update_bundle
         if File.exist?('Gemfile.apk') && File.exists?('libs/bundle.jar')
           FileUtils.rm 'libs/bundle.jar'

data/lib/ruboto/util/verify.rb

@@ -48,16 +48,17 @@ module Ruboto
       end
 
       def verify_min_sdk
+        return @min_sdk if @min_sdk
         verify_sdk_versions
-        @min_sdk ||= @uses_sdk.attribute('android:minSdkVersion').value
-        abort "you must specify a minimum sdk level in the manifest (e.g., <uses-sdk android:minSdkVersion='3' android:targetSdkVersion='8' />)" unless @min_sdk
-        @min_sdk
+        min_sdk_attr = @uses_sdk.attribute('android:minSdkVersion').value
+        abort "you must specify a minimum sdk level in the manifest (e.g., <uses-sdk android:minSdkVersion='3' android:targetSdkVersion='8' />)" unless min_sdk_attr
+        @min_sdk = min_sdk_attr.to_i
       end
 
       def verify_target_sdk
         return @target_sdk if @target_sdk
         verify_sdk_versions
-        target_sdk_attr ||= @uses_sdk.attribute('android:targetSdkVersion').value
+        target_sdk_attr = @uses_sdk.attribute('android:targetSdkVersion').value
         abort "you must specify a target sdk level in the manifest (e.g., <uses-sdk android:minSdkVersion='3' android:targetSdkVersion='8' />)" unless target_sdk_attr
         @target_sdk = target_sdk_attr.to_i
       end
@@ -86,4 +87,4 @@ module Ruboto
 
     end
   end
-end
+end

data/lib/ruboto/util/xml_element.rb

@@ -151,7 +151,7 @@ module Ruboto
         rv ? "return #{rv}" : default_return
       end
 
-      def ruby_call(on_ruby_instance = false, camelize = false)
+      def ruby_call(camelize = false)
         params = parameters
         args = ""
         if params.size > 1
@@ -175,7 +175,6 @@ module Ruboto
           convert_return = "#{return_class.sub(/<.*>$/, '')}.class, "
         end
 
-        if on_ruby_instance
           method_name = camelize ? attribute("name") : snake_case_attribute
           global_args = params.map{|i| "$arg_#{i[0]}"}.join(", ")
               ["// FIXME(uwe): Simplify when we stop support for RubotoCore 0.4.7"] +
@@ -192,9 +191,6 @@ module Ruboto
                       ['throw new RuntimeException("Unknown JRuby version: " + JRubyAdapter.get("JRUBY_VERSION"));']
                   )
               )
-        else
-          ["#{return_cast}JRubyAdapter.runRubyMethod(#{convert_return}scriptInfo.getCallbackProcs()[#{constant_string}], \"call\" #{args});"]
-        end
       end
 
       def snake_case_attribute
@@ -205,31 +201,22 @@ module Ruboto
         method_call(
             (attribute("return") ? attribute("return") : "void"),
             attribute("name"), parameters,
-            get_elements('exception').map{|m| m.attribute('type')},
+            get_elements('exception').map { |m| m.attribute('type') },
             ["if (ScriptLoader.isCalledFromJRuby()) #{super_return}",
-            if_else(
-                "JRubyAdapter.isInitialized()",
-                if_else(
-                    "scriptInfo.getCallbackProcs() != null && scriptInfo.getCallbackProcs()[#{constant_string}] != null",
-                    [super_string] + ruby_call,
-                    ['String rubyClassName = scriptInfo.getRubyClassName();'] +
-                        if_else(
-                            # TODO(uwe):  Remove defined?(rubyClassName) if we remove non-class-based class definitions
-                            "(Boolean)JRubyAdapter.runScriptlet(\"defined?(\" + rubyClassName + \") == 'constant' && \" + rubyClassName + \".instance_methods(false).any?{|m| m.to_sym == :#{snake_case_attribute}}\")",
-                            ruby_call(true),
-                            if_else(
-                                # TODO(uwe):  Remove defined?(rubyClassName) if we remove non-class-based class definitions
-                                "(Boolean)JRubyAdapter.runScriptlet(\"defined?(\" + rubyClassName + \") == 'constant' && \" + rubyClassName + \".instance_methods(false).any?{|m| m.to_sym == :#{attribute('name')}}\")",
-                                ruby_call(true, true),
-                                [super_return]
-                            )
-                        )
-                ),
-                [
-                    %Q{Log.i("Method called before JRuby runtime was initialized: #{class_name}##{attribute('name')}");},
-                    super_return,
-                ]
-            )
+             if_else("!JRubyAdapter.isInitialized()",
+                     [%Q{Log.i("Method called before JRuby runtime was initialized: #{class_name}##{attribute('name')}");},
+                      super_return]),
+             'String rubyClassName = scriptInfo.getRubyClassName();',
+             "if (rubyClassName == null) #{super_return}",
+             if_else(
+                 "(Boolean)JRubyAdapter.runScriptlet(rubyClassName + \".instance_methods(false).any?{|m| m.to_sym == :#{snake_case_attribute}}\")",
+                 ruby_call,
+                 if_else(
+                     "(Boolean)JRubyAdapter.runScriptlet(rubyClassName + \".instance_methods(false).any?{|m| m.to_sym == :#{attribute('name')}}\")",
+                     ruby_call(true),
+                     [super_return]
+                 )
+             )
             ]
         ).indent.join("\n")
       end

data/lib/ruboto/version.rb

@@ -5,6 +5,6 @@ Android using the Ruby language and libraries.  It includes support libraries
 and generators for creating projects, classes, tests, and more.  The complete
 APIs of Android, Java, and Ruby is available to you using the Ruby language.
 EOF
-  VERSION = '0.9.0'
-  UPDATE_VERSION_LIMIT = '0.5.2'
+  VERSION = '0.10.0.rc.0'
+  UPDATE_VERSION_LIMIT = '0.7.0'
 end

data/test/activity/mytest_activity.rb

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