ruboto 0.7.0 → 0.8.0

data/Gemfile

@@ -2,4 +2,4 @@ source :rubygems
 
 gem 'rake'
 gem 'main'
-gem 'jruby-jars'
+# gem 'jruby-jars'

data/Gemfile.lock

@@ -4,7 +4,6 @@ GEM
     arrayfields (4.7.4)
     chronic (0.6.7)
     fattr (2.2.1)
-    jruby-jars (1.6.7)
     main (5.0.1)
       arrayfields (>= 4.7.4)
       chronic (>= 0.6.2)
@@ -18,6 +17,5 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  jruby-jars
   main
   rake

data/Rakefile

@@ -31,6 +31,7 @@ end
 task :install => :gem do
   `gem query -i -n ^ruboto$ -v #{Ruboto::VERSION}`
   if $? != 0
+    puts 'Installing gem'
     cmd = "gem install ruboto-#{Ruboto::VERSION}.gem"
     output = `#{cmd}`
     if $? == 0
@@ -43,6 +44,24 @@ task :install => :gem do
   end
 end
 
+task :uninstall do
+  `gem query -i -n ^ruboto$ -v #{Ruboto::VERSION}`
+  if $? == 0
+    puts 'Uninstalling gem'
+    cmd = "gem uninstall ruboto -v #{Ruboto::VERSION}"
+    output = `#{cmd}`
+    if $? == 0
+      puts output
+    else
+      sh "sudo #{cmd}"
+    end
+  else
+    puts "ruboto-#{Ruboto::VERSION} is not installed."
+  end
+end
+
+task :reinstall => [:uninstall, :clean, :install]
+
 desc "Generate an example app"
 task :example => EXAMPLE_FILE
 
@@ -57,6 +76,49 @@ file EXAMPLE_FILE => :install do
   end
 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 }
+  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)
+  https.use_ssl = true
+  https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+  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}
+  grouped_issues = issues.group_by do |i|
+    labels = i['labels'].map { |l| l['name']}
+    cat = nil
+    categories.each do |k,v|
+      if labels.include? v
+        cat = k
+        break
+      end
+    end
+    cat || 'Other'
+  end
+  puts "\nNew in version #{milestone_name}:\n\n"
+  (categories.keys & grouped_issues.keys).each do |cat|
+    puts "#{cat}:\n\n"
+    grouped_issues[cat].each { |i| puts %Q{* Issue ##{i['number']} #{i['title']}} }
+    puts
+  end
+  puts "You can find a complete list of issues here:\n\n"
+  puts "* https://github.com/ruboto/ruboto/issues?state=closed&milestone=#{milestone}\n\n"
+end
+
 desc "Push the gem to RubyGems"
 task :release => [:clean, :gem] do
   output = `git status --porcelain`
@@ -67,6 +129,7 @@ task :release => [:clean, :gem] do
 
   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 push"
 end
@@ -74,7 +137,7 @@ end
 desc "Run the tests"
 task :test do
   FileUtils.rm_rf Dir['tmp/RubotoTestApp_template*']
-  Dir['test/*_test.rb'].each do |f|
+  Dir['./test/*_test.rb'].each do |f|
     require f.chomp('.rb')
   end
 end

data/assets/rakelib/ruboto.rake

@@ -207,7 +207,12 @@ file BUNDLE_JAR => [GEM_FILE, GEM_LOCK_FILE] do
 
   FileUtils.mkdir_p BUNDLE_PATH
   sh "bundle install --gemfile #{GEM_FILE} --path=#{BUNDLE_PATH}"
-  gem_path = Dir["#{BUNDLE_PATH}/*ruby/1.8/gems"][0]
+
+  gem_paths = Dir["#{BUNDLE_PATH}/{{,j}ruby,rbx}/{1.8,1.9{,.1},shared}/gems"]
+  raise "Gem path not found" if gem_paths.empty?
+  raise "Found multiple gem paths: #{gem_paths}" if gem_paths.size > 1
+  gem_path = gem_paths[0]
+  puts "Found gems in #{gem_path}"
 
   if package != 'org.ruboto.core' && JRUBY_JARS.none? { |f| File.exists? f }
     Dir.chdir gem_path do
@@ -350,6 +355,17 @@ def package_installed? test = false
         return false
       end
     end
+
+    sdcard_path = "/mnt/asec/#{package_name}#{i}/pkg.apk"
+    o = `adb shell ls -l #{sdcard_path}`.chomp
+    if o =~ /^-r-xr-xr-x system\s+root\s+(\d+) \d{4}-\d{2}-\d{2} \d{2}:\d{2} #{File.basename(sdcard_path)}$/
+      apk_file = test ? TEST_APK_FILE : APK_FILE
+      if !File.exists?(apk_file) || $1.to_i == File.size(apk_file)
+        return true
+      else
+        return false
+      end
+    end
   end
   return nil
 end
@@ -397,7 +413,10 @@ def install_apk
   when false
     puts "Package #{package} already installed, but of different size.  Replacing package."
     output = `adb install -r #{APK_FILE} 2>&1`
-    return if $? == 0 && output !~ failure_pattern && output =~ success_pattern
+    if $? == 0 && output !~ failure_pattern && output =~ success_pattern
+      clear_update
+      return
+    end
     case $1
     when 'INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES'
       puts "Found package signed with different certificate.  Uninstalling it and retrying install."
@@ -407,7 +426,9 @@ def install_apk
     end
     uninstall_apk
   end
+  puts "Installing package #{package}"
   output = `adb install #{APK_FILE} 2>&1`
+  puts output
   raise "Install failed (#{$?}) #{$1 ? "[#$1}]" : output}" if $? != 0 || output =~ failure_pattern || output !~ success_pattern
   clear_update
 end

data/assets/res/layout/get_ruboto_core.xml

@@ -6,8 +6,6 @@
     android:orientation="vertical"
     android:gravity="center_horizontal|center_vertical"
 >
-<!--                                                                                                                                                                                                                                 
--->
   <ImageButton
       android:id="@+id/image"
       android:layout_width="fill_parent"

data/assets/samples/sample_activity.rb

@@ -1,4 +1,3 @@
-require 'ruboto/activity'
 require 'ruboto/widget'
 require 'ruboto/util/toast'
 
@@ -7,16 +6,14 @@ ruboto_import_widgets :Button, :LinearLayout, :TextView
 # http://xkcd.com/378/
 
 class SampleActivity
-  include Ruboto::Activity
-
   def on_create(bundle)
     set_title 'Domo arigato, Mr Ruboto!'
 
     self.content_view =
         linear_layout :orientation => :vertical do
-          @text_view = text_view :text    => 'What hath Matz wrought?', :id => 42, :width => :fill_parent,
-                                 :gravity => android.view.Gravity::CENTER, :text_size => 48.0
-          button :text => 'M-x butterfly', :width => :fill_parent, :id => 43, :on_click_listener => proc { butterfly }
+          @text_view = text_view :text => 'What hath Matz wrought?', :id => 42, :width => :match_parent,
+                                 :gravity => :center, :text_size => 48.0
+          button :text => 'M-x butterfly', :width => :match_parent, :id => 43, :on_click_listener => proc { butterfly }
         end
   rescue
     puts "Exception creating activity: #{$!}"

data/assets/samples/sample_broadcast_receiver.rb

@@ -1,15 +1,19 @@
-require 'ruboto/broadcast_receiver'
-
 import android.util.Log
 
 class SampleBroadcastReceiver
-  include Ruboto::BroadcastReceiver
-
   # will get called whenever the BroadcastReceiver receives an intent (whenever onReceive is called)
   def on_receive(context, intent)
     Log.v "SampleBroadcastReceiver", 'Broadcast received!'
     Log.v "SampleBroadcastReceiver", intent.getExtras.to_s
-    context.run_on_ui_thread{$activity.title = 'Broadcast received!'}
+    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
 end

data/assets/samples/sample_service.rb

@@ -1,4 +1,3 @@
-require 'ruboto/service'
 require 'ruboto/util/toast'
 
 # Services are complicated and don't really make sense unless you
@@ -8,8 +7,6 @@ require 'ruboto/util/toast'
 # online:
 # http://developer.android.com/reference/android/app/Service.html
 class SampleService
-  include Ruboto::Service
-
   def on_start_command(intent, flags, startId)
     toast "Hello from the service"
     android.app.Service::START_NOT_STICKY

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) {
-		setScriptName("sample_activity.rb");
+		setRubyClassName(getClass().getSimpleName());
 	    super.onCreate(bundle);
 	}
 }

data/assets/src/InheritingClass.java

@@ -1,18 +1,24 @@
+// Generated Ruboto subclass with method base "THE_METHOD_BASE"
+
 package THE_PACKAGE;
 
 import org.ruboto.JRubyAdapter;
+import org.ruboto.Log;
+import org.ruboto.Script;
 
 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];
 
 THE_CONSTRUCTORS
 
-  public void setCallbackProc(int id, Object obj) {
-    callbackProcs[id] = obj;
-  }
+    public void setCallbackProc(int id, Object obj) {
+        callbackProcs[id] = obj;
+    }
 	
 THE_METHODS
 

data/assets/src/RubotoActivity.java

@@ -8,15 +8,15 @@ import android.app.ProgressDialog;
 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 String remoteVariable = null;
     private Object[] args;
     private Bundle configBundle = null;
-    private Object rubyInstance;
-
-THE_CONSTANTS
-
-    private Object[] callbackProcs = new Object[CONSTANTS_COUNT];
 
     public void setCallbackProc(int id, Object obj) {
         callbackProcs[id] = obj;
@@ -31,6 +31,10 @@ THE_CONSTANTS
         return (remoteVariable == null ? "" : (remoteVariable + ".")) + call;
     }
 
+    public void setRubyClassName(String name) {
+        rubyClassName = name;
+    }
+
     public void setScriptName(String name) {
         scriptName = name;
     }
@@ -42,6 +46,7 @@ THE_CONSTANTS
 	
     @Override
     public void onCreate(Bundle bundle) {
+        System.out.println("RubotoActivity onCreate(): " + getClass().getName());
         args = new Object[1];
         args[0] = bundle;
 
@@ -51,6 +56,13 @@ THE_CONSTANTS
             if (configBundle.containsKey("Theme")) {
                 setTheme(configBundle.getInt("Theme"));
             }
+            if (configBundle.containsKey("ClassName")) {
+                if (this.getClass().getName() == RubotoActivity.class.getName()) {
+                    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"));
@@ -60,8 +72,15 @@ THE_CONSTANTS
             }
         }
 
+        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();
@@ -81,26 +100,77 @@ THE_CONSTANTS
     protected void loadScript() {
         try {
             if (scriptName != null) {
-                String rubyClassName = Script.toCamelCase(scriptName);
                 System.out.println("Looking for Ruby class: " + rubyClassName);
                 Object rubyClass = JRubyAdapter.get(rubyClassName);
-                if (rubyClass == null) {
-                    System.out.println("Loading script: " + scriptName);
-                    JRubyAdapter.exec(new Script(scriptName).getContents());
-                    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("Instanciating Ruby class: " + rubyClassName);
-                    rubyInstance = JRubyAdapter.callMethod(rubyClass, "new", this, Object.class);
-                    JRubyAdapter.callMethod(rubyInstance, "on_create", args[0]);
+                    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) {
-                // TODO: Why doesn't this work?
-                // JRubyAdapter.callMethod(this, "initialize_ruboto");
-            	JRubyAdapter.execute("$activity.initialize_ruboto");
-                // TODO: Why doesn't this work?
-                // JRubyAdapter.callMethod(this, "on_create", args[0]);
-            	JRubyAdapter.execute("$activity.on_create($bundle)");
+                // 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();