ruboto 0.9.0 → 0.10.0.rc.0

data/README.md

@@ -16,7 +16,7 @@ Before you use Ruboto, you should do the following things:
 * Install the JDK if it's not on your system already
 * Install [jruby](http://jruby.org/) if you don't already have it. JRuby has a [very easy install process](http://jruby.org/#2), or you can use [rvm](http://rvm.beginrescueend.com/)
 * Install [the Android SDK](http://developer.android.com/sdk/index.html)
-* Add the sdk's `tools/` directory to your `$PATH`
+* Add the sdk's `tools/` and `platform-tools/` directory to your `$PATH`
 * Generate an [Emulator](http://developer.android.com/guide/developing/tools/emulator.html) image unless you want to develop using your phone.
 
 General Information
@@ -24,7 +24,7 @@ General Information
 
 The Rakefile assumes that you are in the root directory of your app, as do all commands of the `ruboto` command line utility, other than `ruboto gen app`.
 
-The Rakefile requires you to run it through JRuby's rake. 
+The Rakefile requires you to run it through JRuby's rake.
 
 Command-line Tools
 -------
@@ -46,7 +46,7 @@ Version values must be specified using'android-' and the sdk level number (e.g.,
 <a name="class_generator"></a>
 ### Class generator
 
-Generates a Java class (Activity, Service, or BroadcastReceiver) associated with a specific ruboto script.  The generator also generates a corrsponding test script.
+Generates a Java class (Activity, Service, or BroadcastReceiver) associated with a specific ruboto script.  The generator also generates a corresponding test script.
 
     $ ruboto gen class ClassName --name YourObjectName
 Ex:
@@ -77,7 +77,7 @@ When you're ready to post your app to the Market, you need to do a few things.
 
 First, you'll need to generate a key to sign the app with using `keytool` if you do not already have one. If you're ok with accepting some sane defaults, you can use
     $ ruboto gen key --alias alias_for_your_key
-with an optional flag `--keystore /path/to/keystore.keystore`, which defaults to `~/.android/production.keystore`. It will ask for a password for the keystore and one for the key itself. Make sure that you remember those two passwords, as well as the alias for the key. 
+with an optional flag `--keystore /path/to/keystore.keystore`, which defaults to `~/.android/production.keystore`. It will ask for a password for the keystore and one for the key itself. Make sure that you remember those two passwords, as well as the alias for the key.
 
 Also make sure to keep your key backed up (if you lose it, you won't be able to release updates to your app that can install right over the old versions), but secure.
 
@@ -113,16 +113,16 @@ Also, you need root access to your device for this to work, as it needs to write
 You can update various portions of your generated Ruboto app through the ruboto command:
 
 * JRuby:
- 
+
 1) If a new version of JRuby is released, you should update your gem (e.g., sudo gem update jruby-jars).
 
-2) From the root directory of your app: 
+2) From the root directory of your app:
 
     $ ruboto update jruby
 
 * The ruboto.rb script:
 
-1) From the root directory of your app: 
+1) From the root directory of your app:
 
     $ ruboto update ruboto
 
@@ -136,12 +136,12 @@ You can update various portions of your generated Ruboto app through the ruboto
 
     $ ruboto gen core Activity --method_base all-on-or-none --method_include specific-methods-to-include --method_include specific-methods-to-exclude
 
-4) The generator will load up the SDK information and find the specified methods. The generator will abort around methods that were added or deprecated based on the SDK levels. You can either use method_exclude to remove methods individually or add '--force exclude' to remove the all. You can also us '--force include' to create them anyway (added methods are created without calling super to avoid crashin on legacy hardware).
+4) The generator will load up the SDK information and find the specified methods. The generator will abort around methods that were added or deprecated based on the SDK levels. You can either use method_exclude to remove methods individually or add '--force exclude' to remove the all. You can also us '--force include' to create them anyway (added methods are created without calling super to avoid crashing on legacy hardware).
 
 Scripts
 -------
 
-The main thing Ruboto offers you is the ability to write Ruby scripts to define the behavior of Activites, BroadcastReceievers, and Services. (Eventually it'll be every class. It's setup such that adding in more classes should be trivial.)
+The main thing Ruboto offers you is the ability to write Ruby scripts to define the behavior of Activities, BroadcastReceievers, and Services. (Eventually it'll be every class. It's setup such that adding in more classes should be trivial.)
 
 Here's how it works:
 
@@ -212,14 +212,14 @@ Want to contribute? Great! Meet us in #ruboto on irc.freenode.net, fork the proj
 * As you gain wisdom, contribute it to [the wiki](http://github.com/ruboto/ruboto/wiki/)
 * When you gain enough wisdom, reconsider whether you could fork the project.
 
-If contributing code to the project, please run the exising tests and add tests for your changes.  You run the tests using rake
+If contributing code to the project, please run the existing tests and add tests for your changes.  You run the tests using rake
 
     $ jruby -S rake test
 
 Getting Help
 ------------
 
-* You'll need to be pretty familiar with the Android API. The [Developer Guide](http://developer.android.com/guide/index.html) and [Reference](http://developer.android.com/reference/packages.html) are very useful. 
+* You'll need to be pretty familiar with the Android API. The [Developer Guide](http://developer.android.com/guide/index.html) and [Reference](http://developer.android.com/reference/packages.html) are very useful.
 * There is further documentation at the [wiki](http://github.com/ruboto/ruboto/wiki)
 * If you have bugs or feature requests, [open an issue on GitHub](http://github.com/ruboto/ruboto/issues)
 * You can ask questions in #ruboto on irc.freenode.net and on the [mailing list](http://groups.google.com/groups/ruboto)
@@ -241,9 +241,9 @@ If you have an "eclair" emulator that runs Android 2.1 and a "froyo" one that ru
 Alternatives
 ------------
 
-If Ruboto's performance is a problem for you, or you want something that gives you total access to the android API (as Ruboto does not yet do), check out [Mirah](http://mirah.org/) and [Garrett](http://github.com/technomancy/Garrett). 
+If Ruboto's performance is a problem for you, or you want something that gives you total access to the android API (as Ruboto does not yet do), check out [Mirah](http://mirah.org/) and [Garrett](http://github.com/technomancy/Garrett).
 
-Mirah, formerly known as Duby, is a language with Ruby-like syntax that compiles to java files. This means that it adds no big runtime dependencies and has essentially the same performance as writing Java code because it essentially generates the same Java code that you would write. This makes it extremely well-suited for mobile devices where performance is a much bigger consideration. 
+Mirah, formerly known as Duby, is a language with Ruby-like syntax that compiles to java files. This means that it adds no big runtime dependencies and has essentially the same performance as writing Java code because it essentially generates the same Java code that you would write. This makes it extremely well-suited for mobile devices where performance is a much bigger consideration.
 
 Garrett is a "playground for Mirah exploration on Android."
 

data/Rakefile

@@ -260,10 +260,10 @@ end
 
 desc "Push the gem to RubyGems"
 task :release => [:clean, :gem] do
-  #output = `git status --porcelain`
-  #raise "Workspace not clean!\n#{output}" unless output.empty?
-  #sh "git tag #{Ruboto::VERSION}"
-  #sh "git push --tags"
+  output = `git status --porcelain`
+  raise "Workspace not clean!\n#{output}" unless output.empty?
+  sh "git tag #{Ruboto::VERSION}"
+  sh "git push --tags"
   sh "gem push #{GEM_FILE}"
 
   examples_glob = "#{EXAMPLE_FILE.slice(/^.*?_\d+\.\d+\.\d+/)}*"

data/assets/rakelib/ruboto.rake

@@ -270,11 +270,19 @@ file BUNDLE_JAR => [GEM_FILE, GEM_LOCK_FILE] do
     Dir['*'].each do |gem_lib|
       Dir.chdir "#{gem_lib}/lib" do
         Dir['**/*.jar'].each do |jar|
+          unless jar =~ /sqlite-jdbc/
+            puts "Expanding #{gem_lib} #{jar} into #{BUNDLE_JAR}"
+            `jar xf #{jar}`
+          end
           if jar == 'arjdbc/jdbc/adapter_java.jar'
             jar_load_code = <<-END_CODE
 require 'jruby'
 Java::arjdbc.jdbc.AdapterJavaService.new.basicLoad(JRuby.runtime)
             END_CODE
+            classes = Dir['arjdbc/**/*']
+            dbs = /db2|derby|firebird|h2|hsqldb|informix|mimer|mssql|mysql|oracle|postgres|sybase/i
+            files = classes.grep(dbs)
+            FileUtils.rm_f(files)
           elsif jar =~ /shared\/jopenssl.jar$/
             jar_load_code = <<-END_CODE
 require 'jruby'
@@ -285,10 +293,6 @@ Java::JopensslService.new.basicLoad(JRuby.runtime)
           else
             jar_load_code = ''
           end
-          unless jar =~ /sqlite-jdbc/
-            puts "Expanding #{gem_lib} #{jar} into #{BUNDLE_JAR}"
-            `jar xf #{jar}`
-          end
           puts "Writing dummy JAR file #{jar + '.rb'}"
           File.open(jar + '.rb', 'w') { |f| f << jar_load_code }
           if jar.end_with?('.jar')

data/assets/samples/sample_broadcast_receiver.rb

@@ -5,14 +5,6 @@ class SampleBroadcastReceiver
   def on_receive(context, intent)
     Log.v "SampleBroadcastReceiver", 'Broadcast received!'
     Log.v "SampleBroadcastReceiver", intent.getExtras.to_s
-    context.run_on_ui_thread do
-      begin
-        $activity.title = 'Broadcast received!'
-      rescue Exception
-        Log.e "Exception setting title: #{$!.message}\n#{$!.backtrace.join("\n")}"
-      end
-    end
-    Log.v "SampleBroadcastReceiver", 'Broadcast processed OK!'
   rescue Exception
     Log.e "Exception processing broadcast: #{$!.message}\n#{$!.backtrace.join("\n")}"
   end

data/assets/src/InheritingBroadcastReceiver.java

@@ -1,28 +1,9 @@
 package THE_PACKAGE;
 
 import org.ruboto.JRubyAdapter;
-import org.ruboto.ScriptLoader;
 
 public class InheritingBroadcastReceiver extends org.ruboto.RubotoBroadcastReceiver {
-    private boolean scriptLoaded = false;
-
     public InheritingBroadcastReceiver() {
         super("sample_broadcast_receiver.rb");
-        if (JRubyAdapter.isInitialized()) {
-            scriptLoaded = true;
-        }
-    }
-
-    public void onReceive(android.content.Context context, android.content.Intent intent) {
-        if (!scriptLoaded) {
-            if (JRubyAdapter.setUpJRuby(context)) {
-                ScriptLoader.loadScript(this);
-                scriptLoaded = true;
-            } else {
-                // FIXME(uwe): What to do if the Ruboto Core platform is missing?
-            }
-        }
-        super.onReceive(context, intent);
     }
-
 }

data/assets/src/InheritingClass.java

@@ -9,9 +9,7 @@ import org.ruboto.ScriptInfo;
 import org.ruboto.ScriptLoader;
 
 public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
-THE_CONSTANTS
-
-    private final ScriptInfo scriptInfo = new ScriptInfo(CONSTANTS_COUNT);
+    private final ScriptInfo scriptInfo = new ScriptInfo();
     {
 		scriptInfo.setRubyClassName(getClass().getSimpleName());
 		ScriptLoader.loadScript(this);
@@ -23,11 +21,6 @@ THE_CONSTRUCTORS
         return scriptInfo;
     }
 
-    // FIXME(uwe):  Only used for block based primary activities.  Remove if we remove support for such.
-	public void onCreateSuper() {
-	    // Do nothing
-	}
-
 THE_METHODS
 
 }

data/assets/src/RubotoActivity.java

@@ -8,9 +8,7 @@ import android.app.ProgressDialog;
 import android.os.Bundle;
 
 public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
-THE_CONSTANTS
-
-    private final ScriptInfo scriptInfo = new ScriptInfo(CONSTANTS_COUNT);
+    private final ScriptInfo scriptInfo = new ScriptInfo();
     private String remoteVariable = null;
     Bundle[] args;
     private Bundle configBundle = null;
@@ -32,12 +30,6 @@ THE_CONSTANTS
      *
      *  Activity Lifecycle: onCreate
      */
-
-    // FIXME(uwe):  Only used for block based primary activities.  Remove if we remove support for such.
-	public void onCreateSuper() {
-	    super.onCreate((Bundle) args[0]);
-	}
-
     @Override
     public void onCreate(Bundle bundle) {
         System.out.println("THE_RUBOTO_CLASS onCreate(): " + getClass().getName());
@@ -71,23 +63,12 @@ THE_CONSTANTS
         }
 
         if (JRubyAdapter.isInitialized()) {
-            prepareJRuby();
     	    ScriptLoader.loadScript(this, (Object[]) args);
         } else {
             super.onCreate(bundle);
         }
     }
 
-    // TODO(uwe):  Only needed for non-class-based definitions
-    // Can be removed if we stop supporting non-class-based definitions
-    // This causes JRuby to initialize and takes a while.
-    protected void prepareJRuby() {
-    	JRubyAdapter.put("$context", this);
-    	JRubyAdapter.put("$activity", this);
-    	JRubyAdapter.put("$bundle", args[0]);
-    }
-    // TODO end
-
     public boolean rubotoAttachable() {
       return true;
     }

data/assets/src/RubotoBroadcastReceiver.java

@@ -5,13 +5,9 @@ import java.io.IOException;
 import org.ruboto.ScriptLoader;
 
 public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
-    private final ScriptInfo scriptInfo = new ScriptInfo(CONSTANTS_COUNT);
+    private final ScriptInfo scriptInfo = new ScriptInfo();
+    private boolean scriptLoaded = false;
 
-    public void setCallbackProc(int id, Object obj) {
-        // Error: no callbacks
-        throw new RuntimeException("RubotoBroadcastReceiver does not accept callbacks");
-    }
-	
     public ScriptInfo getScriptInfo() {
         return scriptInfo;
     }
@@ -25,39 +21,33 @@ public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
 
         if (name != null) {
             scriptInfo.setScriptName(name);
-        
             if (JRubyAdapter.isInitialized()) {
-                // TODO(uwe):  Only needed for non-class-based definitions
-                // Can be removed if we stop supporting non-class-based definitions
-    	        JRubyAdapter.put("$broadcast_receiver", this);
-    	        // TODO end
-
                 ScriptLoader.loadScript(this);
+                scriptLoaded = true;
             }
         }
     }
 
-    // FIXME(uwe):  Only used for block based primary activities.  Remove if we remove support for such.
-	public void onCreateSuper() {
-	    // Do nothing
-	}
-
     public void onReceive(android.content.Context context, android.content.Intent intent) {
         try {
             Log.d("onReceive: " + this);
-
-            // FIXME(uwe):  Only needed for older broadcast receiver using callbacks
-            // FIXME(uwe):  Remove if we stop suppporting callbacks (to avoid global variables).
-            JRubyAdapter.put("$context", context);
-            JRubyAdapter.put("$intent", intent);
-            JRubyAdapter.put("$broadcast_receiver", this);
-            // FIXME end
+            if (!scriptLoaded) {
+                if (JRubyAdapter.setUpJRuby(context)) {
+                    ScriptLoader.loadScript(this);
+                    scriptLoaded = true;
+                } else {
+                    // FIXME(uwe): What to do if the Ruboto Core platform is missing?
+                }
+            }
 
             // FIXME(uwe): Simplify when we stop supporting JRuby 1.6.x
             if (JRubyAdapter.isJRubyPreOneSeven()) {
+    	        JRubyAdapter.put("$broadcast_receiver", this);
+    	        JRubyAdapter.put("$context", context);
+    	        JRubyAdapter.put("$intent", intent);
                 JRubyAdapter.runScriptlet("$broadcast_receiver.on_receive($context, $intent)");
             } else if (JRubyAdapter.isJRubyOneSeven()) {
-        	    JRubyAdapter.runRubyMethod(this, "on_receive", new Object[]{context, intent});
+    	        JRubyAdapter.runRubyMethod(this, "on_receive", new Object[]{context, intent});
             } else {
                 throw new RuntimeException("Unknown JRuby version: " + JRubyAdapter.get("JRUBY_VERSION"));
         	}

data/assets/src/RubotoService.java

@@ -5,9 +5,7 @@ import org.ruboto.ScriptLoader;
 import java.io.IOException;
 
 public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
-THE_CONSTANTS
-
-    private final ScriptInfo scriptInfo = new ScriptInfo(CONSTANTS_COUNT);
+    private final ScriptInfo scriptInfo = new ScriptInfo();
 
     public ScriptInfo getScriptInfo() {
         return scriptInfo;
@@ -17,12 +15,6 @@ THE_CONSTANTS
      *
      *  Service Lifecycle: onCreate
      */
-
-    // FIXME(uwe):  Only used for block based primary activities.  Remove if we remove support for such.
-	public void onCreateSuper() {
-	    super.onCreate();
-	}
-
     @Override
     public void onCreate() {
         if (ScriptLoader.isCalledFromJRuby()) {
@@ -32,12 +24,6 @@ THE_CONSTANTS
 	    System.out.println("RubotoService.onCreate()");
 
         if (JRubyAdapter.setUpJRuby(this)) {
-            // TODO(uwe):  Only needed for non-class-based definitions
-            // Can be removed if we stop supporting non-class-based definitions
-    	    JRubyAdapter.defineGlobalVariable("$context", this);
-    	    JRubyAdapter.defineGlobalVariable("$service", this);
-    	    // TODO end
-
             ScriptLoader.loadScript(this);
         } else {
             // FIXME(uwe):  What to do if the Ruboto Core platform cannot be found?

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

@@ -100,7 +100,6 @@ public class EntryPointActivity extends org.ruboto.RubotoActivity {
                 final boolean jrubyOk = JRubyAdapter.setUpJRuby(EntryPointActivity.this);
                 if (jrubyOk) {
                     Log.d("onResume: JRuby OK");
-                    prepareJRuby();
                     runOnUiThread(new Runnable() {
                         public void run() {
                             fireRubotoActivity();

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

@@ -242,7 +242,7 @@ public class JRubyAdapter {
             // END Ruboto HeapAlloc
             setDebugBuild(appContext);
             Log.d("Setting up JRuby runtime (" + (isDebugBuild ? "DEBUG" : "RELEASE") + ")");
-            System.setProperty("jruby.compile.mode", "OFF"); // OFF OFFIR JITIR? FORCEIR
+            System.setProperty("jruby.compile.mode", "OFF"); // OFF OFFIR JITIR? FORCE FORCEIR
             // System.setProperty("jruby.compile.backend", "DALVIK");
             System.setProperty("jruby.bytecode.version", "1.6");
             System.setProperty("jruby.interfaces.useProxy", "true");
@@ -255,7 +255,7 @@ public class JRubyAdapter {
             System.setProperty("jruby.backtrace.style", "normal"); // normal raw full mri
 
             // Uncomment these to debug/profile Ruby source loading
-            System.setProperty("jruby.debug.loadService", "true");
+            // System.setProperty("jruby.debug.loadService", "true");
             // System.setProperty("jruby.debug.loadService.timing", "true");
 
             // Used to enable JRuby to generate proxy classes
@@ -342,6 +342,7 @@ public class JRubyAdapter {
                 System.setProperty("jruby.home", jrubyHome);
 
                 addLoadPath(scriptsDirName(appContext));
+    	        put("$package_name", appContext.getPackageName());
 
                 initialized = true;
             } catch (ClassNotFoundException e) {
@@ -371,9 +372,7 @@ public class JRubyAdapter {
         return RUBOTO_CORE_VERSION_NAME != null;
     }
 
-    // Private methods
-
-    private static Boolean addLoadPath(String scriptsDir) {
+    public static Boolean addLoadPath(String scriptsDir) {
         if (new File(scriptsDir).exists()) {
             Log.i("Added directory to load path: " + scriptsDir);
             Script.addDir(scriptsDir);
@@ -387,6 +386,8 @@ public class JRubyAdapter {
         }
     }
 
+    // Private methods
+
     @SuppressWarnings("unchecked")
     private static <T> T callScriptingContainerMethod(Class<T> returnType, String methodName, Object... args) {
         Class<?>[] argClasses = new Class[args.length];
@@ -495,15 +496,15 @@ public class JRubyAdapter {
         }
     }
 
-    private static void setLocalContextScope(String val) {
+    public static void setLocalContextScope(String val) {
         localContextScope = val;
     }
 
-    private static void setLocalVariableBehavior(String val) {
+    public static void setLocalVariableBehavior(String val) {
         localVariableBehavior = val;
     }
 
-    private static void setOutputStream(PrintStream out) {
+    public static void setOutputStream(PrintStream out) {
       if (ruby == null) {
         output = out;
       } else {

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

@@ -2,7 +2,4 @@ package org.ruboto;
 
 public interface RubotoComponent {
     ScriptInfo getScriptInfo();
-
-    // FIXME(uwe):  Only used for block based primary activities.  Remove if we remove support for such.
-    void onCreateSuper();
 }