ruboto 0.10.2 → 0.11.0.rc.0

data/test/broadcast_receiver_test.rb

@@ -19,8 +19,8 @@ class BroadcastReceiverTest < Test::Unit::TestCase
       activity_filename = 'src/ruboto_test_app_activity.rb'
       activity_content = File.read(activity_filename)
 
-      assert activity_content.sub!(/  def on_create\(bundle\)\n/, <<EOF)
-  def on_create(bundle)
+      assert activity_content.sub!(/  def onCreate\(bundle\)\n/, <<EOF)
+  def onCreate(bundle)
     super
     $broadcast_test_activity = self
     @receiver = $package.ClickReceiver.new
@@ -52,8 +52,8 @@ EOF
       receiver_filename = 'src/click_receiver.rb'
       receiver_content = File.read(receiver_filename)
 
-      assert receiver_content.sub!(/  def on_receive\(context, intent\)\n.*?^  end\n/m, <<EOF)
-  def on_receive(context, intent)
+      assert receiver_content.sub!(/  def onReceive\(context, intent\)\n.*?^  end\n/m, <<EOF)
+  def onReceive(context, intent)
     Log.d "RUBOTO TEST", "Changing UI text"
     context.run_on_ui_thread{$broadcast_test_activity.find_view_by_id(42).text = '#{message}'}
     Log.d "RUBOTO TEST", "UI text changed OK!"

data/test/minimal_app_test.rb

@@ -1,18 +1,47 @@
-require File.expand_path("test_helper", File.dirname(__FILE__))
+require File.expand_path('test_helper', File.dirname(__FILE__))
 
 if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
   require 'bigdecimal'
 
   class MinimalAppTest < Test::Unit::TestCase
     def setup
-      generate_app :excluded_stdlibs => %w{ant cgi digest dl drb ffi irb net optparse racc rbconfig rdoc rexml rinda rss
-        rubygems runit shell soap test uri webrick win32 wsdl xmlrpc xsd ../1.9}
+      generate_app :included_stdlibs => []
     end
 
     def teardown
       cleanup_app
     end
 
+    # APK was 3.5MB.  JRuby: 1.6.7,     ANDROID_TARGET: 15
+    # APK was 3.3MB.  JRuby: 1.6.7.2,   ANDROID_TARGET: 10
+    # APK was 4.7MB.  JRuby: 1.7.0,     ANDROID_TARGET: 15
+    # APK was 4.5MB.  JRuby: 1.7.2,     ANDROID_TARGET: 10
+    # APK was 4.5MB.  JRuby: 1.7.2,     ANDROID_TARGET: 15
+    # APK was 4.3MB.  JRuby: 1.7.3,     ANDROID_TARGET: 10
+    # APK was 4.2MB.  JRuby: 1.7.3,     ANDROID_TARGET: 15
+    # APK was 4.4MB.  JRuby: 1.7.4.dev, ANDROID_TARGET: 10
+
+    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.6.7' => 3.5,
+          '1.6.7.2' => 3.5,
+          '1.6.8' => 3.5,
+          '1.7.0' => ANDROID_TARGET < 15 ? 4.7 : 4.9,
+          '1.7.1' => ANDROID_TARGET < 15 ? 4.7 : 4.9,
+          '1.7.2' => ANDROID_TARGET < 15 ? 4.6 : 4.9,
+          '1.7.3' => ANDROID_TARGET < 15 ? 4.3 : 4.4,
+      }[JRUBY_JARS_VERSION.to_s] || 4.4
+      lower_limit = upper_limit * 0.9
+      version_message ="JRuby: #{JRUBY_JARS_VERSION}, ANDROID_TARGET: #{ANDROID_TARGET}"
+      assert apk_size <= upper_limit, "APK was larger than #{'%.1f' % upper_limit}MB: #{'%.1f' % apk_size.ceil(1)}MB.  #{version_message}"
+      assert apk_size >= lower_limit, "APK was smaller than #{'%.1f' % lower_limit}MB: #{'%.1f' % apk_size.floor(1)}MB.  You should lower the limit.  #{version_message}"
+    end
+
+    def test_minimal_apk_succeeds_tests
+      run_app_tests
+    end
+
     # APK was 3.5MB.  JRuby: 1.6.7,     ANDROID_TARGET: 15.
     # APK was 3.3MB.  JRuby: 1.6.7.2,   ANDROID_TARGET: 10.
     # APK was 4.7MB.  JRuby: 1.7.0,     ANDROID_TARGET: 15.
@@ -20,7 +49,10 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
     # APK was 4.5MB.  JRuby: 1.7.2,     ANDROID_TARGET: 15.
     # APK was 4.6MB.  JRuby: 1.7.3.dev, ANDROID_TARGET: 10.
     # APK was 4.5MB.  JRuby: 1.7.3.dev, ANDROID_TARGET: 15.
-    def test_minimal_apk_is_less_than_3_mb
+    # FIXME(uwe): Remove when we remove the exclude feature
+    def test_minimal_apk_with_excludes_is_less_than_5_mb
+      generate_app :excluded_stdlibs => %w{ant cgi digest dl drb ffi irb net optparse racc rbconfig rdoc rexml rinda rss
+        rubygems runit shell soap test uri webrick win32 wsdl xmlrpc xsd ../1.9}
       apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / (1024 * 1024)
       upper_limit = {
           '1.6.7' => 3.5,
@@ -36,9 +68,5 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
       assert apk_size >= lower_limit, "APK was smaller than #{'%.1f' % lower_limit}MB: #{'%.1f' % apk_size.floor(1)}MB.  You should lower the limit.  #{version_message}"
     end
 
-    def test_minimal_apk_succeeds_tests
-      run_app_tests
-    end
-
   end
 end

data/test/ruboto_gen_test.rb

@@ -52,7 +52,7 @@ class RubotoGenTest < Test::Unit::TestCase
   # 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    73.1KB.  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
@@ -80,7 +80,8 @@ class RubotoGenTest < Test::Unit::TestCase
           7 => 62.0,
           10 => 62.0,
           15 => 63.0,
-      }[ANDROID_TARGET] || 73.0
+          16 => 74.0,
+      }[ANDROID_TARGET] || 74.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}"
@@ -122,7 +123,7 @@ require 'ruboto/widget'
 ruboto_import_widgets :LinearLayout, :ListView, :TextView
 
 class RubotoTestAppActivity
-  def on_create(bundle)
+  def onCreate(bundle)
     super
     set_title 'ListView Example'
 
@@ -173,7 +174,7 @@ end
 class RubotoArrayAdapter
   import android.content.Context
 
-  def get_view(position, convert_view, parent)
+  def getView(position, convert_view, parent)
     puts "IN get_view!!!"
     @inflater = context.getSystemService(Context::LAYOUT_INFLATER_SERVICE) unless @inflater
     if convert_view
@@ -216,11 +217,6 @@ class RubotoArrayAdapter
     convert_view
   end
 
-  def getView(position, convert_view, parent)
-    puts "IN get_view!!!"
-    get_view(position, convert_view, parent)
-  end
-
 end
 EOF
 

data/test/service_test.rb

@@ -25,7 +25,7 @@ require 'ruboto/widget'
 ruboto_import_widgets :Button, :LinearLayout, :TextView
 
 class RubotoTestAppActivity
-  def on_create(bundle)
+  def onCreate(bundle)
     super
     $ruboto_test_app_activity = self
     set_title 'Domo arigato, Mr Ruboto!'
@@ -71,8 +71,8 @@ require 'ruboto/service'
 class RubotoTestService
   TARGET_TEXT = 'What hath Matz wrought!'
 
-  def on_create
-    puts "service on_create"
+  def onCreate
+    puts "service onCreate"
     Thread.start do
       loop do
         sleep 1
@@ -81,12 +81,12 @@ class RubotoTestService
     end
     puts "\#{self.class} started."
 
-    $ruboto_test_app_activity.set_title 'on_create'
+    $ruboto_test_app_activity.set_title 'onCreate'
 
     android.app.Service::START_STICKY
   end
 
-  def on_start_command(intent, flags, start_id)
+  def onStartCommand(intent, flags, start_id)
     puts "service on_start_command(\#{intent}, \#{flags}, \#{start_id})"
     $ruboto_test_app_activity.set_title 'on_start_command'
     $ruboto_test_app_activity.set_text TARGET_TEXT

data/test/sqldroid_test.rb

@@ -41,7 +41,7 @@ class MyArrayAdapter < android.widget.ArrayAdapter
 end
 
 class RubotoTestAppActivity
-  def on_create(bundle)
+  def onCreate(bundle)
     super
     setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "\#{s[0..0].upcase}\#{s[1..-1]}" }.join(' ')
 

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 -v "!=1.3.1" --no-ri --no-rdoc' unless $? == 0
+  system 'gem install bundler --no-ri --no-rdoc' unless $? == 0
   `bundle check`
   system 'bundle --system' unless $? == 0
   lib_path = File.expand_path('lib', File.dirname(File.dirname(__FILE__)))
@@ -111,7 +111,7 @@ module RubotoTest
   install_jruby_jars_gem unless RUBOTO_PLATFORM == 'CURRENT'
 
   if RUBOTO_PLATFORM == 'CURRENT'
-    JRUBY_JARS_VERSION = Gem::Version.new('1.7.1')
+    JRUBY_JARS_VERSION = Gem::Version.new('1.7.3')
   else
     # FIXME(uwe):  Simplify when we stop supporting rubygems < 1.8.0
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.8.0')
@@ -164,8 +164,10 @@ class Test::Unit::TestCase
   def generate_app(options = {})
     example = options.delete(:example) || false
     update = options.delete(:update) || false
+    # FIXME(uwe): Remove exclusion feature
     excluded_stdlibs = options.delete(:excluded_stdlibs)
-    standalone = options.delete(:standalone) || !!excluded_stdlibs || ENV['RUBOTO_PLATFORM'] == 'STANDALONE'
+    included_stdlibs = options.delete(:included_stdlibs)
+    standalone = options.delete(:standalone) || !!included_stdlibs  || !!excluded_stdlibs || ENV['RUBOTO_PLATFORM'] == 'STANDALONE'
     bundle = options.delete(:bundle)
     raise "Unknown options: #{options.inspect}" unless options.empty?
     Dir.mkdir TMP_DIR unless File.exists? TMP_DIR
@@ -177,6 +179,7 @@ class Test::Unit::TestCase
     template_dir << '_updated' if update
     template_dir << '_standalone' if standalone
     template_dir << "_without_#{excluded_stdlibs.map { |ed| ed.gsub(/[.\/]/, '_') }.join('_')}" if excluded_stdlibs
+    template_dir << "_with_#{included_stdlibs.map { |ed| ed.gsub(/[.\/]/, '_') }.join('_')}" if included_stdlibs
     if File.exists?(template_dir)
       puts "Copying app from template #{template_dir}"
       FileUtils.cp_r template_dir, APP_DIR, :preserve => true
@@ -210,6 +213,7 @@ class Test::Unit::TestCase
         Dir.chdir APP_DIR do
           write_gemfile(bundle) if bundle
           if standalone
+            include_stdlibs(included_stdlibs) if included_stdlibs
             exclude_stdlibs(excluded_stdlibs) if excluded_stdlibs
             system "#{RUBOTO_CMD} gen jruby"
             raise "update jruby failed with return code #$?" if $? != 0
@@ -275,6 +279,11 @@ class Test::Unit::TestCase
     end
   end
 
+  def include_stdlibs(included_stdlibs)
+    puts "Adding ruboto.yml: #{included_stdlibs.join(' ')}"
+    File.open('ruboto.yml', 'w') { |f| f << YAML.dump({:included_stdlibs => included_stdlibs}) }
+  end
+
   def exclude_stdlibs(excluded_stdlibs)
     puts "Adding ruboto.yml: #{excluded_stdlibs.join(' ')}"
     File.open('ruboto.yml', 'w') { |f| f << YAML.dump({:excluded_stdlibs => excluded_stdlibs}) }
@@ -284,7 +293,7 @@ class Test::Unit::TestCase
     gems = [*bundle]
     puts "Adding Gemfile.apk: #{gems.join(' ')}"
     File.open('Gemfile.apk', 'w') do |f|
-      f << "source :rubygems\n\n"
+      f << "source 'https://rubygems.org/'\n\n"
       gems.each{|g| f << "gem '#{g}'\n"}
     end
   end

metadata

@@ -1,46 +1,61 @@
 --- !ruby/object:Gem::Specification
 name: ruboto
 version: !ruby/object:Gem::Version
-  version: 0.10.2
-  prerelease:
+  version: 0.11.0.rc.0
+  prerelease: 7
 platform: ruby
 authors:
 - Daniel Jackoway
 - Charles Nutter
 - Scott Moyer
 - Uwe Kubosch
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-10 00:00:00.000000000 Z
+date: 2013-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.7.2
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  type: :runtime
-description: |
-  Ruboto (JRuby on Android) is a platform for developing full stand-alone apps for
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! 'Ruboto (JRuby on Android) is a platform for developing full stand-alone
+  apps for
+
   Android using the Ruby language and libraries.  It includes 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.
+
+'
 email: ruboto@googlegroups.com
 executables:
 - ruboto
@@ -52,8 +67,8 @@ files:
 - LICENSE
 - Rakefile
 - README.md
-- assets/Rakefile
 - assets/libs/dx.jar
+- assets/Rakefile
 - assets/rakelib/ruboto.rake
 - assets/res/drawable/get_ruboto_core.png
 - assets/res/drawable-hdpi/ic_launcher.png
@@ -72,9 +87,6 @@ files:
 - assets/src/InheritingBroadcastReceiver.java
 - assets/src/InheritingClass.java
 - assets/src/InheritingService.java
-- assets/src/RubotoActivity.java
-- assets/src/RubotoBroadcastReceiver.java
-- assets/src/RubotoService.java
 - assets/src/org/ruboto/EntryPointActivity.java
 - assets/src/org/ruboto/JRubyAdapter.java
 - assets/src/org/ruboto/Log.java
@@ -91,9 +103,12 @@ files:
 - assets/src/ruboto/package.rb
 - assets/src/ruboto/preference.rb
 - assets/src/ruboto/service.rb
-- assets/src/ruboto/widget.rb
 - assets/src/ruboto/util/stack.rb
 - assets/src/ruboto/util/toast.rb
+- assets/src/ruboto/widget.rb
+- assets/src/RubotoActivity.java
+- assets/src/RubotoBroadcastReceiver.java
+- assets/src/RubotoService.java
 - assets/test/src/test_helper.rb
 - assets/.DS_Store
 - assets/.gitignore
@@ -102,16 +117,14 @@ files:
 - bin/ruboto
 - lib/DalvikProxyClassFactory.java
 - lib/DexClient.java
-- lib/ruboto.rb
 - lib/java_class_gen/android_api.xml
 - lib/ruboto/api.rb
-- lib/ruboto/description.rb
-- lib/ruboto/sdk_versions.rb
-- lib/ruboto/version.rb
 - lib/ruboto/commands/base.rb
 - lib/ruboto/core_ext/array.rb
 - lib/ruboto/core_ext/object.rb
 - lib/ruboto/core_ext/rexml.rb
+- lib/ruboto/description.rb
+- lib/ruboto/sdk_versions.rb
 - lib/ruboto/util/asset_copier.rb
 - lib/ruboto/util/build.rb
 - lib/ruboto/util/code_formatting.rb
@@ -122,18 +135,8 @@ files:
 - lib/ruboto/util/update.rb
 - lib/ruboto/util/verify.rb
 - lib/ruboto/util/xml_element.rb
-- test/app_test_methods.rb
-- test/broadcast_receiver_test.rb
-- test/gem_test.rb
-- test/minimal_app_test.rb
-- test/rake_test.rb
-- test/ruboto_gen_test.rb
-- test/ruboto_update_test.rb
-- test/service_test.rb
-- test/sqldroid_test.rb
-- test/test_helper.rb
-- test/update_test_methods.rb
-- test/updated_example_test_methods.rb
+- lib/ruboto/version.rb
+- lib/ruboto.rb
 - test/activity/call_super_activity.rb
 - test/activity/call_super_activity_test.rb
 - test/activity/dir_and_file_activity.rb
@@ -161,36 +164,50 @@ files:
 - test/activity/ssl_activity_test.rb
 - test/activity/stack_activity.rb
 - test/activity/stack_activity_test.rb
+- test/activity/startup_exception_activity.rb
+- test/activity/startup_exception_activity_test.rb
 - test/activity/subclass_activity.rb
 - test/activity/subclass_activity_test.rb
 - test/activity/view_constants_activity.rb
 - test/activity/view_constants_activity_test.rb
+- test/app_test_methods.rb
+- test/broadcast_receiver_test.rb
+- test/gem_test.rb
+- test/minimal_app_test.rb
+- test/rake_test.rb
+- test/ruboto_gen_test.rb
+- test/ruboto_update_test.rb
+- test/service_test.rb
+- test/sqldroid_test.rb
+- test/test_helper.rb
+- test/update_test_methods.rb
+- test/updated_example_test_methods.rb
 homepage: http://ruboto.org/
 licenses:
 - MIT
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
+      segments:
+      - 0
+      hash: -1360630008982281470
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: 1.3.1
 requirements: []
 rubyforge_project: ruboto/ruboto
-rubygems_version: 1.8.24
-signing_key:
+rubygems_version: 1.8.25
+signing_key: 
 specification_version: 3
 summary: A platform for developing apps using JRuby on Android.
 test_files: []
-has_rdoc: