ruboto 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57638eee95f5a2cba9bf8c77af5a68250c23c7bb
-  data.tar.gz: 9ed24085fa7c14979aa4a5e8582608753f0323c0
+  metadata.gz: aa80ecb3d9c8d5a37b94142f2a1fe730daad9563
+  data.tar.gz: bca65a11d086368713f67496b1ce279e17c56480
 SHA512:
-  metadata.gz: 13dbc48f6712b77210a2403e9e6bd69f381ec5a3a9a9d840e114b9e326f8e56a2ad3acf23e5ab0196884b9eea87a97969b06c76ac71c6007c50d1d30436655dd
-  data.tar.gz: 741ede8a69755af779acceadc5957b7d165f0441bd3d3b1b216b6ccc923828b847c935843e283d101431ebf81aed4734c06c3e19440018e213ef659e6bdad3cd
+  metadata.gz: d2b7f8bd447f38c527684f6b4caaa193f5ea7e88388a98888ace26ab6e85228d0f122d9ce6e1ef0c9c20c33bd50b69cda678fb4ce8e6cacd0382ea8596c8c10f
+  data.tar.gz: 7c929fcee3c3f860dd33930618d46dfc0350c21a745872db259435c8b2993ce674fe9afdd2698dcda94ef0a02410aa423a4a2792d37d79cee92dee9da700e640

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruboto (1.0.2)
+    ruboto (1.0.3)
       main (~> 5.2.0)
       rake (~> 10.0)
       rubyzip (~> 1.0)
@@ -9,17 +9,17 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    arrayfields (4.9.0)
+    arrayfields (4.9.2)
     chronic (0.10.2)
-    fattr (2.2.1)
+    fattr (2.2.2)
     main (5.2.0)
       arrayfields (>= 4.7.4)
       chronic (>= 0.6.2)
       fattr (>= 2.2.0)
       map (>= 5.1.0)
-    map (6.5.1)
-    rake (10.1.1)
-    rubyzip (1.1.0)
+    map (6.5.3)
+    rake (10.3.0)
+    rubyzip (1.1.3)
 
 PLATFORMS
   java

data/RELEASE_CANDICATE_DOC.md

@@ -1,11 +1,14 @@
-Subject: [ANN] Ruboto 1.0.2 release candidate
+Subject: [ANN] Ruboto 1.0.3 release candidate
 
 Hi all!
 
-The Ruboto 1.0.2 release candidate is now available.
+The Ruboto 1.0.3 release candidate is now available.
 
-This releases updates to JRuby 1.7.10 and improves installation with
-automated setup of Apache ANT on Windows and Linux.
+This release focuses on stability and introduces a new mechanism for
+reducing the footprint of your app using the ruboto.yml config file.  You
+can now specify the Ruby compatibility level of your app (1.8/1.9/2.0) and
+which parts of the Ruby Standard Library you want to use.  Ruboto will now
+strip the parts you don't need, making your app a bit smaller.
 
 As always we need your help and feedback to ensure the quality of the release.  Please install the release candidate using
 

data/RELEASE_DOC.md

@@ -1,6 +1,6 @@
-Subject: [ANN] Ruboto 1.0.2 released!
+Subject: [ANN] Ruboto 1.0.3 released!
 
-The Ruboto team is pleased to announce the release of Ruboto 1.0.2.
+The Ruboto team is pleased to announce the release of Ruboto 1.0.3.
 
 Ruboto (JRuby on Android) is a platform for developing full stand-alone
 apps for Android using the Ruby language and libraries.  It includes
@@ -8,37 +8,43 @@ 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 1.0.2:
+New in version 1.0.3:
 
-This releases updates to JRuby 1.7.10 and improves installation with
-automated setup of Apache ANT on Windows and Linux.
+This release focuses on stability and introduces a new mechanism for
+reducing the footprint of your app using the ruboto.yml config file.  You
+can now specify the Ruby compatibility level of your app (1.8/1.9/2.0) and
+which parts of the Ruby Standard Library you want to use.  Ruboto will now
+strip the parts you don't need, making your app a bit smaller.
 
 Features:
 
-* Issue #447 Use "ruboto setup" to flag and install ant
-* Issue #564 Update to JRuby 1.7.10
+* Issue #418 Dynamic Ruboto runtime sizing and inclusion
+* Issue #576 Make Android 4.0 the default target.
+* Issue #592 Update to JRuby 1.7.12
 
 Bugfixes:
 
-* Issue #525 Quick Start : "Unfortunately, Browser has stopped"
-* Issue #565 Odd behaviour when changing orientation with Fragments
-* Issue #575 Gemfile.lock contains references to gems that are not part
-  of the dependencies
+* Issue #529 rake install start fails on windows
+* Issue #566 ruboto emulator -t android-19 failed
+* Issue #580 Ruboto setup fails if the path configuration script doesn't
+  exist
+* Issue #582 JRuby 9000 tests fail
+* Issue #583 'ruboto setup' crashes when config file does not exist.
+* Issue #585 rake install start does not power up app in Android 4.4
+  Kitkat emulator and sleeps at build successful
+* Issue #587 warning breaks is_installed?
 
-Documentation:
+Support:
 
-* Issue #568 Error with tutorial on "Example: Open a web page"
+* Issue #579 Android platform SDK for android-10 not found (v1.0.2)
 
-Community:
+Internal:
 
-* Issue #533 How can I help? (di3z )
-* Issue #562 How can I help? (lucasallan)
-* Issue #563 How can I help? (pedroandrade)
-* Issue #572 How can I help? (iamrahulroy)
+* Issue #577 Domain expired
 
 You can find a complete list of issues here:
 
-* https://github.com/ruboto/ruboto/issues?state=closed&milestone=27
+* https://github.com/ruboto/ruboto/issues?state=closed&milestone=28
 
 
 Installation:

data/assets/rakelib/ruboto.rake

@@ -77,7 +77,7 @@ end
 PROJECT_DIR = File.expand_path('..', File.dirname(__FILE__))
 UPDATE_MARKER_FILE = File.join(PROJECT_DIR, 'bin', 'LAST_UPDATE')
 BUNDLE_JAR = File.expand_path 'libs/bundle.jar'
-BUNDLE_PATH = File.expand_path 'bin/bundle'
+BUNDLE_PATH = File.join(PROJECT_DIR, 'bin', 'bundle')
 MANIFEST_FILE = File.expand_path 'AndroidManifest.xml'
 PROJECT_PROPS_FILE = File.expand_path 'project.properties'
 RUBOTO_CONFIG_FILE = File.expand_path 'ruboto.yml'
@@ -239,10 +239,18 @@ file RUBOTO_CONFIG_FILE
 task :jruby_adapter => JRUBY_ADAPTER_FILE
 file JRUBY_ADAPTER_FILE => RUBOTO_CONFIG_FILE do
   require 'yaml'
+
+  ruboto_yml = (YAML.load(File.read(RUBOTO_CONFIG_FILE)) || {})
+  source = File.read(JRUBY_ADAPTER_FILE)
+
+  #
+  # HeapAlloc
+  #
+  comment = ''
   marker_topic ='Ruboto HeapAlloc'
   begin_marker = "// BEGIN #{marker_topic}"
   end_marker = "// END #{marker_topic}"
-  unless (heap_alloc = YAML.load(File.read(RUBOTO_CONFIG_FILE))['heap_alloc'])
+  unless (heap_alloc = ruboto_yml['heap_alloc'])
     heap_alloc = 13
     comment = '// '
   end
@@ -253,9 +261,31 @@ file JRUBY_ADAPTER_FILE => RUBOTO_CONFIG_FILE do
             #{comment}arrayForHeapAllocation = null;
             #{end_marker}
 EOF
-  source = File.read(JRUBY_ADAPTER_FILE)
-  heap_alloc_pattern = %r{^\s*#{begin_marker}\n.*^\s*#{end_marker}\n}m
-  File.open(JRUBY_ADAPTER_FILE, 'w') { |f| f << source.sub(heap_alloc_pattern, config) }
+  pattern = %r{^\s*#{begin_marker}\n.*^\s*#{end_marker}\n}m
+  source = source.sub(pattern, config)
+
+  #
+  # RubyVersion
+  #
+  comment = ''
+  marker_topic ='Ruboto RubyVersion'
+  begin_marker = "// BEGIN #{marker_topic}"
+  end_marker = "// END #{marker_topic}"
+  unless (ruby_version = ruboto_yml['ruby_version'])
+    ruby_version = 2.0
+    comment = '// '
+  end
+  ruby_version = ruby_version.to_s
+  ruby_version['.'] = '_'
+  config = <<EOF
+            #{begin_marker}
+            #{comment}System.setProperty("jruby.compat.version", "RUBY#{ruby_version}"); // RUBY1_9 is the default in JRuby 1.7
+            #{end_marker}
+EOF
+  pattern = %r{^\s*#{begin_marker}\n.*^\s*#{end_marker}\n}m
+  source = source.sub(pattern, config)
+
+  File.open(JRUBY_ADAPTER_FILE, 'w') { |f| f << source }
 end
 
 file APK_FILE => APK_DEPENDENCIES do |t|
@@ -365,25 +395,27 @@ file BUNDLE_JAR => [GEM_FILE, GEM_LOCK_FILE] do
   puts "Generating #{BUNDLE_JAR}"
   require 'bundler'
   # FIXME(uwe): Issue #547 https://github.com/ruboto/ruboto/issues/547
-  if true || Gem::Version.new(Bundler::VERSION) <= Gem::Version.new('1.5.0')
+  if true || Gem::Version.new(Bundler::VERSION) <= Gem::Version.new('1.6.3')
     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}
+    env_home = ENV['GEM_HOME']
+    env_path = ENV['GEM_PATH']
 
     # 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}
+    ENV['GEM_HOME'] = BUNDLE_PATH
+    ENV['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
@@ -402,7 +434,8 @@ file BUNDLE_JAR => [GEM_FILE, GEM_LOCK_FILE] do
       $VERBOSE = old_verbose
     end
     Gem.platforms = platforms
-    Gem.paths = gem_paths['GEM_PATH']
+    ENV['GEM_HOME'] = env_home
+    ENV['GEM_PATH'] = env_path
   else
     # Bundler.settings[:platform] = Gem::Platform::DALVIK
     sh "bundle install --gemfile #{GEM_FILE} --path=#{BUNDLE_PATH} --platform=dalvik#{sdk_level}"
@@ -619,8 +652,10 @@ def package_installed?(test = false)
   package_name = "#{package}#{'.tests' if test}"
   loop do
     path_line = `adb shell pm path #{package_name}`.chomp
+    path_line.gsub! /^WARNING:.*$/, ''
     return nil if $? == 0 && path_line.empty?
     break if $? == 0 && path_line =~ /^package:(.*)$/
+    puts path_line
     sleep 0.5
   end
   path = $1
@@ -651,8 +686,8 @@ end
 def build_apk(t, release)
   apk_file = release ? RELEASE_APK_FILE : APK_FILE
   if File.exist?(apk_file)
-    changed_prereqs = t.prerequisites.select do |p|
-      File.file?(p) && !Dir[p].empty? && Dir[p].map { |f| File.mtime(f) }.max > File.mtime(apk_file)
+    changed_prereqs = t.prerequisites.select do |pr|
+      File.file?(pr) && !Dir[pr].empty? && Dir[pr].map { |f| File.mtime(f) }.max >= File.mtime(apk_file)
     end
     return false if changed_prereqs.empty?
     changed_prereqs.each { |f| puts "#{f} changed." }
@@ -666,7 +701,17 @@ def build_apk(t, release)
   true
 end
 
+def wait_for_valid_device
+  while `adb shell echo "ping"`.strip != 'ping'
+    `adb kill-server`
+    `adb devices`
+    sleep 5
+  end
+end
+
 def install_apk
+  wait_for_valid_device
+
   failure_pattern = /^Failure \[(.*)\]/
   success_pattern = /^Success/
   case package_installed?
@@ -741,7 +786,8 @@ def uninstall_apk
 end
 
 def update_scripts
-  `adb shell mkdir -p #{scripts_path}` if !device_path_exists?(scripts_path)
+  puts(`adb shell mkdir -p #{scripts_path}`) unless device_path_exists?(scripts_path)
+  raise "Unable to create device scripts dir: #{scripts_path}" unless device_path_exists?(scripts_path)
   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
     source_files = Dir['**/*.rb']
@@ -769,8 +815,8 @@ end
 
 # Triggers reload of updated scripts and restart of the current activity
 def reload_scripts(scripts)
-  s = scripts.map{|s| s.gsub(/[&;]/){|m| "&#{m[0]}"}}.join(';')
-  cmd = %Q{adb shell am broadcast -a android.intent.action.VIEW -e reload "#{s}"}
+  s = scripts.map{|s| s.gsub(/[&;]/){|m| "&#{m[0]}"}}.join('\;')
+  cmd = %Q{adb shell am broadcast -a android.intent.action.VIEW -e reload '#{s}'}
   puts cmd
   system cmd
 end

data/assets/rakelib/stdlib.rake

@@ -0,0 +1,266 @@
+require 'yaml'
+require 'fileutils'
+require 'rexml/document'
+
+namespace :libs do
+  desc 'take a fresh copy of the stdlib and rebuild it for use with this project'
+  task :reconfigure_stdlib do
+    require_relative 'stdlib_dependencies'
+    reconfigure_jruby_stdlib
+  end
+
+  desc 'check the stdlib dependencies and store them in auto_dependencies.yml'
+  task :check_dependencies do
+    require_relative 'stdlib_dependencies'
+
+    if File.exists? 'auto_dependencies.yml'
+      old_dep = (YAML::load_file('auto_dependencies.yml') || {})
+    end
+
+    new_dep = find_dependencies
+    if new_dep == old_dep
+      puts "Dependencies haven't changed: #{new_dep.join(', ')}"
+    else
+      puts "New dependencies: #{new_dep.join(', ')}"
+      File.open( "auto_dependencies.yml", 'w' ) do |out|
+        YAML.dump( new_dep, out )
+      end
+    end
+  end
+end
+
+def log_action(initial_text, final_text="Done.", &block)
+  $stdout.sync = true
+
+  print initial_text, "..."
+  result = yield
+  puts final_text
+  
+  result
+end
+
+############################################################################
+#
+# Support for reconfigure_jruby_stdlib
+#
+
+# - Moves ruby stdlib to the root of the jruby-stdlib jar
+def reconfigure_jruby_stdlib
+  abort "cannot find jruby library in libs" if Dir["libs/jruby*"].empty?
+
+  require 'jruby-jars'
+
+  log_action("Copying #{JRubyJars::stdlib_jar_path} to libs") { FileUtils.cp JRubyJars::stdlib_jar_path, "libs/jruby-stdlib-#{JRubyJars::VERSION}.jar" }
+  StdlibDependencies.load('rakelib/stdlib.yml')
+
+  Dir.chdir 'libs' do
+    jruby_stdlib = Dir['jruby-stdlib-*.jar'][-1]
+    log_action("Reformatting #{jruby_stdlib}") do
+      FileUtils.mkdir_p 'tmp'
+      Dir.chdir 'tmp' do
+        FileUtils.mkdir_p 'old'
+        FileUtils.mkdir_p 'new/jruby.home'
+        Dir.chdir 'old' do
+          `jar -xf ../../#{jruby_stdlib}`
+          raise "Unpacking jruby-stdlib jar failed: #$?" unless $? == 0
+        end
+        FileUtils.move 'old/META-INF/jruby.home/lib', 'new/jruby.home/lib'
+        FileUtils.rm_rf 'new/jruby.home/lib/ruby/gems'
+
+        remove_unneeded_parts_of_stdlib
+        cleanup_jars
+
+        Dir.chdir 'new' do
+          `jar -cf ../../#{jruby_stdlib} .`
+          raise "Creating repackaged jruby-stdlib jar failed: #$?" unless $? == 0
+        end
+      end
+
+      FileUtils.remove_dir 'tmp', true
+    end
+  end
+end
+
+def remove_unneeded_parts_of_stdlib
+  if File.exists? '../../ruboto.yml'
+    ruboto_config = (YAML::load_file('../../ruboto.yml') || {})
+  else
+    ruboto_config = {}
+  end
+
+  ruby_version = ruboto_config['ruby_version']
+  included_stdlibs = ruboto_config['included_stdlibs']
+  excluded_stdlibs = [*ruboto_config['excluded_stdlibs']].compact
+
+  if included_stdlibs and included_stdlibs == "auto"
+    if File.exists? '../../auto_dependencies.yml'
+      included_stdlibs = YAML::load_file('../../auto_dependencies.yml')
+    else
+      puts "No auto_dependencies.yml file found. Use 'rake libs:check_dependencies' to create one."
+      included_stdlibs = nil
+    end
+  end
+
+  Dir.chdir 'new/jruby.home/lib/ruby' do
+    #
+    # Add ruby_version (e.g., 1.8, 1.9, 2.0) to ruboto.yml
+    # to trim unused versions from stdlib
+    #
+    if ruby_version
+      ruby_stdlib_versions = Dir['*'] - %w(gems shared)
+      print "ruby version = #{ruby_version}..."
+      ruby_stdlib_versions.each do |ld|
+        unless ld == ruby_version.to_s
+          print "removing #{ld}..."
+          FileUtils.rm_rf ld
+        end
+      end
+    end
+
+    if included_stdlibs
+      ruby_version ||= 1.9
+      ruby_version = ruby_version.to_s
+
+      # Require jruby and java
+      included_stdlibs = (included_stdlibs + %w(java jruby)).uniq
+
+      ruby_stdlib_versions = Dir['*'] - %w(gems)
+      print 'excluded...'
+      ruby_stdlib_versions.each do |ld|
+        Dir.chdir ld do
+          libs = Dir['*'].map { |d| d.sub /\.(rb|jar)$/, '' }.uniq
+          libs.each do |d|
+            next if included_stdlibs.include? d
+            FileUtils.rm_rf d if File.exists? d
+            file = "#{d}.rb"
+            FileUtils.rm_rf file if File.exists? file
+            jarfile = "#{d}.jar"
+            FileUtils.rm_rf jarfile if File.exists? jarfile
+            print "#{d} "
+          end
+        end
+      end
+    end
+
+    if included_stdlibs.nil? and excluded_stdlibs.any?
+      # Don't allow jruby and java to be removed
+      excluded_stdlibs = excluded_stdlibs - %w(jruby java)
+
+      ruby_stdlib_versions = Dir['*'] - %w(gems)
+      ruby_stdlib_versions.each do |ld|
+        excluded_stdlibs.each do |d|
+          dir = "#{ld}/#{d}"
+          FileUtils.rm_rf dir if File.exists? dir
+          file = "#{dir}.rb"
+          FileUtils.rm_rf file if File.exists? file
+        end
+      end
+      print "excluded #{excluded_stdlibs.join(' ')}..."
+    end
+  end
+end
+
+def cleanup_jars
+  Dir.chdir 'new' do
+    Dir['**/*.jar'].each do |j|
+
+      # FIXME(uwe):  Installing bcmail-jdk15-146.jar + bcprov-jdk15-146.jar fails due to
+      # http://code.google.com/p/android/issues/detail?id=40409
+      # This breaks ssl and https. Remove when we stop supporting JRuby <= 1.7.2
+      if j =~ /bcmail|bcprov-jdk15-146/
+        FileUtils.rm j
+        next
+      end
+      # EMXIF
+
+      # FIXME(uwe): Adding the jars triggers the "LinearAlloc exceeded capacity"
+      # bug in Android 2.3.  Remove when we stop supporting android-10 and older
+      abort "cannot find your AndroidManifest.xml to extract info from it" unless File.exists? '../../../AndroidManifest.xml'
+      manifest = REXML::Document.new(File.read('../../../AndroidManifest.xml')).root
+      min_sdk_version = manifest.elements['uses-sdk'].attributes['android:minSdkVersion'].to_i
+      if min_sdk_version <= 10
+        FileUtils.rm j
+        next
+      end
+      # EMXIF
+
+      # FIXME(uwe): These should be included but break the 64K method count limit
+      if j =~ /bcpkix-jdk15on-1\.?47|bcprov-jdk15on-1\.?47|jopenssl|kryptcore|kryptproviderjdk/
+        FileUtils.rm j
+        next
+      end
+      # EMXIF
+
+      print "#{File.basename(j).chomp('.jar')}..."
+      system "jar xf #{j}"
+      FileUtils.rm j
+      if ENV['STRIP_INVOKERS']
+        invokers = Dir['**/*$INVOKER$*.class']
+        if invokers.size > 0
+          print "Removing invokers(#{invokers.size})..."
+          FileUtils.rm invokers
+        end
+        populators = Dir['**/*$POPULATOR.class']
+        if populators.size > 0
+          print "Removing populators(#{populators.size})..."
+          FileUtils.rm populators
+        end
+      end
+
+      if j =~ %r{json/ext/generator.jar$}
+        jar_load_code = <<-END_CODE
+          require 'jruby'
+          puts 'Starting JSON Generator Service'
+          public
+          Java::json.ext.GeneratorService.new.basicLoad(JRuby.runtime)
+        END_CODE
+      elsif j =~ %r{json/ext/parser.jar$}
+        jar_load_code = <<-END_CODE
+          require 'jruby'
+          puts 'Starting JSON Parser Service'
+          public
+          Java::json.ext.ParserService.new.basicLoad(JRuby.runtime)
+        END_CODE
+      else
+        jar_load_code = ''
+      end
+
+      File.open("#{j}.rb", 'w') { |f| f << jar_load_code }
+      File.open("#{j}.jar.rb", 'w') { |f| f << jar_load_code }
+    end
+  end
+end
+
+############################################################################
+#
+# Support for check_dependencies
+#
+
+def find_dependencies
+  if File.exists? 'rakefile/ruboto.yml'
+    ruboto_config = (YAML::load_file('rakefile/ruboto.yml') || {})
+  else
+    ruboto_config = {}
+  end
+  ruby_version = ruboto_config['ruby_version'] || "1.9"
+
+  local = StdlibDependencies.collect("src").dependencies
+  stdlib = StdlibDependencies.load('rakelib/stdlib.yml')[ruby_version]
+
+  dependencies = local.values.flatten
+  new_values = []
+  check_values = local.values.flatten
+
+  while check_values.any?
+    check_values.each do |j|
+      new_values += stdlib[j] if stdlib[j] 
+    end
+
+    check_values = new_values - dependencies
+    dependencies = dependencies + new_values
+    new_values = []
+  end
+
+  dependencies.map{|d| d.split("/")[0]}.uniq.sort
+end
+