ruboto 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99baa768052a043076db03f4d9598cf9d076bf2e
-  data.tar.gz: 3bf07e86b7f41a0cbba8dd9d6f02e750f31ee9ab
+  metadata.gz: c968343b3a48179ec48fecd316b53fa63ad49e49
+  data.tar.gz: 2a00ac4f9378a4ea037519665d94dee920b0b076
 SHA512:
-  metadata.gz: f7bd276940850a60b549e140bb7eec8b2e2932c20a31a318034d831e74a46ea50221fbdb133e924cdc1598d73fe670af0ed2ef86da30dc84bf0b3eebf13bc1f4
-  data.tar.gz: 493aa40906f9100157163398355975c5570c3aa210eb7f6816c8413006bed929fca0fcf90841fde123643786d7d90a7d40b55a7b72134518c8a54fc9e913586f
+  metadata.gz: 7beb90cd29d1041a36f2d657023dafc8ac6869ab94532eef8123dddd00fac65f7695747914b0b1549b30284cc9036167545f35c428d3d21637c8bc7f00f52ca2
+  data.tar.gz: ca14e4d1b2bb0c2a49f809b5211e476deb03a4630d55b3aee0109afb2b19f2c2b8f008d63e10f4e760ef41fbca0f4d3aa205113dd4098c0ac3d195eeec356bab

data/Gemfile

@@ -1,2 +1,2 @@
-source 'https://rubygems.org/'
+source 'http://rubygems.org/'
 gemspec

data/Gemfile.lock

@@ -1,18 +1,16 @@
 PATH
   remote: .
   specs:
-    ruboto (0.14.0.dev)
-      jruby-jars
+    ruboto (0.15.0)
       main (>= 4.7.2)
       rake
 
 GEM
-  remote: https://rubygems.org/
+  remote: http://rubygems.org/
   specs:
     arrayfields (4.9.0)
-    chronic (0.9.1)
+    chronic (0.10.2)
     fattr (2.2.1)
-    jruby-jars (1.7.4)
     main (5.2.0)
       arrayfields (>= 4.7.4)
       chronic (>= 0.6.2)

data/README.md

@@ -199,17 +199,19 @@ your favorite text editor. If you want an activity that does nothing but Log
 when it gets launched and when it gets destroyed (in the onCreate and onPause
 methods). You want your script to look like this:
 
-    class FooActivity
-      def onCreate(bundle)
-        super
-        android.util.Log.v 'MYAPPNAME', 'onCreate got called!'
-      end
-
-      def onPause
-        super
-        android.util.Log.v 'MYAPPNAME', 'onPause got called!'
-      end
-    end
+```ruby
+class FooActivity
+  def onCreate(bundle)
+    super
+    android.util.Log.v 'MYAPPNAME', 'onCreate got called!'
+  end
+
+  def onPause
+    super
+    android.util.Log.v 'MYAPPNAME', 'onPause got called!'
+  end
+end
+```
 
 The arguments passed to the methods are the same as the arguments that the java
 methods take. Consult the Android documentation.
@@ -234,27 +236,29 @@ 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
-
-    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
+```ruby
+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
 
@@ -328,10 +332,11 @@ commands.
 
 For example, in your `~/.bashrc`, `~/.zshrc`, or similar file, you might put
 
-    alias ics="ruboto emulator -t 15"
-    alias jellyb="ruboto emulator -t 16"
-    alias jb17="ruboto emulator -t 17"
-
+```sh
+alias ics="ruboto emulator -t 15"
+alias jellyb="ruboto emulator -t 16"
+alias jb17="ruboto emulator -t 17"
+```
 
 Alternatives
 ------------

data/RELEASE_CANDICATE_DOC

@@ -1,11 +1,18 @@
-Subject: [ANN] Ruboto 0.14.0 release candidate
+Subject: [ANN] Ruboto 0.15.0 release candidate
 
 Hi all!
 
-The Ruboto 0.14.0 release candidate is now available.
-
-In this release we change the startup to use a separate SplashActivity.
-This simplifies the startup and makes it more robust.
+The Ruboto 0.15.0 release candidate is now available.
+
+In this release we stabilize the new SplashActivity feature and introduce
+a new rapid development cycle.
+
+Using "rake update_scripts:reload" changed Ruby scripts are pushed to the
+device/emulator and an intent is broadcasted to reload the files inside
+the running app, and the currently displayed activity is restarted.
+
+The process should take just a few seconds and avoids the full
+build->transfer->restart cycle.
 
 As always we need your help and feedback to ensure the quality of the release.  Please install the release candidate using
 

data/RELEASE_DOC

@@ -1,6 +1,6 @@
-Subject: [ANN] Ruboto 0.14.0 released!
+Subject: [ANN] Ruboto 0.15.0 released!
 
-The Ruboto team is pleased to announce the release of Ruboto 0.14.0.
+The Ruboto team is pleased to announce the release of Ruboto 0.15.0.
 
 Ruboto (JRuby on Android) is a platform for developing full stand-alone
 apps for Android using the Ruby language and libraries.  It includes
@@ -8,73 +8,52 @@ support libraries and generators for creating projects, classes, tests,
 and more.  The complete APIs of Android, Java, and Ruby are available to
 you using the Ruby language.
 
-New in version 0.14.0:
+New in version 0.15.0:
 
-In this release we change the startup to use a separate SplashActivity.
-This simplifies the startup and makes it more robust.
+In this release we stabilize the new SplashActivity feature and introduce
+a new rapid development cycle.
+
+Using "rake update_scripts:reload" changed Ruby scripts are pushed to the
+device/emulator and an intent is broadcasted to reload the files inside
+the running app, and the currently displayed activity is restarted.
+
+The process should take just a few seconds and avoids the full
+build->transfer->restart cycle.
 
 Features:
 
-* Issue #433 Tests: add support for individual/matrix tests in Windows
-* Issue #460 New startup sequence with SplashActivity
-* Issue #471 Allow sending Intent extras with start_ruboto_activity
-* Issue #473 Modify EntryPointActivity to send an Intent to SplashActivity
+* Issue #12 Fast development with "rake update_scripts:reload"
+* Issue #461 Old API level files removed from repository as of 4.3
+* Issue #475 Reuse the original Intent when relaunching the user activity
+  after the SplashActivity has completed.
+* Issue #482 Better handling of "update_scripts" apk timestamp
+* Issue #486 Let "ruboto setup" download the latest version of a tool if
+  multiple versions exist.
 
 Bugfixes:
 
-* Issue #428 Splash requests window feature too late
-* Issue #429 ruboto emulator -t android-17 fails
-* Issue #432 'ruboto update app' leaves some old files behind
-* Issue #434 After JRuby is loaded, check the activity state before
-  calling onCreate
-* Issue #442 Adding splash.xml crashes app.
-* Issue #443 onCreateOptionsMenu (and other callbacks) not called on first
-  time startup
-* Issue #449 Change ruboto setup to use /linux/ instead of /^linux(.*)/
-* Issue #451 Changing device orientation during splash causes exception
-* Issue #453 Builds but fails to load ruby scripts on uppercase package
-  name
-* Issue #455 Rake install fails in ruboto-0.14.0-dev
-* Issue #468 Using the EntryPointActivity check in the RubotoActivity
-  template doesn't work for other activities like PreferencesActivity
-* Issue #470 "ruboto update app" deletes "src/ruboto/.svn" subversion
-  directory
+* Issue #174 Ensure APK is not rebuilt if only Ruby source has changed
+* Issue #452 Android SDK command dx Not found
+* Issue #481 New Splash fails to start on Android 2.3
+* Issue #490 ruboto setup
 
 Support:
 
-* Issue #446 Bad call from ruboto setup
-* Issue #450 Application aborts prematurely, when I add a Gemfile.apk
-
-Documentation:
-
-* Issue #225 Investigate AIDE
-* Issue #430 Add Downloads page to ruboto.org
+* Issue #469 Missing step in "Getting started": 1'. install GEMS
 
 Pull requests:
 
-* Issue #439 Fixes #432
-* Issue #440 Added check for compatible APIs for update examples: re issue
-  #437
-* Issue #444 Fix building on Windows caused by mixed file separators. Also
-  pre-compressed the included PNGs with optipng, despite included pngcrush
-  during rake for increased loseless file compression.
-* Issue #454 Fix android_package_directory for ones already installed
-  android sdk
-* Issue #457 Allow uppercase package name
-* Issue #462 Add SplashActivity for new startup sequence
-* Issue #463 New APK size upper limit in test/ruboto_gen_test
-* Issue #464 Fix #451 by locking screen orientation of SplashActivity
+* Issue #474 Longer 'Timeout' time of BOSS process
+* Issue #477 Add readme.MD syntax highlight.
 
 Internal:
 
-* Issue #436 Use "ruboto emulator" instead of start_emulator.sh when
-  running tests on travis-ci
-* Issue #437 test ruboto_update_test fails for old versions < 0.11.0
-* Issue #465 Adjust update scripts to the new JRuby mavenized packaging
+* Issue #487 Start testing against JRuby 9000
+* Issue #488 Start testing against JRuby 1.7.5
 
 You can find a complete list of issues here:
 
-* https://github.com/ruboto/ruboto/issues?state=closed&milestone=26
+* https://github.com/ruboto/ruboto/issues?state=closed&milestone=29
 
 
 Installation:

data/Rakefile

@@ -21,6 +21,8 @@ README_FILE = 'README.md'
 BLOG_DIR = "#{File.dirname PROJECT_DIR}/ruboto.github.com/_posts"
 RELEASE_BLOG = "#{BLOG_DIR}/#{Date.today}-Ruboto-#{Ruboto::VERSION}-release-doc.md"
 RELEASE_BLOG_GLOB = "#{BLOG_DIR}/*-Ruboto-#{Ruboto::VERSION}-release-doc.md"
+RELEASE_CANDIDATE_DOC = 'RELEASE_CANDICATE_DOC'
+RELEASE_DOC = 'RELEASE_DOC'
 
 CLEAN.include('ruboto-*.gem', 'tmp')
 
@@ -35,10 +37,10 @@ file GEM_FILE => GEM_SPEC_FILE do
 end
 
 task :install => :gem do
-  `gem query -i -n ^ruboto$ -v #{Ruboto::VERSION}`
+  `RUBYOPT= gem query -i -n ^ruboto$ -v #{Ruboto::VERSION}`
   if $? != 0
     puts 'Installing gem'
-    cmd = "gem install ruboto-#{Ruboto::VERSION}.gem"
+    cmd = "RUBYOPT= gem install ruboto-#{Ruboto::VERSION}.gem"
     output = `#{cmd}`
     if $? == 0
       puts output
@@ -51,10 +53,10 @@ task :install => :gem do
 end
 
 task :uninstall do
-  `gem query -i -n ^ruboto$ -v #{Ruboto::VERSION}`
+  `RUBYOPT= gem query -i -n ^ruboto$ -v #{Ruboto::VERSION}`
   if $? == 0
     puts 'Uninstalling gem'
-    cmd = "gem uninstall -x ruboto -v #{Ruboto::VERSION}"
+    cmd = "RUBYOPT= gem uninstall -x ruboto -v #{Ruboto::VERSION}"
     output = `#{cmd}`
     if $? == 0
       puts output
@@ -204,7 +206,8 @@ http://ruboto.org/
 EOF
 
   puts release_candidate_doc
-  File.write('RELEASE_CANDICATE_DOC', release_candidate_doc)
+  File.write(RELEASE_CANDIDATE_DOC, release_candidate_doc)
+  sh "git add -f #{RELEASE_CANDIDATE_DOC}"
 
   puts
   puts '=' * 80
@@ -278,7 +281,9 @@ title : Ruboto #{Ruboto::VERSION}
 layout: post
 ---
 EOF
-    File.write('RELEASE_DOC', release_doc)
+    File.write(RELEASE_DOC, release_doc)
+    sh "git add -f #{RELEASE_DOC}"
+    `git commit -m "* Added release doc for Ruboto #{Ruboto::VERSION}"`
     Dir.chdir BLOG_DIR do
       output = `git status --porcelain`
       old_blog_posts = Dir[RELEASE_BLOG_GLOB] - [RELEASE_BLOG]
@@ -447,6 +452,7 @@ namespace :platform do
       content = http.request(Net::HTTP::Get.new(uri.request_uri)).body
       File.open(PLATFORM_CURRENT_RELEASE_APK, 'wb') { |f| f << content }
     rescue Exception, SystemExit
+      puts "Download failed: #{$!}"
       FileUtils.rm(PLATFORM_CURRENT_RELEASE_APK) if File.exists?(PLATFORM_CURRENT_RELEASE_APK)
       raise
     end
@@ -564,7 +570,7 @@ end
 
 desc 'Download the latest jruby-jars snapshot'
 task :get_jruby_jars_snapshot do
-  current_gem = 'jruby-jars-1.7.5.dev.gem'
+  current_gem = 'jruby-jars-9000.dev.gem'
   `wget http://ci.jruby.org/snapshots/master/#{current_gem}`
   jars = Dir["#{current_gem}.*"]
   jars[0..-2].each { |j| FileUtils.rm_f j } if jars.size > 1

data/assets/rakelib/ruboto.rake

@@ -54,11 +54,25 @@ unless DX_FILENAME
   exit 1
 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')
@@ -224,7 +238,7 @@ file RUBOTO_CONFIG_FILE
 file JRUBY_ADAPTER_FILE => RUBOTO_CONFIG_FILE do
   require 'yaml'
   if (heap_alloc = YAML.load(File.read(RUBOTO_CONFIG_FILE))['heap_alloc'])
-  config = <<EOF
+    config = <<EOF
             // BEGIN Ruboto HeapAlloc
             @SuppressWarnings("unused")
             byte[] arrayForHeapAllocation = new byte[#{heap_alloc} * 1024 * 1024];
@@ -242,7 +256,7 @@ EOF
   end
   source = File.read(JRUBY_ADAPTER_FILE)
   heap_alloc_pattern = %r{^\s*// BEGIN Ruboto HeapAlloc\n.*^\s*// END Ruboto HeapAlloc\n}m
-  File.open(JRUBY_ADAPTER_FILE, 'w'){|f| f << source.sub(heap_alloc_pattern, config)}
+  File.open(JRUBY_ADAPTER_FILE, 'w') { |f| f << source.sub(heap_alloc_pattern, config) }
 end
 
 file APK_FILE => APK_DEPENDENCIES do |t|
@@ -269,7 +283,7 @@ end
 
 namespace :update_scripts do
   desc 'Copy scripts to emulator and restart the app'
-  task :restart => APK_DEPENDENCIES do |t|
+  task :restart => APK_DEPENDENCIES - RUBY_SOURCE_FILES do |t|
     if build_apk(t, false) || !stop_app
       install_apk
     else
@@ -277,6 +291,27 @@ namespace :update_scripts do
     end
     start_app
   end
+
+  desc 'Copy scripts to emulator and restart the app'
+  task :start => APK_DEPENDENCIES - RUBY_SOURCE_FILES do |t|
+    if build_apk(t, false)
+      install_apk
+    else
+      update_scripts
+    end
+    start_app # FIXME(uwe): Should trigger reload of updated scripts
+  end
+
+  desc 'Copy scripts to emulator and reload'
+  task :reload => APK_DEPENDENCIES - RUBY_SOURCE_FILES do |t|
+    if build_apk(t, false)
+      install_apk
+      start_app
+    else
+      scripts = update_scripts
+      reload_scripts(scripts) if scripts
+    end
+  end
 end
 
 task :test => APK_DEPENDENCIES + [:uninstall] do
@@ -665,24 +700,36 @@ end
 
 def update_scripts
   `adb shell mkdir -p #{scripts_path}` if !device_path_exists?(scripts_path)
-  puts 'Pushing files to apk public 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('src') do
-    Dir['**/*.rb'].each do |script_file|
-      next if File.directory? script_file
-      next if File.mtime(script_file) < last_update
-      next if script_file =~ /~$/
-      print "#{script_file}: "; $stdout.flush
-      `adb push #{script_file} #{scripts_path}/#{script_file}`
+    source_files = Dir['**/*.rb']
+    changed_files = source_files.select { |f| !File.directory?(f) && File.mtime(f) >= last_update && f !~ /~$/ }
+    unless changed_files.empty?
+      puts 'Pushing files to apk public file area.'
+      changed_files.each do |script_file|
+        print "#{script_file}: "; $stdout.flush
+        `adb push #{script_file} #{scripts_path}/#{script_file}`
+      end
+      mark_update
+      return changed_files
     end
   end
-  mark_update
+  return nil
 end
 
 def start_app
   `adb shell am start -a android.intent.action.MAIN -n #{package}/.#{main_activity}`
 end
 
+# Triggers reload of updated scripts and restart of the current activity
+def reload_scripts(scripts)
+  scripts.each.with_index do |s, i|
+    cmd = "adb shell am broadcast -a android.intent.action.VIEW -e file #{s} #{'-e restart YES' if i == (scripts.size - 1)}"
+    puts cmd
+    system cmd
+  end
+end
+
 def stop_app
   output = `adb shell ps | grep #{package} | awk '{print $2}' | xargs adb shell kill`
   output !~ /Operation not permitted/