ruboto-core 0.2.1 → 0.3.3

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Daniel Jackoway, Charles Nutter, Scott Moyer
+Copyright (c) 2011 Daniel Jackoway, Charles Nutter, Scott Moyer, Uwe Kubosch
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Gemfile.lock

@@ -2,11 +2,15 @@ GEM
   remote: http://rubygems.org/
   specs:
     arrayfields (4.7.4)
-    fattr (2.1.0)
+    chronic (0.6.2)
+    fattr (2.2.0)
     jruby-jars (1.6.3)
-    main (4.2.0)
-      arrayfields (>= 4.7.4)
-      fattr (>= 2.1.0)
+    main (4.7.3)
+      arrayfields (~> 4.7.4)
+      chronic (~> 0.6.2)
+      fattr (~> 2.2.0)
+      map (~> 4.3.0)
+    map (4.3.0)
 
 PLATFORMS
   java

data/README.md

@@ -40,7 +40,7 @@ Command-line Tools
 <a name="application_generator"></a>
 ### Application generator
 
-    $ ruboto gen app --package com.yourdomain.whatever --path path/to/where/you/want/the/app --name NameOfApp --target android-version --min_sdk another-android-version --activity MainActivityName
+    $ ruboto gen app --package com.yourdomain.whatever --path path/to/where/you/want/the/app --name NameOfApp --target android-version --min-sdk another-android-version --activity MainActivityName
 Version values must be specified using'android-' and the sdk level number (e.g., android-8 is froyo).
 
 <a name="class_generator"></a>

data/Rakefile

@@ -1,14 +1,18 @@
 task :default => :gem
 
+desc "Generate a gem"
 task :gem do
   `gem build ruboto-core.gemspec`
 end
 
+desc "Push the gem to RubyGems"
 task :release do
   sh "gem push #{Dir['ruboto-core-*.gem'][-1]}"
 end
 
+desc "Run the tests"
 task :test do
+  FileUtils.rm_rf Dir['tmp/RubotoTestApp_template*']
   Dir['test/*_test.rb'].each do |f|
     require f.chomp('.rb')
   end

data/assets/Rakefile

@@ -3,32 +3,51 @@ require 'time'
 def manifest() @manifest ||= REXML::Document.new(File.read(MANIFEST_FILE)) end
 def package() manifest.root.attribute('package') end
 def build_project_name() @build_project_name ||= REXML::Document.new(File.read('build.xml')).elements['project'].attribute(:name).value end
-
-UPDATE_MARKER_FILE = File.expand_path(File.join('tmp', 'LAST_UPDATE'), File.dirname(__FILE__))
-BUNDLE_JAR = 'libs/bundle.jar'
-BUNDLE_PATH = 'tmp/bundle'
+def sdcard_path() @sdcard_path ||= "/mnt/sdcard/Android/data/#{package}/files" end
+def app_files_path() @app_files_path ||= "/data/data/#{package}/files" end
 
 require 'rake/clean'
 require 'rexml/document'
 
-jars = Dir['libs/*.jar']
-stdlib             = jars.grep(/stdlib/).first #libs/jruby-stdlib-VERSION.jar
-jruby_jar          = jars.grep(/core/).first   #libs/jruby-core-VERSION.jar
-MANIFEST_FILE      = 'AndroidManifest.xml'
-APK_FILE           = "bin/#{build_project_name}-debug.apk"
+UPDATE_MARKER_FILE = File.expand_path(File.join('tmp', 'LAST_UPDATE'), File.dirname(__FILE__))
+BUNDLE_JAR         = File.expand_path 'libs/bundle.jar'
+BUNDLE_PATH        = File.expand_path 'tmp/bundle'
+MANIFEST_FILE      = File.expand_path 'AndroidManifest.xml'
+RUBOTO_CONFIG_FILE = File.expand_path 'ruboto.yml'
+GEM_FILE           = File.expand_path('Gemfile.apk')
+APK_FILE           = File.expand_path "bin/#{build_project_name}-debug.apk"
+TEST_APK_FILE      = File.expand_path "test/bin/#{build_project_name}Test-debug.apk"
+JRUBY_JARS         = Dir[File.expand_path 'libs/jruby-*.jar']
+RESOURCE_FILES     = Dir[File.expand_path 'res/**/*']
+JAVA_SOURCE_FILES  = Dir[File.expand_path 'src/**/*.java']
 
 CLEAN.include('tmp', 'bin')
 
 task :default => :debug
 
-desc 'build debug package'
-task :debug => [BUNDLE_JAR, :mark_update] do
-  sh 'ant debug'
+file JRUBY_JARS => RUBOTO_CONFIG_FILE do
+  next unless File.exists? RUBOTO_CONFIG_FILE
+  jruby_jars_mtime = JRUBY_JARS.map{|f| File.mtime(f)}.min
+  ruboto_yml_mtime = File.mtime(RUBOTO_CONFIG_FILE)
+  next if jruby_jars_mtime > ruboto_yml_mtime
+  puts '*' * 80
+  if JRUBY_JARS.empty?
+    puts '  The JRuby jars are missing.'
+  else
+    puts "  The JRuby jars need reconfiguring after changes to #{RUBOTO_CONFIG_FILE}"
+    puts "  #{RUBOTO_CONFIG_FILE}: #{ruboto_yml_mtime}"
+    puts "  #{JRUBY_JARS.join(', ')}: #{jruby_jars_mtime}"
+  end
+  puts '  Run "ruboto update jruby" to regenerate the JRuby jars'
+  puts '*' * 80
 end
 
+desc 'build debug package'
+task :debug => APK_FILE
+
 desc "build package and install it on the emulator or device"
-task :install => [BUNDLE_JAR, :mark_update] do
-  sh 'ant install'
+task :install => APK_FILE do
+  install_apk
 end
 
 task :tag => :release do
@@ -59,67 +78,81 @@ task :emulator do
   system 'emulator -partition-size 1024 -avd Android_3.0'
 end
 
-task :start_app do
+task :start do
   `adb shell am start -a android.intent.action.MAIN -n #{package}/.#{main_activity}`
 end
 
-task :stop_app do
+task :stop do
   `adb shell ps | grep #{package} | awk '{print $2}' | xargs adb shell kill`
 end
 
 desc 'Restart the application'
-task :restart => [:stop_app, :start_app]
+task :restart => [:stop, :start]
 
 task :uninstall do
-  puts "Uninstalling package #{package}"
-  system "adb uninstall #{package}"
+  uninstall_apk
 end
 
 namespace :install do
   desc 'Uninstall, build, and install the application'
-  task :clean => [:uninstall, :install]
-
-  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
+  task :clean => [:uninstall, APK_FILE, :install]
 end
 
 file MANIFEST_FILE
+file RUBOTO_CONFIG_FILE
+
+file APK_FILE => [MANIFEST_FILE, RUBOTO_CONFIG_FILE, BUNDLE_JAR] + JRUBY_JARS + JAVA_SOURCE_FILES + RESOURCE_FILES do |t|
+  if File.exist?(APK_FILE)
+    changed_prereqs = t.prerequisites.select do |p|
+      File.exist?(p) && !Dir[p].empty? && Dir[p].map{|f| File.mtime(f)}.max > File.mtime(APK_FILE)
+    end
 
-file APK_FILE => MANIFEST_FILE do
-  puts "#{MANIFEST_FILE} changed.  Forcing rebuild of #{APK_FILE}."
-  Rake::Task['install:clean'].invoke
+    if changed_prereqs.empty?
+      puts
+      puts 'skipping'
+      puts
+      next
+    end
+    changed_prereqs.each{|f| puts "#{f} changed."}
+    puts "Forcing rebuild of #{APK_FILE}."
+  end
+  sh 'ant debug'
 end
 
 desc 'Copy scripts to emulator or device'
-task :update_scripts => [BUNDLE_JAR, APK_FILE] do
-  sdcard_path = "/mnt/sdcard/Android/data/#{package}/files"
-  app_files_path = "/data/data/#{package}/files"
-  if package_installed? && device_path_exists?(sdcard_path)
-    puts 'Pushing files to apk public file area.'
+task :update_scripts do
+  if device_path_exists?(sdcard_path)
+    data_dir_name = 'public'
     data_dir = sdcard_path
-  elsif package_installed? && device_path_exists?(app_files_path)
-    puts 'Pushing files to apk private file area.'
+  elsif device_path_exists?(app_files_path)
+    data_dir_name = 'private'
     data_dir = app_files_path
   else
     puts 'Cannot find the scripts directory on the device.'
-    puts 'If you have a non-rooted device, you need to add'
-    puts %q{    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />}
-    puts 'to the AndroidManifest.xml file to enable the update_scripts rake task.'
+    unless manifest.root.elements["uses-permission[@android:name='android.permission.WRITE_EXTERNAL_STORAGE']"]
+      puts 'If you have a non-rooted device, you need to add'
+      puts %q{    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />}
+      puts 'to the AndroidManifest.xml file to enable the update_scripts rake task.'
+    end
     puts "Reverting to uninstalling and re-installing the apk."
-    Rake::Task['install:clean'].invoke
+    Rake::Task[:uninstall].reenable
+    Rake::Task[:uninstall].invoke
+    FileUtils.rm_f APK_FILE
+    Rake::Task[APK_FILE].reenable
+    Rake::Task[APK_FILE].invoke
+    Rake::Task[:install].reenable
+    Rake::Task[:install].invoke
     next
   end
+  Rake::Task['install'].invoke
+  puts "Pushing files to apk #{data_dir_name} file area."
   last_update = File.exists?(UPDATE_MARKER_FILE) ? Time.parse(File.read(UPDATE_MARKER_FILE)) : Time.parse('1970-01-01T00:00:00')
   Dir.chdir('assets') do
     ['scripts'].each do |asset_dir|
       Dir["#{asset_dir}/*"].each do |asset_file|
         next if File.directory? asset_file
-        next if File.ctime(asset_file) < last_update
+        next if File.mtime(asset_file) < last_update
+        next if asset_file =~ /~$/
         print "#{asset_file}: " ; $stdout.flush
         `adb push #{asset_file} #{data_dir}/#{asset_file}`
       end
@@ -130,13 +163,13 @@ end
 
 namespace :update_scripts do
   desc 'Copy scripts to emulator and restart the app'
-  task :restart => [:stop_app, :update_scripts, :start_app]
+  task :restart => [:stop, :update_scripts, :start]
 end
 
 task :update_test_scripts do
   test_scripts_path = "/data/data/#{package}.tests/files/scripts"
   # TODO(uwe): Investigate if we can just push the scripts instead of building and installing the instrumentation APK
-  if false && package_installed?(true) && device_path_exists?(test_scripts_path)
+  if package_installed?(true) && device_path_exists?(test_scripts_path)
     Dir['test/assets/scripts/*.rb'].each do |script|
       print "#{script}: " ; $stdout.flush
       `adb push #{script} #{test_scripts_path}`
@@ -166,15 +199,15 @@ namespace :test do
   end
 end
 
-file 'Gemfile'
+file GEM_FILE
 
 desc 'Generate bundle jar from Gemfile'
-file BUNDLE_JAR => 'Gemfile' do
-  next unless File.exists? 'Gemfile'
+file BUNDLE_JAR => GEM_FILE do
+  next unless File.exists? GEM_FILE
   puts "Generating #{BUNDLE_JAR}"
 
   FileUtils.mkdir_p BUNDLE_PATH
-  sh "bundle install --path=#{BUNDLE_PATH}"
+  sh "bundle install --gemfile #{GEM_FILE} --path=#{BUNDLE_PATH}"
 
   # FIXME(uwe):  Should not be necessary.  ARJDBC should not offer the same files as AR.
 
@@ -210,6 +243,25 @@ end
     EOF
     replace_faulty_code(faulty_file, faulty_code)
   end
+  # FIXME end
+
+  # Expand JARs
+  Dir.chdir "#{BUNDLE_PATH}/ruby/1.8/gems" do
+    Dir['*'].each do |gem_lib|
+      next if gem_lib =~ /jdbc-sqlite/
+      Dir.chdir "#{gem_lib}/lib" do
+        Dir['**/*.jar'].each do |jar|
+          puts "Expanding #{gem_lib} #{jar} into #{BUNDLE_JAR}"
+
+          `jar xf #{jar}`
+          FileUtils.rm_f(jar)
+          # FileUtils.touch(jar + '.rb')
+          # FileUtils.touch(jar.chomp('jar') + 'rb')
+        end
+      end
+    end
+  end
+
 
   FileUtils.rm_f BUNDLE_JAR
   Dir["#{BUNDLE_PATH}/ruby/1.8/gems/*"].each_with_index do |gem_dir, i|
@@ -220,15 +272,15 @@ end
   Rake::Task['install'].invoke
 end
 
-task :mark_update do
-  mark_update
-end
-
 # Methods
 
-def mark_update
+def mark_update(time = Time.now)
   FileUtils.mkdir_p File.dirname(UPDATE_MARKER_FILE)
-  File.open(UPDATE_MARKER_FILE, 'w'){|f| f << Time.now.iso8601}
+  File.open(UPDATE_MARKER_FILE, 'w'){|f| f << time.iso8601}
+end
+
+def clear_update
+  FileUtils.rm_f UPDATE_MARKER_FILE
 end
 
 def strings(name)
@@ -246,22 +298,24 @@ def main_activity() manifest.root.elements['application'].elements["activity[@an
 def device_path_exists?(path)
   path_output =`adb shell ls #{path}`
   result = path_output.chomp !~ /No such file or directory|opendir failed, Permission denied/
-  puts "Checking path on device: #{path}: #{result || path_output}"
   result
 end
 
 def package_installed? test = false
   package_name = "#{package}#{'.tests' if test}"
-  app_paths = ['', '-0', '-1', '-2'].map{|i| "/data/app/#{package_name}#{i}.apk"}
-  path_outputs = app_paths.map{|p| `adb shell ls #{p}`.chomp}
-  path_outputs.each_with_index do |o, i|
-    if o == app_paths[i]
-      puts "Found package #{app_paths[i]}"
-      return true
+  ['', '-0', '-1', '-2'].each do |i|
+    p = "/data/app/#{package_name}#{i}.apk"
+    o = `adb shell ls -l #{p}`.chomp
+    if o =~ /^-rw-r--r-- system\s+system\s+(\d+) \d{4}-\d{2}-\d{2} \d{2}:\d{2} #{File.basename(p)}$/
+      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
-  puts "Package not found: #{package_name}"
-  return false
+  return nil
 end
 
 private
@@ -280,3 +334,25 @@ def replace_faulty_code(faulty_file, faulty_code)
     puts "Could not find expected faulty code\n\n#{faulty_code}\n\nin file #{faulty_file}\n\n#{old_code}\n\n"
   end
 end
+
+def install_apk
+  case package_installed?
+  when true
+    puts "Package already installed."
+    return
+  when false
+    puts "Package installed, but of wrong size."
+  end
+  sh 'ant ruboto-install-debug'
+  clear_update
+end
+
+def uninstall_apk
+  return if package_installed?.nil?
+  puts "Uninstalling package #{package}"
+  system "adb uninstall #{package}"
+  if $? != 0 && package_installed?
+    puts "Uninstall failed exit code #{$?}"
+    exit $?
+  end
+end

data/assets/assets/scripts/ruboto.rb

@@ -197,8 +197,9 @@ def ruboto_configure_activity(klass)
 
       p = Proc.new do |num, menu_item|
         # handles a problem where this is called for context items
-        # JRUBY-5866 JRuby can't access nested Java class if the class is called 'id'
-        unless @just_processed_context_item == menu_item || menu_item.item_id == JavaUtilities.get_proxy_class('android.R$id').home
+        # TODO(uwe): JRUBY-5866 JRuby can't access nested Java class if the class is called 'id'
+        # TODO(uwe): Remove check for SDK version when we stop supporting api level < 11
+        unless @just_processed_context_item == menu_item || (android.os.Build::VERSION::SDK_INT >= 11 && menu_item.item_id == AndroidIds.home)
           instance_eval &(menu_item.on_click)
           @just_processed_context_item = nil
           true
@@ -599,27 +600,17 @@ def setup_preferences
   @preferences_setup_complete = true
 end
 
-#############################################################################
-#############################################################################
-#
-# Final set up depending on globals
-#
-# TODO(uwe): I think ruboto.rb should not contain any conditions so it does not matter when it is required.
-# TODO(uwe): Remove the commented lines after checking with Scott.
-# 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
+# Setup activity support
+java_import "org.ruboto.RubotoActivity"
+setup_activity
+ruboto_configure_activity(RubotoActivity)
+ruboto_setup(RubotoActivity)
+setup_view
+
+# setup service support
+java_import "org.ruboto.RubotoService"
+ruboto_setup(RubotoService)
+
+# setup broadcast receiver support
+java_import "org.ruboto.RubotoBroadcastReceiver"
+ruboto_setup(RubotoBroadcastReceiver, "receive")

data/assets/src/RubotoActivity.java

@@ -127,11 +127,13 @@ THE_CONSTANTS
     } else {
       try {
           new Script(scriptName).execute();
+          /* TODO(uwe): Add a way to add callbacks from a class or just forward all calls to the instance
           rubyClassName = this.getClass().getSimpleName();
           if (getRuby().get(rubyClassName) != null) {
   		    rubyInstance = Script.exec(rubyClassName + ".new");
   		    getRuby().callMethod(rubyInstance, "on_create", configBundle);
           }
+          */
       } catch(IOException e){
         e.printStackTrace();
         ProgressDialog.show(this, "Script failed", "Something bad happened", true, true);