ruboto 1.0.2 → 1.0.3

data/lib/ruboto/util/setup.rb

@@ -645,6 +645,11 @@ module Ruboto
                 end
               end
               config_file_name = File.expand_path("~/#{a.nil? || a.empty? ? path_setup_file : a}")
+              unless File.exist? config_file_name
+                puts "Your path configuration script (#{config_file_name}) does not exist, Ruboto will create a new one."
+                system "touch #{config_file_name}"
+              end
+
               old_config = File.read(config_file_name)
               new_config = old_config.dup
               new_config.gsub! /\n*# BEGIN Ruboto setup\n.*?\n# END Ruboto setup\n*/m, ''

data/lib/ruboto/util/update.rb

@@ -232,7 +232,7 @@ module Ruboto
       def update_assets
         puts "\nCopying files:"
         weak_copier = Ruboto::Util::AssetCopier.new Ruboto::ASSETS, '.', false
-        %w{.gitignore Rakefile}.each { |f| log_action(f) { weak_copier.copy f } }
+        %w{.gitignore Rakefile ruboto.yml}.each { |f| log_action(f) { weak_copier.copy f } }
 
         copier = Ruboto::Util::AssetCopier.new Ruboto::ASSETS, '.'
         %w{assets rakelib res/layout test}.each do |f|
@@ -358,6 +358,7 @@ module Ruboto
       def update_core_classes(force = nil)
         generate_core_classes(:class => 'all', :method_base => 'on', :method_include => '', :method_exclude => '', :force => force, :implements => '')
         if File.exists?('ruboto.yml')
+          sleep 1
           FileUtils.touch 'ruboto.yml'
           system 'rake jruby_adapter'
         end
@@ -424,7 +425,9 @@ module Ruboto
                     '**/*windows*',
                     '**/*Windows*',
                     'META-INF',
-                    'com/headius',
+                    # 'com/headius',
+                    'com/headius/invokebinder',
+                    'com/headius/options/example',
                     'com/kenai/constantine',
                     'com/kenai/jffi',
                     'com/kenai/jnr/x86asm',
@@ -465,6 +468,8 @@ module Ruboto
                     'org/jruby/truffle',
                     'org/yecht',
                 ]
+              elsif gem_version >= Gem::Version.new('1.7.12')
+                excluded_core_packages = %w(**/*Darwin* **/*Solaris* **/*windows* **/*Windows* META-INF com/kenai/constantine com/kenai/jffi com/kenai/jnr/x86asm com/martiansoftware jni jnr/constants/platform/darwin jnr/constants/platform/fake jnr/constants/platform/freebsd jnr/constants/platform/openbsd jnr/constants/platform/sunos jnr/ffi/annotations jnr/ffi/byref jnr/ffi/mapper jnr/ffi/provider jnr/ffi/util jnr/ffi/Struct$* jnr/ffi/types jnr/posix/Aix* jnr/posix/FreeBSD* jnr/posix/MacOS* jnr/posix/OpenBSD* jnr/x86asm org/jruby/ant org/jruby/cext org/jruby/compiler/impl/BaseBodyCompiler* org/jruby/compiler/util org/jruby/demo org/jruby/embed/bsf org/jruby/embed/jsr223 org/jruby/embed/osgi org/jruby/ext/ffi/AbstractMemory* org/jruby/ext/ffi/io org/jruby/ext/ffi/jffi org/jruby/ext/tracepoint org/jruby/javasupport/bsf org/yecht)
               elsif gem_version >= Gem::Version.new('1.7.5')
                 excluded_core_packages = %w(**/*Darwin* **/*Solaris* **/*windows* **/*Windows* META-INF com/headius com/kenai/constantine com/kenai/jffi com/kenai/jnr/x86asm com/martiansoftware jni jnr/constants/platform/darwin jnr/constants/platform/fake jnr/constants/platform/freebsd jnr/constants/platform/openbsd jnr/constants/platform/sunos jnr/ffi/annotations jnr/ffi/byref jnr/ffi/mapper jnr/ffi/provider jnr/ffi/util jnr/ffi/Struct$* jnr/ffi/types jnr/posix/Aix* jnr/posix/FreeBSD* jnr/posix/MacOS* jnr/posix/OpenBSD* jnr/x86asm org/jruby/ant org/jruby/cext org/jruby/compiler/impl/BaseBodyCompiler* org/jruby/compiler/util org/jruby/demo org/jruby/embed/bsf org/jruby/embed/jsr223 org/jruby/embed/osgi org/jruby/ext/ffi/AbstractMemory* org/jruby/ext/ffi/io org/jruby/ext/ffi/jffi org/jruby/ext/tracepoint org/jruby/javasupport/bsf org/yecht)
               elsif gem_version >= Gem::Version.new('1.7.4')
@@ -541,129 +546,8 @@ module Ruboto
 
       # - Moves ruby stdlib to the root of the jruby-stdlib jar
       def reconfigure_jruby_stdlib
-        min_sdk_version = verify_manifest.elements['uses-sdk'].attributes['android:minSdkVersion'].to_i
-        included_stdlibs = verify_ruboto_config['included_stdlibs']
-        excluded_stdlibs = [*verify_ruboto_config['excluded_stdlibs']].compact
-        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'
-
-              Dir.chdir 'new/jruby.home/lib/ruby' do
-                ruby_stdlib_versions = Dir['*'] - %w(gems)
-                if included_stdlibs
-                  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 excluded_stdlibs.any?
-                  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
-
-              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
-                  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
-
-                `jar -cf ../../#{jruby_stdlib} .`
-                raise "Creating repackaged jruby-stdlib jar failed: #$?" unless $? == 0
-              end
-            end
-          end
-
-          FileUtils.remove_dir 'tmp', true
-        end
+        abort "cannot find rakelib/stdlib.rake; make sure you update your app (ruboto update app)" unless File.exists?("rakelib/stdlib.rake")
+        system 'rake libs:reconfigure_stdlib'
       end
 
       # - Removes unneeded code from dx.jar

data/lib/ruboto/util/verify.rb

@@ -77,7 +77,7 @@ module Ruboto
 
       def verify_ruboto_config
         if File.exists? 'ruboto.yml'
-          @ruboto_config ||= YAML::load_file('ruboto.yml')
+          @ruboto_config ||= (YAML::load_file('ruboto.yml') || {})
         else
           @ruboto_config = {}
         end

data/lib/ruboto/version.rb

@@ -1,4 +1,4 @@
 module Ruboto
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
   UPDATE_VERSION_LIMIT = '0.7.0'
 end

data/test/activity/dir_and_file_activity.rb

@@ -11,7 +11,7 @@ class DirAndFileActivity
         linear_layout :orientation => :vertical do
           text_view :id => 42, :text => __FILE__
           text_view :id => 43, :text => File.dirname(__FILE__)
-          text_view :id => 44, :text => Dir["#{File.dirname(__FILE__)}/*"][0].to_s
+          text_view :id => 44, :text => Dir["#{File.dirname(__FILE__)}/*"].sort[0].to_s
           text_view :id => 45, :text => Dir.foreach(File.dirname(__FILE__)).to_a[2].to_s
         end
   end

data/test/minimal_app_test.rb

@@ -19,15 +19,20 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
     # APK was 4.3MB.  JRuby: 1.7.5, ANDROID_TARGET: 16
     # APK was 8.4MB.  JRuby: 1.7.8, ANDROID_TARGET: 10
     # APK was 4.3MB.  JRuby: 1.7.8, ANDROID_TARGET: 16
+    # APK was 4.4MB.  JRuby: 1.7.12, ANDROID_TARGET: 19
     # APK was 4.2MB.  JRuby: 9000.dev, ANDROID_TARGET: 10
     # APK was 4.2MB.  JRuby: 9000.dev, ANDROID_TARGET: 15
-    # APK was 4.3MB.  JRuby: 9000.dev, ANDROID_TARGET: 16
+    # APK was 4.5MB.  JRuby: 9000.dev, ANDROID_TARGET: 16
     def test_minimal_apk_is_within_limits
       apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / (1024 * 1024)
       upper_limit = {
           '1.7.4' => 4.4,
           '1.7.8' => 4.3,
-          '9000.dev' => 4.3,
+          '1.7.9' => 4.3,
+          '1.7.10' => 4.4,
+          '1.7.11' => 4.4,
+          '1.7.12' => 4.4,
+          '9000.dev' => 4.5,
       }[JRUBY_JARS_VERSION.to_s] || 4.3
       lower_limit = upper_limit * 0.9
       version_message ="JRuby: #{JRUBY_JARS_VERSION}, ANDROID_TARGET: #{ANDROID_TARGET}"

data/test/rake_test.rb

@@ -21,34 +21,40 @@ class RakeTest < Test::Unit::TestCase
       s2.gsub!(/What hath Matz wrought\?/, 'This text was changed by script!')
       File.open(test_filename, 'w') { |f| f << s2 }
 
-      apk_timestamp = File.ctime("bin/#{APP_NAME}-debug.apk")
+      apk_timestamp = File.mtime("bin/#{APP_NAME}-debug.apk")
     end
     run_app_tests
 
     # FIXME(uwe): Uncomment this when we can build the test package without building the main package
-    # assert_equal apk_timestamp, File.ctime("bin/#{APP_NAME}-debug.apk"), 'APK should not have been rebuilt'
+    # assert_equal apk_timestamp, File.mtime("bin/#{APP_NAME}-debug.apk"), 'APK should not have been rebuilt'
     # EMXIF
 
     assert_match %r{^/sdcard/Android/data/#{PACKAGE}/files/scripts$}, `adb shell ls -d /sdcard/Android/data/#{PACKAGE}/files/scripts`.chomp
   end
 
+  # FIXME(uwe):  This is actually a case where we want to just update the Ruby
+  # source file instead of rebuilding the apk.
   def test_that_apk_is_built_if_only_one_ruby_source_file_has_changed
     Dir.chdir APP_DIR do
       system 'rake debug'
-      apk_timestamp = File.ctime("bin/#{APP_NAME}-debug.apk")
+      apk_timestamp = File.mtime("bin/#{APP_NAME}-debug.apk")
+      sleep 1
       FileUtils.touch 'src/ruboto_test_app_activity.rb'
+      sleep 1
       system 'rake debug'
-      assert_not_equal apk_timestamp, File.ctime("bin/#{APP_NAME}-debug.apk"), 'APK should have been rebuilt'
+      assert_not_equal apk_timestamp, File.mtime("bin/#{APP_NAME}-debug.apk"),
+          'APK should have been rebuilt'
     end
   end
 
   def test_that_apk_is_built_if_only_one_non_ruby_source_file_has_changed
     Dir.chdir APP_DIR do
       system 'rake debug'
-      apk_timestamp = File.ctime("bin/#{APP_NAME}-debug.apk")
+      apk_timestamp = File.mtime("bin/#{APP_NAME}-debug.apk")
       FileUtils.touch 'src/not_ruby_source.properties'
       system 'rake debug'
-      assert_not_equal apk_timestamp, File.ctime("bin/#{APP_NAME}-debug.apk"), 'APK should have been rebuilt'
+      assert_not_equal apk_timestamp, File.mtime("bin/#{APP_NAME}-debug.apk"),
+          'APK should have been rebuilt'
     end
   end
 

data/test/ruboto_gen_test.rb

@@ -62,8 +62,12 @@ class RubotoGenTest < Test::Unit::TestCase
   # APK was  8781.6KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.8
   # APK was  8789.6KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.9
   # APK was  8791.2KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.10
+  # APK was  8575.0KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 10, JRuby: 1.7.11
+  # APK was  8793.4KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.11
+  # APK was  8820.3KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 19, JRuby: 1.7.12
   # APK was  6689.5KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 10, JRuby: 9000.dev
   # APK was  7012.2KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 9000.dev
+  # APK was  7201.1KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 17, JRuby: 9000.dev
   def test_new_apk_size_is_within_limits
     apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / 1024
     version = "  PLATFORM: #{RUBOTO_PLATFORM}"
@@ -76,7 +80,9 @@ class RubotoGenTest < Test::Unit::TestCase
           '1.7.8' => 8800.0,
           '1.7.9' => 8800.0,
           '1.7.10' => 8800.0,
-          '9000.dev' => 7100.0,
+          '1.7.11' => 8800.0,
+          '1.7.12' => 8900.0,
+          '9000.dev' => 7300.0,
       }[JRUBY_JARS_VERSION.to_s] || 0.0
       version << ", JRuby: #{JRUBY_JARS_VERSION.to_s}"
     else
@@ -86,7 +92,7 @@ class RubotoGenTest < Test::Unit::TestCase
           16 => 75.0,
       }[ANDROID_TARGET] || 75.0
     end
-    lower_limit = upper_limit * 0.9
+    lower_limit = upper_limit * 0.7
     assert apk_size <= upper_limit, "APK was larger than #{'%.1f' % upper_limit}KB: #{'%.1f' % apk_size.ceil(1)}KB.#{version}"
     assert apk_size >= lower_limit, "APK was smaller than #{'%.1f' % lower_limit}KB: #{'%.1f' % apk_size.floor(1)}KB.  You should lower the limit.#{version}"
   end

data/test/test_helper.rb

@@ -46,7 +46,7 @@ module RubotoTest
         version = $1
         api_level = VERSION_TO_API_LEVEL[version]
         raise "Unknown version: #{version}" if api_level.nil?
-        return api_level
+        return "android-#{api_level}"
       end
       if line =~ /\[ro\.build\.version\.sdk\]: \[(\d+)\]/
         return $1
@@ -159,6 +159,7 @@ class Test::Unit::TestCase
     package = options.delete(:package) || PACKAGE
     standalone = options.delete(:standalone) || !!included_stdlibs || !!excluded_stdlibs || ENV['RUBOTO_PLATFORM'] == 'STANDALONE'
     update = options.delete(:update) || false
+    ruby_version = options.delete(:ruby_version) || (JRUBY_JARS_VERSION.to_s[0..0] == "9" ? 2.1 : 1.9)
     raise "Unknown options: #{options.inspect}" unless options.empty?
 
     raise 'Inclusion/exclusion of libs requires standalone mode.' if (included_stdlibs || excluded_stdlibs) && !standalone
@@ -169,6 +170,7 @@ class Test::Unit::TestCase
     template_dir = "#{APP_DIR}_template_#{$$}"
     template_dir << "_package_#{package}" if package != PACKAGE
     template_dir << "_heap_alloc_#{heap_alloc}" if heap_alloc
+#    template_dir << "_ruby_version_#{ruby_version.to_s.gsub('.', '_')}" if ruby_version
     template_dir << "_example_#{example}" if example
     template_dir << "_bundle_#{[*bundle].join('_')}" if bundle
     template_dir << '_updated' if update
@@ -187,7 +189,7 @@ class Test::Unit::TestCase
           File.open('local.properties', 'w') { |f| f.puts "sdk.dir=#{ANDROID_HOME}" }
           File.open('test/local.properties', 'w') { |f| f.puts "sdk.dir=#{ANDROID_HOME}" }
           if standalone
-            write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc) if included_stdlibs || excluded_stdlibs || heap_alloc
+            write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc, ruby_version) if included_stdlibs || excluded_stdlibs || heap_alloc || ruby_version
             FileUtils.touch 'libs/jruby-core-x.x.x.jar'
             FileUtils.touch 'libs/jruby-stdlib-x.x.x.jar'
             install_jruby_jars_gem
@@ -209,7 +211,7 @@ class Test::Unit::TestCase
         end
         Dir.chdir APP_DIR do
           write_gemfile(bundle) if bundle
-          write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc) if included_stdlibs || excluded_stdlibs || heap_alloc
+          write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc, ruby_version) if included_stdlibs || excluded_stdlibs || heap_alloc || ruby_version
           if standalone
             system "#{RUBOTO_CMD} gen jruby"
             raise "update jruby failed with return code #$?" if $? != 0
@@ -287,14 +289,13 @@ class Test::Unit::TestCase
     end
   end
 
-  def write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc)
+  def write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc, ruby_version)
     yml = YAML.dump({'included_stdlibs' => included_stdlibs,
                      'excluded_stdlibs' => excluded_stdlibs,
+ #                    'ruby_version' => ruby_version,
                      'heap_alloc' => heap_alloc})
     puts "Adding ruboto.yml:\n#{yml}"
-    File.open('ruboto.yml', 'w') do |f|
-      f << yml
-    end
+    File.open('ruboto.yml', 'w') { |f| f << yml }
   end
 
   def write_gemfile(bundle)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruboto
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Daniel Jackoway
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-22 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
@@ -78,6 +78,9 @@ files:
 - assets/Rakefile
 - assets/libs/dx.jar
 - assets/rakelib/ruboto.rake
+- assets/rakelib/stdlib.rake
+- assets/rakelib/stdlib.yml
+- assets/rakelib/stdlib_dependencies.rb
 - assets/res/.DS_Store
 - assets/res/drawable-hdpi/.DS_Store
 - assets/res/drawable-hdpi/ic_launcher.png
@@ -86,6 +89,7 @@ files:
 - assets/res/drawable/.DS_Store
 - assets/res/drawable/get_ruboto_core.png
 - assets/res/layout/get_ruboto_core.xml
+- assets/ruboto.yml
 - assets/samples/sample_activity.rb
 - assets/samples/sample_activity_test.rb
 - assets/samples/sample_broadcast_receiver.rb
@@ -228,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ruboto/ruboto
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A platform for developing apps using JRuby on Android.