ruboto 0.8.1 → 0.9.0.rc.0

data/test/ruboto_gen_test.rb

@@ -21,6 +21,17 @@ class RubotoGenTest < Test::Unit::TestCase
     end
   end
 
+  def test_activity_with_number_in_name
+    Dir.chdir APP_DIR do
+      system "#{RUBOTO_CMD} gen class Activity --name App1Activity"
+      assert_equal 0, $?.exitstatus
+      assert File.exists?('src/org/ruboto/test_app/App1Activity.java')
+      assert File.exists?('src/app1_activity.rb')
+      assert File.exists?('test/src/app1_activity_test.rb')
+    end
+    run_app_tests
+  end
+
   def test_gen_class_activity_with_lowercase_should_fail
     Dir.chdir APP_DIR do
       system "#{RUBOTO_CMD} gen class activity --name VeryNewActivity"
@@ -32,22 +43,29 @@ class RubotoGenTest < Test::Unit::TestCase
     end
   end
 
+  # APK was smaller than 277.2KB:   61.9KB.  PLATFORM: CURRENT,    ANDROID_TARGET: 10.
+  # APK was larger than 7100.0KB: 7341.1KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 10, JRuby: 1.7.0.preview2.
+  # 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 7308.0KB: 7558.3KB.  PLATFORM: STANDALONE, ANDROID_TARGET: 15, JRuby: 1.7.0.preview2.
+
   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}"
     version << ", ANDROID_TARGET: #{ANDROID_TARGET}"
     if RUBOTO_PLATFORM == 'STANDALONE'
       upper_limit = {
-          '1.6.7' => 5800.0,
-          '1.7.0.preview1' => 7308.0,
-          '1.7.0.preview2' => 7308.0,
+          '1.6.7' => ANDROID_TARGET < 15 ? 5800.0 : 5900.0,
+          '1.7.0.preview1' => ANDROID_TARGET < 15 ? 7400.0 : 7308.0,
+          '1.7.0.preview2' => ANDROID_TARGET < 15 ? 7400.0 : 7600.0,
+          '1.7.0.rc1' => ANDROID_TARGET < 15 ? 7400.0 : 7600.0,
       }[JRUBY_JARS_VERSION.to_s] || 4200.0
       version << ", JRuby: #{JRUBY_JARS_VERSION.to_s}"
     else
       upper_limit = {
           7 => 67.0,
-          10 => 309.0,
-          15 => 309.0,
+          10 => 64.0,
+          15 => 68.0,
       }[ANDROID_TARGET] || 64.0
     end
     lower_limit = upper_limit * 0.9
@@ -224,12 +242,14 @@ EOF
     run_app_tests
   end
 
-  def test_gen_jruby
-    Dir.chdir APP_DIR do
-      system "#{RUBOTO_CMD} gen jruby"
-      assert_equal 0, $?.exitstatus
-      assert File.exists?("libs/jruby-core-#{JRUBY_JARS_VERSION}.jar")
-      assert File.exists?("libs/jruby-stdlib-#{JRUBY_JARS_VERSION}.jar")
+  if RUBOTO_PLATFORM == 'FROM_GEM'
+    def test_gen_jruby
+      Dir.chdir APP_DIR do
+        system "#{RUBOTO_CMD} gen jruby"
+        assert_equal 0, $?.exitstatus
+        assert File.exists?("libs/jruby-core-#{JRUBY_JARS_VERSION}.jar")
+        assert File.exists?("libs/jruby-stdlib-#{JRUBY_JARS_VERSION}.jar")
+      end
     end
   end
 

data/test/sqldroid_test.rb

@@ -20,12 +20,23 @@ class SqldroidTest < Test::Unit::TestCase
       File.open('src/ruboto_test_app_activity.rb', 'w'){|f| f << <<EOF}
 require 'ruboto/activity'
 require 'ruboto/widget'
-require 'ruboto/generate'
 require 'sqldroid'
 
 ruboto_import_widgets :LinearLayout, :ListView, :TextView
 
-ruboto_generate("android.widget.ArrayAdapter" => $package_name + ".MyArrayAdapter")
+class MyArrayAdapter < android.widget.ArrayAdapter
+  def get_view(position, convert_view, parent)
+    puts "IN get_view!!!"
+    @inflater ||= context.getSystemService(Context::LAYOUT_INFLATER_SERVICE)
+    row = convert_view ? convert_view : @inflater.inflate(mResource, nil)
+    row.findViewById(mFieldId).text = get_item(position)
+    row
+  rescue Exception
+    puts "Exception getting list item view: \#$!"
+    puts $!.backtrace.join("\n")
+    convert_view
+  end
+end
 
 class RubotoTestAppActivity
   def on_create(bundle)
@@ -33,19 +44,6 @@ class RubotoTestAppActivity
     setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "\#{s[0..0].upcase}\#{s[1..-1]}" }.join(' ')
 
     adapter = MyArrayAdapter.new(self, android.R.layout.simple_list_item_1 , AndroidIds::text1, ['Record one', 'Record two'])
-    adapter.initialize_ruboto_callbacks do
-      def get_view(position, convert_view, parent)
-        puts "IN get_view!!!"
-        @inflater ||= context.getSystemService(Context::LAYOUT_INFLATER_SERVICE)
-        row = convert_view ? convert_view : @inflater.inflate(mResource, nil)
-        row.findViewById(mFieldId).text = get_item(position)
-        row
-      rescue Exception
-        puts "Exception getting list item view: \#$!"
-        puts $!.backtrace.join("\n")
-        convert_view
-      end
-    end
 
     self.content_view =
         linear_layout :orientation => LinearLayout::VERTICAL do

data/test/test_helper.rb

@@ -1,4 +1,5 @@
-$:.unshift('lib') unless $:.include?('lib')
+lib = File.dirname(File.dirname(__FILE__)) + '/lib'
+$:.unshift(lib) unless $:.include?(lib)
 require 'test/unit'
 require 'rubygems'
 require 'fileutils'
@@ -59,10 +60,17 @@ module RubotoTest
   end
 
   def self.install_jruby_jars_gem
-    jars_version_from_env = ENV['JRUBY_JARS_VERSION']
-    version_requirement = "-v #{jars_version_from_env}" if jars_version_from_env
-    `gem query -i -n jruby-jars #{version_requirement}`
-    system "gem install #{jars_version_from_env.nil? || !File.exists?("jruby-jars-#{jars_version_from_env}.gem") ? '-r' : '-l'} jruby-jars #{version_requirement} --no-ri --no-rdoc" unless $? == 0
+    jars_version_from_env = ENV['JRUBY_JARS_VERSION'] unless RUBOTO_PLATFORM == 'CURRENT'
+    version_requirement = " -v #{jars_version_from_env}" if jars_version_from_env
+    `gem query -i -n jruby-jars#{version_requirement}`
+    unless $? == 0
+      local_gem_file = "jruby-jars-#{jars_version_from_env}.gem"
+      if File.exists?(local_gem_file)
+        system "gem install -l #{local_gem_file} --no-ri --no-rdoc"
+      else
+        system "gem install -r jruby-jars#{version_requirement} --no-ri --no-rdoc"
+      end
+    end
     raise "install of jruby-jars failed with return code #$?" unless $? == 0
     if jars_version_from_env
       exclusion_clause = %Q{-v "!=#{jars_version_from_env}"}
@@ -103,22 +111,27 @@ module RubotoTest
   puts "ANDROID_HOME: #{ANDROID_HOME}"
   puts "ANDROID_SDK_TOOLS_REVISION: #{ANDROID_TOOLS_REVISION}"
 
+  RUBOTO_PLATFORM = ENV['RUBOTO_PLATFORM'] || 'CURRENT'
+  puts "RUBOTO_PLATFORM: #{RUBOTO_PLATFORM}"
+
   install_jruby_jars_gem
 
-  # FIXME(uwe):  Simplify when we stop supporting rubygems < 1.8.0
-  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.8.0')
-    gem_spec = Gem::Specification.find_by_path 'jruby-jars'
+  if RUBOTO_PLATFORM == 'CURRENT'
+    JRUBY_JARS_VERSION = Gem::Version.new('1.7.0.dev')
   else
-    gem_spec = Gem.searcher.find('jruby-jars')
+    # FIXME(uwe):  Simplify when we stop supporting rubygems < 1.8.0
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.8.0')
+      gem_spec = Gem::Specification.find_by_path 'jruby-jars'
+    else
+      gem_spec = Gem.searcher.find('jruby-jars')
+    end
+    # EMXIF
+
+    raise StandardError.new("Can't find Gem specification jruby-jars.") unless gem_spec
+    JRUBY_JARS_VERSION = gem_spec.version
   end
-  # EMXIF
 
-  raise StandardError.new("Can't find Gem specification jruby-jars.") unless gem_spec
-  JRUBY_JARS_VERSION = gem_spec.version
   puts "JRUBY_JARS_VERSION: #{JRUBY_JARS_VERSION}"
-
-  RUBOTO_PLATFORM = ENV['RUBOTO_PLATFORM'] || 'CURRENT'
-  puts "RUBOTO_PLATFORM: #{RUBOTO_PLATFORM}"
 end
 
 class Test::Unit::TestCase
@@ -187,7 +200,7 @@ class Test::Unit::TestCase
             FileUtils.touch 'libs/jruby-core-x.x.x.jar'
             FileUtils.touch 'libs/jruby-stdlib-x.x.x.jar'
           else
-            FileUtils.rm(Dir['libs/{jruby-*.jar,dexmaker*.jar}'])
+            FileUtils.rm(Dir['libs/{jruby-*.jar,dx.jar}'])
           end
           update_app if update
         end
@@ -209,12 +222,12 @@ class Test::Unit::TestCase
         end
       end
 
-      # FIXME(uwe): Installation with dexmaker fails on Android < 4.0.3 due to complex interface structure
+      # FIXME(uwe): Installation with dx.jar fails on Android < 4.0.3 due to complex interface structure
       # Fixme(uwe): Remove when solved
       #if standalone && ANDROID_OS < 15
       #  Dir.chdir APP_DIR do
-      #    puts "Removing dexmaker jar for android-#{ANDROID_OS}"
-      #    FileUtils.rm(Dir['libs/dexmaker*.jar'])
+      #    puts "Removing dx.jar for android-#{ANDROID_OS}"
+      #    FileUtils.rm(Dir['libs/dx.jar'])
       #  end
       #end
       # EMXIF
@@ -244,7 +257,7 @@ class Test::Unit::TestCase
       puts "Skipping instrumentation tests on #{ANDROID_OS} since they don't work."
       return
     end
-    check_platform_installation(Dir['libs/jruby-core-*.jar'].any?)
+    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.
@@ -274,15 +287,15 @@ class Test::Unit::TestCase
     end
   end
 
-  def check_platform_installation(standalone)
-    if standalone
+  def check_platform_installation
+    if RUBOTO_PLATFORM == 'STANDALONE'
       system 'rake platform:uninstall'
+    elsif RUBOTO_PLATFORM == 'CURRENT'
+      system "rake platform:current platform:install"
+    elsif RUBOTO_PLATFORM == 'FROM_GEM'
+      system "rake platform:debug platform:install"
     else
-      if RUBOTO_PLATFORM == 'CURRENT'
-        system "rake platform:current platform:install"
-      elsif RUBOTO_PLATFORM == 'FROM_GEM'
-        system "rake platform:debug platform:install"
-      end
+      fail "Unknown Ruboto platform: #{RUBOTO_PLATFORM.inspect}"
     end
     if $? != 0
       FileUtils.rm_rf 'tmp/RubotoCore'

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ruboto
 version: !ruby/object:Gem::Version 
-  hash: 61
-  prerelease: 
+  hash: 752453167
+  prerelease: 6
   segments: 
   - 0
-  - 8
-  - 1
-  version: 0.8.1
+  - 9
+  - 0
+  - rc
+  - 0
+  version: 0.9.0.rc.0
 platform: ruby
 authors: 
 - Daniel Jackoway
@@ -18,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-05 00:00:00 Z
+date: 2012-09-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: main
@@ -59,7 +61,7 @@ files:
 - Gemfile.lock
 - Rakefile
 - README.md
-- assets/libs/dexmaker20120305.jar
+- assets/libs/dx.jar
 - assets/Rakefile
 - assets/rakelib/ruboto.rake
 - assets/res/drawable/get_ruboto_core.png
@@ -92,7 +94,6 @@ files:
 - assets/src/ruboto/activity.rb
 - assets/src/ruboto/base.rb
 - assets/src/ruboto/broadcast_receiver.rb
-- assets/src/ruboto/generate.rb
 - assets/src/ruboto/legacy.rb
 - assets/src/ruboto/menu.rb
 - assets/src/ruboto/package.rb
@@ -107,6 +108,8 @@ files:
 - assets/src/RubotoService.java
 - assets/test/src/test_helper.rb
 - bin/ruboto
+- lib/DalvikProxyClassFactory.java
+- lib/DexClient.java
 - lib/java_class_gen/android_api.xml
 - lib/java_class_gen/InheritingClass.java.erb
 - lib/ruboto/api.rb
@@ -128,8 +131,6 @@ files:
 - lib/ruboto.rb
 - test/activity/call_super_activity.rb
 - test/activity/call_super_activity_test.rb
-- test/activity/generate_activity.rb
-- test/activity/generate_activity_test.rb
 - test/activity/image_button_activity.rb
 - test/activity/image_button_activity_test.rb
 - test/activity/image_button_and_button_activity.rb
@@ -144,6 +145,8 @@ files:
 - test/activity/psych_activity_test.rb
 - test/activity/stack_activity.rb
 - test/activity/stack_activity_test.rb
+- test/activity/subclass_activity.rb
+- test/activity/subclass_activity_test.rb
 - test/app_test_methods.rb
 - test/block_def_activity/image_button_activity.rb
 - test/block_def_activity/image_button_activity_test.rb
@@ -201,12 +204,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