ruboto-core 0.1.0 → 0.2.1

data/assets/samples/sample_activity.rb

@@ -1,20 +1,20 @@
 require 'ruboto'
 
-ruboto_import_widgets :TextView, :LinearLayout, :Button
+ruboto_import_widgets :Button, :LinearLayout, :TextView
 
 $activity.handle_create do |bundle|
   setTitle 'This is the Title'
 
   setup_content do
     linear_layout :orientation => LinearLayout::VERTICAL do
-      @text_view = text_view :text => "What hath Matz wrought?", :id => 42
-      button :text => "M-x butterfly", :width => :wrap_content, :id => 43
+      @text_view = text_view :text => 'What hath Matz wrought?', :id => 42
+      button :text => 'M-x butterfly', :width => :wrap_content, :id => 43
     end
   end
 
   handle_click do |view|
     if view.getText == 'M-x butterfly'
-      @text_view.setText "What hath Matz wrought!"
+      @text_view.setText 'What hath Matz wrought!'
       toast 'Flipped a bit via butterfly'
     end
   end

data/assets/src/InheritingActivity.java

@@ -2,11 +2,13 @@ package THE_PACKAGE;
 
 public class InheritingActivity extends org.ruboto.RubotoActivity {
 	public void onCreate(android.os.Bundle arg0) {
-    try {
-      setSplash(Class.forName("THE_PACKAGE.R$layout").getField("splash").getInt(null));
-    } catch (Exception e) {}
+		try {
+			setSplash(Class.forName("THE_PACKAGE.R$layout").getField("splash")
+					.getInt(null));
+		} catch (Exception e) {
+		}
 
-    setScriptName("start.rb");
-    super.onCreate(arg0);
-  }
+		setScriptName("start.rb");
+		super.onCreate(arg0);
+	}
 }

data/assets/src/InheritingBroadcastReceiver.java

@@ -1,10 +1,10 @@
 package THE_PACKAGE;
 
 public class InheritingBroadcastReceiver extends org.ruboto.RubotoBroadcastReceiver {
-	public void onReceive(android.content.Context arg0, android.content.Intent arg1) {
-
-               setScriptName("start.rb");
-               super.onReceive(arg0,arg1);
-        }
+	public void onReceive(android.content.Context arg0,
+			android.content.Intent arg1) {
+		setScriptName("start.rb");
+		super.onReceive(arg0, arg1);
+	}
 
 }

data/assets/src/InheritingClass.java

@@ -1,6 +1,6 @@
 package THE_PACKAGE;
 
-import org.jruby.Ruby;
+import org.jruby.embed.ScriptingContainer;
 import org.jruby.javasupport.util.RuntimeHelpers;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.javasupport.JavaUtil;
@@ -8,14 +8,14 @@ import org.jruby.exceptions.RaiseException;
 import org.ruboto.Script;
 
 public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
-  private Ruby __ruby__;
+  private ScriptingContainer __ruby__;
 
 THE_CONSTANTS
   private IRubyObject[] callbackProcs = new IRubyObject[CONSTANTS_COUNT];
 
 THE_CONSTRUCTORS
 
-  private Ruby getRuby() {
+  private ScriptingContainer getRuby() {
     if (__ruby__ == null) __ruby__ = Script.getRuby();
     return __ruby__;
   }

data/assets/src/InheritingService.java

@@ -2,9 +2,8 @@ package THE_PACKAGE;
 
 public class InheritingService extends org.ruboto.RubotoService {
 	public void onCreate() {
-
-               setScriptName("start.rb");
-               super.onCreate();
-        }
+		setScriptName("start.rb");
+		super.onCreate();
+	}
 
 }

data/assets/src/RubotoActivity.java

@@ -1,18 +1,23 @@
 package THE_PACKAGE;
 
+import java.io.IOException;
+
 import org.jruby.Ruby;
+import org.jruby.embed.ScriptingContainer;
+import org.jruby.exceptions.RaiseException;
+import org.jruby.javasupport.JavaUtil;
 import org.jruby.javasupport.util.RuntimeHelpers;
 import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.javasupport.JavaUtil;
-import org.jruby.exceptions.RaiseException;
 import org.ruboto.Script;
-import java.io.IOException;
+
 import android.app.ProgressDialog;
 import android.os.Handler;
 
 public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
-  private Ruby __ruby__;
+  private ScriptingContainer __ruby__;
   private String scriptName;
+  private String rubyClassName;
+  private Object rubyInstance;
   private int splash = 0;
   private String remoteVariable = "";
   public Object[] args;
@@ -21,12 +26,14 @@ public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
 THE_CONSTANTS
   private IRubyObject[] callbackProcs = new IRubyObject[CONSTANTS_COUNT];
 
-  private Ruby getRuby() {
-    if (__ruby__ == null) __ruby__ = Script.getRuby();
-
+  private ScriptingContainer getRuby() {
     if (__ruby__ == null) {
-      Script.setUpJRuby(null);
-      __ruby__ = Script.getRuby();
+        __ruby__ = Script.getRuby();
+
+        if (__ruby__ == null) {
+          Script.setUpJRuby(this);
+          __ruby__ = Script.getRuby();
+        }
     }
 
     return __ruby__;
@@ -59,6 +66,12 @@ THE_CONSTANTS
     args = new Object[1];
     args[0] = arg0;
 
+    android.os.Bundle configBundle = getIntent().getBundleExtra("RubotoActivity Config");
+
+    if (configBundle != null && configBundle.containsKey("Theme")) {
+      setTheme(configBundle.getInt("Theme"));
+    }
+
     super.onCreate(arg0);
     
     if (Script.getRuby() != null) {
@@ -79,7 +92,6 @@ THE_CONSTANTS
   
   private final Thread loadingThread = new Thread() {
       public void run(){
-        Script.setUpJRuby(null);
         backgroundCreate();
         loadingHandler.post(loadingComplete);
       }
@@ -95,10 +107,8 @@ THE_CONSTANTS
   };
 
   private void backgroundCreate() {
-    Script.copyScriptsIfNeeded(getFilesDir().getAbsolutePath() + "/scripts", getAssets());
-    getRuby();
-    Script.defineGlobalVariable("$activity", this);
-    Script.defineGlobalVariable("$bundle", args[0]);
+      getRuby().put("$activity", this);
+      getRuby().put("$bundle", args[0]);
   }
 
   private void finishCreate() {
@@ -116,7 +126,12 @@ THE_CONSTANTS
       Script.execute(remoteVariable + "on_create($bundle)");
     } else {
       try {
-        new Script(scriptName).execute();
+          new Script(scriptName).execute();
+          rubyClassName = this.getClass().getSimpleName();
+          if (getRuby().get(rubyClassName) != null) {
+  		    rubyInstance = Script.exec(rubyClassName + ".new");
+  		    getRuby().callMethod(rubyInstance, "on_create", configBundle);
+          }
       } catch(IOException e){
         e.printStackTrace();
         ProgressDialog.show(this, "Script failed", "Something bad happened", true, true);

data/assets/src/RubotoBroadcastReceiver.java

@@ -1,16 +1,12 @@
 package THE_PACKAGE;
 
-import org.jruby.Ruby;
-import org.jruby.javasupport.util.RuntimeHelpers;
-import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.javasupport.JavaUtil;
-import org.jruby.exceptions.RaiseException;
-import org.ruboto.Script;
 import java.io.IOException;
-import android.app.ProgressDialog;
+
+import org.jruby.embed.ScriptingContainer;
+import org.jruby.runtime.builtin.IRubyObject;
 
 public abstract class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
-  private Ruby __ruby__;
+  private ScriptingContainer __ruby__;
   private String scriptName;
   private String remoteVariable = "";
   public Object[] args;
@@ -18,12 +14,9 @@ public abstract class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
 THE_CONSTANTS
   private IRubyObject[] callbackProcs = new IRubyObject[CONSTANTS_COUNT];
 
-  private Ruby getRuby() {
-    if (__ruby__ == null) __ruby__ = Script.getRuby();
-
+  private ScriptingContainer getRuby() {
     if (__ruby__ == null) {
-      Script.setUpJRuby(null);
-      __ruby__ = Script.getRuby();
+        __ruby__ = Script.getRuby();
     }
 
     return __ruby__;

data/assets/src/RubotoService.java

@@ -4,13 +4,14 @@ import org.jruby.Ruby;
 import org.jruby.javasupport.util.RuntimeHelpers;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.javasupport.JavaUtil;
+import org.jruby.embed.ScriptingContainer;
 import org.jruby.exceptions.RaiseException;
 import org.ruboto.Script;
 import java.io.IOException;
 import android.app.ProgressDialog;
 
 public abstract class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
-  private Ruby __ruby__;
+  private ScriptingContainer __ruby__;
   private String scriptName;
   private String remoteVariable = "";
   public Object[] args;
@@ -18,11 +19,11 @@ public abstract class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
 THE_CONSTANTS
   private IRubyObject[] callbackProcs = new IRubyObject[CONSTANTS_COUNT];
 
-  private Ruby getRuby() {
+  private ScriptingContainer getRuby() {
     if (__ruby__ == null) __ruby__ = Script.getRuby();
 
     if (__ruby__ == null) {
-      Script.setUpJRuby(null);
+      Script.setUpJRuby(this);
       __ruby__ = Script.getRuby();
     }
 

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

@@ -1,53 +1,43 @@
 package org.ruboto;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.AssetManager;
+import android.os.Environment;
+import android.util.Log;
+
 import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.FilenameFilter;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.PrintStream;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.io.PrintStream;
 
-import org.jruby.Ruby;
 import org.jruby.RubyInstanceConfig;
+import org.jruby.embed.ScriptingContainer;
 import org.jruby.exceptions.RaiseException;
-import org.jruby.javasupport.JavaUtil;
-import org.jruby.parser.EvalStaticScope;
-import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.runtime.DynamicScope;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.scope.ManyVarsDynamicScope;
-
-import android.os.Environment;
-import android.util.Log;
-import android.content.res.AssetManager;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.BasicResponseHandler;
-import org.apache.http.impl.client.DefaultHttpClient;
 
 public class Script {
     private static String scriptsDir = "scripts";
     private static File scriptsDirFile = null;
-  
+
     private String name = null;
-    private static Ruby ruby;
-    private static DynamicScope scope;
+    private static ScriptingContainer ruby;
     private static boolean initialized = false;
 
     private String contents = null;
 
-    public static final String TAG = "RUBOTO"; //for logging
+    public static final String TAG = "RUBOTO"; // for logging
 
     /*************************************************************************************************
-     *
+     * 
      * Static Methods: JRuby Execution
      */
 
@@ -61,56 +51,66 @@ public class Script {
         return initialized;
     }
 
-    public static synchronized Ruby setUpJRuby(PrintStream out) {
+    public static synchronized ScriptingContainer setUpJRuby(Context appContext) {
+        return setUpJRuby(appContext, System.out);
+    }
+
+    public static synchronized ScriptingContainer setUpJRuby(Context appContext, PrintStream out) {
         if (ruby == null) {
-        	System.setProperty("jruby.interfaces.useProxy", "true");
-            RubyInstanceConfig config = new RubyInstanceConfig();
+            Log.d(TAG, "Setting up JRuby runtime");
+            System.setProperty("jruby.interfaces.useProxy", "true");
+            System.setProperty("jruby.bytecode.version", "1.5");
+		    // ruby = new ScriptingContainer(LocalContextScope.THREADSAFE);
+		    ruby = new ScriptingContainer();
+		    RubyInstanceConfig config = ruby.getProvider().getRubyInstanceConfig();
             config.setCompileMode(RubyInstanceConfig.CompileMode.OFF);
 
             config.setLoader(Script.class.getClassLoader());
-            if (scriptsDir != null) config.setCurrentDirectory(scriptsDir);
-
+		    if (scriptsDir != null) {
+                Log.d(TAG, "Setting JRuby current directory to " + scriptsDir);
+                config.setCurrentDirectory(scriptsDir);
+            }
             if (out != null) {
             	config.setOutput(out);
             	config.setError(out);
             }
-            
-            /* Set up Ruby environment */
-            ruby = Ruby.newInstance(config);
-
-            ThreadContext context = ruby.getCurrentContext();
-            DynamicScope currentScope = context.getCurrentScope();
-            scope = new ManyVarsDynamicScope(new EvalStaticScope(currentScope.getStaticScope()), currentScope);
-            
+            copyScriptsIfNeeded(appContext);
             initialized = true;
-        }
+		} else {
+			while (!initialized) {
+                Log.i(TAG, "Waiting for JRuby runtime to initialize.");
+				try {
+					Thread.sleep(1000);
+				} catch (InterruptedException iex) {
+				}
+			}
+		}
 
         return ruby;
     }
 
     public static String execute(String code) {
-        if (!initialized) return null;
         try {
-            return exec(code).inspect().asJavaString();
+			return getRuby().callMethod(exec(code), "inspect", String.class);
         } catch (RaiseException re) {
-            re.printStackTrace(ruby.getErrorStream());
+			re.printStackTrace(ruby.getError());
             return null;
         }
     }
 
-    public static IRubyObject exec(String code) throws RaiseException {
-        return ruby.evalScriptlet(code, scope);
-    }
+	public static Object exec(String code) throws RaiseException {
+		return ruby.runScriptlet(code);
+	}
 
     public static void defineGlobalConstant(String name, Object object) {
-        ruby.defineGlobalConstant(name, JavaUtil.convertJavaToRuby(ruby, object));
+		ruby.put(name, object);
     }
     
     public static void defineGlobalVariable(String name, Object object) {
-        ruby.getGlobalVariables().set(name, JavaUtil.convertJavaToRuby(ruby, object));
+		ruby.put(name, object);
     }
     
-    public static Ruby getRuby() {
+	public static ScriptingContainer getRuby() {
     	return ruby;
     }
 
@@ -122,8 +122,11 @@ public class Script {
     public static void setDir(String dir) {
     	scriptsDir = dir;
     	scriptsDirFile = new File(dir);
-        if (ruby != null) ruby.setCurrentDirectory(scriptsDir);
-    }
+		if (ruby != null) {
+            Log.d(TAG, "Changing JRuby current directory to " + scriptsDir);
+			ruby.setCurrentDirectory(scriptsDir);
+        }
+	}
     
     public static String getDir() {
     	return scriptsDir;
@@ -135,11 +138,19 @@ public class Script {
 
     public static Boolean configDir(String noSdcard) {
         setDir(noSdcard);
+        if (!ruby.getLoadPaths().contains(noSdcard)) {
+            Log.i(TAG, "Adding scripts dir to load path: " + noSdcard);
+            java.util.List paths = ruby.getLoadPaths();
+            paths.add(noSdcard);
+            ruby.setLoadPaths(paths);
+        }
 
         /* Create directory if it doesn't exist */
         if (!scriptsDirFile.exists()) {
-            // TODO check return code
-            scriptsDirFile.mkdir();
+            boolean dirCreatedOk = scriptsDirFile.mkdirs();
+            if (!dirCreatedOk) {
+                throw new RuntimeException("Unable to create script directory");
+            }
             return true;
         }
 
@@ -178,10 +189,56 @@ public class Script {
         }
     }
 
-    public static void copyScriptsIfNeeded(String to, AssetManager assets) {
+    public static void copyAssets(Context context, String directory) {
+    	File dest = new File(scriptsDirFile.getParentFile(), directory);
+		if (dest.exists() || dest.mkdir()) {
+            copyScripts(directory, dest, context.getAssets());
+		} else {
+            throw new RuntimeException("Unable to create scripts directory: " + dest);
+		}
+    }
+    
+    private static boolean isDebugBuild(Context context) {
+        PackageManager pm = context.getPackageManager();
+        PackageInfo pi;
+        try {
+            pi = pm.getPackageInfo(context.getPackageName(), 0);
+            return ((pi.applicationInfo.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0);
+        } catch (NameNotFoundException e) {
+            return false;
+        }
+
+    }
+
+    private static void copyScriptsIfNeeded(Context context) {
+		File toFile = null;
+        if (isDebugBuild(context)) {
+    		
+        	// FIXME(uwe):  Simplify this as soon as we drop support for android-7 or JRuby 1.5.6 or JRuby 1.6.2
+            Log.i(TAG, "JRuby VERSION: " + org.jruby.runtime.Constants.VERSION);
+            if (!org.jruby.runtime.Constants.VERSION.equals("1.5.6") && !org.jruby.runtime.Constants.VERSION.equals("1.6.2") && android.os.Build.VERSION.SDK_INT >= 8) {
+            	ruby.put("script_context", context);
+            	toFile = (File) exec("script_context.getExternalFilesDir(nil)");
+            } else {
+                toFile = new File(Environment.getExternalStorageDirectory(), "Android/data/" + context.getPackageName() + "/files");
+                Log.e(TAG, "Calculated path to sdcard the old way: " + toFile);
+            }
+            // FIXME end
+            
+	        if (toFile == null || (!toFile.exists() && !toFile.mkdirs())) {
+		    	Log.e(TAG,
+                        "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.");
+	            toFile = context.getFilesDir();
+            }
+		} else {
+            toFile = context.getFilesDir();
+        }
+		String to = toFile.getAbsolutePath() + "/scripts";
+		Log.i(TAG, "Checking scripts in " + to);
         /* the if makes sure we only do this the first time */
         if (configDir(to)) {
-            copyScripts("scripts", scriptsDirFile, assets);
+			Log.i(TAG, "Copying scripts to " + to);
+        	copyAssets(context, "scripts");
         }
     }
 
@@ -198,7 +255,6 @@ public class Script {
     public Script(String name, String contents) {
         this.name = name;
         this.contents = contents;
-        File file = getFile();
     }
 
     /*************************************************************************************************
@@ -225,7 +281,9 @@ public class Script {
         StringBuilder source = new StringBuilder();
         while (true) {
             String line = buffer.readLine();
-            if (line == null) break;
+			if (line == null) {
+				break;
+			}
             source.append(line).append("\n");
         }
         buffer.close();
@@ -239,6 +297,7 @@ public class Script {
      */
 
     public String execute() throws IOException {
+    	Script.getRuby().setScriptFilename(name);
         return Script.execute(getContents());
     }
 }