ruboto 0.11.0 → 0.12.0.rc.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruboto (0.11.0)
+    ruboto (0.12.0.dev)
       main (>= 4.7.2)
 
 GEM

data/README.md

@@ -42,7 +42,7 @@ Command-line Tools
 ### 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
-Version values must be specified using'android-' and the sdk level number (e.g., android-8 is froyo).
+Version values must be specified using'android-' and the sdk level number (e.g., android-10 is gingerbread).
 
 <a name="class_generator"></a>
 ### Class generator
@@ -165,7 +165,7 @@ You generate an app with the option `--activity FooActivity`, which means that r
 
 The arguments passed to the methods are the same as the arguments that the java methods take. Consult the Android documentation.
 
-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/blob/master/assets/src/ruboto.rb) where everything is defined.
+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-irb/blob/master/src/ruboto.rb) where everything is defined.
 
 Testing
 -------
@@ -231,12 +231,14 @@ Tips & Tricks
 
 ### Emulators
 
+You can start an emulator corresponding to the api level of your project with `rake emulator`.  The emulator will be created for you and will be called after the android version of you rproject, like "Android_4.0.3".
+
 If you're doing a lot of Android development, you'll probably find yourself typing `emulator -avd name_of_emulator` a lot to open emulators. It can be convenient to alias these to shorter commands.
 
 For example, in your `~/.bashrc`, `~/.zshrc`, or similar file, you might put
-    alias eclair="emulator -avd eclair"
-    alias froyo="emulator -avd froyo"
-If you have an "eclair" emulator that runs Android 2.1 and a "froyo" one that runs Android 2.2.
+    alias ics="emulator -avd Android_4.0.3"
+    alias jellyb="emulator -avd Android_4.1.2"
+If you have an "Android_4.0.3" emulator that runs Android 4..0.1 and a "Android_4.1.2" one that runs Android 4.1.2.
 
 
 Alternatives

data/Rakefile

@@ -4,6 +4,7 @@ require 'rexml/document'
 require 'ruboto/version'
 require 'ruboto/description'
 require 'ruboto/sdk_versions'
+require 'ruboto/sdk_locations'
 require 'uri'
 require 'net/https'
 
@@ -15,7 +16,7 @@ PLATFORM_CURRENT_RELEASE_APK = File.expand_path('tmp/RubotoCore-release.apk', Fi
 MANIFEST_FILE = 'AndroidManifest.xml'
 GEM_FILE = "ruboto-#{Ruboto::VERSION}.gem"
 GEM_SPEC_FILE = 'ruboto.gemspec'
-EXAMPLE_FILE = File.expand_path("examples/RubotoTestApp_#{Ruboto::VERSION}_tools_r#{Ruboto::SdkVersions::ANDROID_TOOLS_REVISION}.tgz", File.dirname(__FILE__))
+EXAMPLE_FILE = File.expand_path("examples/RubotoTestApp_#{Ruboto::VERSION}_tools_r#{Ruboto::SdkLocations::ANDROID_TOOLS_REVISION}.tgz", File.dirname(__FILE__))
 
 CLEAN.include('ruboto-*.gem', 'tmp')
 
@@ -330,11 +331,9 @@ namespace :platform do
   desc 'Download the current RubotoCore platform release apk'
   file PLATFORM_CURRENT_RELEASE_APK do
     puts 'Downloading the current RubotoCore platform release apk'
-    uri = URI('https://raw.github.com/ruboto/ruboto-core/master/dist/RubotoCore-release.apk')
+    uri = URI('http://ruboto.org/downloads/RubotoCore-release.apk')
     begin
       http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       content = http.request(Net::HTTP::Get.new(uri.request_uri)).body
       File.open(PLATFORM_CURRENT_RELEASE_APK, 'w') { |f| f << content }
     rescue Exception, SystemExit

data/assets/rakelib/ruboto.rake

@@ -4,6 +4,7 @@ require 'time'
 require 'rake/clean'
 require 'rexml/document'
 require 'timeout'
+require 'net/telnet'
 
 ON_WINDOWS = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw/i)
 
@@ -42,18 +43,34 @@ new_dx_content = File.read(dx_filename).dup
 # set defaultXmx=-Xmx1024M
 
 xmx_pattern = /^defaultMx="-Xmx(\d+)(M|m|G|g|T|t)"/
+MINIMUM_DX_HEAP_SIZE = 2048
 if new_dx_content =~ xmx_pattern &&
-    ($1.to_i * 1024 ** {'M' => 2, 'G' => 3, 'T' => 4}[$2.upcase]) < 2560*1024**2
-  puts "Increasing max heap space from #$1#$2 to 2560M in #{dx_filename}"
-  new_dx_content.sub!(xmx_pattern, 'defaultMx="-Xmx2560M"')
+    ($1.to_i * 1024 ** {'M' => 2, 'G' => 3, 'T' => 4}[$2.upcase]) < MINIMUM_DX_HEAP_SIZE*1024**2
+  puts "Increasing max heap space from #$1#$2 to #{MINIMUM_DX_HEAP_SIZE}M in #{dx_filename}"
+  new_dx_content.sub!(xmx_pattern, %Q{defaultMx="-Xmx#{MINIMUM_DX_HEAP_SIZE}M"})
   File.open(dx_filename, 'w') { |f| f << new_dx_content } rescue puts "\n!!! Unable to increase dx heap size !!!\n\n"
+  puts new_dx_content.lines.grep(xmx_pattern)
 end
 
-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
-def scripts_path; @sdcard_path ||= "/mnt/sdcard/Android/data/#{package}/files/scripts" end
-def app_files_path; @app_files_path ||= "/data/data/#{package}/files" end
+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
+
+def scripts_path;
+  @sdcard_path ||= "/mnt/sdcard/Android/data/#{package}/files/scripts"
+end
+
+def app_files_path;
+  @app_files_path ||= "/data/data/#{package}/files"
+end
 
 PROJECT_DIR = File.expand_path('..', File.dirname(__FILE__))
 UPDATE_MARKER_FILE = File.join(PROJECT_DIR, 'bin', 'LAST_UPDATE')
@@ -63,7 +80,7 @@ MANIFEST_FILE = File.expand_path 'AndroidManifest.xml'
 PROJECT_PROPS_FILE = File.expand_path 'project.properties'
 RUBOTO_CONFIG_FILE = File.expand_path 'ruboto.yml'
 GEM_FILE = File.expand_path 'Gemfile.apk'
-GEM_LOCK_FILE = File.expand_path 'Gemfile.apk.lock'
+GEM_LOCK_FILE = "#{GEM_FILE}.lock"
 RELEASE_APK_FILE = File.expand_path "bin/#{build_project_name}-release.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"
@@ -74,6 +91,10 @@ 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) ? File.expand_path(key_store.chomp.sub(/^key.store=/, '').sub('${user.home}', '~')) : "#{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
+APK_FILE_REGEXP = /^-rw-r--r--\s+(?:system|\d+\s+\d+)\s+(?:system|\d+)\s+(\d+)\s+(\d{4}-\d{2}-\d{2} \d{2}:\d{2}|\w{3} \d{2}\s+(?:\d{4}|\d{2}:\d{2}))\s+(.*)$/
+#                   -rw-r--r-- system   system    7487556 2013-04-21 14:01 org.ruboto.example.gps-1.apk
+#                   -rw-r--r--    1 1000     1000         59252 Aug 15  2010 /data/app/org.update_test-1.apk
+#                   -rw-r--r--    1 1000     1000         59265 Aug 15 01:11 /data/app/org.update2_test-1.apk
 
 CLEAN.include('bin', 'gen', 'test/bin', 'test/gen')
 
@@ -161,9 +182,9 @@ task :tag do
   sh 'git push origin master --tags'
 end
 
-desc 'Start the emulator with larger disk'
+desc 'Start the emulator'
 task :emulator do
-  start_emulator
+  start_emulator(sdk_level)
 end
 
 desc 'Start the application on the device/emulator.'
@@ -258,39 +279,44 @@ file BUNDLE_JAR => [GEM_FILE, GEM_LOCK_FILE] do
   next unless File.exists? GEM_FILE
   puts "Generating #{BUNDLE_JAR}"
   require 'bundler'
-  require 'bundler/vendored_thor'
-
-  # Store original RubyGems/Bundler environment
-  platforms = Gem.platforms
-  ruby_engine = defined?(RUBY_ENGINE) && RUBY_ENGINE
-  gem_paths = {'GEM_HOME' => Gem.path, 'GEM_PATH' => Gem.dir}
-
-  # Override RUBY_ENGINE (we can bundle from MRI for JRuby)
-  Gem.platforms = [Gem::Platform::RUBY, Gem::Platform.new('universal-java')]
-  Gem.paths = {'GEM_HOME' => BUNDLE_PATH, 'GEM_PATH' => BUNDLE_PATH}
-  old_verbose, $VERBOSE = $VERBOSE, nil
-  begin
-    Object.const_set('RUBY_ENGINE', 'jruby')
-  ensure
-    $VERBOSE = old_verbose
-  end
+  if Gem::Version.new(Bundler::VERSION) <= Gem::Version.new('1.3.5')
+    require 'bundler/vendored_thor'
+
+    # Store original RubyGems/Bundler environment
+    platforms = Gem.platforms
+    ruby_engine = defined?(RUBY_ENGINE) && RUBY_ENGINE
+    gem_paths = {'GEM_HOME' => Gem.path, 'GEM_PATH' => Gem.dir}
+
+    # Override RUBY_ENGINE (we can bundle from MRI for JRuby)
+    Gem.platforms = [Gem::Platform::RUBY, Gem::Platform.new("universal-dalvik-#{sdk_level}"), Gem::Platform.new('universal-java')]
+    Gem.paths = {'GEM_HOME' => BUNDLE_PATH, 'GEM_PATH' => BUNDLE_PATH}
+    old_verbose, $VERBOSE = $VERBOSE, nil
+    begin
+      Object.const_set('RUBY_ENGINE', 'jruby')
+    ensure
+      $VERBOSE = old_verbose
+    end
 
-  ENV['BUNDLE_GEMFILE'] = GEM_FILE
-  Bundler.ui = Bundler::UI::Shell.new
-  Bundler.bundle_path = Pathname.new BUNDLE_PATH
-  definition = Bundler.definition
-  definition.validate_ruby!
-  Bundler::Installer.install(Bundler.root, definition)
+    ENV['BUNDLE_GEMFILE'] = GEM_FILE
+    Bundler.ui = Bundler::UI::Shell.new
+    Bundler.bundle_path = Pathname.new BUNDLE_PATH
+    definition = Bundler.definition
+    definition.validate_ruby!
+    Bundler::Installer.install(Bundler.root, definition)
 
-  # Restore RUBY_ENGINE (limit the scope of this hack)
-  old_verbose, $VERBOSE = $VERBOSE, nil
-  begin
-    Object.const_set('RUBY_ENGINE', ruby_engine)
-  ensure
-    $VERBOSE = old_verbose
+    # Restore RUBY_ENGINE (limit the scope of this hack)
+    old_verbose, $VERBOSE = $VERBOSE, nil
+    begin
+      Object.const_set('RUBY_ENGINE', ruby_engine)
+    ensure
+      $VERBOSE = old_verbose
+    end
+    Gem.platforms = platforms
+    Gem.paths = gem_paths
+  else
+    # Bundler.settings[:platform] = Gem::Platform::DALVIK
+    sh "bundle install --gemfile #{GEM_FILE} --path=#{BUNDLE_PATH} --platform=dalvik#{sdk_level}"
   end
-  Gem.platforms = platforms
-  Gem.paths = gem_paths
 
   gem_paths = Dir["#{BUNDLE_PATH}/gems"]
   raise 'Gem path not found' if gem_paths.empty?
@@ -482,36 +508,41 @@ end
 # Return nil if the package is not installed.
 def package_installed?(test = false)
   package_name = "#{package}#{'.tests' if test}"
-  %w( -0 -1 -2).each do |i|
-    path = "/data/app/#{package_name}#{i}.apk"
-    o = `adb shell ls -l #{path}`.chomp
-    if o =~ /^-rw-r--r-- system\s+system\s+(\d+)\s+(\d{4}-\d{2}-\d{2} \d{2}:\d{2})\s+#{File.basename(path)}$/
-      installed_apk_size = $1.to_i
-      installed_timestamp = Time.parse($2)
-      apk_file = test ? TEST_APK_FILE : APK_FILE
-      if !File.exists?(apk_file) || (installed_apk_size == File.size(apk_file) &&
-          installed_timestamp >= File.mtime(apk_file))
-        return true
-      else
-        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+)\s+(\d{4}-\d{2}-\d{2} \d{2}:\d{2})\s+#{File.basename(sdcard_path)}$/
-      installed_apk_size = $1.to_i
-      installed_timestamp = Time.parse($2)
-      apk_file = test ? TEST_APK_FILE : APK_FILE
-      if !File.exists?(apk_file) || (installed_apk_size == File.size(apk_file) &&
-          installed_timestamp >= File.mtime(apk_file))
-        return true
-      else
-        return false
-      end
-    end
+  loop do
+    path_line = `adb shell pm path #{package_name}`.chomp
+
+    # FIXME(uwe): Debug travis CI.  Remove when Travis CI is OK.
+    puts '*' * 80
+    puts 'Output from pm path'
+    puts '*' * 80
+    puts $?.inspect
+    puts '*' * 80
+    puts path_line
+    puts '*' * 80
+    # EMXIF
+
+    return nil if $? == 0 && path_line.empty?
+    break if $? == 0 && path_line =~ /^package:(.*)$/
+
+    # FIXME(uwe): Debug travis CI.  Remove when Travis CI is OK.
+    puts '*' * 80
+    puts 'Unexpected output from pm path'
+    puts '*' * 80
+    puts path_line
+    puts '*' * 80
+    # EMXIF
+
+    sleep 0.5
   end
-  nil
+
+  path = $1
+  o = `adb shell ls -l #{path}`.chomp
+  raise "Unexpected ls output: #{o}" if o !~ APK_FILE_REGEXP
+  installed_apk_size = $1.to_i
+  installed_timestamp = Time.parse($2)
+  apk_file = test ? TEST_APK_FILE : APK_FILE
+  !File.exists?(apk_file) || (installed_apk_size == File.size(apk_file) &&
+      installed_timestamp >= File.mtime(apk_file))
 end
 
 def replace_faulty_code(faulty_file, faulty_code)
@@ -542,6 +573,8 @@ def build_apk(t, release)
   if release
     sh "#{ANT_CMD} release"
   else
+    p RbConfig::CONFIG['host_os']
+    sh 'free' if RbConfig::CONFIG['host_os'] =~ /linux/
     sh "#{ANT_CMD} debug"
   end
   true
@@ -561,7 +594,7 @@ def install_apk
     install_retry_count = 0
     begin
       timeout 120 do
-        output = `adb install -r #{APK_FILE} 2>&1`
+        output = `adb install -r "#{APK_FILE}" 2>&1`
       end
     rescue Timeout::Error
       puts "Installing package #{package} timed out."
@@ -571,7 +604,7 @@ def install_apk
         retry
       end
       puts 'Trying one final time to install the package:'
-      output = `adb install -r #{APK_FILE} 2>&1`
+      output = `adb install -r "#{APK_FILE}" 2>&1`
     end
     if $? == 0 && output !~ failure_pattern && output =~ success_pattern
       clear_update
@@ -594,7 +627,7 @@ def install_apk
   install_retry_count = 0
   begin
     timeout 120 do
-      output = `adb install #{APK_FILE} 2>&1`
+      output = `adb install "#{APK_FILE}" 2>&1`
     end
   rescue Timeout::Error
     puts "Installing package #{package} timed out."
@@ -604,7 +637,7 @@ def install_apk
       retry
     end
     puts 'Trying one final time to install the package:'
-    output = `adb install #{APK_FILE} 2>&1`
+    output = `adb install "#{APK_FILE}" 2>&1`
   end
   puts output
   raise "Install failed (#{$?}) #{$1 ? "[#$1}]" : output}" if $? != 0 || output =~ failure_pattern || output !~ success_pattern
@@ -646,7 +679,7 @@ def stop_app
   output !~ /Operation not permitted/
 end
 
-def start_emulator
+def start_emulator(sdk_level)
   STDOUT.sync = true
   # FIXME(uwe):  Use RBConfig instead
   if `uname -m`.chomp == 'x86_64'
@@ -654,7 +687,7 @@ def start_emulator
   else
     emulator_cmd = 'emulator-arm'
   end
-  
+
   emulator_opts = '-partition-size 256'
   if ENV['DISPLAY'].nil?
     emulator_opts << ' -no-window -no-audio'
@@ -662,6 +695,24 @@ def start_emulator
 
   avd_name = "Android_#{sdk_level_name}"
   new_snapshot = false
+
+  if `adb devices` =~ /emulator-5554/
+    t = Net::Telnet.new('Host' => 'localhost', 'Port' => 5554, 'Prompt' => /^OK/)
+    output = ''
+    t.cmd('avd name') { |c| output << c }
+    if output =~ /OK\n(.*)\nOK/
+      running_avd_name = $1
+      if running_avd_name == avd_name
+        puts "Emulator #{avd_name} is already running."
+        return
+      else
+        puts "Emulator #{running_avd_name} is running."
+      end
+    else
+      puts 'No emulator is running.'
+    end
+  end
+
   loop do
     `killall -0 #{emulator_cmd} 2> /dev/null`
     if $? == 0
@@ -703,10 +754,10 @@ def start_emulator
       `sed -i.bak -e "s/vm.heapSize=[0-9]*/vm.heapSize=#{heap_size}/" #{ENV['HOME']}/.android/avd/#{avd_name}.avd/config.ini`
       new_snapshot = true
     end
-  
+
     puts 'Start emulator'
     system "emulator -avd #{avd_name} #{emulator_opts} &"
-  
+
     3.times do |i|
       sleep 1
       `killall -0 #{emulator_cmd} 2> /dev/null`
@@ -716,7 +767,7 @@ def start_emulator
       if i == 3
         print 'Waiting for emulator: ...'
       elsif i > 3
-          print '.'
+        print '.'
       end
     end
     puts
@@ -733,12 +784,12 @@ def start_emulator
         if i == 3
           print 'Waiting for emulator: ...'
         elsif i > 3
-            print '.'
+          print '.'
         end
         sleep 1
       end
     end
-  
+
     `killall -0 #{emulator_cmd} 2> /dev/null`
     if $? == 0
       print 'Emulator started: '
@@ -761,8 +812,8 @@ def start_emulator
     puts 'Allow the emulator to calm down a bit.'
     sleep 15
   end
-  
-  system %Q{(
+
+  system '(
     set +e
     for i in 1 2 3 4 5 6 7 8 9 10 ; do
       sleep 6
@@ -777,9 +828,9 @@ def start_emulator
     echo "Failed to unlock screen"
     set -e
     exit 1
-  ) &}
-  
-  system "adb logcat > adb_logcat.log &"
-  
+  ) &'
+
+  system 'adb logcat > adb_logcat.log &'
+
   puts "Emulator #{avd_name} started OK."
 end

data/assets/samples/sample_broadcast_receiver.rb

@@ -1,7 +1,7 @@
 import android.util.Log
 
 class SampleBroadcastReceiver
-  # will get called whenever the BroadcastReceiver receives an intent (whenever onReceive is called)
+  # Will get called whenever the BroadcastReceiver receives an intent.
   def onReceive(context, intent)
     Log.v 'SampleBroadcastReceiver', 'Broadcast received!'
     Log.v 'SampleBroadcastReceiver', intent.getExtras.to_s