ruboto-core 0.0.3 → 0.1.0

data/Gemfile

@@ -1,4 +1,4 @@
-source :gemcutter
+source :rubygems
 
 gem 'main'
 gem 'jruby-jars'

data/Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     arrayfields (4.7.4)
     fattr (2.1.0)
-    jruby-jars (1.5.3)
+    jruby-jars (1.5.6)
     main (4.2.0)
       arrayfields (>= 4.7.4)
       fattr (>= 2.1.0)

data/README.md

@@ -46,7 +46,7 @@ Version values must be specified using'android-' and the sdk level number (e.g.,
 <a name="class_generator"></a>
 ### Class generator
 
-Generates a Java class (Activity, Service, or BroadcastReceiver) associated with a specific ruboto script.
+Generates a Java class (Activity, Service, or BroadcastReceiver) associated with a specific ruboto script.  The generator also generates a corrsponding test script.
 
     $ ruboto gen class ClassName --name YourObjectName
 Ex:
@@ -61,7 +61,7 @@ For classes that need subclassing (e.g., PhoneStateListener, SQLiteOpenHelper, V
 
     $ ruboto gen subclass AndroidPackageAndClassName --name YourClassName --method_base all-on-or-none --method_include methods --method_exclude methods
 Ex:
-    $ ruboto gen class android.telephony.PhoneStateListener --name MyPhoneStateListener
+    $ ruboto gen subclass android.telephony.PhoneStateListener --name MyPhoneStateListener --method_base on
 
 For interfaces that need implementing (e.g., OnClickListener or SensorListener)
 
@@ -200,6 +200,41 @@ The arguments passed to the block you give `handle_` methods are the same as the
 
 Activities also have some special methods defined to make things easier. The easiest way to get an idea of what they are is looking over the [demo scripts](http://github.com/ruboto/ruboto-irb/tree/master/assets/demo-scripts/). You can also read the [ruboto.rb file](http://github.com/ruboto/ruboto-core/blob/master/assets/assets/scripts/ruboto.rb) where everything is defined.
 
+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
+file is created containing a sample test script:
+
+    activity Java::org.ruboto.sample_app.RubotoSampleAppActivity
+
+    setup do |activity|
+      start = Time.now
+      loop do
+        @text_view = activity.findViewById(42)
+        break if @text_view || (Time.now - start > 60)
+        sleep 1
+      end
+      assert @text_view
+    end
+
+    test('initial setup') do |activity|
+      assert_equal "What hath Matz wrought?", @text_view.text
+    end
+
+    test('button changes text') do |activity|
+      button = activity.findViewById(43)
+      button.performClick
+      assert_equal "What hath Matz wrought!", @text_view.text
+    end
+
+You run the tests for your app using ant or rake
+
+    $ jruby -S rake test
+
+    $ cd test ; ant run-tests
+
 Contributing
 ------------
 
@@ -211,6 +246,10 @@ Want to contribute? Great! Meet us in #ruboto on irc.freenode.net, fork the proj
 * As you gain wisdom, contribute it to [the wiki](http://github.com/ruboto/ruboto-core/wiki/)
 * When you gain enough wisdom, reconsider whether you could fork the project.
 
+If contributing code to the project, please run the exising tests and add tests for your changes.  You run the tests using rake
+
+    $ jruby -S rake test
+
 Getting Help
 ------------
 
@@ -244,7 +283,7 @@ Garrett is a "playground for Mirah exploration on Android."
 
 
 Domo Arigato
------
+------------
 
 Thanks go to:
 

data/Rakefile

@@ -8,3 +8,8 @@ task :release do
   `gem push #{Dir['ruboto-core-*.gem'][-1]}`
 end
 
+task :test do
+  Dir['test/*_test.rb'].each do |f|
+    load f
+  end
+end

data/assets/Rakefile

@@ -5,8 +5,12 @@
 #
 
 
-raise "Needs JRuby 1.5" unless RUBY_PLATFORM =~ /java/
-require 'ant'
+if RUBY_PLATFORM =~ /java/
+  puts "Detected JRuby.  Loading ANT."
+  require 'ant'
+  ant_loaded = true
+end
+
 require 'rake/clean'
 require 'rexml/document'
 
@@ -16,13 +20,13 @@ stdlib             = jars.grep(/stdlib/).first #libs/jruby-stdlib-VERSION.jar
 jruby_jar          = jars.grep(/core/).first   #libs/jruby-core-VERSION.jar
 stdlib_precompiled = File.join(generated_libs, 'jruby-stdlib-precompiled.jar')
 jruby_ruboto_jar   = File.join(generated_libs, 'jruby-ruboto.jar')
-ant.property :name=>'external.libs.dir', :value => generated_libs
+ant.property :name=>'external.libs.dir', :value => generated_libs if ant_loaded
 dirs = ['tmp/ruby', 'tmp/precompiled', generated_libs]
 dirs.each { |d| directory d }
 
 CLEAN.include('tmp', 'bin', generated_libs)
 
-ant_import
+ant_import if ant_loaded
 
 file stdlib_precompiled => :compile_stdlib
 file jruby_ruboto_jar => generated_libs do
@@ -74,9 +78,69 @@ task :publish => :align do
   puts "#{build_project_name}.apk is ready for the market!"
 end
 
+task :start_app do
+  `adb shell am start -a android.intent.action.MAIN -n #{package}/.#{main_activity}`
+end
+
+task :stop_app do
+  `adb shell ps | grep #{package} | awk '{print $2}' | xargs adb shell kill`
+end
+
+task :restart => [:stop_app, :start_app]
+
+task :uninstall do
+  system "adb uninstall #{package}"
+end
+
+namespace :install do
+  desc 'Build, install, and restart the application'
+  task :restart => [:install, :start_app]
+  namespace :restart do
+    desc 'Uninstall, build, install, and restart the application'
+    task :clean => [:uninstall, :install, :start_app]
+  end
+end
+
+desc 'Copy scripts to emulator'
 task :update_scripts do
-  Dir['assets/scripts/*.rb'].each do |script|
-    `adb push #{script} /data/data/#{package}/files/scripts`
+  manifest
+  Dir.chdir('assets') do
+    # Add more directories here if you want them copied to the emulator
+    ['scripts'].each do |script_dir|
+      Dir["#{script_dir}/*"].each do |script|
+        next if File.directory? script
+        `adb push #{script} /data/data/#{package}/files/#{script_dir}`
+      end
+    end
+  end
+end
+
+namespace :update_scripts do
+  desc 'Copy scripts to emulator and restart the app'
+  task :restart => [:stop_app, :update_scripts, :start_app]
+end
+
+task :update_test_scripts do
+  Dir['test/assets/scripts/*.rb'].each do |script|
+    `adb push #{script} /data/data/#{package}.tests/files/scripts/`
+  end
+  `adb shell ps | grep #{package}.tests | awk '{print $2}' | xargs adb shell kill`
+end
+
+task :test => :uninstall do
+  Dir.chdir('test') do
+    puts 'Running tests'
+    system "adb uninstall #{package}.tests"
+    system "ant run-tests"
+  end
+end
+
+namespace :test do
+  task :quick => [:update_scripts, :update_test_scripts] do
+    Dir.chdir('test') do
+      puts 'Running quick tests'
+      system "ant run-tests-quick"
+    end
   end
 end
 
@@ -92,5 +156,6 @@ end
 
 def package() manifest.root.attribute('package') end
 def version() strings :version_name end
-def app_name()  strings :app_name end
+def app_name() strings :app_name end
+def main_activity() manifest.root.elements['application'].elements['activity'].attributes['android:name'] end
 def build_project_name() @build_project_name ||= REXML::Document.new(File.read('build.xml')).elements['project'].attribute(:name).value end

data/assets/assets/scripts/ruboto.rb

@@ -9,7 +9,7 @@
 #
 #######################################################
 
-$RUBOTO_VERSION = 6
+$RUBOTO_VERSION = 7
 
 def confirm_ruboto_version(required_version, exact=true)
   raise "requires $RUBOTO_VERSION=#{required_version} or greater, current version #{$RUBOTO_VERSION}" if $RUBOTO_VERSION < required_version and not exact
@@ -20,38 +20,15 @@ require 'java'
 
 $package_name = "THE_PACKAGE"
 
-%w(Activity Dialog BroadcastReceiver Service).map do |klass|
-  java_import "org.ruboto.Ruboto#{klass}"
-end
-
-RUBOTO_CLASSES = [RubotoActivity, RubotoBroadcastReceiver, RubotoService]
-$init_methods = Hash.new 'create'
-$init_methods[RubotoBroadcastReceiver] = 'receive'
-
-java_import "android.app.Activity"
-java_import "android.content.Intent"
-java_import "android.os.Bundle"
-
-java_import "android.view.View"
-java_import "android.view.ViewGroup"
-
-java_import "android.widget.Toast"
-
-java_import "android.widget.ArrayAdapter"
-java_import "java.util.Arrays"
-java_import "java.util.ArrayList"
 java_import "android.R"
 
-java_import "android.util.Log"
-
 module Ruboto
   java_import "#{$package_name}.R"
   begin
     Id = JavaUtilities.get_proxy_class("#{$package_name}.R$id")
   rescue NameError
-    Log.d "RUBOTO", "no R$id"
+    Java::android.util.Log.d "RUBOTO", "no R$id"
   end
-
 end
 AndroidIds = JavaUtilities.get_proxy_class("android.R$id")
 
@@ -60,7 +37,10 @@ AndroidIds = JavaUtilities.get_proxy_class("android.R$id")
 # Activity
 #
 
-class Activity
+def setup_activity
+ java_import "android.app.Activity"
+
+ Activity.class_eval do
   def start_ruboto_dialog(remote_variable, &block)
     start_ruboto_activity(remote_variable, RubotoDialog, &block)
   end
@@ -68,13 +48,13 @@ class Activity
   def start_ruboto_activity(remote_variable, klass=RubotoActivity, &block)
     $activity_init_block = block
 
-    if @initialized or not self.kind_of?(RubotoActivity)
-      b = Bundle.new
+    if @initialized or self == $activity
+      b = Java::android.os.Bundle.new
       b.putString("Remote Variable", remote_variable)
       b.putBoolean("Define Remote Variable", true)
       b.putString("Initialize Script", "#{remote_variable}.initialize_activity")
 
-      i = Intent.new
+      i = Java::android.content.Intent.new
       i.setClass self, klass.java_class
       i.putExtra("RubotoActivity Config", b)
 
@@ -91,13 +71,14 @@ class Activity
 
   #plugin
   def toast(text, duration=5000)
-    Toast.makeText(self, text, duration).show
+    Java::android.widget.Toast.makeText(self, text, duration).show
   end
 
   #plugin
   def toast_result(result, success, failure, duration=5000)
     toast(result ? success : failure, duration)
   end
+ end
 end
 
 #############################################################################
@@ -220,9 +201,13 @@ def ruboto_configure_activity(klass)
 
   ruboto_allow_handlers(klass)
 end
-ruboto_configure_activity(RubotoActivity)
 
-RUBOTO_CLASSES.each do |klass|
+#############################################################################
+#
+# Ruboto Set up for all app types (Activity, Service, BroadcastReceiver)
+#
+
+def ruboto_setup(klass, init_method="create")
   # Setup ability to handle callbacks
   ruboto_allow_handlers(klass)
 
@@ -233,7 +218,7 @@ RUBOTO_CLASSES.each do |klass|
     end
 
     eval %Q{
-      def handle_#{$init_methods[klass]}(&block)
+      def handle_#{init_method}(&block)
         when_launched &block
       end
     }
@@ -266,6 +251,11 @@ def ruboto_import_widget(class_name, package_name="android.widget")
         rv
      end
    "
+
+  setup_list_view       if class_name == :ListView
+  setup_button          if class_name == :Button
+  setup_linear_layout   if class_name == :LinearLayout
+  setup_relative_layout if class_name == :RelativeLayout
 end
 
 #############################################################################
@@ -273,62 +263,104 @@ end
 # Extend Common View Classes
 #
 
-# Need to load these two to extend classes
-ruboto_import_widgets :ListView, :Button
+def setup_view
+ java_import "android.view.View"
+ java_import "android.view.ViewGroup"
 
-class View
-  @@convert_params = {
-     :wrap_content => ViewGroup::LayoutParams::WRAP_CONTENT,
-     :fill_parent  => ViewGroup::LayoutParams::FILL_PARENT,
-  }
+ View.class_eval do
+  @@convert_constants ||= {}
+
+  def self.add_constant_conversion(from, to)
+    @@convert_constants[from] = to
+  end
+
+  def self.convert_constant(from)
+    @@convert_constants[from] or from
+  end
+
+  def self.setup_constant_conversion
+    (self.constants - self.superclass.constants).each do |i|
+      View.add_constant_conversion i.downcase.to_sym, self.const_get(i)
+    end
+  end
 
   def configure(context, params = {})
     if width = params.delete(:width)
-      getLayoutParams.width = @@convert_params[width] or width
+      getLayoutParams.width = View.convert_constant(width)
     end
 
     if height = params.delete(:height)
-      getLayoutParams.height = @@convert_params[height] or height
+      getLayoutParams.height = View.convert_constant(height)
     end
 
-    params.each do |k, v|
-      if v.is_a?(Array)
-        self.send("set#{k.to_s.gsub(/(^|_)([a-z])/) {$2.upcase}}", *v)
-      else
-        self.send("set#{k.to_s.gsub(/(^|_)([a-z])/) {$2.upcase}}", v)
+    if layout = params.delete(:layout)
+      lp = getLayoutParams
+      layout.each do |k, v|
+        values = (v.is_a?(Array) ? v : [v]).map{|i| @@convert_constants[i] or i}
+        lp.send("#{k.to_s.gsub(/_([a-z])/) {$1.upcase}}", *values)
       end
     end
+
+    params.each do |k, v|
+      values = (v.is_a?(Array) ? v : [v]).map{|i| @@convert_constants[i] or i}
+      self.send("set#{k.to_s.gsub(/(^|_)([a-z])/) {$2.upcase}}", *values)
+    end
   end
+ end
+
+ View.add_constant_conversion :wrap_content, ViewGroup::LayoutParams::WRAP_CONTENT
+ View.add_constant_conversion :fill_parent,  ViewGroup::LayoutParams::FILL_PARENT
 end
 
-class ListView
-  attr_reader :adapter, :adapter_list
+#############################################################################
+#
+# Special widget setup
+#
 
-  def configure(context, params = {})
-    if params.has_key? :list
-      @adapter_list = ArrayList.new
-      @adapter_list.addAll(params[:list])
-      @adapter = ArrayAdapter.new(context, R::layout::simple_list_item_1, @adapter_list)
-      setAdapter @adapter
-      params.delete :list
+def setup_linear_layout
+  LinearLayout.setup_constant_conversion
+end
+
+def setup_relative_layout
+  RelativeLayout.setup_constant_conversion
+end
+
+def setup_button
+  Button.class_eval do
+    def configure(context, params = {})
+      setOnClickListener(context)
+      super(context, params)
     end
-    setOnItemClickListener(context)
-    super(context, params)
   end
 
-  def reload_list(list)
-    @adapter_list.clear();
-    @adapter_list.addAll(list)
-    @adapter.notifyDataSetChanged
-    invalidate
-  end
+  ruboto_register_handler("org.ruboto.callbacks.RubotoOnClickListener", "click", Button, "setOnClickListener")
 end
 
-class Button
-  def configure(context, params = {})
-    setOnClickListener(context)
-    super(context, params)
+def setup_list_view
+  ListView.class_eval do
+    attr_reader :adapter, :adapter_list
+
+    def configure(context, params = {})
+      if params.has_key? :list
+        @adapter_list = Java::java.util.ArrayList.new
+        @adapter_list.addAll(params[:list])
+        @adapter = Java::android.widget.ArrayAdapter.new(context, R::layout::simple_list_item_1, @adapter_list)
+        setAdapter @adapter
+        params.delete :list
+      end
+      setOnItemClickListener(context)
+      super(context, params)
+    end
+
+    def reload_list(list)
+      @adapter_list.clear();
+      @adapter_list.addAll(list)
+      @adapter.notifyDataSetChanged
+      invalidate
+    end
   end
+
+  ruboto_register_handler("org.ruboto.callbacks.RubotoOnItemClickListener", "item_click", ListView, "setOnItemClickListener")
 end
 
 #############################################################################
@@ -373,9 +405,6 @@ def ruboto_register_handler(handler_class, unique_name, for_class, method_name)
   "
 end
 
-ruboto_register_handler("org.ruboto.callbacks.RubotoOnClickListener", "click", Button, "setOnClickListener")
-ruboto_register_handler("org.ruboto.callbacks.RubotoOnItemClickListener", "item_click", ListView, "setOnItemClickListener")
-
 #############################################################################
 #
 # RubotoPreferenceActivity Preference Generation
@@ -454,3 +483,27 @@ def setup_preferences
   @preferences_setup_complete = true
 end
 
+#############################################################################
+#############################################################################
+#
+# Final set up depending on globals
+#
+
+if $activity
+  java_import "org.ruboto.RubotoActivity"
+  setup_activity
+  ruboto_configure_activity(RubotoActivity)
+  ruboto_setup(RubotoActivity)
+  setup_view
+end
+
+if $service
+  java_import "org.ruboto.RubotoService"
+  ruboto_setup(RubotoService)
+end
+
+if $broadcast_receiver
+  java_import "org.ruboto.RubotoBroadcastReceiver"
+  ruboto_setup(RubotoBroadcastReceiver, "receive")
+end
+