ruboto 0.11.0 → 0.12.0.rc.0

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

@@ -23,92 +23,6 @@ public class JRubyAdapter {
     private static String localVariableBehavior = "TRANSIENT";
     private static String RUBOTO_CORE_VERSION_NAME;
 
-    /**
-     * @deprecated  As of Ruboto 0.7.1, replaced by {@link #runRubyMethod(Object receiver, String methodName, Object... args)}
-     */
-    @Deprecated public static void callMethod(Object receiver, String methodName, Object[] args) {
-        runRubyMethod(receiver, methodName, args);
-    }
-
-    /**
-     * @deprecated  As of Ruboto 0.7.1, replaced by {@link #runRubyMethod(Object receiver, String methodName, Object... args)}
-     */
-    @Deprecated public static void callMethod(Object object, String methodName, Object arg) {
-        runRubyMethod(object, methodName, arg);
-    }
-
-    /**
-     * @deprecated  As of Ruboto 0.7.1, replaced by {@link #runRubyMethod(Object receiver, String methodName, Object... args)}
-     */
-    @Deprecated public static void callMethod(Object object, String methodName) {
-        runRubyMethod(object, methodName, new Object[] {});
-    }
-
-    /**
-     * @deprecated  As of Ruboto 0.7.1, replaced by {@link #runRubyMethod(Class<T> returnType, Object receiver, String methodName, Object... args)}
-     */
-    @SuppressWarnings("unchecked")
-    @Deprecated public static <T> T callMethod(Object receiver, String methodName, Object[] args, Class<T> returnType) {
-        return (T) runRubyMethod(returnType, receiver, methodName, args);
-    }
-
-    /**
-     * @deprecated  As of Ruboto 0.7.1, replaced by {@link #runRubyMethod(Class<T> returnType, Object receiver, String methodName, Object... args)}
-     */
-    @SuppressWarnings("unchecked")
-    @Deprecated public static <T> T callMethod(Object receiver, String methodName, Object arg, Class<T> returnType) {
-        return (T) runRubyMethod(returnType, receiver, methodName, arg);
-    }
-
-    /**
-     * @deprecated  As of Ruboto 0.7.1, replaced by {@link #runRubyMethod(Class<T> returnType, Object receiver, String methodName, Object... args)}
-     */
-    @SuppressWarnings("unchecked")
-    @Deprecated public static <T> T callMethod(Object receiver, String methodName, Class<T> returnType) {
-        return (T) runRubyMethod(returnType, receiver, methodName);
-    }
-
-    /**
-     * @deprecated  As of Ruboto 0.7.0, replaced by {@link #put(String name, Object object)}
-     */
-    @Deprecated public static void defineGlobalConstant(String name, Object object) {
-        put(name, object);
-    }
-
-    /**
-     * @deprecated  As of Ruboto 0.7.0, replaced by {@link #put(String name, Object object)}
-     */
-    @Deprecated public static void defineGlobalVariable(String name, Object object) {
-        put(name, object);
-    }
-
-    /**
-     * @deprecated  As of Ruboto 0.7.0, replaced by {@link #runScriptlet(String code)}
-     */
-    @Deprecated public static Object exec(String code) {
-        try {
-            Method runScriptletMethod = ruby.getClass().getMethod("runScriptlet", String.class);
-            return runScriptletMethod.invoke(ruby, code);
-        } catch (NoSuchMethodException nsme) {
-            throw new RuntimeException(nsme);
-        } catch (IllegalAccessException iae) {
-            throw new RuntimeException(iae);
-        } catch (java.lang.reflect.InvocationTargetException ite) {
-            if (isDebugBuild) {
-                throw ((RuntimeException) ite.getCause());
-            } else {
-                return null;
-            }
-        }
-    }
-
-    /**
-     * @deprecated  As of Ruboto 0.7.0, replaced by {@link #runScriptlet(String code)}
-     */
-    @Deprecated public static String execute(String code) {
-        return (String) runRubyMethod(String.class, exec(code), "inspect");
-    }
-
     public static Object get(String name) {
         try {
             Method getMethod = ruby.getClass().getMethod("get", String.class);
@@ -132,21 +46,8 @@ public class JRubyAdapter {
 
     public static Object runRubyMethod(Object receiver, String methodName, Object... args) {
         try {
-            // FIXME(uwe):  Simplify when we stop supporting JRuby < 1.7.0
-            if (isJRubyPreOneSeven()) {
-                if (args.length == 0) {
-                    Method m = ruby.getClass().getMethod("callMethod", Object.class, String.class, Class.class);
-                    // System.out.println("Calling callMethod(" + receiver + ", " + methodName + ", " + Object.class + ")");
-                    return m.invoke(ruby, receiver, methodName, Object.class);
-                } else {
-                    Method m = ruby.getClass().getMethod("callMethod", Object.class, String.class, Object[].class, Class.class);
-                    // System.out.println("Calling callMethod(" + receiver + ", " + methodName + ", " + args + ", " + Object.class + ")");
-                    return m.invoke(ruby, receiver, methodName, args, Object.class);
-                }
-            } else {
-                Method m = ruby.getClass().getMethod("runRubyMethod", Class.class, Object.class, String.class, Object[].class);
-                return m.invoke(ruby, Object.class, receiver, methodName, args);
-            }
+            Method m = ruby.getClass().getMethod("runRubyMethod", Class.class, Object.class, String.class, Object[].class);
+            return m.invoke(ruby, Object.class, receiver, methodName, args);
         } catch (NoSuchMethodException nsme) {
             throw new RuntimeException(nsme);
         } catch (IllegalAccessException iae) {
@@ -163,19 +64,8 @@ public class JRubyAdapter {
     @SuppressWarnings("unchecked")
     public static <T> T runRubyMethod(Class<T> returnType, Object receiver, String methodName, Object... args) {
         try {
-            // FIXME(uwe):  Simplify when we stop supporting JRuby < 1.7.0
-            if (isJRubyPreOneSeven()) {
-                if (args.length == 0) {
-                  Method m = ruby.getClass().getMethod("callMethod", Object.class, String.class, Class.class);
-                  return (T) m.invoke(ruby, receiver, methodName, returnType);
-                } else {
-                  Method m = ruby.getClass().getMethod("callMethod", Object.class, String.class, Object[].class, Class.class);
-                  return (T) m.invoke(ruby, receiver, methodName, args, returnType);
-                }
-            } else {
-                Method m = ruby.getClass().getMethod("runRubyMethod", Class.class, Object.class, String.class, Object[].class);
-                return (T) m.invoke(ruby, returnType, receiver, methodName, args);
-            }
+            Method m = ruby.getClass().getMethod("runRubyMethod", Class.class, Object.class, String.class, Object[].class);
+            return (T) m.invoke(ruby, returnType, receiver, methodName, args);
         } catch (NoSuchMethodException nsme) {
             throw new RuntimeException(nsme);
         } catch (IllegalAccessException iae) {
@@ -262,11 +152,6 @@ 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;
@@ -459,16 +344,6 @@ public class JRubyAdapter {
         ruby = null;
     }
 
-    // FIXME(uwe):  Remove when we stop supporting JRuby < 1.7.0
-    @Deprecated public static boolean isJRubyPreOneSeven() {
-        return ((String)get("JRUBY_VERSION")).equals("1.7.0.dev") || ((String)get("JRUBY_VERSION")).startsWith("1.6.");
-    }
-
-    // FIXME(uwe):  Remove when we stop supporting JRuby < 1.7.0
-    @Deprecated public static boolean isJRubyOneSeven() {
-        return !isJRubyPreOneSeven() && ((String)get("JRUBY_VERSION")).startsWith("1.7.");
-    }
-
     // FIXME(uwe):  Remove when we stop supporting Ruby 1.8
     @Deprecated public static boolean isRubyOneEight() {
         return ((String)get("RUBY_VERSION")).startsWith("1.8.");
@@ -496,29 +371,7 @@ public class JRubyAdapter {
     private static String scriptsDirName(Context context) {
         File storageDir = null;
         if (isDebugBuild()) {
-
-            // FIXME(uwe): Simplify this as soon as we drop support for android-7
-            if (android.os.Build.VERSION.SDK_INT >= 8) {
-                try {
-                    Method method = context.getClass().getMethod("getExternalFilesDir", String.class);
-                    storageDir = (File) method.invoke(context, (Object) null);
-                } catch (SecurityException e) {
-                    printStackTrace(e);
-                } catch (NoSuchMethodException e) {
-                    printStackTrace(e);
-                } catch (IllegalArgumentException e) {
-                    printStackTrace(e);
-                } catch (IllegalAccessException e) {
-                    printStackTrace(e);
-                } catch (InvocationTargetException e) {
-                    printStackTrace(e);
-                }
-            } else {
-                storageDir = new File(Environment.getExternalStorageDirectory(), "Android/data/" + context.getPackageName() + "/files");
-                Log.e("Calculated path to sdcard the old way: " + storageDir);
-            }
-            // FIXME end
-
+            storageDir = context.getExternalFilesDir(null);
             if (storageDir == null || (!storageDir.exists() && !storageDir.mkdirs())) {
                 Log.e("Development mode active, but sdcard is not available.  Make sure you have added\n<uses-permission android:name='android.permission.WRITE_EXTERNAL_STORAGE' />\nto your AndroidManifest.xml file.");
                 storageDir = context.getFilesDir();

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

@@ -105,7 +105,7 @@ public class Script {
      * Instance methods
      */
     public String execute() throws IOException {
-        return JRubyAdapter.execute(getContents());
+        return JRubyAdapter.runScriptlet(getContents()).toString();
     }
 
     boolean exists() {

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

@@ -21,15 +21,16 @@ public class ScriptLoader {
         return false;
     }
 
-    public static void loadScript(final RubotoComponent component, Object... args) {
+    public static void loadScript(final RubotoComponent component) {
         try {
             if (component.getScriptInfo().getScriptName() != null) {
-                System.out.println("Looking for Ruby class: " + component.getScriptInfo().getRubyClassName());
+                Log.d("Looking for Ruby class: " + component.getScriptInfo().getRubyClassName());
                 Object rubyClass = JRubyAdapter.get(component.getScriptInfo().getRubyClassName());
-                System.out.println("Found: " + rubyClass);
+                Log.d("Found: " + rubyClass);
                 final Script rubyScript = new Script(component.getScriptInfo().getScriptName());
                 Object rubyInstance;
                 if (rubyScript.exists()) {
+                    Log.d("Found script.");
                     rubyInstance = component;
                     final String script = rubyScript.getContents();
                     boolean scriptContainsClass = script.matches("(?s).*class "
@@ -38,43 +39,38 @@ public class ScriptLoader {
                             .equals(component.getClass().getSimpleName());
                     if (scriptContainsClass) {
                         if (hasBackingJavaClass) {
+                            Log.d("hasBackingJavaClass");
                             if (rubyClass != null && !rubyClass.toString().startsWith("Java::")) {
-                                System.out.println("Found Ruby class instead of Java class.  Reloading.");
+                                Log.d("Found Ruby class instead of Java class.  Reloading.");
                                 rubyClass = null;
                             }
                         } else {
-                            System.out.println("Script defines methods on meta class");
+                            Log.d("Script defines methods on meta class");
 
-                            // FIXME(uwe): Simplify when we stop support for RubotoCore 0.4.7
-                            if (JRubyAdapter.isJRubyPreOneSeven() || JRubyAdapter.isRubyOneEight()) {
+                            // FIXME(uwe): Simplify when we stop support for Ruby 1.8 mode.
+                            if (JRubyAdapter.isRubyOneEight()) {
                                 JRubyAdapter.put("$java_instance", component);
                                 rubyClass = JRubyAdapter.runScriptlet("class << $java_instance; self; end");
-                            } else if (JRubyAdapter.isJRubyOneSeven() && JRubyAdapter.isRubyOneNine()) {
+                            } else if (JRubyAdapter.isRubyOneNine()) {
                                 JRubyAdapter.runScriptlet("Java::" + component.getClass().getName() + ".__persistent__ = true");
                                 rubyClass = JRubyAdapter.runRubyMethod(component, "singleton_class");
                             } else {
-                                throw new RuntimeException("Unknown JRuby/Ruby version: " + JRubyAdapter.get("JRUBY_VERSION") + "/" + JRubyAdapter.get("RUBY_VERSION"));
+                                throw new RuntimeException("Unknown Ruby version: " + JRubyAdapter.get("RUBY_VERSION"));
                             }
                             // EMXIF
 
                         }
                     }
                     if (rubyClass == null || !hasBackingJavaClass) {
-                        System.out.println("Loading script: " + component.getScriptInfo().getScriptName());
+                        Log.d("Loading script: " + component.getScriptInfo().getScriptName());
                         if (scriptContainsClass) {
-                            System.out.println("Script contains class definition");
+                            Log.d("Script contains class definition");
                             if (rubyClass == null && hasBackingJavaClass) {
-                                System.out.println("Script has separate Java class");
-
-                                // FIXME(uwe): Simplify when we stop support for JRuby < 1.7.0
-                                if (!JRubyAdapter.isJRubyPreOneSeven()) {
-                                    JRubyAdapter.runScriptlet("Java::" + component.getClass().getName() + ".__persistent__ = true");
-                                }
-                                // EMXIF
-
+                                Log.d("Script has separate Java class");
+                                JRubyAdapter.runScriptlet("Java::" + component.getClass().getName() + ".__persistent__ = true");
                                 rubyClass = JRubyAdapter.runScriptlet("Java::" + component.getClass().getName());
                             }
-                            System.out.println("Set class: " + rubyClass);
+                            Log.d("Set class: " + rubyClass);
                             JRubyAdapter.put(component.getScriptInfo().getRubyClassName(), rubyClass);
                             // FIXME(uwe):  Collect these threads in a ThreadGroup ?
                             Thread t = new Thread(null, new Runnable(){
@@ -82,7 +78,7 @@ public class ScriptLoader {
                                     long loadStart = System.currentTimeMillis();
                                     JRubyAdapter.setScriptFilename(rubyScript.getAbsolutePath());
                                     JRubyAdapter.runScriptlet(script);
-                                    System.out.println("Script load took " + (System.currentTimeMillis() - loadStart) + "ms");
+                                    Log.d("Script load took " + (System.currentTimeMillis() - loadStart) + "ms");
                                 }
                             }, "ScriptLoader for " + rubyClass, 128 * 1024);
                             try {
@@ -101,18 +97,14 @@ public class ScriptLoader {
                     }
                 } else if (rubyClass != null) {
                     // We have a predefined Ruby class without corresponding Ruby source file.
-                    System.out.println("Create separate Ruby instance for class: " + rubyClass);
+                    Log.d("Create separate Ruby instance for class: " + rubyClass);
                     rubyInstance = JRubyAdapter.runRubyMethod(rubyClass, "new");
                     JRubyAdapter.runRubyMethod(rubyInstance, "instance_variable_set", "@ruboto_java_instance", component);
                 } else {
                     // Neither script file nor predefined class
+                    Log.e("Missing script and class.  Either script or predefined class must be present.");
                     throw new RuntimeException("Either script or predefined class must be present.");
                 }
-                if (rubyClass != null) {
-                    if (component instanceof android.content.Context) {
-                        callOnCreate(rubyInstance, args, component.getScriptInfo().getRubyClassName());
-                    }
-                }
                 component.getScriptInfo().setRubyInstance(rubyInstance);
             }
         } catch(IOException e){
@@ -123,27 +115,17 @@ public class ScriptLoader {
         }
     }
 
-    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) {
-                JRubyAdapter.put("$bundle", args[0]);
-            }
-            JRubyAdapter.put("$ruby_instance", rubyInstance);
-            JRubyAdapter.runScriptlet("$ruby_instance.on_create(" + (args.length > 0 ? "$bundle" : "") + ")");
-        } else if (JRubyAdapter.isJRubyOneSeven()) {
+    public static final void callOnCreate(final RubotoComponent component, Object... args) {
+        if (component instanceof android.content.Context) {
+            Log.d("Call onCreate on: " + component.getScriptInfo().getRubyInstance());
             // FIXME(uwe):  Simplify when we stop support for snake case aliasing interface callback methods.
-            if ((Boolean)JRubyAdapter.runScriptlet(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);
+            if ((Boolean)JRubyAdapter.runScriptlet(component.getScriptInfo().getRubyClassName() + ".instance_methods(false).any?{|m| m.to_sym == :onCreate}")) {
+                JRubyAdapter.runRubyMethod(component.getScriptInfo().getRubyInstance(), "onCreate", args);
+            } else if ((Boolean)JRubyAdapter.runScriptlet(component.getScriptInfo().getRubyClassName() + ".instance_methods(false).any?{|m| m.to_sym == :on_create}")) {
+                JRubyAdapter.runRubyMethod(component.getScriptInfo().getRubyInstance(), "on_create", args);
             }
             // EMXIF
-        } else {
-            throw new RuntimeException("Unknown JRuby version: " + JRubyAdapter.get("JRUBY_VERSION"));
         }
-        // EMXIF
     }
 
 }

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

@@ -47,9 +47,7 @@ public class InstrumentationTestRunner extends android.test.InstrumentationTestR
             Thread t = new Thread(null, new Runnable() {
                 public void run() {
                     JRubyLoadedOk.set(JRubyAdapter.setUpJRuby(getTargetContext()));
-                    if (!JRubyAdapter.isJRubyPreOneSeven()) {
-                        JRubyAdapter.runScriptlet("Java::OrgRubotoTest::InstrumentationTestRunner.__persistent__ = true");
-                    }
+                    JRubyAdapter.runScriptlet("Java::OrgRubotoTest::InstrumentationTestRunner.__persistent__ = true");
                 }
             }, "Setup JRuby from instrumentation test runner", 64 * 1024);
             try {
@@ -132,14 +130,7 @@ public class InstrumentationTestRunner extends android.test.InstrumentationTestR
     }
 
     public void test(String name, Map options, Object block) {
-        // FIXME(uwe): Remove when we stop supporting Android 2.2
-        if (android.os.Build.VERSION.SDK_INT <= 8) {
-          name ="runTest";
-        }
-        // FIXME end
-
         boolean runOnUiThread = options == null || options.get("ui") == "true";
-
         Test test = new ActivityTest(activityClass, JRubyAdapter.getScriptFilename(), setup, teardown, name, runOnUiThread, block);
         suite.addTest(test);
         Log.d(getClass().getName(), "Made test instance: " + test);
@@ -174,18 +165,10 @@ public class InstrumentationTestRunner extends android.test.InstrumentationTestR
         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.put("$filename", f);
-            JRubyAdapter.runScriptlet("$test.instance_eval($script_code, $filename)");
+        if (f.equals("test_helper.rb")) {
+            JRubyAdapter.runScriptlet(source.toString());
         } else {
-            if (f.equals("test_helper.rb")) {
-                JRubyAdapter.runScriptlet(source.toString());
-            } else {
-                JRubyAdapter.runRubyMethod(this, "instance_eval", source.toString(), f);
-            }
+            JRubyAdapter.runRubyMethod(this, "instance_eval", source.toString(), f);
         }
         Log.d(getClass().getName(), "Test script " + f + " loaded");
     }

data/bin/ruboto

@@ -1,11 +1,5 @@
 #!/usr/bin/env ruby
 
-output = `android list 2>&1`
-if $? != 0
-  puts "Android SDK not in path\n#{output}"
-  exit 1
-end
-
 begin
   require 'ruboto/commands/base'
 rescue RuntimeError

data/lib/ruboto/commands/base.rb

@@ -8,7 +8,6 @@ require 'ruboto/util/log_action'
 require 'ruboto/util/xml_element'
 require 'ruboto/util/code_formatting'
 require 'ruboto/util/build'
-require 'ruboto/util/update'
 require 'ruboto/util/verify'
 require 'ruboto/util/scan_in_api'
 require 'ruboto/core_ext/array'
@@ -20,35 +19,37 @@ module Ruboto
       include Ruboto::SdkVersions
 
       def self.main
-        Main {
+        Main do
           mode 'gen' do
+            require 'ruboto/util/update'
+
             mode 'app' do
               include Ruboto::Util::LogAction
               include Ruboto::Util::Build
               include Ruboto::Util::Update
               include Ruboto::Util::Verify
 
-              option('package'){
+              option('package') {
                 required
                 argument :required
                 description 'Name of package. Must be unique for every app. A common pattern is yourtld.yourdomain.appname (Ex. org.ruboto.irb)'
               }
-              option('name'){
+              option('name') {
                 argument :required
                 description 'Name of your app.  Defaults to the last part of the package name capitalized.'
               }
-              option('activity'){
+              option('activity') {
                 argument :required
                 description 'Name of your primary Activity.  Defaults to the name of the application with Activity appended.'
               }
-              option('path'){
+              option('path') {
                 argument :required
                 description 'Path to where you want your app.  Defaults to the last part of the package name.'
               }
               option('target') {
                 argument :required
                 defaults DEFAULT_TARGET_SDK
-                description "Android version to target. Must begin with 'android-' (e.g., 'android-8' for froyo)"
+                description "Android version to target. Must begin with 'android-' (e.g., 'android-10' for gingerbread)"
               }
               option('min-sdk') {
                 argument :required
@@ -65,7 +66,7 @@ module Ruboto
 
               def run
                 package = params['package'].value
-                name = params['name'].value || package.split('.').last.split('_').map{|s| s.capitalize}.join
+                name = params['name'].value || package.split('.').last.split('_').map { |s| s.capitalize }.join
                 name[0..0] = name[0..0].upcase
                 activity = params['activity'].value || "#{name}Activity"
                 path = params['path'].value || package.split('.').last
@@ -91,8 +92,8 @@ module Ruboto
                   puts "Removed file #{"src/#{package.gsub '.', '/'}/#{activity}"}.java"
                   FileUtils.rm_f 'res/layout/main.xml'
                   puts 'Removed file res/layout/main.xml'
-                  verify_strings.root.elements['string'].text = name.gsub(/([A-Z]+)([A-Z][a-z])/,'\1 \2').gsub(/([a-z\d])([A-Z])/,'\1 \2')
-                  File.open('res/values/strings.xml', 'w') {|f| verify_strings.document.write(f, 4)}
+                  verify_strings.root.elements['string'].text = name.gsub(/([A-Z]+)([A-Z][a-z])/, '\1 \2').gsub(/([a-z\d])([A-Z])/, '\1 \2')
+                  File.open('res/values/strings.xml', 'w') { |f| verify_strings.document.write(f, 4) }
                 end
                 puts 'Done'
 
@@ -131,19 +132,19 @@ module Ruboto
               include Ruboto::Util::Build
               include Ruboto::Util::Verify
 
-              argument('class'){
+              argument('class') {
                 required
-                alternatives = Dir[File.join(Ruboto::ASSETS, 'src/Inheriting*.java')].map{|f| File.basename(f)[10..-6]} - %w(Class)
-                description "the Android Class that you want: #{alternatives[0..-2].map{|c| "#{c}, "}}or #{alternatives[-1]}"
-                validate {|v| alternatives.include? v}
+                alternatives = Dir[File.join(Ruboto::ASSETS, 'src/Inheriting*.java')].map { |f| File.basename(f)[10..-6] } - %w(Class)
+                description "the Android Class that you want: #{alternatives[0..-2].map { |c| "#{c}, " }}or #{alternatives[-1]}"
+                validate { |v| alternatives.include? v }
               }
 
-              option('script_name'){
+              option('script_name') {
                 argument :required
                 description 'name of the ruby script that this class will execute. Should end in .rb.  Optional.'
               }
 
-              option('name'){
+              option('name') {
                 required
                 argument :required
                 description 'name of the class (and file). Should be CamelCase'
@@ -174,83 +175,83 @@ module Ruboto
             mode 'subclass' do
               include Ruboto::Util::Build
 
-              argument('class'){
+              argument('class') {
                 required
                 description 'the Android Class that you want to subclass (e.g., package.Class).'
               }
 
-              option('name'){
+              option('name') {
                 required
                 argument :required
                 description 'name of the class (and file). Should be CamelCase'
               }
 
-              option('package'){
+              option('package') {
                 argument :required
                 description 'package for the new class (if not specified, uses project package)'
               }
 
-              option('method_base'){
+              option('method_base') {
                 required
-                validate {|i| %w(all on none abstract).include?(i)}
+                validate { |i| %w(all on none abstract).include?(i) }
                 argument :required
                 description 'the base set of methods to generate (adjusted with method_include and method_exclude): all, none, abstract, on (e.g., onClick)'
               }
 
-              option('method_include'){
+              option('method_include') {
                 argument :required
                 defaults ''
                 description 'additional methods to add to the base list'
               }
 
-              option('method_exclude'){
+              option('method_exclude') {
                 argument :required
                 defaults ''
                 description 'methods to remove from the base list'
               }
 
-              option('implements'){
+              option('implements') {
                 required
                 argument :required
                 defaults ''
                 description 'comma separated list interfaces to implement'
               }
 
-              option('force'){
+              option('force') {
                 argument :required
-                validate {|i| %w(include exclude).include?(i)}
+                validate { |i| %w(include exclude).include?(i) }
                 description "force handling of added and deprecated methods (values: 'include' or 'exclude') unless individually included or excluded"
               }
 
               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})
+                    %w(class name package method_base method_include method_exclude implements force).inject({}) { |h, i| h[i.to_sym] = params[i].value; h })
               end
             end
 
             mode 'interface' do
               include Ruboto::Util::Build
 
-              argument('interface'){
+              argument('interface') {
                 required
                 description 'the Android Interface that you want to implement (e.g., package.Interface).'
               }
 
-              option('name'){
+              option('name') {
                 required
                 argument :required
                 description 'name of the class (and file) that will implement the interface. Should be CamelCase'
               }
 
-              option('package'){
+              option('package') {
                 argument :required
                 description 'package for the new class (if not specified, uses project package)'
               }
 
-              option('force'){
+              option('force') {
                 argument :required
-                validate {|i| %w(include exclude).include?(i)}
+                validate { |i| %w(include exclude).include?(i) }
                 description "force added and deprecated interfaces (values: 'include' or 'exclude')"
               }
 
@@ -258,63 +259,63 @@ module Ruboto
                 # 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}
+                generate_subclass_or_interface %w(interface name package force).inject({}) { |h, i| h[i.to_sym] = params[i].value; h }
               end
             end
 
             mode 'core' do
               include Ruboto::Util::Build
 
-              argument('class'){
+              argument('class') {
                 required
-                validate {|i| %w(Activity Service BroadcastReceiver View PreferenceActivity TabActivity OnClickListener OnItemClickListener OnItemSelectedListener all).include?(i)}
+                validate { |i| %w(Activity Service BroadcastReceiver View PreferenceActivity TabActivity OnClickListener OnItemClickListener OnItemSelectedListener all).include?(i) }
                 description "Activity, Service, BroadcastReceiver, View, OnClickListener, OnItemClickListener, OnItemSelectedListener, or all (default = all); Other activities not included in 'all': PreferenceActivity, TabActivity"
               }
 
-              option('method_base'){
+              option('method_base') {
                 required
                 argument :required
-                validate {|i| %w(all on none).include?(i)}
+                validate { |i| %w(all on none).include?(i) }
                 defaults 'on'
                 description 'the base set of methods to generate (adjusted with method_include and method_exclude): all, none, on (e.g., onClick)'
               }
 
-              option('method_include'){
+              option('method_include') {
                 required
                 argument :required
                 defaults ''
                 description 'additional methods to add to the base list'
               }
 
-              option('method_exclude'){
+              option('method_exclude') {
                 required
                 argument :required
                 defaults ''
                 description 'methods to remove from the base list'
               }
 
-              option('implements'){
+              option('implements') {
                 required
                 argument :required
                 defaults ''
                 description "for classes only, interfaces to implement (cannot be used with 'gen core all')"
               }
 
-              option('force'){
+              option('force') {
                 argument :required
-                validate {|i| %w(include exclude).include?(i)}
+                validate { |i| %w(include exclude).include?(i) }
                 description "force handling of added and deprecated methods (values: 'include' or 'exclude') unless individually included or excluded"
               }
 
               def run
-                abort("specify 'implements' only for Activity, Service, BroadcastReceiver, PreferenceActivity, or TabActivity") unless
-                %w(Activity Service BroadcastReceiver PreferenceActivity TabActivity).include?(params['class'].value) or params['implements'].value == ''
-                generate_core_classes [:class, :method_base, :method_include, :method_exclude, :implements, :force].inject({}) {|h, i| h[i] = params[i.to_s].value; h}
+                abort("specify 'implements' only for Activity, Service, BroadcastReceiver, PreferenceActivity, or TabActivity") unless %w(Activity Service BroadcastReceiver PreferenceActivity TabActivity).include?(params['class'].value) or params['implements'].value == ''
+                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
           end
 
           mode 'update' do
+            require 'ruboto/util/update'
             include Ruboto::Util::LogAction
             include Ruboto::Util::Update
             include Ruboto::Util::Verify
@@ -322,7 +323,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)}
+              validate { |i| %w(jruby app ruboto).include?(i) }
               description "What do you want to update: 'app', 'jruby', or 'ruboto'"
             }
 
@@ -357,7 +358,7 @@ module Ruboto
                 update_bundle
               when 'jruby' then
                 update_jruby(params['force'].value, true) || abort
-              # FIXME(uwe): Deprecated in Ruboto 0.8.1.  Remove september 2013.
+                # 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
@@ -365,6 +366,15 @@ module Ruboto
             end
           end
 
+          mode 'setup' do
+            require 'ruboto/util/setup'
+            include Ruboto::Util::Setup
+
+            def run
+              setup_ruboto
+            end
+          end
+
           option 'version' do
             description 'display ruboto version'
           end
@@ -391,7 +401,7 @@ module Ruboto
               }
             end
           end
-        }
+        end
       end
     end
   end