ruboto 0.8.0 → 0.8.1

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

@@ -17,14 +17,16 @@ import org.ruboto.JRubyAdapter;
 
 public class ActivityTest extends ActivityInstrumentationTestCase2 {
     private final Object setup;
+    private final Object teardown;
     private final Object block;
     private final String filename;
     private final boolean onUiThread;
 
-    public ActivityTest(Class activityClass, String filename, Object setup, String name, boolean onUiThread, Object block) {
+    public ActivityTest(Class activityClass, String filename, Object setup, Object teardown, String name, boolean onUiThread, Object block) {
         super(activityClass.getPackage().getName(), activityClass);
         this.filename = filename;
         this.setup = setup;
+        this.teardown = teardown;
         setName(filename + "#" + name);
         this.onUiThread = onUiThread;
         this.block = block;
@@ -38,16 +40,21 @@ public class ActivityTest extends ActivityInstrumentationTestCase2 {
             Log.i(getClass().getName(), "Activity OK");
             Runnable testRunnable = new Runnable() {
                 public void run() {
-                    String oldFile = JRubyAdapter.getScriptFilename();
+                    if (setup != null) {
+                        Log.i(getClass().getName(), "calling setup");
+                        JRubyAdapter.setScriptFilename(filename);
+                        JRubyAdapter.runRubyMethod(setup, "call", activity);
+                        Log.i(getClass().getName(), "setup ok");
+                    }
 
-                    Log.i(getClass().getName(), "calling setup");
-                    JRubyAdapter.setScriptFilename(filename);
-                    JRubyAdapter.runRubyMethod(setup, "call", activity);
-                    Log.i(getClass().getName(), "setup ok");
-                    
                     JRubyAdapter.setScriptFilename(filename);
                     JRubyAdapter.runRubyMethod(block, "call", activity);
-                    JRubyAdapter.setScriptFilename(oldFile);
+
+                    if (teardown != null) {
+                        Log.i(getClass().getName(), "calling teardown");
+                        JRubyAdapter.runRubyMethod(teardown, "call", activity);
+                        Log.i(getClass().getName(), "teardown ok");
+                    }
                 }
             };
             if (onUiThread) {

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

@@ -31,6 +31,7 @@ import java.util.HashSet;
 public class InstrumentationTestRunner extends android.test.InstrumentationTestRunner {
     private Class activityClass;
     private Object setup;
+    private Object teardown;
     private TestSuite suite;
     
     public TestSuite getAllTests() {
@@ -99,6 +100,7 @@ public class InstrumentationTestRunner extends android.test.InstrumentationTestR
                     if (name.equals("test_helper.rb")) continue;
                     loadStep = "Load " + name;
                     loadScript(name);
+                    setup = teardown = null;
                 }
             } else {
                 addError(suite, loadStep, new RuntimeException("Ruboto Core platform is missing"));
@@ -121,6 +123,10 @@ public class InstrumentationTestRunner extends android.test.InstrumentationTestR
         this.setup = block;
     }
 
+    public void teardown(Object block) {
+        this.teardown = block;
+    }
+
     public void test(String name, Object block) {
         test(name, null, block);
     }
@@ -134,7 +140,7 @@ public class InstrumentationTestRunner extends android.test.InstrumentationTestR
 
         boolean runOnUiThread = options == null || options.get("ui") == "true";
 
-        Test test = new ActivityTest(activityClass, JRubyAdapter.getScriptFilename(), setup, name, runOnUiThread, block);
+        Test test = new ActivityTest(activityClass, JRubyAdapter.getScriptFilename(), setup, teardown, name, runOnUiThread, block);
         suite.addTest(test);
         Log.d(getClass().getName(), "Made test instance: " + test);
     }
@@ -166,21 +172,20 @@ public class InstrumentationTestRunner extends android.test.InstrumentationTestR
             source.append(line).append("\n");
         }
         buffer.close();
+        JRubyAdapter.setScriptFilename(f);
 
         // FIXME(uwe):  Simplify when we stop supporting JRuby < 1.7.0
         if (JRubyAdapter.isJRubyPreOneSeven()) {
             JRubyAdapter.put("$test", this);
             JRubyAdapter.put("$script_code", source.toString());
-            JRubyAdapter.runScriptlet("$test.instance_eval($script_code)");
+            JRubyAdapter.put("$filename", f);
+            JRubyAdapter.runScriptlet("$test.instance_eval($script_code, $filename)");
         } else {
-            String oldFilename = JRubyAdapter.getScriptFilename();
-            JRubyAdapter.setScriptFilename(f);
             if (f.equals("test_helper.rb")) {
                 JRubyAdapter.runScriptlet(source.toString());
             } else {
-                JRubyAdapter.runRubyMethod(this, "instance_eval", source.toString());
+                JRubyAdapter.runRubyMethod(this, "instance_eval", source.toString(), f);
             }
-            JRubyAdapter.setScriptFilename(oldFilename);
         }
         Log.d(getClass().getName(), "Test script " + f + " loaded");
     }

data/assets/src/ruboto/activity.rb

@@ -32,27 +32,57 @@ module Ruboto
       start_ruboto_activity(remote_variable, RubotoDialog, theme, &block)
     end
   
-    def start_ruboto_activity(global_variable_name = '$activity', klass=RubotoActivity, theme=nil, &block)
-      $context_init_block = block
-      $new_context_global = global_variable_name
-  
-      if @initialized or (self == $activity && !$activity.rubotoAttachable)
+    def start_ruboto_activity(global_variable_name = '$activity', klass=RubotoActivity, theme=nil, options = nil, &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
+
+      # FIXME(uwe): Used for block-based definition of main activity.
+      # FIXME(uwe): Remove when we stop supporting Ruboto 0.8.0 or older.
+      puts "start_ruboto_activity self: #{self.inspect}"
+      if @ruboto_java_class and not @ruboto_java_class_initialized
+        @ruboto_java_class_initialized = true
+        puts "Block based main activity definition"
+        instance_eval &block if block
+        setup_ruboto_callbacks
+        on_create nil
+      else
+        puts "Class based main activity definition"
+        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))
+        else
+          Object.const_get(class_name).class_eval(&block)
+        end
         b = Java::android.os.Bundle.new
         b.putInt("Theme", theme) if theme
-  
-        i = Java::android.content.Intent.new
+        b.putString("ClassName", class_name)
+        i = android.content.Intent.new
         i.setClass self, klass.java_class
         i.putExtra("RubotoActivity Config", b)
-  
-        self.startActivity i
-      else
-        initialize_ruboto
-        on_create nil
+        startActivity i
       end
-  
       self
     end
+
+    private
+
+    def source_descriptor(proc)
+      if md = /^#<Proc:0x[0-9A-Fa-f]+@(.+):(\d+)(?: \(lambda\))?>$/.match(proc.inspect)
+        filename, line = md.captures
+        return filename, line.to_i
+      end
+    end
+
   end
+
 end
 
 java_import "android.content.Context"
@@ -76,10 +106,6 @@ end
 def ruboto_configure_activity(klass)
   klass.class_eval do
     include Ruboto::Activity
-    
-    # Can't be moved into the module
-    def on_create(bundle)
-    end
   end
 end
 

data/assets/src/ruboto/base.rb

@@ -22,6 +22,12 @@ module Kernel
   def android
     JavaUtilities.get_package_module_dot_format('android')
   end
+
+  alias :old_method_missing :method_missing
+  def method_missing(method, *args, &block)
+    return @ruboto_java_instance.send(method, *args, &block) if @ruboto_java_instance && @ruboto_java_instance.respond_to?(method)
+    old_method_missing(method, *args, &block)
+  end
 end
 
 java_import "android.R"
@@ -54,7 +60,7 @@ module Ruboto
       ruboto_callback_methods.each do |i|
         begin
           # FIXME(uwe): Remove to_sym conversion when we stop supporting Ruby 1.8 mode
-          setCallbackProc((self.class.constants.map(&:to_sym).include?(i.to_s.sub(/^on_/, "CB_").upcase.to_sym) && self.class.const_get(i.to_s.sub(/^on_/, "CB_").upcase)) || (self.class.constants.map(&:to_sym).include?("CB_#{i}".upcase.to_sym) && self.class.const_get("CB_#{i}".upcase)), method(i))
+          scriptInfo.setCallbackProc((self.class.constants.map(&:to_sym).include?(i.to_s.sub(/^on_/, "CB_").upcase.to_sym) && self.class.const_get(i.to_s.sub(/^on_/, "CB_").upcase)) || (self.class.constants.map(&:to_sym).include?("CB_#{i}".upcase.to_sym) && self.class.const_get("CB_#{i}".upcase)), method(i))
         rescue
         end
       end 

data/assets/src/ruboto/generate.rb

@@ -43,11 +43,15 @@ class TypeId
   end
 
   def self.convert_type(type)
-    # TODO: Handling arrays
     rv = @@convert_hash[type]
     unless rv
       rv = type.split("[")
-      rv[-1] = "L#{rv[-1].gsub('.', '/')};" unless rv[-1].length == 1
+      unless rv[-1].length == 1
+        rv[-1] = rv[-1].gsub('.', '/')
+        unless rv[-1] =~ /^L.*;$/
+          rv[-1] = "L#{rv[-1]};"
+        end
+      end
       rv = get(rv.join("["))
     end
     rv

data/assets/src/ruboto/legacy.rb

@@ -17,7 +17,7 @@ module Ruboto
   module Callbacks
     def method_missing(name, *args, &block)
       if name.to_s =~ /^handle_(.*)/ && self.class.respond_to?(:const_get) && (const = self.class.const_get("CB_#{$1.upcase}"))
-        setCallbackProc(const, block)
+        scriptInfo.setCallbackProc(const, block)
         self
       else
         super

data/assets/src/ruboto/menu.rb

@@ -30,7 +30,7 @@ module Ruboto
         @menu = args[0]
         instance_eval { block.call(*args) } if block
       end
-      setCallbackProc(self.class.const_get("CB_CREATE_OPTIONS_MENU"), p)
+      scriptInfo.setCallbackProc(self.class.const_get("CB_CREATE_OPTIONS_MENU"), p)
 
       p = Proc.new do |num, menu_item|
         # handles a problem where this is called for context items
@@ -43,7 +43,7 @@ module Ruboto
           false
         end
       end
-      setCallbackProc(self.class.const_get("CB_MENU_ITEM_SELECTED"), p)
+      scriptInfo.setCallbackProc(self.class.const_get("CB_MENU_ITEM_SELECTED"), p)
     end
 
     #
@@ -65,7 +65,7 @@ module Ruboto
         @context_menu = args[0]
         instance_eval { block.call(*args) } if block
       end
-      setCallbackProc(self.class.const_get("CB_CREATE_CONTEXT_MENU"), p)
+      scriptInfo.setCallbackProc(self.class.const_get("CB_CREATE_CONTEXT_MENU"), p)
 
       p = Proc.new do |menu_item|
         if menu_item.on_click
@@ -81,7 +81,7 @@ module Ruboto
           false
         end
       end
-      setCallbackProc(self.class.const_get("CB_CONTEXT_ITEM_SELECTED"), p)
+      scriptInfo.setCallbackProc(self.class.const_get("CB_CONTEXT_ITEM_SELECTED"), p)
     end
   end
 end

data/assets/src/ruboto/widget.rb

@@ -157,19 +157,12 @@ end
 
 def setup_list_view
   Java::android.widget.ListView.class_eval do
-    attr_reader :adapter, :adapter_list
-
     def configure(context, params = {})
-      if params.has_key? :list
-        @adapter_list = Java::java.util.ArrayList.new
-        @adapter_list.addAll(params[:list])
+      if list = params.delete(:list)
+        adapter_list = Java::java.util.ArrayList.new
+        adapter_list.addAll(list)
         item_layout = params.delete(:item_layout) || R::layout::simple_list_item_1
-        @adapter    = Java::android.widget.ArrayAdapter.new(context, item_layout, @adapter_list)
-        setAdapter @adapter
-        params.delete :list
-      end
-      if params.has_key? :adapter
-        @adapter = params[:adapter]
+        params[:adapter] = Java::android.widget.ArrayAdapter.new(context, item_layout, adapter_list)
       end
       super(context, params)
     end

data/lib/ruboto/commands/base.rb

@@ -95,9 +95,9 @@ module Ruboto
                   update_assets
                   update_ruboto true
                   update_icons true
-                  update_classes true
+                  update_classes nil, true
                   update_jruby true if params['with-jruby'].value
-#                  update_build_xml
+                  update_dexmaker true unless params['with-jruby'].value
                   update_core_classes "exclude"
 
                   log_action("Generating the default Activity and script") do
@@ -116,9 +116,7 @@ module Ruboto
               include Ruboto::Util::Verify
 
               def run
-                Dir.chdir root do
-                  update_jruby true
-                end
+                update_jruby true
               end
             end
 
@@ -217,6 +215,7 @@ module Ruboto
               }
 
               def run
+                generate_inheriting_file 'Class', params['name'].value
                 generate_subclass_or_interface(
                 %w(class name package method_base method_include method_exclude implements force).inject({}) {|h, i| h[i.to_sym] = params[i].value; h})
               end
@@ -248,6 +247,9 @@ module Ruboto
               }
 
               def run
+                # FIXME(uwe):  DEPRECATED!  Remove before Ruboto version 1.0.0.
+                puts "\nThe use of \"ruboto gen interface\" has been deprecated.  Please use\n\n    ruboto gen subclass\n\ninstead.\n\n"
+                generate_inheriting_file 'Class', params['name'].value
                 generate_subclass_or_interface %w(interface name package force).inject({}) {|h, i| h[i.to_sym] = params[i].value; h}
               end
             end
@@ -330,6 +332,7 @@ module Ruboto
 
             argument("what") {
               required
+              # FIXME(uwe): Deprecated "ruboto update ruboto" in Ruboto 0.8.1.  Remove september 2013.
               validate {|i| %w(jruby app ruboto).include?(i)}
               description "What do you want to update: 'app', 'jruby', or 'ruboto'"
             }
@@ -342,11 +345,20 @@ module Ruboto
               case params['what'].value
               when "app" then
                 force = params['force'].value
+                old_version = read_ruboto_version
+                if Gem::Version.new(old_version) < Gem::Version.new(Ruboto::UPDATE_VERSION_LIMIT)
+                  puts "Detected old Ruboto version: #{old_version}"
+                  puts "Will use Ruboto #{Ruboto::UPDATE_VERSION_LIMIT} to update it first."
+                  `gem query -i -n ruboto -v #{Ruboto::UPDATE_VERSION_LIMIT}`
+                  system "gem install ruboto -v #{Ruboto::UPDATE_VERSION_LIMIT}" unless $? == 0
+                  system "ruboto _#{Ruboto::UPDATE_VERSION_LIMIT}_ update app"
+                end
                 update_android
                 update_test force
                 update_assets
                 update_ruboto force
-                update_classes force
+                update_classes old_version, force
+                update_dexmaker force
                 update_jruby force
                 update_manifest nil, nil, force
                 update_icons force
@@ -354,7 +366,9 @@ module Ruboto
                 update_bundle
               when "jruby" then
                 update_jruby(params['force'].value) || abort
+              # FIXME(uwe): Deprecated in Ruboto 0.8.1.  Remove september 2013.
               when "ruboto" then
+                puts "\nThe 'ruboto update ruboto' command has been deprecated.  Use\n\n    ruboto update app\n\ninstead.\n\n"
                 update_ruboto(params['force'].value) || abort
               end
             end
@@ -372,7 +386,7 @@ module Ruboto
             else
               gem_spec = Gem.searcher.find('ruboto')
             end
-            # FIXME end
+            # EMXIF
 
             version = gem_spec.version.version
 

data/lib/ruboto/util/build.rb

@@ -115,12 +115,15 @@ module Ruboto
         # 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"
         build_file params[:template], params[:package], params[:name], {
             "THE_METHOD_BASE" => params[:method_base].to_s,
             "THE_PACKAGE" => params[:package],
-            "THE_ACTION" => class_desc.name == "class" ? "extends" : "implements",
+            "THE_ACTION" => action,
             "THE_ANDROID_CLASS" => (params[:class] || params[:interface]) +
-                (params[:implements] == "" ? "" : (" implements " + params[:implements].split(",").join(", "))),
+                (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,
@@ -160,7 +163,7 @@ module Ruboto
       # generate_inheriting_file:
       #   Builds a script based subclass of Activity, Service, or BroadcastReceiver
       #
-      def generate_inheriting_file(klass, name, package, script_name = "#{underscore(name)}.rb")
+      def generate_inheriting_file(klass, name, package = verify_package, script_name = "#{underscore(name)}.rb")
         dest = '.'
         file = File.expand_path File.join(dest, "src/#{package.gsub('.', '/')}", "#{name}.java")
         text = File.read(File.join(Ruboto::ASSETS, "src/Inheriting#{klass}.java"))

data/lib/ruboto/util/code_formatting.rb

@@ -5,8 +5,8 @@ module Ruboto
       #
       # Methods for formatting code
       #
-      def method_call(return_type=nil, method_name="", parameters=[], body_clause=[])
-        ["public #{"#{return_type} " unless return_type.nil? || return_type.empty?}#{method_name}(" + parameters.map{|i| "#{i[1]} #{i[0]}"}.join(", ") + ") {",
+      def method_call(return_type, method_name, parameters=[], exceptions=nil, body_clause=[])
+        ["public #{"#{return_type} " unless return_type.nil? || return_type.empty?}#{method_name}(" + parameters.map{|i| "#{i[1]} #{i[0]}"}.join(", ") + ") #{" throws #{exceptions.join(', ')}" if exceptions && exceptions.any?}{",
         body_clause.indent, "}"]
       end
 

data/lib/ruboto/util/update.rb

@@ -1,3 +1,5 @@
+require 'ruboto/version'
+
 module Ruboto
   module Util
     module Update
@@ -23,7 +25,7 @@ module Ruboto
           puts "Forcing generation of new build.xml since upgrading a project generated with Android SDK 13 or older."
           FileUtils.rm_f build_xml_file
         end
-        # FIXME end
+        # EMXIF
 
         # FIXME(uwe):  Simplify when we stop supporting upgrading apps from Android SDK <= 13
         prop_file = File.exists?(new_prop_file) ? new_prop_file : old_prop_file
@@ -34,7 +36,7 @@ module Ruboto
             File.open(prop_file, 'w') { |f| f << project_property_file.gsub(version_regexp, "\\1#{MINIMUM_SUPPORTED_SDK_LEVEL}") }
           end
         end
-        # FIXME end
+        # EMXIF
 
         system "android update project -p #{root} -n #{name}"
         raise "android update project failed with return code #{$?}" unless $? == 0
@@ -52,7 +54,7 @@ module Ruboto
           # FIXME(uwe): Remove build.xml file to force regeneration.
           # FIXME(uwe): Needed when updating apps from Android SDK <= 13 to 14
           FileUtils.rm_f "#{root}/test/build.xml"
-          # FIXME end
+        # EMXIF
 
           puts "\nUpdating Android test project #{name} in #{root}/test..."
           system "android update test-project -m #{root} -p #{root}/test"
@@ -85,7 +87,7 @@ module Ruboto
           prop_file = %w{ant.properties build.properties}.find { |f| File.exists?(f) }
           prop_lines = File.readlines(prop_file)
           File.open(prop_file, 'a') { |f| f << instrumentation_property } unless prop_lines.include?(instrumentation_property)
-          # FIXME end
+          # EMXIF
 
           ant_setup_line = /^(\s*<\/project>)/
           run_tests_override = <<-EOF
@@ -134,22 +136,18 @@ module Ruboto
 
           EOF
           ant_script = File.read('build.xml')
-          # TODO(uwe): Old patches without delimiter.  Remove when we stop supporting upgrading from ruboto-core 0.2.0 and older.
-          ant_script.gsub!(/\s*<macrodef name="run-tests-helper">.*?<\/macrodef>\s*/m, '')
-          ant_script.gsub!(/\s*<target name="run-tests-quick".*?<\/target>\s*/m, '')
-          # TODO end
           ant_script.gsub!(/\s*<!-- BEGIN added by ruboto(?:-core)? -->.*?<!-- END added by ruboto(?:-core)? -->\s*/m, '')
           raise "Bad ANT script" unless ant_script.gsub!(ant_setup_line, "#{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.2
+          # 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
-          # FIXME end
+          # EMXIF
         end
       end
 
@@ -190,9 +188,9 @@ module Ruboto
         log_action("Copying #{JRubyJars::stdlib_jar_path} to libs") { copier.copy_from_absolute_path JRubyJars::stdlib_jar_path, "libs" }
 
         # FIXME(uwe):  Try keeping the class count low to enable installation on Android 2.3 devices
-        unless new_jruby_version =~ /^1.7.0/ && verify_target_sdk < 15
+        # unless new_jruby_version =~ /^1.7.0/ && verify_target_sdk < 15
           log_action("Copying dexmaker.jar to libs") { copier.copy 'libs' }
-        end
+        # end
 
         reconfigure_jruby_libs(new_jruby_version)
 
@@ -200,14 +198,32 @@ module Ruboto
         true
       end
 
+      def update_dexmaker(force=nil)
+        jar_file = Dir.glob("libs/dexmaker*.jar")[0]
+
+        # FIXME(uwe):  Skip copying dexmaker to apps using RubotoCore when we include dexmaker.jar in RubotoCore
+        # return false if !jar_file && !force
+
+        copier = AssetCopier.new Ruboto::ASSETS, File.expand_path(".")
+        # FIXME(uwe):  Skip copying dexmaker to apps using RubotoCore when we include dexmaker.jar in RubotoCore
+        # log_action("Removing #{jar_file}") { File.delete *Dir.glob("libs/dexmaker*.jar") } if jar_file
+
+        # FIXME(uwe):  Try keeping the class count low to enable installation on Android 2.3 devices
+        # FIXME(uwe):  Skip copying dexmaker to apps using RubotoCore when we include dexmaker.jar in RubotoCore
+        # if verify_target_sdk < 15
+          log_action("Copying dexmaker.jar to libs") { copier.copy 'libs/dexmaker*.jar' }
+        # end
+        # EMXIF
+      end
+
       def update_assets
         puts "\nCopying files:"
 
-        # FIXME(uwe):  Remove when we stop supporting updating from Ruboto <= 0.5.4
+        # 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
-        # FIXME end
+        # EMXIF
 
         weak_copier = Ruboto::Util::AssetCopier.new Ruboto::ASSETS, '.', false
         %w{.gitignore Rakefile}.each { |f| log_action(f) { weak_copier.copy f } }
@@ -216,15 +232,6 @@ module Ruboto
         %w{assets rakelib res/layout test}.each do |f|
           log_action(f) { copier.copy f }
         end
-
-        # FIXME(uwe):  Remove when we stop supporting upgrades from ruboto-core 0.3.3 and older
-        old_scripts_dir = 'assets/scripts'
-        if File.exists? old_scripts_dir
-          FileUtils.mv Dir["#{old_scripts_dir}/*"], SCRIPTS_DIR
-          FileUtils.rm_rf old_scripts_dir
-        end
-        # FIXME end
-
       end
 
       def update_icons(force = nil)
@@ -248,7 +255,7 @@ module Ruboto
         end
       end
 
-      def update_classes(force = nil)
+      def update_classes(old_version, force = nil)
         copier = Ruboto::Util::AssetCopier.new Ruboto::ASSETS, '.'
         log_action("Ruboto java classes") { copier.copy "src/org/ruboto/*.java" }
         log_action("Ruboto java test classes") { copier.copy "src/org/ruboto/test/*.java", "test" }
@@ -261,37 +268,31 @@ module Ruboto
             puts "Regenerating #{class_name} #{subclass_name}"
             generate_inheriting_file(class_name, subclass_name, verify_package)
 
-            # FIXME(uwe): Remove when we stop supporting upgrading from ruboto-core 0.3.3 and older
-            if class_name == 'BroadcastReceiver'
+            # FIXME(uwe): Remove when we stop supporting upgrading from ruboto 0.7.0 and ruboto 0.8.0
+            if (old_version == '0.7.0' || old_version == '0.8.0')
+              puts "Ruboto version #{old_version.inspect} detected."
               script_file = File.expand_path("#{SCRIPTS_DIR}/#{underscore(subclass_name)}.rb")
+              puts "Adding explicit super call in #{script_file}"
               script_content = File.read(script_file)
-              if script_content !~ /\$broadcast_receiver.handle_receive do \|context, intent\|/ &&
-                  script_content !~ /RubotoBroadcastReceiver.new_with_callbacks/ &&
-                  script_content !~ /class \w+\s+include Ruboto::BroadcastReceiver/ &&
-                  script_content !~ /^\s*class #{subclass_name}\s/
-                puts "Putting receiver script in a block in #{script_file}"
-                script_content.gsub! '$broadcast_context', 'context'
-                File.open(script_file, 'w') do |of|
-                  of.puts "class #{subclass_name}
-  def on_receive(context, intent)"
-                  of << script_content
-                  of.puts '  end\nend'
-                end
-              end
+              script_content.gsub! /^(\s*)(def on_(?:create\(bundle\)|start|resume|pause|destroy)\n)/, "\\1\\2\\1  super\n"
+              File.open(script_file, 'w'){|of| of << script_content}
             end
-            # FIXME end
-          elsif source_code =~ /^\/\/ Generated Ruboto subclass with method base "(.*?)".*^\s*package\s+(\S+?)\s*;.*public\s+class\s+(\S+?)\s+extends\s+(.*?)\s\{/m
+            # EMXIF
+
+          elsif source_code =~ /^\/\/ Generated Ruboto subclass with method base "(.*?)".*^\s*package\s+(\S+?)\s*;.*public\s+class\s+(\S+?)\s+extends\s+(.*?)\s*(?:implements\s+org.ruboto.RubotoComponent\s*)?\{/m
             method_base, package, subclass_name, class_name = $1, $2, $3, $4
             puts "Regenerating subclass #{package}.#{subclass_name}"
+            generate_inheriting_file 'Class', subclass_name
             generate_subclass_or_interface(:package => package, :template => 'InheritingClass', :class => class_name,
                                            :name => subclass_name, :method_base => method_base, :force => force)
           # FIXME(uwe): Remove when we stop updating from Ruboto 0.7.0 and older
           elsif source_code =~ /^\s*package\s+(\S+?)\s*;.*public\s+class\s+(\S+?)\s+extends\s+(.*?)\s\{.*^\s*private Object\[\] callbackProcs = new Object\[\d+\];/m
             package, subclass_name, class_name = $1, $2, $3
             puts "Regenerating subclass #{package}.#{subclass_name}"
+            generate_inheriting_file 'Class', subclass_name
             generate_subclass_or_interface(:package => package, :template => 'InheritingClass', :class => class_name,
                                            :name => subclass_name, :method_base => 'on', :force => force)
-          # FIXME end
+          # EMXIF
           end
         end
       end
@@ -348,11 +349,16 @@ module Ruboto
         # 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'
-        # FIXME end
+        # EMXIF
 
         generate_core_classes(:class => "all", :method_base => "on", :method_include => "", :method_exclude => "", :force => force, :implements => "")
       end
 
+      def read_ruboto_version
+        version_file = File.expand_path("./#{SCRIPTS_DIR}/ruboto/version.rb")
+        File.read(version_file).slice(/^\s*VERSION = '(.*?)'/, 1) if File.exists?(version_file)
+      end
+
       def update_ruboto(force=nil)
         log_action("Copying ruboto.rb") do
           from = File.expand_path(Ruboto::GEM_ROOT + "/assets/#{SCRIPTS_DIR}/ruboto.rb")
@@ -366,15 +372,8 @@ module Ruboto
           FileUtils.cp from, to
         end
         log_action("Copying additional ruboto script components") do
-          Dir.glob(Ruboto::GEM_ROOT + "/assets/#{SCRIPTS_DIR}/ruboto/*.rb").each do |i|
-            from = File.expand_path(i)
-            to = File.expand_path("./#{SCRIPTS_DIR}/ruboto/#{File.basename(i)}")
-            FileUtils.mkdir_p File.dirname(to)
-            FileUtils.cp from, to
-          end
-          Dir.glob(Ruboto::GEM_ROOT + "/assets/#{SCRIPTS_DIR}/ruboto/util/*.rb").each do |i|
-            from = File.expand_path(i)
-            to = File.expand_path("./#{SCRIPTS_DIR}/ruboto/util/#{File.basename(i)}")
+          Dir.glob(Ruboto::GEM_ROOT + "/assets/#{SCRIPTS_DIR}/ruboto/**/*.rb").each do |from|
+            to = File.expand_path("./#{from.slice /#{SCRIPTS_DIR}\/ruboto\/.*\.rb/}")
             FileUtils.mkdir_p File.dirname(to)
             FileUtils.cp from, to
           end
@@ -424,16 +423,17 @@ module Ruboto
                     'org/jruby/ext/ffi/jffi',
                     'org/jruby/ext/openssl', # TODO(uwe): Issue #154 Add back when we add jruby-openssl.
 
-                    # 'org/jruby/ir', # FIXME(uwe):  Try to modify JRuby to allow this to be removed
-                    'org/jruby/ir/dataflow',
+                    # 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/representations',
                     # 'org/jruby/ir/targets',
-                    'org/jruby/ir/transformations',
-                    'org/jruby/ir/util',
+                    # 'org/jruby/ir/transformations',
+                    # 'org/jruby/ir/util',
 
                     'org/jruby/javasupport/bsf',
                     'org/jruby/runtime/invokedynamic',
@@ -458,7 +458,7 @@ module Ruboto
                     'org/jruby/embed/jsr223', 'org/jruby/embed/osgi', 'org/jruby/ext/ffi', 'org/jruby/javasupport/bsf',
                     'org/jruby/runtime/invokedynamic',
                 ]
-                # TODO end
+                # ODOT
               end
 
               excluded_core_packages.each do |i|