ruboto 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccf9964eb67eb09ea2597a828b52d06dff60115b
-  data.tar.gz: 12313a6e4b4a2e1e4256a3c86e4155b4b48d6e83
+  metadata.gz: 99baa768052a043076db03f4d9598cf9d076bf2e
+  data.tar.gz: 3bf07e86b7f41a0cbba8dd9d6f02e750f31ee9ab
 SHA512:
-  metadata.gz: 9155934ff5d0af26fdd163ab4627dce2303ea1359626a9ea2e2ac6fadf1ee8da067f756ee0ea49e99fca6978edec8529cbc4d6346109048973db344b28752525
-  data.tar.gz: 5caee4391fcd9b3d094531fe8c807aaa8db72a08ba0313f9cf46f5b3413c6ffd02e73d043d600a23b2205e67fe1fa3da976875a367c1431a7ab2cded85799535
+  metadata.gz: f7bd276940850a60b549e140bb7eec8b2e2932c20a31a318034d831e74a46ea50221fbdb133e924cdc1598d73fe670af0ed2ef86da30dc84bf0b3eebf13bc1f4
+  data.tar.gz: 493aa40906f9100157163398355975c5570c3aa210eb7f6816c8413006bed929fca0fcf90841fde123643786d7d90a7d40b55a7b72134518c8a54fc9e913586f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruboto (0.13.0)
+    ruboto (0.14.0.dev)
       jruby-jars
       main (>= 4.7.2)
       rake
@@ -19,10 +19,9 @@ GEM
       fattr (>= 2.2.0)
       map (>= 5.1.0)
     map (6.5.1)
-    rake (10.0.4)
+    rake (10.1.0)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES

data/RELEASE_CANDICATE_DOC

@@ -1,12 +1,11 @@
-Subject: [ANN] Ruboto 0.13.0 release candidate
+Subject: [ANN] Ruboto 0.14.0 release candidate
 
 Hi all!
 
-The Ruboto 0.13.0 release candidate is now available.
+The Ruboto 0.14.0 release candidate is now available.
 
-In this release we add support for Android API level 17 and the Android
-SDK r22.  There are improvements on the "ruboto setup" command, and
-general preparations for the 1.0 release.
+In this release we change the startup to use a separate SplashActivity.
+This simplifies the startup and makes it more robust.
 
 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.13.0 released!
+Subject: [ANN] Ruboto 0.14.0 released!
 
-The Ruboto team is pleased to announce the release of Ruboto 0.13.0.
+The Ruboto team is pleased to announce the release of Ruboto 0.14.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,69 +8,73 @@ 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.13.0:
+New in version 0.14.0:
 
-In this release we add support for Android API level 17 and the Android
-SDK r22.  There are improvements on the "ruboto setup" command, and
-general preparations for the 1.0 release.
+In this release we change the startup to use a separate SplashActivity.
+This simplifies the startup and makes it more robust.
 
 Features:
 
-* Issue #176 Add option to allocate large heap at startup
-* Issue #252 View constant conversion errors aren't very clear
-* Issue #333 Prettier design for the Ruboto platform apk
-* Issue #405 "ruboto setup" on Windows
-* Issue #408 Setup: Need to look up the latest Android tool version
-  (instead of hard coding it) if we can
-* Issue #409 Add support for Android SDK r22
-* Issue #410 Add -y option to "ruboto setup" to automatically install
-  components, accept licenses, and add to configuration
-* Issue #412 Enable starting the emulator without a project
-* Issue #414 Add -t --target parameter to "ruboto setup" to set up for a
-  specific api level
-* Issue #415 Update API xml file to cover android-17
-* Issue #416 Add code for generating the API xml file
-* Issue #422 Put RubotoActivity intent data directly in the Intent instead
-  of inside a Bundle
-* Issue #423 Focus the "start_ruboto_activity" API
+* 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
 
 Bugfixes:
 
-* Issue #264 Force rebuild of (release) apk when jar file is removed from
-  the libs directory
-* Issue #268 Callback for Audio Focus
-* Issue #285 Look into pause/restart issues for secondary Activities
-* Issue #407 Process::Status#to_int not implemented (NotImplementedError)
-  with jruby 1.7.x and ruboto 0.11.0
+* 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
 
 Support:
 
-* Issue #303 Ruboto should synchronise target in project.properties and
-  targetSdkVersion in AndroidManifest.xml
-* Issue #314 Tool confusion: ruboto vs rake
-* Issue #424 Initiliaze the new App
+* Issue #446 Bad call from ruboto setup
+* Issue #450 Application aborts prematurely, when I add a Gemfile.apk
 
 Documentation:
 
-* Issue #258 Add welcome and information with links to RubotoCore
-* Issue #427 Add sidebar to the WIKI
+* Issue #225 Investigate AIDE
+* Issue #430 Add Downloads page to ruboto.org
 
-Internal:
+Pull requests:
 
-* Issue #411 Use "ruboto setup -y" to install components in travis-ci
-  automated testing
+* 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
 
-Rejected:
+Internal:
 
-* Issue #175 Rename "update_scripts" rake task to "update" for less typing
-* Issue #259 Link RubotoCore platform apk version to JRuby version
-* Issue #261 Rename RubotoCore platform apk display name to Ruboto
-* Issue #337 Change default for "ruboto gen app" to include JRuby in the
-  app
+* 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
 
 You can find a complete list of issues here:
 
-* https://github.com/ruboto/ruboto/issues?state=closed&milestone=25
+* https://github.com/ruboto/ruboto/issues?state=closed&milestone=26
 
 
 Installation:

data/Rakefile

@@ -79,6 +79,12 @@ task :example => :install do
   Dir.chdir File.dirname(EXAMPLE_FILE) do
     FileUtils.rm_rf app_name
     sh "ruboto gen app --package org.ruboto.test_app --name #{app_name} --path #{app_name}"
+    Dir.chdir app_name do
+      sh 'rake patch_dex'
+      Dir.chdir 'test' do
+        sh 'ant instrument' # This will also build the main project.
+      end
+    end
     sh "tar czf #{EXAMPLE_FILE} #{app_name}"
     FileUtils.rm_rf app_name
   end
@@ -124,13 +130,9 @@ def get_github_issues
   req.basic_auth(user, pass)
   res = https.start { |http| http.request(req) }
   milestones = YAML.load(res.body).sort_by { |i| Date.parse(i['due_on']) }
-  puts milestones.map { |m| "#{'%2d' % m['number']} #{m['title']}" }.join("\n")
-
-  if defined? ask
-    milestone = ask('milestone: ', Integer) { |q| q.echo = true }
-  else
-    print 'milestone: '; milestone = STDIN.gets.chomp
-  end
+  milestone_entry = milestones.find{|m| m['title'] == Ruboto::VERSION}
+  raise "Milestone for version #{} not found." unless milestone_entry
+  milestone = milestone_entry['number']
 
   uri = URI("#{base_uri}/issues?milestone=#{milestone}&state=closed&per_page=1000")
   req = Net::HTTP::Get.new(uri.request_uri)
@@ -437,12 +439,13 @@ namespace :platform do
 
   desc 'Download the current RubotoCore platform release apk'
   file PLATFORM_CURRENT_RELEASE_APK do
+    FileUtils.mkdir_p File.dirname(PLATFORM_CURRENT_RELEASE_APK)
     puts 'Downloading the current RubotoCore platform release apk'
     uri = URI('http://ruboto.org/downloads/RubotoCore-release.apk')
     begin
       http = Net::HTTP.new(uri.host, uri.port)
       content = http.request(Net::HTTP::Get.new(uri.request_uri)).body
-      File.open(PLATFORM_CURRENT_RELEASE_APK, 'w') { |f| f << content }
+      File.open(PLATFORM_CURRENT_RELEASE_APK, 'wb') { |f| f << content }
     rescue Exception, SystemExit
       FileUtils.rm(PLATFORM_CURRENT_RELEASE_APK) if File.exists?(PLATFORM_CURRENT_RELEASE_APK)
       raise
@@ -483,7 +486,6 @@ namespace :platform do
       puts "Package #{package} already installed, but of different size.  Replacing package."
       output = `adb install -r #{PLATFORM_CURRENT_RELEASE_APK} 2>&1`
       if $? == 0 && output !~ failure_pattern && output =~ success_pattern
-        clear_update
         return
       end
       case $1
@@ -559,3 +561,12 @@ namespace :platform do
   end
 
 end
+
+desc 'Download the latest jruby-jars snapshot'
+task :get_jruby_jars_snapshot do
+  current_gem = 'jruby-jars-1.7.5.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
+  FileUtils.mv(jars[-1], current_gem) if jars[-1]
+end

data/assets/rakelib/ruboto.rake

@@ -20,7 +20,7 @@ end
 #
 def which(cmd)
   exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-  ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+  ENV['PATH'].gsub('\\', '/').split(File::PATH_SEPARATOR).each do |path|
     exts.each do |ext|
       exe = File.join(path, "#{cmd}#{ext}")
       return exe if File.executable? exe
@@ -33,39 +33,26 @@ adb_version_str = `adb version`
 (puts 'Android SDK platform tools not in PATH (adb command not found).'; exit 1) unless $? == 0
 (puts "Unrecognized adb version: #$1"; exit 1) unless adb_version_str =~ /Android Debug Bridge version (\d+\.\d+\.\d+)/
 (puts "adb version 1.0.31 or later required.  Version found: #$1"; exit 1) unless Gem::Version.new($1) >= Gem::Version.new('1.0.31')
-if ENV['ANDROID_HOME'].nil? && (adb_path = which('adb'))
-  ENV['ANDROID_HOME'] = File.dirname(File.dirname(adb_path))
+android_home = ENV['ANDROID_HOME']
+android_home = android_home.gsub("\\", "/") unless android_home.nil?
+if android_home.nil?
+  if (adb_path = which('adb'))
+    android_home = File.dirname(File.dirname(adb_path))
+  else
+    abort 'You need to set the ANDROID_HOME environment variable.'
+  end
+else
+  android_home.gsub! '\\', '/'
 end
-(puts 'You need to set the ANDROID_HOME environment variable.'; exit 1) unless ENV['ANDROID_HOME']
 
-# FIXME(uwe): Simplify when we stop supporting Android SDK < 22: Don't look in pltform-tools for dx
-dx_filename = Dir[File.join(ENV['ANDROID_HOME'], '{build-tools/*,platform-tools}', ON_WINDOWS ? 'dx.bat' : 'dx')][-1]
+# FIXME(uwe): Simplify when we stop supporting Android SDK < 22: Don't look in platform-tools for dx
+DX_FILENAME = Dir[File.join(android_home, '{build-tools/*,platform-tools}', ON_WINDOWS ? 'dx.bat' : 'dx')][-1]
 # EMXIF
 
-unless dx_filename
+unless DX_FILENAME
   puts 'You need to install the Android SDK Build-tools!'
   exit 1
 end
-new_dx_content = File.read(dx_filename).dup
-
-xmx_pattern = ON_WINDOWS ? /^set defaultXmx=-Xmx(\d+)(M|m|G|g|T|t)/ : /^defaultMx="-Xmx(\d+)(M|m|G|g|T|t)"/
-MINIMUM_DX_HEAP_SIZE = 1600
-if new_dx_content =~ xmx_pattern &&
-    ($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_xmx_value = ON_WINDOWS ? %Q{set defaultXmx=-Xmx#{MINIMUM_DX_HEAP_SIZE}M} : %Q{defaultMx="-Xmx#{MINIMUM_DX_HEAP_SIZE}M"}
-  new_dx_content.sub!(xmx_pattern, new_xmx_value)
-
-  # FIXME(uwe): For travis debugging  Remove when travis is stable.
-  new_dx_content.sub!(/^exec/, "free\ncat /proc/meminfo\necho Virtual:\nps -e -ovsize=,args= | sort -b -k1,1n | tail -n10\necho RSS:\nps -e -orss=,args= | sort -b -k1,1n | tail -n10\necho $javaOpts\necho $@\njava -XX:+PrintFlagsFinal -version | grep InitialHeapSize\nexec") if RbConfig::CONFIG['host_os'] =~ /linux/
-  # EMXIF
-
-  File.open(dx_filename, 'w') { |f| f << new_dx_content } rescue puts "\n!!! Unable to increase dx heap size !!!\n\n"
-
-  # FIXME(uwe): For travis debugging  Remove when travis is stable.
-  puts new_dx_content.lines.grep(xmx_pattern)
-  # EMXIF
-end
 
 def manifest; @manifest ||= REXML::Document.new(File.read(MANIFEST_FILE)) end
 def package; manifest.root.attribute('package') end
@@ -91,7 +78,7 @@ RESOURCE_FILES = Dir[File.expand_path 'res/**/*']
 JAVA_SOURCE_FILES = Dir[File.expand_path 'src/**/*.java']
 RUBY_SOURCE_FILES = Dir[File.expand_path 'src/**/*.rb']
 CLASSES_CACHE = "#{PROJECT_DIR}/bin/#{build_project_name}-debug-unaligned.apk.d"
-APK_DEPENDENCIES = [MANIFEST_FILE, RUBOTO_CONFIG_FILE, BUNDLE_JAR, CLASSES_CACHE] + JRUBY_JARS + JARS + JAVA_SOURCE_FILES + RESOURCE_FILES + RUBY_SOURCE_FILES
+APK_DEPENDENCIES = [:patch_dex, MANIFEST_FILE, RUBOTO_CONFIG_FILE, BUNDLE_JAR, CLASSES_CACHE] + JRUBY_JARS + 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+(.*)$/
@@ -149,7 +136,7 @@ desc 'uninstall, build, and install the application'
 task :reinstall => [:uninstall, APK_FILE, :install]
 
 namespace :install do
-  # FIXME(uwe):  Remove in 2013
+  # FIXME(uwe):  Remove December 2013
   desc 'Deprecated:  use "reinstall" instead.'
   task :clean => :reinstall do
     puts '"rake install:clean" is deprecated.  Use "rake reinstall" instead.'
@@ -262,6 +249,19 @@ file APK_FILE => APK_DEPENDENCIES do |t|
   build_apk(t, false)
 end
 
+MINIMUM_DX_HEAP_SIZE = 2048
+task :patch_dex do
+  new_dx_content = File.read(DX_FILENAME).dup
+  xmx_pattern = ON_WINDOWS ? /^set defaultXmx=-Xmx(\d+)(M|m|G|g|T|t)/ : /^defaultMx="-Xmx(\d+)(M|m|G|g|T|t)"/
+  if new_dx_content =~ xmx_pattern &&
+      ($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_xmx_value = ON_WINDOWS ? %Q{set defaultXmx=-Xmx#{MINIMUM_DX_HEAP_SIZE}M} : %Q{defaultMx="-Xmx#{MINIMUM_DX_HEAP_SIZE}M"}
+    new_dx_content.sub!(xmx_pattern, new_xmx_value)
+    File.open(DX_FILENAME, 'w') { |f| f << new_dx_content } rescue puts "\n!!! Unable to increase dx heap size !!!\n\n"
+  end
+end
+
 desc 'Copy scripts to emulator or device'
 task :update_scripts => %w(install:quick) do
   update_scripts
@@ -291,11 +291,10 @@ namespace :test do
   task :quick => :update_scripts do
     Dir.chdir('test') do
       puts 'Running quick tests'
-      sh "#{ANT_CMD} instrument"
       install_retry_count = 0
       begin
         timeout 120 do
-          sh "#{ANT_CMD} installi"
+          sh "#{ANT_CMD} instrument install"
         end
       rescue TimeoutError
         puts 'Installing package timed out.'
@@ -355,7 +354,7 @@ file BUNDLE_JAR => [GEM_FILE, GEM_LOCK_FILE] do
       $VERBOSE = old_verbose
     end
     Gem.platforms = platforms
-    Gem.paths = gem_paths
+    Gem.paths = gem_paths["GEM_PATH"]
   else
     # Bundler.settings[:platform] = Gem::Platform::DALVIK
     sh "bundle install --gemfile #{GEM_FILE} --path=#{BUNDLE_PATH} --platform=dalvik#{sdk_level}"
@@ -486,10 +485,9 @@ Java::json.ext.ParserService.new.basicLoad(JRuby.runtime)
     end
   end
 
-
   FileUtils.rm_f BUNDLE_JAR
   Dir["#{gem_path}/*"].each_with_index do |gem_dir, i|
-    `jar #{i == 0 ? 'c' : 'u'}f #{BUNDLE_JAR} -C #{gem_dir}/lib .`
+    `jar #{i == 0 ? 'c' : 'u'}f "#{BUNDLE_JAR}" -C "#{gem_dir}/lib" .`
   end
   FileUtils.rm_rf BUNDLE_PATH
 end
@@ -586,11 +584,6 @@ def build_apk(t, release)
   if release
     sh "#{ANT_CMD} release"
   else
-
-    # FIXME(uwe): For travis debugging  Remove when travis is stable.
-    sh 'free' if RbConfig::CONFIG['host_os'] =~ /linux/
-    # EMXIF
-
     sh "#{ANT_CMD} debug"
   end
   true

data/assets/src/RubotoActivity.java

@@ -10,18 +10,8 @@ import android.os.Bundle;
 public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
     public static final String THEME_KEY = "RUBOTO_THEME";
     private final ScriptInfo scriptInfo = new ScriptInfo();
-    private String remoteVariable = null;
     Bundle[] args;
 
-    public THE_RUBOTO_CLASS setRemoteVariable(String var) {
-        remoteVariable = var;
-        return this;
-    }
-
-    public String getRemoteVariableCall(String call) {
-        return (remoteVariable == null ? "" : (remoteVariable + ".")) + call;
-    }
-
     public ScriptInfo getScriptInfo() {
         return scriptInfo;
     }
@@ -35,9 +25,9 @@ public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
         System.out.println("THE_RUBOTO_CLASS onCreate(): " + getClass().getName());
 
         // Shut this RubotoActivity down if it's not able to restart 
-        if (!(this instanceof EntryPointActivity) && !JRubyAdapter.isInitialized()) {
+        if (this.getClass().getName().equals("org.ruboto.THE_RUBOTO_CLASS") && !JRubyAdapter.isInitialized()) {
             super.onCreate(bundle);
-	        System.out.println("Shutting down stale THE_RUBOTO_CLASS: " + getClass().getName());
+	          System.out.println("Shutting down stale THE_RUBOTO_CLASS: " + getClass().getName());
             finish();
             return;
         }
@@ -46,8 +36,7 @@ public class THE_RUBOTO_CLASS THE_ACTION THE_ANDROID_CLASS {
             super.onCreate(bundle);
             return;
         }
-        args = new Bundle[1];
-        args[0] = bundle;
+        args = new Bundle[]{bundle};
 
         // FIXME(uwe):  Deprecated as of Ruboto 0.13.0.  Remove in june 2014 (twelve months).
         Bundle configBundle = getIntent().getBundleExtra("Ruboto Config");