ruboto 0.5.2 → 0.5.3

data/assets/src/RubotoActivity.java

@@ -75,6 +75,7 @@ THE_CONSTANTS
 
     // This causes JRuby to initialize and takes while
     protected void prepareJRuby() {
+        Script.put("$context", this);
         Script.put("$activity", this);
         Script.put("$bundle", args[0]);
     }
@@ -82,18 +83,15 @@ THE_CONSTANTS
     protected void loadScript() {
         try {
             if (scriptName != null) {
-                new Script(scriptName).execute();
-            } else if (configBundle != null && configBundle.getString("Remote Variable") != null) {
-                setRemoteVariable(configBundle.getString("Remote Variable"));
-                if (configBundle.getBoolean("Define Remote Variable")) {
-                    Script.put(remoteVariable, this);
-                }
-                if (configBundle.getString("Initialize Script") != null) {
-                    Script.execute(configBundle.getString("Initialize Script"));
-                }
-                Script.execute(getRemoteVariableCall("on_create($bundle)"));
+    	        Script.setScriptFilename(getClass().getClassLoader().getResource(scriptName).getPath());
+                Script.execute(new Script(scriptName).getContents());
             } else {
-                throw new RuntimeException("Neither script name nor remote variable was set.");
+                // TODO: Why doesn't this work? 
+                // Script.callMethod(this, "initialize_ruboto");
+                Script.execute("$activity.initialize_ruboto");
+                // TODO: Why doesn't this work?
+                // Script.callMethod(this, "on_create", args[0]);
+                Script.execute("$activity.on_create($bundle)");
             }
         } catch(IOException e){
             e.printStackTrace();

data/assets/src/RubotoBroadcastReceiver.java

@@ -2,50 +2,57 @@ package THE_PACKAGE;
 
 import java.io.IOException;
 
-public abstract class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
-    private String scriptName;
-    private String remoteVariable = "";
-
-THE_CONSTANTS
-
-    private Object[] callbackProcs = new Object[CONSTANTS_COUNT];
+public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
+    private String scriptName = null;
+    private boolean initialized = false;
 
     public void setCallbackProc(int id, Object obj) {
-        callbackProcs[id] = obj;
+        // Error: no callbacks
+        throw new RuntimeException("RubotoBroadcastReceiver does not accept callbacks");
     }
 	
-    public THE_RUBOTO_CLASS setRemoteVariable(String var) {
-        remoteVariable = ((var == null) ? "" : (var + "."));
-        return this;
-    }
-
     public void setScriptName(String name){
         scriptName = name;
     }
 
-    public THE_RUBOTO_CLASS(String scriptName) {
-        setScriptName(scriptName);
-        if (Script.isInitialized()) {
-            loadScript();
+    public THE_RUBOTO_CLASS() {
+        this(null);
+    }
+
+    public THE_RUBOTO_CLASS(String name) {
+        super();
+
+        if (name != null) {
+            setScriptName(name);
+        
+            if (Script.isInitialized()) {
+                loadScript();
+            }
         }
     }
 
     protected void loadScript() {
         Script.put("$broadcast_receiver", this);
-        try {
-            new Script(scriptName).execute();
-        } catch(IOException e) {
-            throw new RuntimeException("IOException loading broadcast receiver script", e);
+        if (scriptName != null) {
+            try {
+                new Script(scriptName).execute();
+            } catch(IOException e) {
+                throw new RuntimeException("IOException loading broadcast receiver script", e);
+            }
         }
     }
 
-    /****************************************************************************************
-     * 
-     *  Generated Methods
-     */
-
-THE_METHODS
+    public void onReceive(android.content.Context context, android.content.Intent intent) {
+        Script.put("$context", context);
+        Script.put("$broadcast_receiver", this);
+        Script.put("$intent", intent);
 
+        try {
+            Script.execute("$broadcast_receiver.on_receive($context, $intent)");
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+    }
 }	
 
 

data/assets/src/RubotoService.java

@@ -4,7 +4,7 @@ import org.ruboto.Script;
 import java.io.IOException;
 import android.app.ProgressDialog;
 
-public abstract class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
+public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
   private String scriptName;
   private String remoteVariable = "";
   public Object[] args;
@@ -38,9 +38,16 @@ THE_CONSTANTS
     super.onCreate();
 
     if (Script.setUpJRuby(this)) {
+        Script.defineGlobalVariable("$context", this);
         Script.defineGlobalVariable("$service", this);
+
         try {
-            new Script(scriptName).execute();
+            if (scriptName != null) {
+                new Script(scriptName).execute();
+            } else {
+                Script.execute("$service.initialize_ruboto");
+                Script.execute("$service.on_create");
+            }
         } catch(IOException e) {
             e.printStackTrace();
         }

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

@@ -0,0 +1,194 @@
+package org.ruboto;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.ruboto.Script;
+
+import android.app.ProgressDialog;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnCancelListener;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.util.Log;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class EntryPointActivity extends org.ruboto.RubotoActivity {
+    private int splash = 0;
+    private ProgressDialog loadingDialog;
+    private boolean dialogCancelled = false;
+    private BroadcastReceiver receiver;
+    private boolean appStarted = false;
+
+	public void onCreate(Bundle bundle) {
+        Log.d("RUBOTO", "onCreate: ");
+
+	    try {
+    		splash = Class.forName(getPackageName() + ".R$layout").getField("splash").getInt(null);
+		} catch (Exception e) {
+		    splash = -1;
+		}
+
+        if (Script.isInitialized()) {
+            appStarted = true;
+		}
+	    super.onCreate(bundle);
+	}
+
+    public void onResume() {
+        Log.d("RUBOTO", "onResume: ");
+
+        if(appStarted) {
+            Log.d("RUBOTO", "onResume: App already started!");
+            super.onResume();
+            return;
+        }
+
+        Log.d("RUBOTO", "onResume: Checking JRuby");
+        if (Script.isInitialized()) {
+            Log.d("RUBOTO", "Already initialized");
+    	    fireRubotoActivity();
+        } else {
+            Log.d("RUBOTO", "Not initialized");
+            showProgress();
+            receiver = new BroadcastReceiver(){
+                public void onReceive(Context context, Intent intent) {
+                    Log.i("RUBOTO", "received broadcast: " + intent);
+                    Log.i("RUBOTO", "URI: " + intent.getData());
+                    if (intent.getData().toString().equals("package:org.ruboto.core")) {
+                        Toast.makeText(context,"Ruboto Core is now installed.",Toast.LENGTH_SHORT).show();
+                        if (receiver != null) {
+                    	    unregisterReceiver(receiver);
+                    	    receiver = null;
+                        }
+                        showProgress();
+                        initJRuby(false);
+                    }
+                }
+            };
+            IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED);
+            filter.addDataScheme("package");
+            registerReceiver(receiver, filter);
+            initJRuby(true);
+            super.onResume();
+        }
+    }
+
+    public void onPause() {
+        Log.d("RUBOTO", "onPause: ");
+
+        if (receiver != null) {
+    	    unregisterReceiver(receiver);
+    	    receiver = null;
+        }
+        super.onPause();
+    }
+
+    public void onDestroy() {
+        Log.d("RUBOTO", "onDestroy: ");
+
+        super.onDestroy();
+        if (dialogCancelled) {
+            System.runFinalizersOnExit(true);
+            System.exit(0);
+        }
+    }
+
+    private void initJRuby(final boolean firstTime) {
+        new Thread(new Runnable() {
+            public void run() {
+                final boolean jrubyOk = Script.setUpJRuby(EntryPointActivity.this);
+                if (jrubyOk) {
+                    Log.d("RUBOTO", "onResume: JRuby OK");
+                    prepareJRuby();
+                    runOnUiThread(new Runnable() {
+                        public void run() {
+                            fireRubotoActivity();
+                        }
+                    });
+                } else {
+                    runOnUiThread(new Runnable() {
+                        public void run() {
+                            if (firstTime) {
+                                Log.d("RUBOTO", "onResume: Checking JRuby - IN UI thread");
+                                try {
+                                    setContentView(Class.forName(getPackageName() + ".R$layout").getField("get_ruboto_core").getInt(null));
+                                } catch (Exception e) {
+                                }
+                            } else {
+                                Toast.makeText(EntryPointActivity.this,"Failed to initialize Ruboto Core.",Toast.LENGTH_SHORT).show();
+                                try {
+                                    TextView textView = (TextView) findViewById(Class.forName(getPackageName() + ".R$id").getField("text").getInt(null));
+                                    textView.setText("Woops!  Ruboto Core was installed, but it failed to initialize properly!  I am not sure how to proceed from here.  If you can, please file an error report at http://ruboto.org/");
+                                } catch (Exception e) {
+                                }
+                            }
+                            hideProgress();
+                        }
+                    });
+                }
+            }
+        }).start();
+    }
+
+	private static final String RUBOTO_APK = "RubotoCore-release.apk";
+	private static final String RUBOTO_URL = "https://github.com/downloads/ruboto/ruboto/" + RUBOTO_APK;
+
+    // Called when the button is pressed.
+    public void getRubotoCore(View view) {
+        try {
+            startActivity(new Intent(Intent.ACTION_VIEW).setData(Uri.parse("market://details?id=org.ruboto.core")));
+        } catch (android.content.ActivityNotFoundException anfe) {
+            try {
+                TextView textView = (TextView) findViewById(Class.forName(getPackageName() + ".R$id").getField("text").getInt(null));
+                Intent intent = new Intent(android.content.Intent.ACTION_VIEW, Uri.parse(RUBOTO_URL));
+                startActivity(intent);
+            } catch (Exception e) {}
+        }
+    }
+
+    private void fireRubotoActivity() {
+        if(appStarted) return;
+        appStarted = true;
+        Log.i("RUBOTO", "Starting activity");
+        loadScript();
+        onStart();
+        super.onResume();
+        hideProgress();
+    }
+
+    private void showProgress() {
+        if (loadingDialog == null) {
+            Log.i("RUBOTO", "Showing progress");
+            if (splash > 0) {
+                requestWindowFeature(android.view.Window.FEATURE_NO_TITLE);
+                setContentView(splash);
+            } else {
+                loadingDialog = ProgressDialog.show(this, null, "Starting...", true, true);
+                loadingDialog.setCanceledOnTouchOutside(false);
+                loadingDialog.setOnCancelListener(new OnCancelListener() {
+                    public void onCancel(DialogInterface dialog) {
+                        dialogCancelled = true;
+                        finish();
+                    }
+                });
+            }
+        }
+    }
+
+    private void hideProgress() {
+        if (loadingDialog != null) {
+            Log.d("RUBOTO", "Hide progress");
+            loadingDialog.dismiss();
+            loadingDialog = null;
+        }
+    }
+
+}

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

@@ -169,11 +169,8 @@ public class Script {
                 callScriptingContainerMethod(Void.class, "setCurrentDirectory", defaultCurrentDir);
 
                 if (out != null) {
-                    // callScriptingContainerMethod(Void.class, "setOutput", out);
         	        Method setOutputMethod = ruby.getClass().getMethod("setOutput", PrintStream.class);
         	        setOutputMethod.invoke(ruby, out);
-
-                    // callScriptingContainerMethod(Void.class, "setError", out);
         	        Method setErrorMethod = ruby.getClass().getMethod("setError", PrintStream.class);
         	        setErrorMethod.invoke(ruby, out);
                 }
@@ -229,15 +226,10 @@ public class Script {
         } catch (RuntimeException re) {
             re.printStackTrace();
         } catch (IllegalAccessException e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
         } catch (InvocationTargetException e) {
-        	try {
-                e.printStackTrace();
-        	} catch (NullPointerException npe) {
-        	}
+            printStackTrace(e);
         } catch (NoSuchMethodException e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
         }
         return null;
@@ -330,7 +322,7 @@ public class Script {
         if (new File(scriptsDir).exists()) {
             Log.i(TAG, "Found extra scripts dir: " + scriptsDir);
             setDir(scriptsDir);
-            exec("$:.unshift '" + scriptsDir + "' ; $:.uniq! ; p $:");
+            exec("$:.unshift '" + scriptsDir + "' ; $:.uniq!");
             return true;
         } else {
             Log.i(TAG, "Extra scripts dir not present: " + scriptsDir);
@@ -495,7 +487,6 @@ public class Script {
     }
 
 	public static void callMethod(Object receiver, String methodName, Object[] args) {
-		// callScriptingContainerMethod(Void.class, "callMethod", receiver, methodName, args);
         try {
             Method callMethodMethod = ruby.getClass().getMethod("callMethod", Object.class, String.class, Object[].class);
             callMethodMethod.invoke(ruby, receiver, methodName, args);
@@ -504,7 +495,7 @@ public class Script {
         } catch (IllegalAccessException iae) {
             throw new RuntimeException(iae);
         } catch (java.lang.reflect.InvocationTargetException ite) {
-            throw (RuntimeException)(ite.getCause());
+            printStackTrace(ite);
         }
     }
 
@@ -518,7 +509,6 @@ public class Script {
 
 	@SuppressWarnings("unchecked")
 	public static <T> T callMethod(Object receiver, String methodName, Object[] args, Class<T> returnType) {
-		// return callScriptingContainerMethod(returnType, "callMethod", receiver, methodName, args, returnType);
         try {
             Method callMethodMethod = ruby.getClass().getMethod("callMethod", Object.class, String.class, Object[].class, Class.class);
             return (T) callMethodMethod.invoke(ruby, receiver, methodName, args, returnType);
@@ -527,8 +517,9 @@ public class Script {
         } catch (IllegalAccessException iae) {
             throw new RuntimeException(iae);
         } catch (java.lang.reflect.InvocationTargetException ite) {
-            throw (RuntimeException) ite.getCause();
+            printStackTrace(ite);
         }
+        return null;
 	}
 
 	public static <T> T callMethod(Object receiver, String methodName,
@@ -541,5 +532,28 @@ public class Script {
 		return callMethod(receiver, methodName, new Object[]{}, returnType);
 	}
 
-}
+	private static void printStackTrace(Throwable t) {
+        PrintStream out;
+    	try {
+            Method getOutputMethod = ruby.getClass().getMethod("getOutput");
+            out = (PrintStream) getOutputMethod.invoke(ruby);
+        } catch (java.lang.NoSuchMethodException nsme) {
+            throw new RuntimeException("ScriptingContainer#getOutput method not found.", nsme);
+        } catch (java.lang.IllegalAccessException iae) {
+            throw new RuntimeException("ScriptingContainer#getOutput method not accessable.", iae);
+        } catch (java.lang.reflect.InvocationTargetException ite) {
+            throw new RuntimeException("ScriptingContainer#getOutput failed.", ite);
+        }
 
+        // TODO(uwe):  Simplify this when Issue #144 is resolved
+        try {
+            t.printStackTrace(out);
+    	} catch (NullPointerException npe) {
+    	    // TODO(uwe): printStackTrace should not fail
+            for (java.lang.StackTraceElement ste : t.getStackTrace()) {
+                out.append(ste.toString() + "\n");
+            }
+    	}
+	}
+
+}

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

@@ -23,6 +23,8 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import org.ruboto.Script;
+import java.util.Set;
+import java.util.HashSet;
 
 public class InstrumentationTestRunner extends android.test.InstrumentationTestRunner {
     private Class activityClass;
@@ -39,23 +41,25 @@ public class InstrumentationTestRunner extends android.test.InstrumentationTestR
                 Script.defineGlobalVariable("$test", this);
                 Script.defineGlobalVariable("$suite", suite);
 
-                // TODO(uwe):  Why doesn't this work?
-                // Script.copyScriptsIfNeeded(getContext());
-
                 loadScript("test_helper.rb");
 
-                // TODO(uwe):  Why doesn't this work?
-                // String[] scripts = new File(Script.scriptsDirName(getContext())).list();
-
-                String[] scripts = getContext().getResources().getAssets().list("scripts");
-                for (String f : scripts) {
-                    if (f.equals("test_helper.rb")) continue;
-                    Log.i(getClass().getName(), "Found script: " + f);
-                    loadScript(f);
+                String test_apk_path = getContext().getPackageManager().getApplicationInfo(getContext().getPackageName(), 0).sourceDir;
+                JarFile jar = new JarFile(test_apk_path);
+                Enumeration<JarEntry> entries = jar.entries();
+                while(entries.hasMoreElements()) {
+                    JarEntry entry = entries.nextElement();
+                    String name = entry.getName();
+                    if (name.indexOf("/") >= 0 || !name.endsWith(".rb")) {
+                        continue;
+                    }
+                    if (name.equals("test_helper.rb")) continue;
+                    loadScript(name);
                 }
             } else {
                 addError(suite, new RuntimeException("Ruboto Core platform is missing"));
             }
+        } catch (android.content.pm.PackageManager.NameNotFoundException e) {
+            addError(suite, e);
         } catch (IOException e) {
           addError(suite, e);
         } catch (RuntimeException e) {
@@ -98,10 +102,8 @@ public class InstrumentationTestRunner extends android.test.InstrumentationTestR
     }
 
     private void loadScript(String f) throws IOException {
-        // TODO(uwe):  Why doesn't this work?
-        // InputStream is = new FileInputStream(Script.scriptsDirName(getContext()) + "/" + f);
-
-        InputStream is = getContext().getResources().getAssets().open("scripts/" + f);
+        Log.d(getClass().getName(), "Loading test script: " + f);
+        InputStream is = getClass().getClassLoader().getResourceAsStream(f);
         BufferedReader buffer = new BufferedReader(new InputStreamReader(is));
         StringBuilder source = new StringBuilder();
         while (true) {
@@ -111,7 +113,6 @@ public class InstrumentationTestRunner extends android.test.InstrumentationTestR
         }
         buffer.close();
 
-        Log.d(getClass().getName(), "Loading test script: " + f);
         String oldFilename = Script.getScriptFilename();
         Script.setScriptFilename(f);
         Script.put("$script_code", source.toString());