ruboto 0.6.0 → 0.7.0

data/test/minimal_app_test.rb

@@ -16,12 +16,12 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
     def test_minimal_apk_is_less_than_3_mb
       apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / (1024 * 1024)
       upper_limit = {
-          # '1.5.6' => 3.7,
           '1.6.7' => 3.2,
-          '1.7.0.dev' => ANDROID_TARGET < 15 ? 3.4 : 3.8, # Without dexmaker for Android < 4.0.3
+          '1.7.0.preview1' => ANDROID_TARGET < 15 ? 4.4 : 4.6, # Without dexmaker for Android < 4.0.3
+          '1.7.0.preview2.dev' => ANDROID_TARGET < 15 ? 4.4 : 4.6, # Without dexmaker for Android < 4.0.3
       }[JRUBY_JARS_VERSION.to_s] || 3.2
       lower_limit = upper_limit * 0.9
-      version_message ="JRuby: #{JRUBY_JARS_VERSION}"
+      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
@@ -31,4 +31,4 @@ if RubotoTest::RUBOTO_PLATFORM == 'STANDALONE'
     end
 
   end
-end
+end

data/test/rake_test.rb

@@ -48,4 +48,18 @@ class RakeTest < Test::Unit::TestCase
     end
   end
 
-end
+  def test_that_manifest_is_updated_when_project_properties_are_changed
+    Dir.chdir APP_DIR do
+      manifest = File.read('AndroidManifest.xml')
+      assert_equal "android:minSdkVersion='#{ANDROID_TARGET}'", manifest.slice(/android:minSdkVersion='\d+'/)
+      assert_equal "android:targetSdkVersion='#{ANDROID_TARGET}'", manifest.slice(/android:targetSdkVersion='\d+'/)
+      prop_file = File.read('project.properties')
+      File.open('project.properties', 'w'){|f| f << prop_file.sub(/target=android-#{ANDROID_TARGET}/, "target=android-6")}
+      system 'rake debug'
+      manifest = File.read('AndroidManifest.xml')
+      assert_equal "android:minSdkVersion='6'", manifest.slice(/android:minSdkVersion='\d+'/)
+      assert_equal "android:targetSdkVersion='6'", manifest.slice(/android:targetSdkVersion='\d+'/)
+    end
+  end
+
+end

data/test/ruboto_gen_test.rb

@@ -15,7 +15,9 @@ class RubotoGenTest < Test::Unit::TestCase
 
   def test_icons_are_updated
     Dir.chdir APP_DIR do
-      assert_equal 4032, File.size('res/drawable-hdpi/icon.png')
+      assert_equal 4032, File.size('res/drawable-hdpi/ic_launcher.png')
+      assert_equal 2548, File.size('res/drawable-mdpi/ic_launcher.png')
+      assert_equal 1748, File.size('res/drawable-ldpi/ic_launcher.png')
     end
   end
 
@@ -33,19 +35,20 @@ class RubotoGenTest < Test::Unit::TestCase
   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.dev' => 6666.0,
+          '1.7.0.preview1' => ANDROID_TARGET < 15 ? 7062.0 : 7308.0,
+          '1.7.0.preview2.dev' => ANDROID_TARGET < 15 ? 7062.0 : 7308.0,
       }[JRUBY_JARS_VERSION.to_s] || 4200.0
       version << ", JRuby: #{JRUBY_JARS_VERSION.to_s}"
     else
       upper_limit = {
           7 => 56.0,
           10 => 60.0,
-          15 => 65.0,
+          15 => 60.0,
       }[ANDROID_TARGET] || 64.0
-      version << ", ANDROID_TARGET: #{ANDROID_TARGET}"
     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/service_test.rb

@@ -2,7 +2,7 @@ require File.expand_path("test_helper", File.dirname(__FILE__))
 require 'fileutils'
 
 class ServiceTest < Test::Unit::TestCase
-  SRC_DIR ="#{APP_DIR}/src"
+  SRC_DIR = "#{APP_DIR}/src"
 
   def setup
     generate_app
@@ -15,35 +15,124 @@ class ServiceTest < Test::Unit::TestCase
   def test_service_startup
     Dir.chdir APP_DIR do
       system "#{RUBOTO_CMD} gen class Service --name RubotoTestService"
+
+      activity_filename = "#{SRC_DIR}/ruboto_test_app_activity.rb"
+      assert File.exists? activity_filename
+      File.open(activity_filename, 'w') { |f| f << <<EOF }
+require 'ruboto/activity'
+require 'ruboto/widget'
+
+ruboto_import_widgets :Button, :LinearLayout, :TextView
+
+class RubotoTestAppActivity
+  include Ruboto::Activity
+
+  def on_create(bundle)
+    $ruboto_test_app_activity = self
+    set_title 'Domo arigato, Mr Ruboto!'
+
+    self.content_view =
+        linear_layout :orientation => :vertical do
+          @text_view = text_view :text    => 'What hath Matz wrought?', :id => 42, :width => :fill_parent,
+                                 :gravity => android.view.Gravity::CENTER, :text_size => 48.0
+          button :text => 'M-x butterfly', :width => :fill_parent, :id => 43, :on_click_listener => proc { butterfly }
+        end
+  rescue
+    puts "Exception creating activity: \#{$!}"
+    puts $!.backtrace.join("\\n")
+  end
+
+  def set_text(text)
+    @text_view.text = text
+  end
+
+  private
+
+  def butterfly
+    puts 'butterfly'
+    Thread.start do
+      begin
+        startService(android.content.Intent.new(application_context, $package.RubotoTestService.java_class))
+      rescue Exception
+        puts "Exception starting the service: \#{$!}"
+        puts $!.backtrace.join("\\n")
+      end
+    end
+    puts 'butterfly OK'
+  end
+
+end
+EOF
+
       service_filename = "#{SRC_DIR}/ruboto_test_service.rb"
       assert File.exists? service_filename
-      File.open(service_filename, 'w'){|f| f << <<EOF}
-require 'ruboto'
-
-$service.handle_create do
-  Thread.start do
-    loop do
-      sleep 1
-      puts "\#{self.class} running..."
+      File.open(service_filename, 'w') { |f| f << <<EOF }
+require 'ruboto/service'
+
+class RubotoTestService
+  TARGET_TEXT = 'What hath Matz wrought!'
+  include Ruboto::Service
+  def on_create
+    puts "service on_create"
+    Thread.start do
+      loop do
+        sleep 1
+        puts "\#{self.class} running..."
+      end
     end
+    puts "\#{self.class} started."
+
+    $ruboto_test_app_activity.set_title 'on_create'
+
+    android.app.Service::START_STICKY
+  end
+
+  def on_start_command(intent, flags, start_id)
+    puts "service on_start_command(\#{intent}, \#{flags}, \#{start_id})"
+    getApplication()
+    getApplication
+    get_application
+    application
+
+    $ruboto_test_app_activity.set_title 'on_start_command'
+    $ruboto_test_app_activity.set_text TARGET_TEXT
+
+    android.app.Service::START_STICKY
   end
-  puts "\#{self.class} started."
-  android.app.Service::START_STICKY
 end
+EOF
 
-$service.handle_start_command do
-  android.app.Service::START_STICKY
+      service_test_filename = "#{APP_DIR}/test/src/ruboto_test_app_activity_test.rb"
+      assert File.exists? service_test_filename
+      File.open(service_test_filename, 'w') { |f| f << <<EOF }
+activity Java::org.ruboto.test_app.RubotoTestAppActivity
+
+setup do |activity|
+  start = Time.now
+  loop do
+    @text_view = activity.findViewById(42)
+    break if @text_view || (Time.now - start > 60)
+    sleep 1
+  end
+  assert @text_view
+end
+
+test 'button changes text', :ui => false do |activity|
+  button = activity.findViewById(43)
+  puts 'Clicking...'
+  activity.run_on_ui_thread{button.performClick}
+  puts 'Clicked!'
+  start = Time.now
+  loop do
+    break if @text_view.text == 'What hath Matz wrought!' || (Time.now - start > 60)
+    sleep 1
+  end
+  assert_equal 'What hath Matz wrought!', @text_view.text
 end
 EOF
 
-      activity_filename = "#{SRC_DIR}/ruboto_test_app_activity.rb"
-      s        = File.read(activity_filename)
-      s.gsub!(/^(end)$/, "
-  startService(android.content.Intent.new($activity.application_context, $package.RubotoTestService.java_class))
-\\1\n")
-      File.open(activity_filename, 'w') { |f| f << s }
     end
     run_app_tests
-    end
-
   end
+
+end

data/test/test_helper.rb

@@ -16,11 +16,12 @@ module RubotoTest
   ENV['GEM_HOME'] = GEM_PATH
   ENV['GEM_PATH'] = GEM_PATH
   ENV['PATH'] = "#{GEM_PATH}/bin:#{ENV['PATH']}"
-  Gem.path << GEM_PATH
+  Gem.paths = GEM_PATH
   Gem.refresh
   `gem query -i -n bundler`
   system 'gem install bundler' unless $? == 0
-  system 'bundle --system'
+  `bundle check`
+  system 'bundle --system' unless $? == 0
   lib_path = File.expand_path('lib', File.dirname(File.dirname(__FILE__)))
   $LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
   require 'ruboto'
@@ -36,7 +37,8 @@ module RubotoTest
       '2.3' => 'android-9', '2.3.1' => 'android-9', '2.3.2' => 'android-9',
       '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.0.1' => 'android-14', '4.0.3' => 'android-15', '4.0.4' => 'android-15',
+      '4.1' => 'android-16',
   }
 
   def self.version_from_device
@@ -59,16 +61,20 @@ module RubotoTest
   end
 
   def self.install_jruby_jars_gem
-    version_requirement = "-v #{ENV['JRUBY_JARS_VERSION']}" if ENV['JRUBY_JARS_VERSION']
+    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 jruby-jars #{version_requirement}" unless $? == 0
+    system "gem install #{jars_version_from_env.nil? || !File.exists?("jruby-jars-#{jars_version_from_env}.gem") ? '-r' : '-l'} jruby-jars #{version_requirement}" unless $? == 0
     raise "install of jruby-jars failed with return code #$?" unless $? == 0
-    if ENV['JRUBY_JARS_VERSION']
-      exclusion_clause = %Q{-v "!=#{ENV['JRUBY_JARS_VERSION']}"}
-      `gem query -u -n jruby-jars #{exclusion_clause}`
-      system %Q{gem uninstall jruby-jars --all #{exclusion_clause}"} unless $? == 0
-      raise "Uninstall of jruby-jars failed with return code #$?" unless $? == 0
+    if jars_version_from_env
+      exclusion_clause = %Q{-v "!=#{jars_version_from_env}"}
+      `gem query -i -n jruby-jars #{exclusion_clause}`
+      if $? == 0
+        system %Q{gem uninstall jruby-jars --all #{exclusion_clause}}
+        raise "Uninstall of jruby-jars failed with return code #$?" unless $? == 0
+      end
     end
+    Gem.refresh
   end
 
   def install_jruby_jars_gem
@@ -113,9 +119,6 @@ module RubotoTest
 
   RUBOTO_PLATFORM = ENV['RUBOTO_PLATFORM'] || 'CURRENT'
   puts "RUBOTO_PLATFORM: #{RUBOTO_PLATFORM}"
-
-  # FIXME(uwe): Remove when we stop supporting JRuby 1.5.6
-  ON_JRUBY_JARS_1_5_6 = JRUBY_JARS_VERSION == Gem::Version.new('1.5.6')
 end
 
 class Test::Unit::TestCase
@@ -253,7 +256,7 @@ class Test::Unit::TestCase
       if RUBOTO_PLATFORM == 'CURRENT'
         system "rake platform:current platform:install"
       elsif RUBOTO_PLATFORM == 'MASTER'
-        system "rake platform:install"
+        system "rake platform:debug platform:install"
       end
     end
     if $? != 0

data/test/updated_example_test_methods.rb

@@ -16,25 +16,16 @@ module UpdatedExampleTestMethods
 
   def test_properties_and_ant_file_has_no_duplicates
     Dir.chdir APP_DIR do
-      # FIXME(uwe): Cleanup when we stop support Android SDK <= 13
-      prop_file = %w{test/ant.properties test/build.properties}.find{|f| File.exists?(f)}
-      # FIXME end
-
-      assert File.readlines(prop_file).grep(/\w/).uniq!.nil?, "Duplicate lines in #{prop_file}"
-      assert_equal 1, File.readlines('test/build.xml').grep(/<macrodef name="run-tests-helper">/).size, 'Duplicate macro in build.xml'
+      assert File.readlines('test/ant.properties').grep(/\w/).uniq!.nil?, "Duplicate lines in test/ant.properties"
+      assert_equal 1, File.readlines('test/build.xml').grep(/<macrodef name="run-tests-helper">/).size, 'Duplicate macro in test/build.xml'
     end
   end
 
   def test_icons_are_untouched
     Dir.chdir APP_DIR do
-      icon_file_size = File.size('res/drawable-hdpi/icon.png')
-      # FIXME(uwe): Simplify when we stop supporting updating from version 0.1.0 and older
-      if @old_ruboto_version == '0.1.0'
-        assert_equal 4100, icon_file_size
-      else
-        assert_equal 4032, icon_file_size
-      end
-      # FIXME end
+      icon_file = Dir['res/drawable-hdpi/{icon,ic_launcher}.png'][0]
+      icon_file_size = File.size(icon_file)
+      assert_equal 4032, icon_file_size
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruboto
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Daniel Jackoway
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-10 00:00:00 Z
+date: 2012-07-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: main
@@ -63,9 +63,9 @@ files:
 - assets/Rakefile
 - assets/rakelib/ruboto.rake
 - assets/res/drawable/get_ruboto_core.png
-- assets/res/drawable-hdpi/icon.png
-- assets/res/drawable-ldpi/icon.png
-- assets/res/drawable-mdpi/icon.png
+- assets/res/drawable-hdpi/ic_launcher.png
+- assets/res/drawable-ldpi/ic_launcher.png
+- assets/res/drawable-mdpi/ic_launcher.png
 - assets/res/layout/get_ruboto_core.xml
 - assets/samples/sample_activity.rb
 - assets/samples/sample_activity_test.rb
@@ -78,6 +78,8 @@ files:
 - assets/src/InheritingClass.java
 - assets/src/InheritingService.java
 - assets/src/org/ruboto/EntryPointActivity.java
+- assets/src/org/ruboto/JRubyAdapter.java
+- assets/src/org/ruboto/Log.java
 - assets/src/org/ruboto/RubotoDialog.java
 - assets/src/org/ruboto/Script.java
 - assets/src/org/ruboto/test/ActivityTest.java
@@ -88,6 +90,7 @@ files:
 - assets/src/ruboto/generate.rb
 - assets/src/ruboto/legacy.rb
 - assets/src/ruboto/menu.rb
+- assets/src/ruboto/package.rb
 - assets/src/ruboto/preference.rb
 - assets/src/ruboto/service.rb
 - assets/src/ruboto/util/stack.rb
@@ -129,7 +132,27 @@ files:
 - test/activity/stack_activity.rb
 - test/activity/stack_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
+- test/block_def_activity/image_button_and_button_activity.rb
+- test/block_def_activity/image_button_and_button_activity_test.rb
+- test/block_def_activity/option_menu_activity.rb
+- test/block_def_activity/option_menu_activity_test.rb
+- test/block_def_activity/psych_activity.rb
+- test/block_def_activity/psych_activity_test.rb
+- test/block_def_activity/stack_activity.rb
+- test/block_def_activity/stack_activity_test.rb
 - test/broadcast_receiver_test.rb
+- test/handle_activity/image_button_activity.rb
+- test/handle_activity/image_button_activity_test.rb
+- test/handle_activity/image_button_and_button_activity.rb
+- test/handle_activity/image_button_and_button_activity_test.rb
+- test/handle_activity/option_menu_activity.rb
+- test/handle_activity/option_menu_activity_test.rb
+- test/handle_activity/psych_activity.rb
+- test/handle_activity/psych_activity_test.rb
+- test/handle_activity/stack_activity.rb
+- test/handle_activity/stack_activity_test.rb
 - test/minimal_app_test.rb
 - test/rake_test.rb
 - test/ruboto_gen_test.rb