ruboto-core 0.0.1 → 0.0.2

data/README.md

@@ -181,12 +181,12 @@ Mirah, formerly known as Duby, is a language with Ruby-like syntax that compiles
 Garrett is a "playground for Mirah exploration on Android."
 
 
-Thanks
+Domo Arigato
 -----
 
 Thanks go to:
 
-* Charles Nutter, a member of the JRuby core team, for being mentoring this RSoC project and starting the Ruboto project in the first place with an [irb](http://github.com/ruboto/ruboto-irb)
+* Charles Nutter, a member of the JRuby core team, for mentoring this RSoC project and starting the Ruboto project in the first place with an [irb](http://github.com/ruboto/ruboto-irb)
 * All of Ruby Summer of Code's [sponsors](http://rubysoc.org/sponsors)
 * [Engine Yard](http://engineyard.com/) in particular for sponsoring RSoC and heavily sponsoring JRuby, which is obviously critical to the project.
 * All [contributors](http://github.com/ruboto/ruboto-core/contributors) and [contributors to the ruboto-irb project](http://github.com/ruboto/ruboto-irb/contributors), as much of this code was taken from ruboto-irb.

data/assets/assets/scripts/ruboto.rb

@@ -17,7 +17,7 @@ require 'java'
 
 
 
-%w(Activity BroadcastReceiver Service).map do |klass|
+%w(Activity Dialog BroadcastReceiver Service View).map do |klass|
   java_import "org.ruboto.Ruboto#{klass}"
 end
 
@@ -25,8 +25,6 @@ RUBOTO_CLASSES = [RubotoActivity, RubotoBroadcastReceiver, RubotoService]
 $init_methods = Hash.new 'create'
 $init_methods[RubotoBroadcastReceiver] = 'receive'
 
-java_import "org.ruboto.RubotoView"
-
 java_import "android.app.Activity"
 java_import "android.content.Intent"
 java_import "android.os.Bundle"
@@ -63,10 +61,10 @@ class Activity
   attr_accessor :init_block
 
   def start_ruboto_dialog(remote_variable, &block)
-    start_ruboto_activity(remote_variable, true, &block)
+    start_ruboto_activity(remote_variable, RubotoDialog, &block)
   end
 
-  def start_ruboto_activity(remote_variable, dialog=false, &block)
+  def start_ruboto_activity(remote_variable, klass=RubotoActivity, &block)
     @@init_block = block
 
     if @initialized or not self.is_a?(RubotoActivity)
@@ -76,8 +74,7 @@ class Activity
       b.putString("Initialize Script", "#{remote_variable}.initialize_activity")
 
       i = Intent.new
-      i.setClassName "THE_PACKAGE",
-                     "THE_PACKAGE.ACTIVITY_NAME"
+      i.setClass self, klass.java_class
       i.putExtra("RubotoActivity Config", b)
 
       self.startActivity i

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

@@ -19,7 +19,7 @@ import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.javasupport.JavaUtil;
 import org.jruby.exceptions.RaiseException;
 
-public abstract class RubotoActivity extends Activity
+public class RubotoActivity extends Activity
     implements
         android.content.DialogInterface.OnCancelListener,
         android.widget.TabHost.TabContentFactory,

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

@@ -0,0 +1,11 @@
+package org.ruboto;
+
+/***********************************************************
+ * 
+ * Extends RubotoActivity to specify Theme.Dialog in
+ * the AndroidManifest.xml file.
+ *
+ */
+
+public class RubotoDialog extends RubotoActivity {
+}

data/bin/ruboto

@@ -6,6 +6,7 @@ begin
 rescue LoadError
 end
 
+require 'rubygems'
 require 'main'
 require 'fileutils'
 require 'rexml/document'
@@ -109,26 +110,65 @@ Main {
         package = params['package'].value
         activity = params['activity'].value
 
-        `android create project -n #{name} -t #{target} -p #{path} -k #{package} -a #{activity}`
+        abort "path must be to a directory that does not yet exist. it will be created" if
+          File.exists?(path)
+
+        abort "Currently you must set target to 'android-8' (Froyo) for ruboto to work" unless
+          target == 'android-8'
+
         root = File.expand_path(path)
+        print "\nGenerating Android app #{name} in #{root}..."
+        `android create project -n #{name} -t #{target} -p #{path} -k #{package} -a #{activity}`
+        puts "Done"
 
+        puts "\nCopying files:"
         copier = AssetCopier.new $assets, root
-        copier.copy "Rakefile"
+
+        %w{Rakefile .gitignore assets}.each do |f|
+          print "#{f}..."
+          copier.copy f
+          puts "Done"
+        end
+
+        print "JRuby jars..."
         copier.copy_from_absolute_path JRubyJars::core_jar_path, "libs"
         copier.copy_from_absolute_path JRubyJars::stdlib_jar_path, "libs"
-        copier.copy ".gitignore"
-        copier.copy "assets"
+        puts "Done"
+
+        print "Ruboto java classes..."
         copier.copy "src/org/ruboto/*.java", "src/org/ruboto"
+        puts "Done"
+
+        print "\nAdding RubotoActivity and RubotoDialog to the manifest..."
+        file = File.join(root, "AndroidManifest.xml")
+        text = File.read(file)
+        File.open(file, 'w') do |f|
+          f << text.gsub("</application>", 
+                 %Q{
+        <activity android:name="org.ruboto.RubotoActivity">
+        </activity>
+        <activity android:name="org.ruboto.RubotoDialog" android:theme="@android:style/Theme.Dialog">
+        </activity>
+    </application>
+                  })
+        end
+        puts "Done"
 
-        java_files = File.join(root, "assets/scripts/ruboto.rb")
+        print "Setting the package name in ruboto.rb..."
+        java_files = [File.join(root, "assets/scripts/ruboto.rb")]
         java_files.each do |file|
           text = File.read(file)
           File.open(file, 'w') do |f|
             f << text.gsub("THE_PACKAGE", package).gsub("ACTIVITY_NAME", activity)
           end
         end
+        puts "Done"
 
+        print "Generating the default Activity and script..."
         generate_inheriting_file "Activity", activity, package, "#{underscore(activity)}.rb", path
+        puts "Done"
+
+        puts "\nHello, #{name}\n"
       end
     end
 
@@ -151,6 +191,9 @@ Main {
 
 
       def run
+        abort "cannot find your AndroidManifest.xml to extract info from it. Make sure you're in the root directory of your app" unless
+          File.exists? 'AndroidManifest.xml'
+
         package = REXML::Document.new(File.read('AndroidManifest.xml')).root.attribute('package').value
         name = params['name'].value
         script_name = params['script_name'].value || "#{underscore(name)}.rb"

data/lib/java_class_gen/RubotoClass.java.erb

@@ -21,7 +21,7 @@ import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.javasupport.JavaUtil;
 import org.jruby.exceptions.RaiseException;
 
-public abstract class Ruboto<%= @class %> extends <%= @class %>
+public<%= @class == "Activity" ? "" : " abstract" %> class Ruboto<%= @class %> extends <%= @class %>
 %##############################################################################################
 %#
 %#  Implement all interfaces

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruboto-core
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Daniel Jackoway
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 -04:00
+date: 2010-07-29 00:00:00 -07:00
 default_executable: ruboto
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,6 +74,7 @@ files:
 - assets/src/InheritingService.java
 - assets/src/org/ruboto/RubotoActivity.java
 - assets/src/org/ruboto/RubotoBroadcastReceiver.java
+- assets/src/org/ruboto/RubotoDialog.java
 - assets/src/org/ruboto/RubotoService.java
 - assets/src/org/ruboto/RubotoView.java
 - assets/src/org/ruboto/Script.java