ruboto 0.10.1 → 0.10.2.rc.0

data/test/ruboto_gen_test.rb

@@ -49,14 +49,18 @@ class RubotoGenTest < Test::Unit::TestCase
     end
   end
 
-  # APK was smaller than 277.2KB:   61.9KB.  PLATFORM: CURRENT,    ANDROID_TARGET: 10.
-  # APK was smaller than 278.1KB:   67.2KB.  PLATFORM: CURRENT,    ANDROID_TARGET: 15.
-  # APK was larger than 5800.0KB: 5879.2KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.6.7.
-  # APK was larger than 7100.0KB: 7341.1KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 10, JRuby: 1.7.0.preview2.
-  # APK was larger than 7308.0KB: 7558.3KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.0.preview2.
-  # APK was larger than 4200.0KB: 7380.0KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.0.
-  # APK was larger than 7600.0KB: 9962.1KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 10, JRuby: 1.7.2.dev.
-
+  # APK was    56.4KB.  PLATFORM: CURRENT,    ANDROID_TARGET: 7
+  # APK was    61.9KB.  PLATFORM: CURRENT,    ANDROID_TARGET: 10
+  # APK was    67.2KB.  PLATFORM: CURRENT,    ANDROID_TARGET: 15
+  # APK was    72.9KB.  PLATFORM: CURRENT     ANDROID_TARGET: 16
+  # APK was  5879.2KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.6.7
+  # APK was  7380.0KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.0
+  # APK was  7310.1KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 10, JRuby: 1.7.2
+  # APK was  7337.0KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.2.
+  # APK was  7317.4KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.3
+  # APK was  7332.1KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.3
+  # APK was  7405.8KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.4.dev
+  # APK was  7420.9KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 16, JRuby: 1.7.4.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}"
@@ -66,15 +70,17 @@ class RubotoGenTest < Test::Unit::TestCase
           '1.6.7' => 5900.0,
           '1.6.8' => 5900.0,
           '1.7.0' => ANDROID_TARGET < 15 ? 7400.0 : 7600.0,
-          '1.7.1.dev' => ANDROID_TARGET < 15 ? 7400.0 : 7600.0,
-          '1.7.2.dev' => 9970.0,
-      }[JRUBY_JARS_VERSION.to_s] || 7600.0
+          '1.7.1' => ANDROID_TARGET < 15 ? 7400.0 : 7600.0,
+          '1.7.2' => 7400.0,
+          '1.7.3' => 7400.0,
+      }[JRUBY_JARS_VERSION.to_s] || 7500.0
       version << ", JRuby: #{JRUBY_JARS_VERSION.to_s}"
     else
       upper_limit = {
+          7 => 62.0,
           10 => 62.0,
           15 => 63.0,
-      }[ANDROID_TARGET] || 64.0
+      }[ANDROID_TARGET] || 73.0
     end
     lower_limit = upper_limit * 0.9
     assert apk_size <= upper_limit, "APK was larger than #{'%.1f' % upper_limit}KB: #{'%.1f' % apk_size.ceil(1)}KB.#{version}"

data/test/ruboto_update_test.rb

@@ -1,17 +1,24 @@
 if ENV['SKIP_RUBOTO_UPDATE_TEST']
   puts 'Detected SKIP_RUBOTO_UPDATE_TEST environment variable.  Skipping Ruboto update test.'
-else
-  require File.expand_path('updated_example_test_methods', File.dirname(__FILE__))
-  require File.expand_path('update_test_methods', File.dirname(__FILE__))
+  example_limit = 0
+elsif ENV['RUBOTO_UPDATE_EXAMPLES']
+  example_limit = ENV['RUBOTO_UPDATE_EXAMPLES'].to_i
+  puts "Detected RUBOTO_UPDATE_EXAMPLES environment variable.  Limiting to #{example_limit} examples."
+end
+require File.expand_path('updated_example_test_methods', File.dirname(__FILE__))
+require File.expand_path('update_test_methods', File.dirname(__FILE__))
 
 # TODO(uwe): Delete obsolete examples when we stop supporting updating from them.
 
-  Dir.chdir "#{RubotoTest::PROJECT_DIR}/examples/" do
-    Dir["#{RubotoTest::APP_NAME}_*_tools_r*.tgz"].each do |f|
-      next unless f =~ /^#{RubotoTest::APP_NAME}_(.*)_tools_r(.*)\.tgz$/
-      ruboto_version = $1
-      tools_version = $2
-      self.class.class_eval <<EOF
+Dir.chdir "#{RubotoTest::PROJECT_DIR}/examples/" do
+  example_archives = Dir["#{RubotoTest::APP_NAME}_*_tools_r*.tgz"]
+  example_archives = example_archives.sort_by{|a| Gem::Version.new a[RubotoTest::APP_NAME.size + 1..-1].slice(/(.*)(?=_tools_)/)}
+  example_archives = example_archives.last(example_limit) if example_limit
+  example_archives.each do |f|
+    next unless f =~ /^#{RubotoTest::APP_NAME}_(.*)_tools_r(.*)\.tgz$/
+    ruboto_version = $1
+    tools_version = $2
+    self.class.class_eval <<EOF
 class RubotoUpdatedExample#{ruboto_version.gsub('.', '_')}Tools#{tools_version}Test < Test::Unit::TestCase
   include UpdatedExampleTestMethods
   def setup
@@ -26,6 +33,5 @@ class RubotoUpdate#{ruboto_version.gsub('.', '_')}Tools#{tools_version}Test < Te
   end
 end
 EOF
-    end
   end
 end

data/test/test_helper.rb

@@ -20,7 +20,7 @@ module RubotoTest
   Gem.paths = GEM_PATH
   Gem.refresh
   `gem query -i -n bundler`
-  system 'gem install bundler --no-ri --no-rdoc' unless $? == 0
+  system 'gem install bundler -v "!=1.3.1" --no-ri --no-rdoc' unless $? == 0
   `bundle check`
   system 'bundle --system' unless $? == 0
   lib_path = File.expand_path('lib', File.dirname(File.dirname(__FILE__)))
@@ -39,13 +39,13 @@ module RubotoTest
       '2.3.3' => 'android-10', '2.3.4' => 'android-10',
       '3.0' => 'android-11', '3.1' => 'android-12', '3.2' => 'android-13',
       '4.0.1' => 'android-14', '4.0.3' => 'android-15', '4.0.4' => 'android-15',
-      '4.1' => 'android-16', '4.1.1' => 'android-16',
+      '4.1' => 'android-16', '4.1.1' => 'android-16', '4.1.2' => 'android-16',
       '4.2' => 'android-17',
   }
 
   def self.version_from_device
-    puts "Reading OS version from device/emulator"
-    system "adb wait-for-device"
+    puts 'Reading OS version from device/emulator'
+    system 'adb wait-for-device'
     IO.popen('adb bugreport').each_line do |line|
       if line =~ /sdk-eng (.*?) .*? .*? test-keys/
         version = $1
@@ -57,7 +57,7 @@ module RubotoTest
         return $1
       end
     end
-    raise "Unable to read device/emulator apilevel"
+    raise 'Unable to read device/emulator apilevel'
   end
 
   def self.install_jruby_jars_gem
@@ -117,10 +117,10 @@ module RubotoTest
   RUBOTO_PLATFORM = ENV['RUBOTO_PLATFORM'] || 'CURRENT'
   puts "RUBOTO_PLATFORM: #{RUBOTO_PLATFORM}"
 
-  install_jruby_jars_gem
+  install_jruby_jars_gem unless RUBOTO_PLATFORM == 'CURRENT'
 
   if RUBOTO_PLATFORM == 'CURRENT'
-    JRUBY_JARS_VERSION = Gem::Version.new('1.7.1.dev')
+    JRUBY_JARS_VERSION = Gem::Version.new('1.7.1')
   else
     # FIXME(uwe):  Simplify when we stop supporting rubygems < 1.8.0
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.8.0')
@@ -263,30 +263,7 @@ class Test::Unit::TestCase
     end
     check_platform_installation
     Dir.chdir APP_DIR do
-      # FIXME(uwe): Simplify when we stop supporting JRuby < 1.7.0 which causes the ArrayIndexOutOfBoundsException
-      # FIXME(uwe): Simplify if we find a cause for the system crashes.
-      # system 'rake test:quick' # This line should replace all those below.
-
-      retries = 0
-      loop do
-        output = `rake test:quick`
-        puts output
-        break if $? == 0
-        retries += 1
-        # FIXME(uwe):  The cause of the system crash is unnown.  We should investigate.
-        if output =~ /INSTRUMENTATION_ABORTED: System has crashed./
-          puts "System crash detected."
-        elsif (RUBOTO_PLATFORM == 'CURRENT' || JRUBY_JARS_VERSION < Gem::Version.new('1.7.0')) &&
-            output =~ /INSTRUMENTATION_RESULT: longMsg=java.lang.ArrayIndexOutOfBoundsException/
-          puts "Known ArrayIndexOutOfBoundsException failure detected.  Retrying (#{retries})."
-        else
-          break
-        end
-        break if retries >= 3
-        puts "Retrying (#{retries})."
-      end
-      # EMXIF
-
+      system 'rake test:quick'
       assert_equal 0, $?, "tests failed with return code #$?"
     end
   end
@@ -295,9 +272,9 @@ class Test::Unit::TestCase
     if RUBOTO_PLATFORM == 'STANDALONE'
       system 'rake platform:uninstall'
     elsif RUBOTO_PLATFORM == 'CURRENT'
-      system "rake platform:current platform:install"
+      system 'rake platform:current'
     elsif RUBOTO_PLATFORM == 'FROM_GEM'
-      system "rake platform:debug platform:install"
+      system 'rake platform:install'
     else
       fail "Unknown Ruboto platform: #{RUBOTO_PLATFORM.inspect}"
     end
@@ -313,8 +290,12 @@ class Test::Unit::TestCase
   end
 
   def write_gemfile(bundle)
-    puts "Adding Gemfile.apk: #{[*bundle].join(' ')}"
-    File.open('Gemfile.apk', 'w') { |f| f << "source :rubygems\n\ngem 'sqldroid'\n" }
+    gems = [*bundle]
+    puts "Adding Gemfile.apk: #{gems.join(' ')}"
+    File.open('Gemfile.apk', 'w') do |f|
+      f << "source :rubygems\n\n"
+      gems.each{|g| f << "gem '#{g}'\n"}
+    end
   end
 
 end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ruboto
 version: !ruby/object:Gem::Version 
-  hash: 53
-  prerelease: 
+  hash: -3617997014
+  prerelease: 7
   segments: 
   - 0
   - 10
-  - 1
-  version: 0.10.1
+  - 2
+  - rc
+  - 0
+  version: 0.10.2.rc.0
 platform: ruby
 authors: 
 - Daniel Jackoway
@@ -18,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-01 00:00:00 Z
+date: 2013-03-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: main
@@ -134,10 +136,16 @@ files:
 - lib/ruboto.rb
 - test/activity/call_super_activity.rb
 - test/activity/call_super_activity_test.rb
+- test/activity/dir_and_file_activity.rb
+- test/activity/dir_and_file_activity_test.rb
 - test/activity/image_button_activity.rb
 - test/activity/image_button_activity_test.rb
 - test/activity/image_button_and_button_activity.rb
 - test/activity/image_button_and_button_activity_test.rb
+- test/activity/json_activity.rb
+- test/activity/json_activity_test.rb
+- test/activity/location_activity.rb
+- test/activity/location_activity_test.rb
 - test/activity/margins_activity.rb
 - test/activity/margins_activity_test.rb
 - test/activity/navigation_activity.rb
@@ -149,6 +157,8 @@ files:
 - test/activity/psych_activity.rb
 - test/activity/psych_activity_test.rb
 - test/activity/ruby_file_activity.rb
+- test/activity/ssl_activity.rb
+- test/activity/ssl_activity_test.rb
 - test/activity/stack_activity.rb
 - test/activity/stack_activity_test.rb
 - test/activity/subclass_activity.rb
@@ -187,12 +197,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: ruboto/ruboto