ruboto 1.1.2 → 1.2.0

data/test/sqldroid_test.rb

@@ -38,7 +38,7 @@ class RubotoTestAppActivity
     super
     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 = MyArrayAdapter.new(self, android.R.layout.simple_list_item_1 , android.R.id.text1, ['Record one', 'Record two'])
 
     self.content_view =
         linear_layout :orientation => LinearLayout::VERTICAL do

data/test/test_helper.rb

@@ -16,13 +16,16 @@ module RubotoTest
   PROJECT_DIR = File.expand_path('..', File.dirname(__FILE__))
   $LOAD_PATH << PROJECT_DIR
 
-  GEM_PATH = File.join PROJECT_DIR, 'tmp', 'gems'
-  FileUtils.mkdir_p GEM_PATH
-  ENV['GEM_HOME'] = GEM_PATH
-  ENV['GEM_PATH'] = GEM_PATH
-  ENV['PATH'] = "#{GEM_PATH}/bin:#{ENV['PATH']}"
-  Gem.paths = GEM_PATH
-  Gem.refresh
+  unless File.writable?(ENV['GEM_HOME'])
+    GEM_PATH = File.join PROJECT_DIR, 'tmp', 'gems'
+    FileUtils.mkdir_p GEM_PATH
+    ENV['GEM_HOME'] = GEM_PATH
+    ENV['GEM_PATH'] = GEM_PATH
+    ENV['PATH'] = "#{GEM_PATH}/bin:#{ENV['PATH']}"
+    Gem.paths = GEM_PATH
+    Gem.refresh
+  end
+
   `gem query -i -n bundler`
   system 'gem install bundler --no-ri --no-rdoc' unless $? == 0
   `bundle check`
@@ -36,7 +39,14 @@ module RubotoTest
   APP_NAME = 'RubotoTestApp'
   TMP_DIR = File.join PROJECT_DIR, 'tmp'
   APP_DIR = File.join TMP_DIR, APP_NAME
-  ANDROID_TARGET = (ENV['ANDROID_TARGET'] && ENV['ANDROID_TARGET'].slice(/\d+/).to_i) || MINIMUM_SUPPORTED_SDK_LEVEL
+
+  # FIXME(uwe):  Remove special case when Android L has been released.
+  if (ENV['ANDROID_TARGET'] && ENV['ANDROID_TARGET'] =~ /(?:android-)?L/)
+    ANDROID_TARGET = 'L'
+  else
+    ANDROID_TARGET = (ENV['ANDROID_TARGET'] && ENV['ANDROID_TARGET'].slice(/\d+/).to_i) || MINIMUM_SUPPORTED_SDK_LEVEL
+  end
+  # EMXIF
 
   def self.version_from_device
     puts 'Reading OS version from device/emulator'
@@ -80,6 +90,11 @@ module RubotoTest
   puts RUBY_DESCRIPTION
 
   ANDROID_OS = (ENV['ANDROID_OS'] || version_from_device).slice(/\d+/).to_i
+
+  # FIXME(uwe): Remove when Android L has been released
+  ANDROID_OS = 21 if ANDROID_OS == 0
+  # EMXIF
+
   puts "ANDROID_OS: #{ANDROID_OS}"
   puts "ANDROID_TARGET: #{ANDROID_TARGET}"
 
@@ -229,16 +244,19 @@ class Test::Unit::TestCase
         File.write('AndroidManifest.xml',
             File.read('AndroidManifest.xml').sub(%r{</manifest>},
                 "    <uses-permission android:name='android.permission.INTERNET'/>\n</manifest>"))
+        File.write('res/layout/dummy_layout.xml', <<-EOF)
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/my_text"
+  android:layout_width="wrap_content" android:layout_height="wrap_content"
+  android:text="This is a dummy layout to generate layout and id constants." />
+        EOF
         if update
           update_app
         end
         if update || !example
-          system 'rake patch_dex' # Ensure dx heap space is sufficient.
+          system 'rake --trace debug' # Ensure dx heap space is sufficient.
           assert_equal 0, $?
-          Dir.chdir 'test' do
-            system 'ant instrument' # This will also build the main project.
-            assert_equal 0, $?
-          end
         end
       end
       puts "Storing app as template #{template_dir}"
@@ -259,14 +277,14 @@ class Test::Unit::TestCase
     check_platform_installation
     test_completed = false
     Thread.start do
-      loop do
-        sleep 60
+      4.times do
+        sleep 600
         break if test_completed
-        print '-'
+        puts '...'
       end
     end
     Dir.chdir APP_DIR do
-      system 'rake test:quick'
+      system 'rake --trace test:quick'
       assert_equal 0, $?, "tests failed with return code #$?"
     end
     test_completed = true
@@ -290,10 +308,10 @@ class Test::Unit::TestCase
 
   def write_ruboto_yml(included_stdlibs, excluded_stdlibs, heap_alloc, ruby_version)
     yml = YAML.dump({'included_stdlibs' => included_stdlibs,
-        'excluded_stdlibs' => excluded_stdlibs,
-        # 'ruby_version' => ruby_version,
-        'heap_alloc' => heap_alloc,
-    })
+            'excluded_stdlibs' => excluded_stdlibs,
+            # 'ruby_version' => ruby_version,
+            'heap_alloc' => heap_alloc,
+        })
     puts "Adding ruboto.yml:\n#{yml}"
     File.open('ruboto.yml', 'w') { |f| f << yml }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruboto
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Daniel Jackoway
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
@@ -73,7 +73,6 @@ files:
 - RELEASE_CANDICATE_DOC.md
 - RELEASE_DOC.md
 - Rakefile
-- assets/.DS_Store
 - assets/.gitignore
 - assets/Rakefile
 - assets/libs/dx.jar
@@ -81,12 +80,9 @@ files:
 - assets/rakelib/ruboto.stdlib.rake
 - assets/rakelib/ruboto.stdlib.rb
 - assets/rakelib/ruboto.stdlib.yml
-- assets/res/.DS_Store
-- assets/res/drawable-hdpi/.DS_Store
 - assets/res/drawable-hdpi/ic_launcher.png
 - assets/res/drawable-ldpi/ic_launcher.png
 - assets/res/drawable-mdpi/ic_launcher.png
-- assets/res/drawable/.DS_Store
 - assets/res/drawable/get_ruboto_core.png
 - assets/res/layout/get_ruboto_core.xml
 - assets/ruboto.yml
@@ -159,6 +155,8 @@ files:
 - lib/ruboto/version.rb
 - test/activity/call_super_activity.rb
 - test/activity/call_super_activity_test.rb
+- test/activity/constants_activity.rb
+- test/activity/constants_activity_test.rb
 - test/activity/dialog_fragment_activity.rb
 - test/activity/dialog_fragment_activity_test.rb
 - test/activity/dir_and_file_activity.rb
@@ -181,8 +179,12 @@ files:
 - test/activity/no_on_create_activity_test.rb
 - test/activity/option_menu_activity.rb
 - test/activity/option_menu_activity_test.rb
+- test/activity/padding_activity.rb
+- test/activity/padding_activity_test.rb
 - test/activity/psych_activity.rb
 - test/activity/psych_activity_test.rb
+- test/activity/rss_activity.rb
+- test/activity/rss_activity_test.rb
 - test/activity/ruby_file_activity.rb
 - test/activity/spinner_activity.rb
 - test/activity/spinner_activity_test.rb
@@ -208,7 +210,9 @@ files:
 - test/ruboto_setup_test.rb
 - test/ruboto_update_test.rb
 - test/sample_broadcast_receiver_test.rb
-- test/service_test.rb
+- test/service_block_test.rb
+- test/service_gen_class_test.rb
+- test/service_infile_class_test.rb
 - test/splash_test.rb
 - test/sqldroid_test.rb
 - test/test_helper.rb