ruboto 1.0.3 → 1.1.0

data/assets/rakelib/{stdlib.rake → ruboto.stdlib.rake}

@@ -5,13 +5,13 @@ 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'
+    require_relative 'ruboto.stdlib'
     reconfigure_jruby_stdlib
   end
 
   desc 'check the stdlib dependencies and store them in auto_dependencies.yml'
   task :check_dependencies do
-    require_relative 'stdlib_dependencies'
+    require_relative 'ruboto.stdlib'
 
     if File.exists? 'auto_dependencies.yml'
       old_dep = (YAML::load_file('auto_dependencies.yml') || {})
@@ -22,20 +22,20 @@ namespace :libs do
       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 )
+      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)
+def log_action(initial_text, final_text='Done.', &block)
   $stdout.sync = true
 
-  print initial_text, "..."
+  print initial_text, '...'
   result = yield
   puts final_text
-  
+
   result
 end
 
@@ -46,12 +46,14 @@ end
 
 # - 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?
-
+  abort 'cannot find jruby library in libs' if Dir['libs/jruby*'].empty?
+  if (gem_version = ENV['JRUBY_JARS_VERSION'])
+    gem('jruby-jars', gem_version)
+  end
   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')
+  StdlibDependencies.load('rakelib/ruboto.stdlib.yml')
 
   Dir.chdir 'libs' do
     jruby_stdlib = Dir['jruby-stdlib-*.jar'][-1]
@@ -92,7 +94,7 @@ def remove_unneeded_parts_of_stdlib
   included_stdlibs = ruboto_config['included_stdlibs']
   excluded_stdlibs = [*ruboto_config['excluded_stdlibs']].compact
 
-  if included_stdlibs and included_stdlibs == "auto"
+  if included_stdlibs == 'auto'
     if File.exists? '../../auto_dependencies.yml'
       included_stdlibs = YAML::load_file('../../auto_dependencies.yml')
     else
@@ -140,15 +142,15 @@ def remove_unneeded_parts_of_stdlib
           end
         end
       end
-    end
-
-    if included_stdlibs.nil? and excluded_stdlibs.any?
+    elsif excluded_stdlibs.any?
       # Don't allow jruby and java to be removed
-      excluded_stdlibs = excluded_stdlibs - %w(jruby java)
-
+      excluded_stdlibs -= %w(jruby java)
       ruby_stdlib_versions = Dir['*'] - %w(gems)
-      ruby_stdlib_versions.each do |ld|
-        excluded_stdlibs.each do |d|
+      excluded_stdlibs.each do |d|
+        if Dir["{#{ruby_stdlib_versions.join(',')}}/#{d}"].empty?
+          puts "Exclude pattern #{dir.inspect} does not match any files."
+        end
+        ruby_stdlib_versions.each do |ld|
           dir = "#{ld}/#{d}"
           FileUtils.rm_rf dir if File.exists? dir
           file = "#{dir}.rb"
@@ -157,11 +159,22 @@ def remove_unneeded_parts_of_stdlib
       end
       print "excluded #{excluded_stdlibs.join(' ')}..."
     end
+
+    # Corrects bug in krypt that loads FFI.
+    # Only affects JRuby 1.7.11, 1.7.12, and 9000 (until fixed).
+    # FIXME(uwe):  Remove when we stop supporting JRuby 1.7.11 and 1.7.12
+    Dir['**/provider.rb'].each do |f|
+      puts "Patching #{f}..."
+      File.write(f, File.read(f).sub(%r{require_relative 'provider/ffi'}, "# require_relative 'provider/ffi'"))
+    end
+    # EMXIF
+
   end
 end
 
 def cleanup_jars
   Dir.chdir 'new' do
+    cmd_line_jar_found = false
     Dir['**/*.jar'].each do |j|
 
       # FIXME(uwe):  Installing bcmail-jdk15-146.jar + bcprov-jdk15-146.jar fails due to
@@ -174,23 +187,31 @@ def cleanup_jars
       # 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'
+      # bug in Android 4.0.  Remove when we stop supporting android-15 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
+      if min_sdk_version <= 15
         FileUtils.rm j
+        cmd_line_jar_found = true
         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/
+      # FIXME(uwe): Duplicate in JRuby <=1.7.12. Remove when we stop supporting JRuby 1.7.12.
+      if j =~ /bc.*147/
         FileUtils.rm j
         next
       end
       # EMXIF
 
+      # Command line option libraries not needed
+      if j =~ /jline|readline/
+        cmd_line_jar_found = true
+        FileUtils.rm j
+        next
+      end
+
       print "#{File.basename(j).chomp('.jar')}..."
       system "jar xf #{j}"
       FileUtils.rm j
@@ -221,6 +242,32 @@ def cleanup_jars
           public
           Java::json.ext.ParserService.new.basicLoad(JRuby.runtime)
         END_CODE
+      elsif j =~ %r{jopenssl.jar$}
+        jar_load_code = <<-END_CODE
+          require 'jruby'
+          puts 'Starting JOpenSSL Service'
+          public
+          # Java::JopensslService.new.basicLoad(JRuby.runtime)
+          require 'java'
+          # remove the original bouncycastle provider of Android (com.android.org.bouncycastle.jce.provider)
+          java.security.Security.removeProvider("BC")
+          # add the new one used by jopenssl
+          java.security.Security.addProvider( org.bouncycastle.jce.provider.BouncyCastleProvider.new )
+        END_CODE
+      elsif j =~ %r{kryptproviderjdk.jar$}
+        jar_load_code = <<-END_CODE
+          require 'jruby'
+          puts 'Starting JRuby KryptproviderjdkService Service'
+          public
+          Java::KryptproviderjdkService.new.basicLoad(JRuby.runtime)
+        END_CODE
+      elsif j =~ %r{kryptcore.jar$}
+        jar_load_code = <<-END_CODE
+          require 'jruby'
+          puts 'Starting JRuby KryptcoreService Service'
+          public
+          Java::KryptcoreService.new.basicLoad(JRuby.runtime)
+        END_CODE
       else
         jar_load_code = ''
       end
@@ -228,6 +275,9 @@ def cleanup_jars
       File.open("#{j}.rb", 'w') { |f| f << jar_load_code }
       File.open("#{j}.jar.rb", 'w') { |f| f << jar_load_code }
     end
+    unless cmd_line_jar_found
+      puts "\nWARNING:  No command line jar filtered.  Has it changed?"
+    end
   end
 end
 
@@ -242,10 +292,10 @@ def find_dependencies
   else
     ruboto_config = {}
   end
-  ruby_version = ruboto_config['ruby_version'] || "1.9"
+  ruby_version = ruboto_config['ruby_version'] || '1.9'
 
-  local = StdlibDependencies.collect("src").dependencies
-  stdlib = StdlibDependencies.load('rakelib/stdlib.yml')[ruby_version]
+  local = StdlibDependencies.collect('src').dependencies
+  stdlib = StdlibDependencies.load('rakelib/ruboto.stdlib.yml')[ruby_version]
 
   dependencies = local.values.flatten
   new_values = []
@@ -253,7 +303,7 @@ def find_dependencies
 
   while check_values.any?
     check_values.each do |j|
-      new_values += stdlib[j] if stdlib[j] 
+      new_values += stdlib[j] if stdlib[j]
     end
 
     check_values = new_values - dependencies
@@ -261,6 +311,7 @@ def find_dependencies
     new_values = []
   end
 
-  dependencies.map{|d| d.split("/")[0]}.uniq.sort
-end
+  dependencies.reject! { |f| File.exists? "src/#{f}.rb" }
 
+  dependencies.map { |d| d.split('/')[0] }.uniq.sort
+end

data/assets/rakelib/{stdlib_dependencies.rb → ruboto.stdlib.rb}

@@ -6,7 +6,7 @@
 class StdlibDependencies
   attr_reader :dependencies, :version
 
-  REQUIRE = %r{^\s*require[ (]['"]([a-zA-Z0-9/-_]+)["'][)]?\s*$}
+  REQUIRE = %r{^\s*require[ (]['"]([a-zA-Z0-9/_-]+)["'][)]?\s*$}
   REQUIRE_RELATIVE = %r{^\s*require_relative[ (]['"]([a-zA-Z0-9/-_]+)["'][)]?\s*$}
 
   def self.[](key)
@@ -17,20 +17,20 @@ class StdlibDependencies
     @@versions ||= {}
   end
 
-  def self.collect(dir=".")
-    local = new("app")
-    Dir.chdir(dir) do 
-      local.check_dir(["ruboto"])
+  def self.collect(dir='.')
+    local = new('app')
+    Dir.chdir(dir) do
+      local.check_dir(['ruboto'])
     end
     local
   end
 
-  def self.generate(dir=".")
+  def self.generate(dir='.')
     versions
 
     Dir.chdir(dir) do
-      raise("Can't find shared directory") unless File.directory?("shared") 
-      Dir["*"].select{|d| File.directory?(d) && d != "shared"}.each do |d|
+      raise("Can't find shared directory") unless File.directory?('shared')
+      Dir['*'].select{|d| File.directory?(d) && d != 'shared'}.each do |d|
         @@versions[d] = new(d).generate
       end
     end
@@ -40,14 +40,9 @@ class StdlibDependencies
 
   def self.dump(file)
     require 'yaml'
-
     all_dependencies = {}
     versions.each{|k, v| all_dependencies[k] = v.dependencies}
-
-    File.open( file, 'w' ) do |out|
-      YAML.dump( all_dependencies, out )
-    end
-
+    File.open(file, 'w') { |out| YAML.dump(all_dependencies, out) }
     versions
   end
 
@@ -55,10 +50,10 @@ class StdlibDependencies
     require 'yaml'
 
     @@versions = {}
-    raise("Can't find #{file}") unless File.exists?(file) 
+    raise("Can't find #{file}") unless File.exists?(file)
 
-    File.open(file) do |versions|
-      YAML.load(versions).each{|k,v| @@versions[k] = new(k, v)}
+    File.open(file) do |f|
+      YAML.load(f).each{|k,v| @@versions[k] = new(k, v)}
     end
 
     versions
@@ -74,10 +69,10 @@ class StdlibDependencies
   end
 
   def generate
-    raise("Can't find shared directory") unless File.directory?("shared") 
-    raise("Can't find #{@version} directory") unless File.directory?(@version) 
+    raise("Can't find shared directory") unless File.directory?('shared')
+    raise("Can't find #{@version} directory") unless File.directory?(@version)
 
-    Dir.chdir("shared"){check_dir}
+    Dir.chdir('shared'){check_dir}
     Dir.chdir(@version){check_dir}
 
     # Clean up dependencies
@@ -85,10 +80,10 @@ class StdlibDependencies
       # remove duplicates
       @dependencies[i] = @dependencies[i].uniq
 
-      # remove references to self 
+      # remove references to self
       @dependencies[i] = @dependencies[i] - [i]
 
-      # sort 
+      # sort
       @dependencies[i] = @dependencies[i].sort
     end
 
@@ -128,9 +123,8 @@ class StdlibDependencies
   end
 
   def check_dir(exclude=[])
-    Dir["**/*.rb"].select{|rb| not exclude.include?(rb.split('/')[0])}.each do |i|
+    Dir['**/*.rb'].select{|rb| not exclude.include?(rb.split('/')[0])}.each do |i|
       gather_dependencies(i)
     end
   end
 end
-

data/assets/ruboto.yml

@@ -13,11 +13,11 @@
 #
 # ruby_version
 #   
-#    Sets the jruby.compat.version property of JRuby
-#    If you include the jruby jars, this is used to
+#    Sets the jruby.compat.version property for JRuby 1.7.x.
+#    If you include the jruby jars, this is also used to
 #      trim away unused versions of the stdlib.
 #
-#ruby_version: 1.9
+# ruby_version: 1.9
 
 ###################################
 #
@@ -44,19 +44,29 @@
 #    Note: If you specify included_stdlibs above,
 #    this information will be ingnored. 
 #
-#excluded_stdlibs:
-#- ant
-#- cgi
-#- drb
-#- erb
-#- gauntlet_rdoc
-#- minitest
-#- profiler
-#- rake
-#- rdoc
-#- shell
-#- test
-#- webrick
-#- win32
-#- Win32API
+# excluded_stdlibs:
+# - ant
+# - cgi
+# - drb
+# - erb
+# - gauntlet_rdoc
+# - minitest
+# - profiler
+# - rake
+# - rdoc
+# - shell
+# - test
+# - webrick
+# - win32
+# - Win32API
 
+###################################
+#
+# multi_dex
+#
+#    Switch on use of multiple classes.dex files when building.
+#    This will allow you to have more than 65535 methods in your app.
+#    WARNING:  This disables pre-dex during build which will increase your
+#    incremental build time substantially.
+#
+# multi_dex: true