ruboto 0.5.2 → 0.5.3

data/Gemfile.lock

@@ -2,15 +2,15 @@ GEM
   remote: http://rubygems.org/
   specs:
     arrayfields (4.7.4)
-    chronic (0.6.2)
+    chronic (0.6.6)
     fattr (2.2.0)
-    jruby-jars (1.6.4)
-    main (4.7.3)
+    jruby-jars (1.6.5.1)
+    main (4.8.1)
       arrayfields (~> 4.7.4)
       chronic (~> 0.6.2)
       fattr (~> 2.2.0)
-      map (~> 4.3.0)
-    map (4.3.0)
+      map (~> 5.1.0)
+    map (5.1.0)
 
 PLATFORMS
   java

data/README.md

@@ -203,8 +203,8 @@ Activities also have some special methods defined to make things easier. The eas
 Testing
 -------
 
-For each generated class, a ruby test script is created in the test/assets/scripts directory.
-For example if you generate a RubotoSampleAppActivity a file test/assets/scripts/ruboto_sample_app_activity_test.rb
+For each generated class, a ruby test script is created in the test/src directory.
+For example if you generate a RubotoSampleAppActivity a file test/src/ruboto_sample_app_activity_test.rb
 file is created containing a sample test script:
 
     activity Java::org.ruboto.sample_app.RubotoSampleAppActivity

data/Rakefile

@@ -1,3 +1,4 @@
+require 'rake/clean'
 require 'rexml/document'
 require 'lib/ruboto/version'
 
@@ -21,6 +22,7 @@ JRUBY_JARS_VERSION = gem_spec.version
 ON_JRUBY_JARS_1_5_6 = JRUBY_JARS_VERSION == Gem::Version.new('1.5.6')
 # FIXME end
 
+CLEAN.include('ruboto-*.gem', 'tmp')
 
 task :default => :gem
 
@@ -66,20 +68,17 @@ namespace :platform do
   task :project => PLATFORM_PROJECT
 
   file PLATFORM_PROJECT do
-    sh "ruby -rubygems -I#{File.expand_path('lib', File.dirname(__FILE__))} bin/ruboto gen app --package org.ruboto.core --name RubotoCore --with-jruby #{'--with-psych' unless ON_JRUBY_JARS_1_5_6} --path #{PLATFORM_PROJECT}"
+    sh "ruby -rubygems -I#{File.expand_path('lib', File.dirname(__FILE__))} bin/ruboto gen app --package org.ruboto.core --name RubotoCore --with-jruby --path #{PLATFORM_PROJECT}"
     Dir.chdir(PLATFORM_PROJECT) do
       manifest = REXML::Document.new(File.read(MANIFEST_FILE))
       manifest.root.attributes['android:versionCode'] = '408'
-      manifest.root.attributes['android:versionName'] = '0.4.8.dev'
+      manifest.root.attributes['android:versionName'] = '0.4.8'
       manifest.root.attributes['android:installLocation'] = 'auto' # or 'preferExternal' ?
       manifest.root.elements['uses-sdk'].attributes['android:targetSdkVersion'] = '8'
       File.open(MANIFEST_FILE, 'w') { |f| manifest.document.write(f, 4) }
       File.open('project.properties', 'w'){|f| f << "target=android-8\n"}
       File.open('Gemfile.apk', 'w'){|f| f << "source :rubygems\n\ngem 'activerecord-jdbc-adapter'\n"}
-      keystore_file = File.expand_path('~/android_market.keystore')
-      if File.exists?(keystore_file)
-        File.open('local.properties', 'a'){|f| f << "key.store=#{keystore_file}\nkey.alias=android_market\n"}
-      end
+      File.open('ant.properties', 'a'){|f| f << "key.store=${user.home}/ruboto_core.keystore\nkey.alias=Ruboto\n"}
     end
   end
 

data/assets/Rakefile

@@ -1,3 +1,8 @@
+if `ant -version` !~ /version (\d+)\.(\d+)\.(\d+)/ || $1.to_i < 1 || ($1.to_i == 1 && $2.to_i < 8)
+  puts "ANT version 1.8.0 or later required.  Version found: #{$1}.#{$2}.#{$3}"
+  exit 1
+end
+
 require 'time'
 
 def manifest() @manifest ||= REXML::Document.new(File.read(MANIFEST_FILE)) end
@@ -10,9 +15,9 @@ require 'rake/clean'
 require 'rexml/document'
 
 PROJECT_DIR        = Dir.getwd
-UPDATE_MARKER_FILE = File.expand_path(File.join('tmp', 'LAST_UPDATE'), File.dirname(__FILE__))
+UPDATE_MARKER_FILE = File.expand_path(File.join('bin', 'LAST_UPDATE'), File.dirname(__FILE__))
 BUNDLE_JAR         = File.expand_path 'libs/bundle.jar'
-BUNDLE_PATH        = File.expand_path 'tmp/bundle'
+BUNDLE_PATH        = File.expand_path 'bin/bundle'
 MANIFEST_FILE      = File.expand_path 'AndroidManifest.xml'
 RUBOTO_CONFIG_FILE = File.expand_path 'ruboto.yml'
 GEM_FILE           = File.expand_path('Gemfile.apk')
@@ -25,8 +30,10 @@ RESOURCE_FILES     = Dir[File.expand_path 'res/**/*']
 JAVA_SOURCE_FILES  = Dir[File.expand_path 'src/**/*.java']
 RUBY_SOURCE_FILES  = Dir[File.expand_path 'src/**/*.rb']
 APK_DEPENDENCIES   = [MANIFEST_FILE, RUBOTO_CONFIG_FILE, BUNDLE_JAR] + JRUBY_JARS + JAVA_SOURCE_FILES + RESOURCE_FILES + RUBY_SOURCE_FILES
+KEYSTORE_FILE      = (key_store = File.readlines('ant.properties').grep(/^key.store=/).first) ? key_store.chomp.sub(/^key.store=/, '') : "#{build_project_name}.keystore"
+KEYSTORE_ALIAS     = (key_alias = File.readlines('ant.properties').grep(/^key.alias=/).first) ? key_alias.chomp.sub(/^key.alias=/, '') : build_project_name
 
-CLEAN.include('tmp', 'bin')
+CLEAN.include('bin')
 
 task :default => :debug
 
@@ -72,21 +79,35 @@ namespace :install do
   end
 end
 
+desc 'Build APK for release'
 task :release => RELEASE_APK_FILE
 
-file RELEASE_APK_FILE => APK_DEPENDENCIES do |t|
+file RELEASE_APK_FILE => [KEYSTORE_FILE] + APK_DEPENDENCIES do |t|
   build_apk(t, true)
 end
 
+desc 'Create a keystore for signing the release APK'
+file KEYSTORE_FILE do
+  unless File.read('ant.properties') =~ /^key.store=/
+    File.open('ant.properties', 'a'){|f| f << "\nkey.store=#{KEYSTORE_FILE}\n"}
+  end
+  unless File.read('ant.properties') =~ /^key.alias=/
+    File.open('ant.properties', 'a'){|f| f << "\nkey.alias=#{KEYSTORE_ALIAS}\n"}
+  end
+  sh "keytool -genkey -v -keystore #{KEYSTORE_FILE} -alias #{KEYSTORE_ALIAS} -keyalg RSA -keysize 2048 -validity 10000"
+end
+
+desc 'Tag this working copy with the current version'
 task :tag => :release do
   unless `git branch` =~ /^\* master$/
     puts "You must be on the master branch to release!"
     exit!
   end
-  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  # sh "git commit --allow-empty -a -m 'Release #{version}'"
+  output = `git status --porcelain`
+  raise "Workspace not clean!\n#{output}" unless output.empty?
   sh "git tag #{version}"
   sh "git push origin master --tags"
-  #sh "gem push pkg/#{name}-#{version}.gem"
 end
 
 task :sign => :release do
@@ -136,11 +157,10 @@ end
 namespace :update_scripts do
   desc 'Copy scripts to emulator and restart the app'
   task :restart => APK_DEPENDENCIES do |t|
-    if stop_app
-      update_scripts
-    else
-      build_apk(t, false)
+    if build_apk(t, false) || !stop_app
       install_apk
+    else
+      update_scripts
     end
     start_app
   end
@@ -326,7 +346,7 @@ def build_apk(t, release)
     changed_prereqs = t.prerequisites.select do |p|
       File.file?(p) && !Dir[p].empty? && Dir[p].map { |f| File.mtime(f) }.max > File.mtime(APK_FILE)
     end
-    return if changed_prereqs.empty?
+    return false if changed_prereqs.empty?
     changed_prereqs.each { |f| puts "#{f} changed." }
     puts "Forcing rebuild of #{apk_file}."
   end
@@ -335,6 +355,7 @@ def build_apk(t, release)
   else
     sh 'ant debug'
   end
+  return true
 end
 
 def install_apk

data/assets/res/layout/get_ruboto_core.xml

@@ -12,7 +12,7 @@
       android:id="@+id/image"
       android:layout_width="fill_parent"
       android:layout_height="fill_parent"
-      android:src="@drawable/icon"
+      android:src="@drawable/get_ruboto_core"
       android:layout_weight="1"
       android:scaleType="fitCenter"
       android:onClick="getRubotoCore"

data/assets/samples/sample_activity.rb

@@ -1,21 +1,23 @@
-require 'ruboto'
+require 'ruboto/activity'
+require 'ruboto/widget'
+require 'ruboto/util/toast'
 
 ruboto_import_widgets :Button, :LinearLayout, :TextView
 
-$activity.handle_create do |bundle|
+$activity.start_ruboto_activity "$sample_activity" do
   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
-    end
+  def on_create(bundle)
+    self.content_view =
+        linear_layout(:orientation => :vertical) do
+          @text_view = text_view :text => 'What hath Matz wrought?', :id => 42
+          button :text => 'M-x butterfly', :width => :wrap_content, :id => 43,
+                    :on_click_listener => @handle_click
+        end
   end
 
-  handle_click do |view|
-    if view.getText == 'M-x butterfly'
-      @text_view.setText 'What hath Matz wrought!'
+  @handle_click = proc do |view|
+      @text_view.text = 'What hath Matz wrought!'
       toast 'Flipped a bit via butterfly'
-    end
   end
 end

data/assets/samples/sample_broadcast_receiver.rb

@@ -1,6 +1,9 @@
-require 'ruboto'
+require 'ruboto/broadcast_receiver'
 
 # will get called whenever the BroadcastReceiver receives an intent (whenever onReceive is called)
-$broadcast_receiver.handle_receive do |context, intent|
-  Log.v "MYAPP", intent.getExtras.to_s
+RubotoBroadcastReceiver.new_with_callbacks do
+  def on_receive(context, intent)
+    Log.v "MYAPP", intent.getExtras.to_s
+  end
 end
+

data/assets/samples/sample_service.rb

@@ -1,14 +1,17 @@
-require 'ruboto'
-
-$service.handle_create do
-  # define what your service does. Directly put any code that you want
-  # executed when onCreate gets called. Define the rest of the
-  # behavior with handle_ blocks. See the README for more info.
+require 'ruboto/service'
+require 'ruboto/util/toast'
 
+$context.start_ruboto_service do
   # Services are complicated and don't really make sense unless you
   # show the interaction between the Service and other parts of your
-  # app
+  # app.
   # For now, just take a look at the explanation and example in
   # online:
   # http://developer.android.com/reference/android/app/Service.html
+
+  def on_start_command(intent, flags, startId)
+    toast "Hello from the service"
+    self.class::START_NOT_STICKY
+  end
+
 end

data/assets/src/InheritingActivity.java

@@ -1,195 +1,10 @@
 package THE_PACKAGE;
 
-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 InheritingActivity extends org.ruboto.RubotoActivity {
-    private int splash = 0;
-    private ProgressDialog loadingDialog;
-    private boolean dialogCancelled = false;
-    private BroadcastReceiver receiver;
-    private boolean appStarted = false;
 
+public class InheritingActivity extends org.ruboto.EntryPointActivity {
 	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;
-		}
-
 		setScriptName("start.rb");
-        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(InheritingActivity.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(InheritingActivity.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;
-        }
-    }
-
 }