ruboto-core 0.3.3 → 0.4.0

data/test/app_test_methods.rb

@@ -3,45 +3,38 @@ require File.expand_path("test_helper", File.dirname(__FILE__))
 module AppTestMethods
   include RubotoTest
 
-  if ['android-7', 'android-8'].include? ANDROID_OS
-    def test_nothing
-      puts "Skipping instrumentation tests on #{ANDROID_OS} since they don't work."
+  def test_activity_tests
+    if not ON_JRUBY_JARS_1_5_6
+      assert_code 'YamlLoads', "with_large_stack{require 'yaml'}"
+    else
+      puts "Skipping YAML tests on jruby-jars-1.5.6"
     end
-  else
-    def test_activity_tests
-      if not ON_JRUBY_JARS_1_5_6
-        assert_code 'YamlLoads', "with_large_stack{require 'yaml'}"
-      else
-        puts "Skipping YAML tests on jruby-jars-1.5.6"
-      end
 
-      assert_code 'ReadSourceFile', "File.read(__FILE__)"
+    assert_code 'ReadSourceFile', "File.read(__FILE__)"
 
-      Dir[File.expand_path('activity/*_test.rb', File.dirname(__FILE__))].each do |test_src|
-        snake_name = test_src.chomp('_test.rb')
-        activity_name = File.basename(snake_name).split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join
-        Dir.chdir APP_DIR do
-          system "#{RUBOTO_CMD} gen class Activity --name #{activity_name}"
-          FileUtils.cp "#{snake_name}.rb", "assets/scripts/"
-          FileUtils.cp test_src, "test/assets/scripts/"
-        end
+    Dir[File.expand_path('activity/*_test.rb', File.dirname(__FILE__))].each do |test_src|
+      snake_name = test_src.chomp('_test.rb')
+      activity_name = File.basename(snake_name).split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join
+      Dir.chdir APP_DIR do
+        system "#{RUBOTO_CMD} gen class Activity --name #{activity_name}"
+        FileUtils.cp "#{snake_name}.rb", "src/"
+        FileUtils.cp test_src, "test/assets/scripts/"
       end
-      run_app_tests
     end
+    run_app_tests
+  end
 
-    private
+  private
 
-    def assert_code(activity_name, code)
-      snake_name = activity_name.scan(/[A-Z]+[a-z]+/).map { |s| s.downcase }.join('_')
-      filename = "assets/scripts/#{snake_name}_activity.rb"
-      Dir.chdir APP_DIR do
-        system "#{RUBOTO_CMD} gen class Activity --name #{activity_name}Activity"
-        s = File.read(filename)
-        s.gsub!(/(require 'ruboto')/, "\\1\n#{code}")
-        File.open(filename, 'w') { |f| f << s }
-      end
+  def assert_code(activity_name, code)
+    snake_name = activity_name.scan(/[A-Z]+[a-z]+/).map { |s| s.downcase }.join('_')
+    filename = "src/#{snake_name}_activity.rb"
+    Dir.chdir APP_DIR do
+      system "#{RUBOTO_CMD} gen class Activity --name #{activity_name}Activity"
+      s = File.read(filename)
+      s.gsub!(/(require 'ruboto')/, "\\1\n#{code}")
+      File.open(filename, 'w') { |f| f << s }
     end
-
   end
 
-end
+end

data/test/rake_test.rb

@@ -9,29 +9,27 @@ class RakeTest < Test::Unit::TestCase
     cleanup_app
   end
 
-  def test_that_update_scripts_task_copies_files_to_sdcard_if_permissions_are_set
-    manifest = File.read("#{APP_DIR}/AndroidManifest.xml")
-    manifest.gsub! %r{</manifest>}, %Q{ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />\n</manifest>}
-    File.open("#{APP_DIR}/AndroidManifest.xml", 'w') { |f| f << manifest }
-
-    Dir.chdir APP_DIR do
-      system 'rake install:clean start'
-      assert_equal 0, $?
-    end
-
-    # wait_for_dir("/mnt/sdcard/Android/data/#{PACKAGE}/files/scripts")
-    wait_for_dir("/sdcard/Android/data/#{PACKAGE}/files/scripts")
-  end
-
   if ANDROID_OS == 'android-7'
     puts "Skipping sdcard test since files on sdcard are not removed on android-7 on app uninstall"
   else
-    def test_that_update_scripts_task_copies_files_to_app_directory_when_permissions_are_not_set
+    def test_that_update_scripts_task_copies_files_to_sdcard_and_are_read_by_activity
       Dir.chdir APP_DIR do
-        system 'rake install:clean start'
+        activity_filename = "src/ruboto_test_app_activity.rb"
+        s = File.read(activity_filename)
+        s.gsub!(/What hath Matz wrought\?/, "This text was changed by script!")
+        File.open(activity_filename, 'w') { |f| f << s }
+
+        test_filename = "test/assets/scripts/ruboto_test_app_activity_test.rb"
+        s2 = File.read(test_filename)
+        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")
+        system 'rake test:quick'
         assert_equal 0, $?
+        assert_equal apk_timestamp, File.ctime("bin/#{APP_NAME}-debug.apk"), 'APK should not have been rebuilt'
+        assert `adb shell ls -d /sdcard/Android/data/#{PACKAGE}/files/scripts`.chomp =~ %r{^/sdcard/Android/data/#{PACKAGE}/files/scripts$}
       end
-      wait_for_dir("/data/data/#{PACKAGE}/files/scripts")
     end
   end
 

data/test/ruboto_gen_test.rb

@@ -23,25 +23,10 @@ class RubotoGenTest < Test::Unit::TestCase
       system "#{RUBOTO_CMD} gen class activity --name VeryNewActivity"
       assert_equal 1, $?.exitstatus
       assert !File.exists?('src/org/ruboto/test_app/VeryNewActivity.java')
-      assert !File.exists?('assets/scripts/very_new_activity.rb')
+      assert !File.exists?('src/very_new_activity.rb')
       assert !File.exists?('test/assets/scripts/very_new_activity_test.rb')
       assert File.read('AndroidManifest.xml') !~ /VeryNewActivity/
     end
   end
 
 end
-
-if not RubotoTest::ON_JRUBY_JARS_1_5_6
-  class RubotoGenWithPsychTest < RubotoGenTest
-    def setup
-      generate_app :with_psych => true
-    end
-
-    def test_psych_jar_exists
-      assert File.exists?("#{APP_DIR}/libs/psych.jar"), "Failed to generate psych jar"
-    end
-
-  end
-else
-  puts "Skipping Psych tests on jruby-jars-1.5.6"
-end

data/test/ruboto_gen_with_psych_test.rb

@@ -0,0 +1,16 @@
+require File.expand_path("ruboto_gen_test", File.dirname(__FILE__))
+
+if not RubotoTest::ON_JRUBY_JARS_1_5_6
+  class RubotoGenWithPsychTest < RubotoGenTest
+    def setup
+      generate_app :with_psych => true
+    end
+
+    def test_psych_jar_exists
+      assert File.exists?("#{APP_DIR}/libs/psych.jar"), "Failed to generate psych jar"
+    end
+
+  end
+else
+  puts "Skipping Psych tests on jruby-jars-1.5.6"
+end

data/test/ruboto_update_test.rb

@@ -1,51 +1,5 @@
-require File.expand_path("test_helper", File.dirname(__FILE__))
-require 'test/app_test_methods'
-
-module UpdateTestMethods
-  include RubotoTest
-
-  def setup(with_psych = false)
-    generate_app(:with_psych => with_psych, :update => true)
-  end
-
-  def teardown
-    cleanup_app
-  end
-  
-  def test_properties_and_ant_file_has_no_duplicates
-    Dir.chdir APP_DIR do
-      assert File.readlines('test/build.properties').grep(/\w/).uniq!.nil?, 'Duplicate lines in build.properties'
-      assert_equal 1, File.readlines('test/build.xml').grep(/<macrodef name="run-tests-helper">/).size, 'Duplicate macro in build.xml'
-    end
-  end
-
-  def test_icons_are_untouched
-    Dir.chdir APP_DIR do
-      assert_equal 4100, File.size('res/drawable-hdpi/icon.png')
-    end
-  end
-
-end
+require File.expand_path("update_test_methods", File.dirname(__FILE__))
 
 class RubotoUpdateTest < Test::Unit::TestCase
   include UpdateTestMethods
-  include AppTestMethods
-end
-
-if not RubotoTest::ON_JRUBY_JARS_1_5_6
-  class RubotoUpdateWithPsychTest < Test::Unit::TestCase
-    include UpdateTestMethods
-    include AppTestMethods
-
-    def setup
-      super(true)
-    end
-    
-    def test_psych_jar_exists
-      assert File.exists?("#{APP_DIR}/libs/psych.jar"), "Failed to generate psych jar"
-    end
-  
-  end
-else
-  puts "Skipping Psych tests on jruby-jars-1.5.6"
 end

data/test/ruboto_update_with_psych_test.rb

@@ -0,0 +1,18 @@
+require File.expand_path("update_test_methods", File.dirname(__FILE__))
+
+if not RubotoTest::ON_JRUBY_JARS_1_5_6
+  class RubotoUpdateWithPsychTest < Test::Unit::TestCase
+    include UpdateTestMethods
+
+    def setup
+      super(true)
+    end
+    
+    def test_psych_jar_exists
+      assert File.exists?("#{APP_DIR}/libs/psych.jar"), "Failed to generate psych jar"
+    end
+  
+  end
+else
+  puts "Skipping Psych tests on jruby-jars-1.5.6"
+end

data/test/service_test.rb

@@ -2,6 +2,8 @@ require File.expand_path("test_helper", File.dirname(__FILE__))
 require 'fileutils'
 
 class ServiceTest < Test::Unit::TestCase
+  SRC_DIR ="#{APP_DIR}/src"
+
   def setup
     generate_app
   end
@@ -13,7 +15,7 @@ class ServiceTest < Test::Unit::TestCase
   def test_service_startup
     Dir.chdir APP_DIR do
       system "#{RUBOTO_CMD} gen class Service --name RubotoTestService"
-      service_filename = "#{APP_DIR}/assets/scripts/ruboto_test_service.rb"
+      service_filename = "#{SRC_DIR}/ruboto_test_service.rb"
       assert File.exists? service_filename
       File.open(service_filename, 'w'){|f| f << <<EOF}
 require 'ruboto'
@@ -34,7 +36,7 @@ $service.handle_start_command do
 end
 EOF
 
-      activity_filename = "#{APP_DIR}/assets/scripts/ruboto_test_app_activity.rb"
+      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))

data/test/test_helper.rb

@@ -7,19 +7,24 @@ module RubotoTest
   PROJECT_DIR = File.expand_path('..', File.dirname(__FILE__))
   $LOAD_PATH << PROJECT_DIR
 
+  # 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
+  # FIXME end
+  
   raise StandardError.new("Can't find Gem specification jruby-jars.") unless gem_spec
-  JRUBY_JARS_VERSION  = gem_spec.version
+  JRUBY_JARS_VERSION = gem_spec.version
+
+  # 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')
 
-  PACKAGE        = 'org.ruboto.test_app'
-  APP_NAME       = 'RubotoTestApp'
-  TMP_DIR        = File.join PROJECT_DIR, 'tmp'
-  APP_DIR        = File.join TMP_DIR, APP_NAME
+  PACKAGE = 'org.ruboto.test_app'
+  APP_NAME = 'RubotoTestApp'
+  TMP_DIR = File.join PROJECT_DIR, 'tmp'
+  APP_DIR = File.join TMP_DIR, APP_NAME
   ANDROID_TARGET = ENV['ANDROID_TARGET'] || 'android-7'
 
   VERSION_TO_API_LEVEL = {
@@ -28,7 +33,7 @@ module RubotoTest
       '2.3.3' => 'android-10', '2.3.4' => 'android-10',
       '3.0' => 'android-11', '3.1' => 'android-12', '3.2' => 'android-13'
   }
-  
+
   def self.version_from_device
     puts "Reading OS version from device/emulator"
     system "adb wait-for-device"
@@ -90,6 +95,17 @@ class Test::Unit::TestCase
     excluded_stdlibs = options.delete(:excluded_stdlibs)
     raise "Unknown options: #{options.inspect}" unless options.empty?
     Dir.mkdir TMP_DIR unless File.exists? TMP_DIR
+
+    if with_psych || excluded_stdlibs
+      system 'rake platform:uninstall'
+    else
+      system 'rake platform:install'
+    end
+    if $? != 0
+      FileUtils.rm_rf 'tmp/RubotoCore'
+      fail 'Error (un)installing RubotoCore'
+    end
+
     FileUtils.rm_rf APP_DIR if File.exists? APP_DIR
     template_dir = "#{APP_DIR}_template_#{$$}#{'_with_psych' if with_psych}#{'_updated' if update}#{"_without_#{excluded_stdlibs.join('_')}" if excluded_stdlibs}"
     if File.exists?(template_dir)
@@ -106,8 +122,8 @@ class Test::Unit::TestCase
           android_home = File.dirname(File.dirname(`which adb`))
         end
         Dir.chdir APP_DIR do
-          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}"}
+          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}" }
           FileUtils.touch "libs/psych.jar" if with_psych
           exclude_stdlibs(excluded_stdlibs) if excluded_stdlibs
           system "#{RUBOTO_CMD} update app"
@@ -142,25 +158,19 @@ class Test::Unit::TestCase
   end
 
   def run_app_tests
-    Dir.chdir "#{APP_DIR}/test" do
-      system 'rake test:quick'
-      assert_equal 0, $?, "tests failed with return code #$?"
-    end
-  end
-
-  def wait_for_dir(dir)
-    puts "Waiting for app to generate script directory: #{dir}"
-    start = Time.now
-    loop do
-      break if `adb shell ls -d #{dir}`.chomp =~ %r{^#{dir}$}
-      flunk 'Timeout waiting for scripts directory to appear' if Time.now > start + 120
-      sleep 1
+    if ['android-7', 'android-8'].include? ANDROID_OS
+      puts "Skipping instrumentation tests on #{ANDROID_OS} since they don't work."
+    else
+      Dir.chdir APP_DIR do
+        system 'rake test:quick'
+        assert_equal 0, $?, "tests failed with return code #$?"
+      end
     end
   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})}
+    File.open('ruboto.yml', 'w') { |f| f << YAML.dump({:excluded_stdlibs => excluded_stdlibs}) }
   end
 
 end

data/test/update_test_methods.rb

@@ -0,0 +1,29 @@
+require File.expand_path("test_helper", File.dirname(__FILE__))
+require 'test/app_test_methods'
+
+module UpdateTestMethods
+  include RubotoTest
+  include AppTestMethods
+
+  def setup(with_psych = false)
+    generate_app(:with_psych => with_psych, :update => true)
+  end
+
+  def teardown
+    cleanup_app
+  end
+
+  def test_properties_and_ant_file_has_no_duplicates
+    Dir.chdir APP_DIR do
+      assert File.readlines('test/build.properties').grep(/\w/).uniq!.nil?, 'Duplicate lines in build.properties'
+      assert_equal 1, File.readlines('test/build.xml').grep(/<macrodef name="run-tests-helper">/).size, 'Duplicate macro in build.xml'
+    end
+  end
+
+  def test_icons_are_untouched
+    Dir.chdir APP_DIR do
+      assert_equal 4100, File.size('res/drawable-hdpi/icon.png')
+    end
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruboto-core
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Daniel Jackoway
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-21 00:00:00 Z
+date: 2011-09-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: main
@@ -43,22 +43,6 @@ dependencies:
         version: 4.7.2
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: jruby-jars
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 5
-        - 6
-        version: 1.5.6
-  type: :runtime
-  version_requirements: *id002
 description: The core components of Ruby on Android
 email: ruboto@googlegroups.com
 executables: 
@@ -73,11 +57,11 @@ files:
 - Gemfile.lock
 - Rakefile
 - README.md
-- assets/assets/scripts/ruboto.rb
 - assets/Rakefile
 - assets/res/drawable-hdpi/icon.png
 - assets/res/drawable-ldpi/icon.png
 - assets/res/drawable-mdpi/icon.png
+- assets/res/layout/get_ruboto_core.xml
 - assets/samples/sample_activity.rb
 - assets/samples/sample_activity_test.rb
 - assets/samples/sample_broadcast_receiver.rb
@@ -92,6 +76,7 @@ files:
 - assets/src/org/ruboto/Script.java
 - assets/src/org/ruboto/test/ActivityTest.java
 - assets/src/org/ruboto/test/InstrumentationTestRunner.java
+- assets/src/ruboto.rb
 - assets/src/RubotoActivity.java
 - assets/src/RubotoBroadcastReceiver.java
 - assets/src/RubotoService.java
@@ -113,6 +98,7 @@ files:
 - lib/ruboto/util/update.rb
 - lib/ruboto/util/verify.rb
 - lib/ruboto/util/xml_element.rb
+- lib/ruboto/version.rb
 - lib/ruboto.rb
 - test/activity/image_button_activity.rb
 - test/activity/image_button_activity_test.rb
@@ -120,13 +106,18 @@ files:
 - test/activity/image_button_and_button_activity_test.rb
 - test/activity/option_menu_activity.rb
 - test/activity/option_menu_activity_test.rb
+- test/activity/stack_activity.rb
+- test/activity/stack_activity_test.rb
 - test/app_test_methods.rb
 - test/minimal_app_test.rb
 - test/rake_test.rb
 - test/ruboto_gen_test.rb
+- test/ruboto_gen_with_psych_test.rb
 - test/ruboto_update_test.rb
+- test/ruboto_update_with_psych_test.rb
 - test/service_test.rb
 - test/test_helper.rb
+- test/update_test_methods.rb
 homepage: http://ruboto.org/
 licenses: []