ruboto 0.8.0 → 0.8.1

data/Rakefile

@@ -78,26 +78,47 @@ end
 
 desc 'Generate release docs for a given milestone'
 task :release_docs do
-  # require 'rubygems'
-  # require 'highline/import'
-  print 'user name: ' ; user = STDIN.gets.chomp # ask('login   : ') { |q| q.echo = true }
-  print 'password : ' ; pass = STDIN.gets.chomp # ask('password: ') { |q| q.echo = '*' }
-  print 'milestone: ' ; milestone = STDIN.gets.chomp # ask('milestone: ', Integer) { |q| q.echo = true }
+  raise "\n    This task requires Ruby 1.9 or newer to parse JSON as YAML.\n\n" if RUBY_VERSION == '1.8.7'
+  begin
+    require 'rubygems'
+    require 'highline/import'
+    user = ask('login   : ') { |q| q.echo = true }
+    pass = ask('password: ') { |q| q.echo = '*' }
+  rescue
+    print 'user name: ' ; user = STDIN.gets.chomp
+    print 'password : ' ; pass = STDIN.gets.chomp
+  end
   require 'uri'
   require 'net/http'
   require 'net/https'
   require 'openssl'
   require 'yaml'
-  uri = URI(%Q{https://api.github.com/repos/ruboto/ruboto/issues?milestone=#{milestone}&state=closed&per_page=1000})
-  https = Net::HTTP.new(uri.host, uri.port)
+  host = 'api.github.com'
+  base_uri = "https://#{host}/repos/ruboto/ruboto"
+  https = Net::HTTP.new(host, 443)
   https.use_ssl = true
   https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+  milestone_uri = URI("#{base_uri}/milestones")
+  req = Net::HTTP::Get.new(milestone_uri.request_uri)
+  req.basic_auth(user, pass)
+  res = https.start { |http| http.request(req) }
+  milestones = YAML.load(res.body).sort_by { |i| Date.parse(i['due_on']) }
+  puts milestones.map{|m| "#{'%2d' % m['number']} #{m['title']}"}.join("\n")
+
+  if defined? ask
+    milestone = ask('milestone: ', Integer) { |q| q.echo = true }
+  else
+    print 'milestone: ' ; milestone = STDIN.gets.chomp
+  end
+
+  uri = URI("#{base_uri}/issues?milestone=#{milestone}&state=closed&per_page=1000")
   req = Net::HTTP::Get.new(uri.request_uri)
   req.basic_auth(user, pass)
   res = https.start { |http| http.request(req) }
   issues = YAML.load(res.body).sort_by { |i| i['number'] }
   milestone_name = issues[0] ? issues[0]['milestone']['title'] : "No issues for milestone #{milestone}"
-  categories = {'Features' => 'feature', 'Bugfixes' => 'bug', 'Internal' => 'internal', 'Support' => 'support', 'Documentation' => 'documentation', 'Other' => nil}
+  categories = {'Features' => 'feature', 'Bugfixes' => 'bug', 'Internal' => 'internal', 'Support' => 'support', 'Documentation' => 'documentation', 'Pull requests' => nil, 'Other' => nil}
   grouped_issues = issues.group_by do |i|
     labels = i['labels'].map { |l| l['name']}
     cat = nil
@@ -107,7 +128,9 @@ task :release_docs do
         break
       end
     end
-    cat || 'Other'
+    cat ||= i['pull_request'] && 'Pull requests'
+    cat ||= 'Other'
+    cat
   end
   puts "\nNew in version #{milestone_name}:\n\n"
   (categories.keys & grouped_issues.keys).each do |cat|
@@ -127,10 +150,11 @@ task :release => [:clean, :gem] do
   sh "git push --tags"
   sh "gem push #{GEM_FILE}"
 
+  examples_glob = "#{EXAMPLE_FILE.slice(/^.*?_\d+\.\d+\.\d+/)}*"
+  sh "git rm #{examples_glob}" unless Dir[examples_glob].empty?
   Rake::Task[:example].invoke
   sh "git add #{EXAMPLE_FILE}"
-  sh "git rm #{EXAMPLE_FILE.slice(/^\d+\.\d+\.\d+/)}.*"
-  sh "git commit -m '* Added example app for Ruboto #{Ruboto::VERSION} tools r#{Ruboto::SdkVersions::ANDROID_TOOLS_REVISION}' #{EXAMPLE_FILE}"
+  sh "git commit -m '* Added example app for Ruboto #{Ruboto::VERSION} tools r#{Ruboto::SdkVersions::ANDROID_TOOLS_REVISION}' \"#{examples_glob}\""
   sh "git push"
 end
 

data/assets/rakelib/ruboto.rake

@@ -128,10 +128,12 @@ task :emulator do
   sh 'emulator -partition-size 1024 -avd Android_3.0'
 end
 
+desc 'Start the application on the device/emulator.'
 task :start do
   start_app
 end
 
+desc 'Stop the application on the device/emulator (requires emulator or rooted device).'
 task :stop do
   raise "Unable to stop app.  Only available on emulator." unless stop_app
 end

data/assets/samples/sample_activity.rb

@@ -7,6 +7,7 @@ ruboto_import_widgets :Button, :LinearLayout, :TextView
 
 class SampleActivity
   def on_create(bundle)
+    super
     set_title 'Domo arigato, Mr Ruboto!'
 
     self.content_view =

data/assets/samples/sample_class.rb

@@ -0,0 +1,2 @@
+class SampleClass
+end

data/assets/samples/sample_class_test.rb

@@ -0,0 +1 @@
+# TODO

data/assets/src/InheritingActivity.java

@@ -4,7 +4,7 @@ import android.os.Bundle;
 
 public class InheritingActivity extends org.ruboto.EntryPointActivity {
 	public void onCreate(Bundle bundle) {
-		setRubyClassName(getClass().getSimpleName());
+		getScriptInfo().setRubyClassName(getClass().getSimpleName());
 	    super.onCreate(bundle);
 	}
 }

data/assets/src/InheritingBroadcastReceiver.java

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

data/assets/src/InheritingClass.java

@@ -5,21 +5,29 @@ package THE_PACKAGE;
 import org.ruboto.JRubyAdapter;
 import org.ruboto.Log;
 import org.ruboto.Script;
+import org.ruboto.ScriptInfo;
+import org.ruboto.ScriptLoader;
 
 public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
 THE_CONSTANTS
 
-    private String rubyClassName = "THE_RUBOTO_CLASS";
-    private String scriptName = "THE_RUBOTO_CLASS";
-    private Object rubyInstance = this;
-    private Object[] callbackProcs = new Object[CONSTANTS_COUNT];
+    private final ScriptInfo scriptInfo = new ScriptInfo(CONSTANTS_COUNT);
+    {
+		scriptInfo.setRubyClassName(getClass().getSimpleName());
+		ScriptLoader.loadScript(this);
+    }
 
 THE_CONSTRUCTORS
 
-    public void setCallbackProc(int id, Object obj) {
-        callbackProcs[id] = obj;
+    public ScriptInfo getScriptInfo() {
+        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/InheritingService.java

@@ -2,8 +2,7 @@ package THE_PACKAGE;
 
 public class InheritingService extends org.ruboto.RubotoService {
 	public void onCreate() {
-	    System.out.println("InheritingService.onCreate()");
-		setScriptName("sample_service.rb");
+		getScriptInfo().setRubyClassName(getClass().getSimpleName());
 		super.onCreate();
 	}
 

data/assets/src/RubotoActivity.java

@@ -10,18 +10,11 @@ import android.os.Bundle;
 public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
 THE_CONSTANTS
 
-    private String rubyClassName;
-    private String scriptName;
-    private Object rubyInstance;
-    private Object[] callbackProcs = new Object[CONSTANTS_COUNT];
+    private final ScriptInfo scriptInfo = new ScriptInfo(CONSTANTS_COUNT);
     private String remoteVariable = null;
-    private Object[] args;
+    Bundle[] args;
     private Bundle configBundle = null;
 
-    public void setCallbackProc(int id, Object obj) {
-        callbackProcs[id] = obj;
-    }
-	
     public THE_RUBOTO_CLASS setRemoteVariable(String var) {
         remoteVariable = var;
         return this;
@@ -31,23 +24,28 @@ THE_CONSTANTS
         return (remoteVariable == null ? "" : (remoteVariable + ".")) + call;
     }
 
-    public void setRubyClassName(String name) {
-        rubyClassName = name;
-    }
-
-    public void setScriptName(String name) {
-        scriptName = name;
+    public ScriptInfo getScriptInfo() {
+        return scriptInfo;
     }
 
     /****************************************************************************************
      *
      *  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("RubotoActivity onCreate(): " + getClass().getName());
-        args = new Object[1];
+        if (ScriptLoader.isCalledFromJRuby()) {
+            super.onCreate(bundle);
+            return;
+        }
+        args = new Bundle[1];
         args[0] = bundle;
 
         configBundle = getIntent().getBundleExtra("RubotoActivity Config");
@@ -58,32 +56,25 @@ THE_CONSTANTS
             }
             if (configBundle.containsKey("ClassName")) {
                 if (this.getClass().getName() == RubotoActivity.class.getName()) {
-                    setRubyClassName(configBundle.getString("ClassName"));
+                    scriptInfo.setRubyClassName(configBundle.getString("ClassName"));
                 } else {
                     throw new IllegalArgumentException("Only local Intents may set class name.");
                 }
             }
             if (configBundle.containsKey("Script")) {
                 if (this.getClass().getName() == RubotoActivity.class.getName()) {
-                    setScriptName(configBundle.getString("Script"));
+                    scriptInfo.setScriptName(configBundle.getString("Script"));
                 } else {
                     throw new IllegalArgumentException("Only local Intents may set script name.");
                 }
             }
         }
 
-        if (rubyClassName == null && scriptName != null) {
-            rubyClassName = Script.toCamelCase(scriptName);
-        }
-        if (scriptName == null && rubyClassName != null) {
-            setScriptName(Script.toSnakeCase(rubyClassName) + ".rb");
-        }
-
-        super.onCreate(bundle);
-
         if (JRubyAdapter.isInitialized()) {
             prepareJRuby();
-    	    loadScript();
+    	    ScriptLoader.loadScript(this, (Object[]) args);
+        } else {
+            super.onCreate(bundle);
         }
     }
 
@@ -97,87 +88,6 @@ THE_CONSTANTS
     }
     // TODO end
 
-    protected void loadScript() {
-        try {
-            if (scriptName != null) {
-                System.out.println("Looking for Ruby class: " + rubyClassName);
-                Object rubyClass = JRubyAdapter.get(rubyClassName);
-                Script rubyScript = new Script(scriptName);
-                if (rubyScript.exists()) {
-                    String script = rubyScript.getContents();
-                    if (script.matches("(?s).*class " + rubyClassName + ".*")) {
-                        if (!rubyClassName.equals(getClass().getSimpleName())) {
-                            System.out.println("Script defines methods on meta class");
-                            // FIXME(uwe): Simplify when we stop support for RubotoCore 0.4.7
-                            if (JRubyAdapter.isJRubyPreOneSeven() || JRubyAdapter.isRubyOneEight()) {
-                                JRubyAdapter.put("$java_instance", this);
-                                JRubyAdapter.put(rubyClassName, JRubyAdapter.runScriptlet("class << $java_instance; self; end"));
-                            } else if (JRubyAdapter.isJRubyOneSeven() && JRubyAdapter.isRubyOneNine()) {
-                                JRubyAdapter.runScriptlet("Java::" + getClass().getName() + ".__persistent__ = true");
-                                JRubyAdapter.put(rubyClassName, JRubyAdapter.runRubyMethod(this, "singleton_class"));
-                            } else {
-                                throw new RuntimeException("Unknown JRuby/Ruby version: " + JRubyAdapter.get("JRUBY_VERSION") + "/" + JRubyAdapter.get("RUBY_VERSION"));
-                            }
-                        }
-                    }
-                    if (rubyClass == null) {
-                        System.out.println("Loading script: " + scriptName);
-                        if (script.matches("(?s).*class " + rubyClassName + ".*")) {
-                            System.out.println("Script contains class definition");
-                            if (rubyClassName.equals(getClass().getSimpleName())) {
-                                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::" + getClass().getName() + ".__persistent__ = true");
-                                }
-                                JRubyAdapter.put(rubyClassName, JRubyAdapter.runScriptlet("Java::" + getClass().getName()));
-                            }
-                            System.out.println("Set class: " + JRubyAdapter.get(rubyClassName));
-                        }
-                        JRubyAdapter.setScriptFilename(scriptName);
-                        JRubyAdapter.runScriptlet(script);
-                        rubyClass = JRubyAdapter.get(rubyClassName);
-                    }
-                    rubyInstance = this;
-                } 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);
-                    rubyInstance = JRubyAdapter.runRubyMethod(rubyClass, "new");
-                    JRubyAdapter.runRubyMethod(rubyInstance, "instance_variable_set", "@ruboto_java_instance", this);
-                } else {
-                    // Neither script file nor predefined class
-                    throw new RuntimeException("Either script or predefined class must be present.");
-                }
-                if (rubyClass != null) {
-                    System.out.println("Call on_create on: " + rubyInstance + ", " + JRubyAdapter.get("JRUBY_VERSION"));
-                    // FIXME(uwe): Simplify when we stop support for RubotoCore 0.4.7
-                    if (JRubyAdapter.isJRubyPreOneSeven()) {
-                        JRubyAdapter.put("$ruby_instance", rubyInstance);
-                        JRubyAdapter.runScriptlet("$ruby_instance.on_create($bundle)");
-                    } else if (JRubyAdapter.isJRubyOneSeven()) {
-                        JRubyAdapter.runRubyMethod(rubyInstance, "on_create", args[0]);
-                    } else {
-                        throw new RuntimeException("Unknown JRuby version: " + JRubyAdapter.get("JRUBY_VERSION"));
-                    }
-                }
-            } else if (configBundle != null) {
-                // FIXME(uwe): Simplify when we stop support for RubotoCore 0.4.7
-                if (JRubyAdapter.isJRubyPreOneSeven()) {
-            	    JRubyAdapter.runScriptlet("$activity.initialize_ruboto");
-            	    JRubyAdapter.runScriptlet("$activity.on_create($bundle)");
-                } else if (JRubyAdapter.isJRubyOneSeven()) {
-            	    JRubyAdapter.runRubyMethod(this, "initialize_ruboto");
-                    JRubyAdapter.runRubyMethod(this, "on_create", args[0]);
-                } else {
-                    throw new RuntimeException("Unknown JRuby version: " + JRubyAdapter.get("JRUBY_VERSION"));
-            	}
-            }
-        } catch(IOException e){
-            e.printStackTrace();
-            ProgressDialog.show(this, "Script failed", "Something bad happened", true, true);
-        }
-    }
-
     public boolean rubotoAttachable() {
       return true;
     }

data/assets/src/RubotoBroadcastReceiver.java

@@ -2,19 +2,18 @@ package THE_PACKAGE;
 
 import java.io.IOException;
 
+import org.ruboto.ScriptLoader;
+
 public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
-    private String rubyClassName;
-    private String scriptName;
-    private Object rubyInstance;
-    private Object[] callbackProcs = new Object[CONSTANTS_COUNT];
+    private final ScriptInfo scriptInfo = new ScriptInfo(CONSTANTS_COUNT);
 
     public void setCallbackProc(int id, Object obj) {
         // Error: no callbacks
         throw new RuntimeException("RubotoBroadcastReceiver does not accept callbacks");
     }
 	
-    public void setScriptName(String name){
-        scriptName = name;
+    public ScriptInfo getScriptInfo() {
+        return scriptInfo;
     }
 
     public THE_RUBOTO_CLASS() {
@@ -25,69 +24,24 @@ public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
         super();
 
         if (name != null) {
-            setScriptName(name);
+            scriptInfo.setScriptName(name);
         
             if (JRubyAdapter.isInitialized()) {
-                loadScript();
-            }
-        }
-    }
-
-    protected void loadScript() {
-        rubyInstance = this;
+                // 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
 
-        // 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
-
-        try {
-            if (scriptName != null) {
-                String rubyClassName = Script.toCamelCase(scriptName);
-                System.out.println("Looking for Ruby class: " + rubyClassName);
-                Object rubyClass = null;
-                String script = new Script(scriptName).getContents();
-                if (script.matches("(?s).*class " + rubyClassName + ".*")) {
-                    if (!rubyClassName.equals(getClass().getSimpleName())) {
-                        System.out.println("Script defines methods on meta class");
-                        // FIXME(uwe): Simplify when we stop support for RubotoCore 0.4.7
-                        if (JRubyAdapter.isJRubyPreOneSeven() || JRubyAdapter.isRubyOneEight()) {
-                            JRubyAdapter.put("$java_instance", this);
-                            JRubyAdapter.put(rubyClassName, JRubyAdapter.runScriptlet("class << $java_instance; self; end"));
-                        } else if (JRubyAdapter.isJRubyOneSeven() && JRubyAdapter.isRubyOneNine()) {
-                            JRubyAdapter.put(rubyClassName, JRubyAdapter.runRubyMethod(this, "singleton_class"));
-                        } else {
-                            throw new RuntimeException("Unknown JRuby/Ruby version: " + JRubyAdapter.get("JRUBY_VERSION") + "/" + JRubyAdapter.get("RUBY_VERSION"));
-                        }
-                    }
-                } else {
-                    rubyClass = JRubyAdapter.get(rubyClassName);
-                }
-                if (rubyClass == null) {
-                    System.out.println("Loading script: " + scriptName);
-                    if (script.matches("(?s).*class " + rubyClassName + ".*")) {
-                        System.out.println("Script contains class definition");
-                        if (rubyClassName.equals(getClass().getSimpleName())) {
-                            System.out.println("Script has separate Java class");
-
-                            // TODO(uwe):  Why doesnt this work?
-                            // JRubyAdapter.put(rubyClassName, JRubyAdapter.runScriptlet("Java::" + getClass().getName()));
-
-                            // TODO(uwe):  Workaround...
-                            JRubyAdapter.runScriptlet(rubyClassName + " = Java::" + getClass().getName());
-                        }
-                        // System.out.println("Set class: " + JRubyAdapter.get(rubyClassName));
-                    }
-                    JRubyAdapter.setScriptFilename(scriptName);
-                    JRubyAdapter.runScriptlet(script);
-                    rubyClass = JRubyAdapter.get(rubyClassName);
-                }
+                ScriptLoader.loadScript(this);
             }
-        } catch(IOException e) {
-            throw new RuntimeException("IOException loading broadcast receiver script", e);
         }
     }
 
+    // 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);