ruboto 0.5.2 → 0.5.3

data/lib/ruboto/util/build.rb

@@ -186,10 +186,9 @@ module Ruboto
           puts "Added file #{script_file}."
         end
 
-        test_file = File.expand_path("test/assets/scripts/#{script_name.chomp('.rb')}_test.rb", dest)
+        test_file = File.expand_path("test/src/#{script_name.chomp('.rb')}_test.rb", dest)
         if !File.exists? test_file
           sample_test_source = File.read(File.join(Ruboto::ASSETS, "samples/sample_#{underscore klass}_test.rb")).gsub("THE_PACKAGE", package).gsub("Sample#{klass}", name)
-          FileUtils.mkdir_p File.join(dest, 'test/assets/scripts')
           File.open test_file, "a" do |f|
             f << sample_test_source
           end

data/lib/ruboto/util/update.rb

@@ -119,10 +119,19 @@ EOF
           ant_script.gsub!(/\s*<!-- BEGIN added by ruboto(?:-core)? -->.*?<!-- END added by ruboto(?:-core)? -->\s*/m, '')
           raise "Bad ANT script" unless ant_script.gsub!(ant_setup_line, "#{run_tests_override}\n\n\\1")
           File.open('build.xml', 'w'){|f| f << ant_script}
+
+          # FIXME(uwe): Remove when we stop supporting update from Ruboto <= 0.5.2
+          if File.directory? 'assets/scripts'
+            log_action 'Moving test scripts to the "src" directory.' do
+              FileUtils.mv Dir['assets/scripts/*'], 'src'
+              FileUtils.rm_rf 'assets/scripts'
+            end
+          end
+          # FIXME end
         end
       end
 
-      def update_jruby(force=nil, with_psych=nil)
+      def update_jruby(force=nil)
         jruby_core = Dir.glob("libs/jruby-core-*.jar")[0]
         jruby_stdlib = Dir.glob("libs/jruby-stdlib-*.jar")[0]
         new_jruby_version = JRubyJars::VERSION
@@ -149,7 +158,7 @@ EOF
         log_action("Copying #{JRubyJars::core_jar_path} to libs") {copier.copy_from_absolute_path JRubyJars::core_jar_path, "libs"}
         log_action("Copying #{JRubyJars::stdlib_jar_path} to libs") {copier.copy_from_absolute_path JRubyJars::stdlib_jar_path, "libs"}
 
-        reconfigure_jruby_libs(new_jruby_version, with_psych)
+        reconfigure_jruby_libs(new_jruby_version)
 
         puts "JRuby version is now: #{new_jruby_version}"
         true
@@ -177,6 +186,7 @@ EOF
         copier = Ruboto::Util::AssetCopier.new Ruboto::ASSETS, '.', force
         log_action('icons') do
           copier.copy 'res/drawable*/icon.png'
+          copier.copy 'res/drawable/get_ruboto_core.png'
           copier.copy 'res/drawable*/icon.png', 'test'
         end
       end
@@ -212,7 +222,7 @@ EOF
       end
 
       def update_manifest(min_sdk, target, force = false)
-        log_action("\nAdding activities (RubotoActivity and RubotoDialog) and SDK versions to the manifest") do
+        log_action("\nAdding RubotoActivity, RubotoDialog, RubotoService, and SDK versions to the manifest") do
           if sdk_element = verify_manifest.elements['uses-sdk']
             min_sdk ||= sdk_element.attributes["android:minSdkVersion"]
             target ||= sdk_element.attributes["android:targetSdkVersion"]
@@ -220,22 +230,27 @@ EOF
             min_sdk ||= MINIMUM_SUPPORTED_SDK
             target ||= MINIMUM_SUPPORTED_SDK
           end
+
           app_element = verify_manifest.elements['application']
           app_element.attributes['android:icon'] ||= '@drawable/icon'
+
           if min_sdk.to_i >= 11
             app_element.attributes['android:hardwareAccelerated'] ||= 'true'
             app_element.attributes['android:largeHeap'] ||= 'true'
           end
-          if app_element.elements["activity[@android:name='org.ruboto.RubotoActivity']"]
-            puts 'found activity tag'
-          else
+
+          if !app_element.elements["activity[@android:name='org.ruboto.RubotoActivity']"]
             app_element.add_element 'activity', {"android:name" => "org.ruboto.RubotoActivity", 'android:exported' => 'false'}
           end
-          if app_element.elements["activity[@android:name='org.ruboto.RubotoDialog']"]
-            puts 'found dialog tag'
-          else
+
+          if !app_element.elements["activity[@android:name='org.ruboto.RubotoDialog']"]
             app_element.add_element 'activity', {"android:name" => "org.ruboto.RubotoDialog", 'android:exported' => 'false', "android:theme" => "@android:style/Theme.Dialog"}
           end
+
+          if !app_element.elements["service[@android:name='org.ruboto.RubotoService']"]
+            app_element.add_element 'service', {"android:name" => "org.ruboto.RubotoService", 'android:exported' => 'false'}
+          end
+
           if sdk_element
             sdk_element.attributes["android:minSdkVersion"] = min_sdk
             sdk_element.attributes["android:targetSdkVersion"] = target
@@ -262,11 +277,25 @@ EOF
           FileUtils.mkdir_p File.dirname(to)
           FileUtils.cp from, to
         end
+        log_action("Copying additional ruboto script components") do
+          Dir.glob(Ruboto::GEM_ROOT + "/assets/#{SCRIPTS_DIR}/ruboto/*.rb").each do |i|
+            from = File.expand_path(i)
+            to = File.expand_path("./#{SCRIPTS_DIR}/ruboto/#{File.basename(i)}")
+            FileUtils.mkdir_p File.dirname(to)
+            FileUtils.cp from, to
+          end
+          Dir.glob(Ruboto::GEM_ROOT + "/assets/#{SCRIPTS_DIR}/ruboto/util/*.rb").each do |i|
+            from = File.expand_path(i)
+            to = File.expand_path("./#{SCRIPTS_DIR}/ruboto/util/#{File.basename(i)}")
+            FileUtils.mkdir_p File.dirname(to)
+            FileUtils.cp from, to
+          end
+        end
       end
 
-      def reconfigure_jruby_libs(jruby_core_version, with_psych=nil)
+      def reconfigure_jruby_libs(jruby_core_version)
         reconfigure_jruby_core(jruby_core_version)
-        reconfigure_jruby_stdlib(with_psych)
+        reconfigure_jruby_stdlib
       end
 
       # - Removes unneeded code from jruby-core
@@ -331,76 +360,54 @@ EOF
       end
 
       # - Moves ruby stdlib to the root of the jruby-stdlib jar
-      # FIXME(uwe): Place stdlib and psych source in lib/ruby/site_ruby/1.8 since that is first in the load path generated by JRuby.
-      def reconfigure_jruby_stdlib(with_psych=nil)
-        excluded_stdlibs = %w{} + (verify_ruboto_config[:excluded_stdlibs] || [])
+      def reconfigure_jruby_stdlib
+        excluded_stdlibs = [*verify_ruboto_config[:excluded_stdlibs]].compact
         Dir.chdir 'libs' do
           jruby_stdlib = JRubyJars::stdlib_jar_path.split('/')[-1]
-          stdlib_1_8_files = nil
           log_action("Reformatting #{jruby_stdlib}") do
-            FileUtils.mkdir_p "tmp/old"
-            FileUtils.mkdir_p "tmp/new/lib/ruby"
-            Dir.chdir "tmp/old" do
-              # FileUtils.move "../#{jruby_stdlib}", "."
-              `jar -xf ../../#{jruby_stdlib}`
-              # File.delete jruby_stdlib
-
-              FileUtils.move "META-INF/jruby.home/lib/ruby/1.8", "../new/lib/ruby"
-              Dir["META-INF/jruby.home/lib/ruby/site_ruby/1.8/*"].each do |f|
-                next if File.basename(f) =~ /^..?$/
-                FileUtils.move f, "../new/lib/ruby/1.8/" + File.basename(f)
-              end
-              Dir["META-INF/jruby.home/lib/ruby/site_ruby/shared/*"].each do |f|
-                next if File.basename(f) =~ /^..?$/
-                FileUtils.move f, "../new/lib/ruby/1.8/" + File.basename(f)
+            FileUtils.mkdir_p 'tmp'
+            Dir.chdir 'tmp' do
+              FileUtils.mkdir_p 'old'
+              FileUtils.mkdir_p 'new'
+              Dir.chdir 'old' do
+                `jar -xf ../../#{jruby_stdlib}`
               end
-            end
-            Dir.chdir "tmp/new/lib/ruby/1.8" do
+              FileUtils.move 'old/META-INF/jruby.home/lib', 'new'
+
+              FileUtils.rm_rf 'new/lib/ruby/gems'
+
               if excluded_stdlibs.any?
-                excluded_stdlibs.each { |d| FileUtils.rm_rf d }
-                print "excluded #{excluded_stdlibs.join(' ')}..."
-              end
-              stdlib_1_8_files = Dir['**/*']
-            end
-            Dir.chdir "tmp/new" do
-              # Uncomment this part to split the stdlib into one jar per directory
-              # Dir['*'].select{|f| File.directory? f}.each do |d|
-              #    `jar -cf ../jruby-stdlib-#{d}-#{JRubyJars::VERSION}.jar #{d}`
-              #    FileUtils.rm_rf d
-              # end
-
-              `jar -cf ../../#{jruby_stdlib} .`
-            end
-          end
 
-          psych_jar = "psych.jar"
-          psych_already_present = File.exists? psych_jar
-          FileUtils.rm_f psych_jar
-
-          if with_psych || with_psych.nil? && psych_already_present
-            log_action("Adding psych #{File.basename psych_jar}") do
-              psych_dir = 'tmp/psych/lib/ruby/1.8'
-              FileUtils.mkdir_p File.dirname(psych_dir)
-              FileUtils.move "tmp/old/META-INF/jruby.home/lib/ruby/1.9", psych_dir
-              Dir.chdir psych_dir do
-                if excluded_stdlibs.any?
-                  excluded_stdlibs.each { |d| FileUtils.rm_rf d }
-                  print "excluded #{excluded_stdlibs.join(' ')}..."
+                # TODO(uwe): Simplify when we stop supporting JRuby < 1.7.0
+                raise "Unrecognized JRuby stdlib jar: #{jruby_stdlib}" unless jruby_stdlib =~ /jruby-stdlib-(.*).jar/
+                jruby_version = Gem::Version.new($1)
+                if Gem::Requirement.new('< 1.7.0.dev') =~ jruby_version
+                  lib_dirs = ['1.8', '1.9', 'site_ruby/1.8', 'site_ruby/1.9', 'site_ruby/shared']
+                else
+                  lib_dirs = ['1.8', '1.9', 'shared']
                 end
-                psych_files = Dir["**/*"]
-                puts if psych_files.any?
-                psych_files.each do |f|
-                  next if File.basename(f) =~ /^..?$/
-                  if stdlib_1_8_files.include? f
-                    puts "Removing duplicate #{f}"
-                    FileUtils.rm_f f
+                # TODO end
+
+                lib_dirs.each do |ld|
+                  excluded_stdlibs.each do |d|
+                    dir = "new/lib/ruby/#{ld}/#{d}"
+                    FileUtils.rm_rf dir if File.exists? dir
+                    file = "#{dir}.rb"
+                    FileUtils.rm_rf file if File.exists? file
                   end
                 end
+                print "excluded #{excluded_stdlibs.join(' ')}..."
               end
-              Dir.chdir 'tmp/psych' do
-                `jar -cf ../../#{psych_jar} .`
+
+              Dir.chdir "new" do
+                # Uncomment this part to split the stdlib into one jar per directory
+                # Dir['*'].select{|f| File.directory? f}.each do |d|
+                #    `jar -cf ../jruby-stdlib-#{d}-#{JRubyJars::VERSION}.jar #{d}`
+                #    FileUtils.rm_rf d
+                # end
+
+                `jar -cf ../../#{jruby_stdlib} .`
               end
-              FileUtils.remove_dir psych_dir, true
             end
           end
 

data/lib/ruboto/version.rb

@@ -1,3 +1,3 @@
 module Ruboto
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/test/activity/psych_activity.rb

@@ -0,0 +1,25 @@
+require 'jruby'
+require 'rbconfig'
+org.jruby.ext.psych.PsychLibrary.new.load(JRuby.runtime, false)
+$LOADED_FEATURES << 'psych.so'
+$LOAD_PATH << File.join(Config::CONFIG['libdir'], 'ruby/1.9')
+require 'psych.rb'
+
+Psych::Parser
+Psych::Handler
+
+require 'ruboto'
+
+ruboto_import_widgets :Button, :LinearLayout, :TextView
+
+$activity.handle_create do |bundle|
+  setTitle File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
+
+  setup_content do
+    linear_layout :orientation => LinearLayout::VERTICAL do
+      @decoded_view = text_view :id => 42, :text => Psych.load('--- foo')
+      # @encoded_view = text_view :id => 43, :text => Psych.dump("foo")
+    end
+  end
+
+end

data/test/activity/psych_activity_test.rb

@@ -0,0 +1,16 @@
+activity org.ruboto.test_app.PsychActivity
+
+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('psych_encode_decode') do |activity|
+  assert_equal 'foo', activity.find_view_by_id(42).text.to_s
+  #assert_equal "--- foo\n...\n", activity.find_view_by_id(43).text.to_s
+end

data/test/activity/stack_activity_test.rb

@@ -19,5 +19,5 @@ test('stack depth') do |activity|
   assert_equal 44 + os_offset + jruby_offset[0], activity.find_view_by_id(42).text.to_i, version_message
   assert_equal 68 + os_offset + jruby_offset[1], activity.find_view_by_id(43).text.to_i, version_message
   assert_equal 77 + os_offset + jruby_offset[2], activity.find_view_by_id(44).text.to_i, version_message
-  assert_equal 96 + os_offset + jruby_offset[3], activity.find_view_by_id(45).text.to_i, version_message
+  assert_equal 93 + os_offset + jruby_offset[3], activity.find_view_by_id(45).text.to_i, version_message
 end

data/test/app_test_methods.rb

@@ -4,22 +4,26 @@ module AppTestMethods
   include RubotoTest
 
   def test_activity_tests
-    if not ON_JRUBY_JARS_1_5_6
-      assert_code 'YamlLoads', "with_large_stack{require 'yaml'}"
-    else
+    # TODO(uwe): Remove check when we stop supporting jruby-jars 1.5.6
+    if ON_JRUBY_JARS_1_5_6
       puts "Skipping YAML tests on jruby-jars-1.5.6"
+    else
+      assert_code 'YamlLoads', "with_large_stack{require 'yaml'}"
     end
 
     assert_code 'ReadSourceFile', "File.read(__FILE__)"
     assert_code 'DirListsFilesInApk', 'Dir["#{File.dirname(__FILE__)}/*"].each{|f| raise "File #{f.inspect} not found" unless File.exists?(f)}'
 
     Dir[File.expand_path('activity/*_test.rb', File.dirname(__FILE__))].each do |test_src|
+      # TODO(uwe): Remove check when we stop supporting jruby-jars 1.5.6
+      next if ON_JRUBY_JARS_1_5_6 && test_src =~ /psych_activity_test.rb$/
+
       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/"
+        FileUtils.cp test_src, "test/src/"
       end
     end
     run_app_tests

data/test/minimal_app_test.rb

@@ -3,7 +3,8 @@ 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}
+    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}
   end
 
   def teardown
@@ -12,8 +13,10 @@ class MinimalAppTest < Test::Unit::TestCase
 
   def test_minimal_apk_is_less_than_3_mb
     apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / (1024 * 1024)
-    limit = 3.0
-    assert apk_size < limit, "APK was larger than #{'%.1f' % limit}MB: #{'%.1f' % apk_size.ceil(1)}MB"
+    upper_limit = 3.0
+    lower_limit = upper_limit * 0.85
+    assert apk_size <= upper_limit, "APK was larger than #{'%.1f' % upper_limit}MB: #{'%.1f' % apk_size.ceil(1)}MB"
+    assert apk_size >= lower_limit, "APK was smaller than #{'%.1f' % lower_limit}MB: #{'%.1f' % apk_size.floor(1)}MB.  You should lower the limit."
   end
 
   def test_minimal_apk_succeeds_tests

data/test/rake_test.rb

@@ -19,7 +19,7 @@ class RakeTest < Test::Unit::TestCase
         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"
+        test_filename = "test/src/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 }

data/test/ruboto_gen_test.rb

@@ -1,4 +1,5 @@
 require File.expand_path("test_helper", File.dirname(__FILE__))
+require 'bigdecimal'
 require 'test/app_test_methods'
 
 class RubotoGenTest < Test::Unit::TestCase
@@ -24,9 +25,17 @@ class RubotoGenTest < Test::Unit::TestCase
       assert_equal 1, $?.exitstatus
       assert !File.exists?('src/org/ruboto/test_app/VeryNewActivity.java')
       assert !File.exists?('src/very_new_activity.rb')
-      assert !File.exists?('test/assets/scripts/very_new_activity_test.rb')
+      assert !File.exists?('test/src/very_new_activity_test.rb')
       assert File.read('AndroidManifest.xml') !~ /VeryNewActivity/
     end
   end
 
+  def test_new_apk_size_is_within_limits
+    apk_size = BigDecimal(File.size("#{APP_DIR}/bin/RubotoTestApp-debug.apk").to_s) / 1024
+    upper_limit = 54.0
+    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"
+    assert apk_size >= lower_limit, "APK was smaller than #{'%.1f' % lower_limit}KB: #{'%.1f' % apk_size.ceil(1)}KB.  You should lower the limit."
+  end
+
 end

data/test/test_helper.rb

@@ -91,13 +91,12 @@ class Test::Unit::TestCase
   end
 
   def generate_app(options = {})
-    with_psych = options.delete(:with_psych) || false
     update = options.delete(:update) || false
     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
+    if excluded_stdlibs
       system 'rake platform:uninstall'
     else
       system 'rake platform:install'
@@ -108,7 +107,7 @@ class Test::Unit::TestCase
     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}"
+    template_dir = "#{APP_DIR}_template_#{$$}#{'_updated' if update}#{"_without_#{excluded_stdlibs.map{|ed| ed.gsub(/[.\/]/, '_')}.join('_')}" if excluded_stdlibs}"
     if File.exists?(template_dir)
       puts "Copying app from template #{template_dir}"
       FileUtils.cp_r template_dir, APP_DIR, :preserve => true
@@ -125,14 +124,13 @@ class Test::Unit::TestCase
         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}" }
-          FileUtils.touch "libs/psych.jar" if with_psych
           exclude_stdlibs(excluded_stdlibs) if excluded_stdlibs
           system "#{RUBOTO_CMD} update app"
           assert_equal 0, $?, "update app failed with return code #$?"
         end
       else
         puts "Generating app #{APP_DIR}"
-        system "#{RUBOTO_CMD} gen app --package #{PACKAGE} --path #{APP_DIR} --name #{APP_NAME} --target #{ANDROID_TARGET} #{'--with-psych' if with_psych}"
+        system "#{RUBOTO_CMD} gen app --package #{PACKAGE} --path #{APP_DIR} --name #{APP_NAME} --target #{ANDROID_TARGET}"
         if $? != 0
           FileUtils.rm_rf APP_DIR
           raise "gen app failed with return code #$?"

data/test/update_test_methods.rb

@@ -5,8 +5,8 @@ module UpdateTestMethods
   include RubotoTest
   include AppTestMethods
 
-  def setup(with_psych = false)
-    generate_app(:with_psych => with_psych, :update => true)
+  def setup
+    generate_app :update => true
   end
 
   def teardown

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruboto
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Daniel Jackoway
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-24 00:00:00 Z
+date: 2012-01-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: main
@@ -45,7 +45,7 @@ dependencies:
   version_requirements: *id001
 description: |-
   Ruboto - JRuby on Android
-  A generator and framework for developing full stand-alone apps for Android usign the Ruby language and libraries.
+  A generator and framework for developing full stand-alone apps for Android using the Ruby language and libraries.
 email: ruboto@googlegroups.com
 executables: 
 - ruboto
@@ -60,6 +60,7 @@ files:
 - Rakefile
 - README.md
 - assets/Rakefile
+- 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
@@ -74,15 +75,26 @@ files:
 - assets/src/InheritingBroadcastReceiver.java
 - assets/src/InheritingClass.java
 - assets/src/InheritingService.java
+- assets/src/org/ruboto/EntryPointActivity.java
 - assets/src/org/ruboto/RubotoDialog.java
 - assets/src/org/ruboto/Script.java
 - assets/src/org/ruboto/test/ActivityTest.java
 - assets/src/org/ruboto/test/InstrumentationTestRunner.java
+- assets/src/ruboto/activity.rb
+- assets/src/ruboto/base.rb
+- assets/src/ruboto/broadcast_receiver.rb
+- assets/src/ruboto/legacy.rb
+- assets/src/ruboto/menu.rb
+- assets/src/ruboto/preference.rb
+- assets/src/ruboto/service.rb
+- assets/src/ruboto/util/stack.rb
+- assets/src/ruboto/util/toast.rb
+- assets/src/ruboto/widget.rb
 - assets/src/ruboto.rb
 - assets/src/RubotoActivity.java
 - assets/src/RubotoBroadcastReceiver.java
 - assets/src/RubotoService.java
-- assets/test/assets/scripts/test_helper.rb
+- assets/test/src/test_helper.rb
 - bin/ruboto
 - lib/java_class_gen/android_api.xml
 - lib/java_class_gen/InheritingClass.java.erb
@@ -108,15 +120,15 @@ 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/psych_activity.rb
+- test/activity/psych_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