ruboto 0.13.0.rc.0 → 0.13.0

data/lib/ruboto/util/setup.rb

@@ -1,9 +1,10 @@
-require 'pty'
 require 'ruboto/sdk_versions'
+require 'ruboto/util/verify'
 
 module Ruboto
   module Util
     module Setup
+      include Ruboto::Util::Verify
       REPOSITORY_BASE = 'https://dl-ssl.google.com/android/repository'
       REPOSITORY_URL = "#{REPOSITORY_BASE}/repository-8.xml"
 
@@ -14,7 +15,7 @@ module Ruboto
 
       def setup_ruboto(accept_all, api_levels = [SdkVersions::DEFAULT_TARGET_SDK])
         @platform_sdk_loc = {}
-        api_levels = [read_project_api_level, *api_levels].compact.uniq
+        api_levels = [project_api_level, *api_levels].compact.uniq
         install_all(accept_all, api_levels) unless check_all(api_levels)
         config_path(accept_all)
       end
@@ -63,14 +64,6 @@ module Ruboto
         end
       end
 
-      def read_project_api_level
-        begin
-          return $1 if File.read('project.properties') =~ /target=(.*)/
-        rescue
-          # ignored
-        end
-      end
-
       def path_setup_file
         case RbConfig::CONFIG['host_os']
         when /^darwin(.*)/ then
@@ -429,7 +422,7 @@ module Ruboto
           a = STDIN.gets.chomp.upcase
         end
         if accept_all || a == 'Y' || a.empty?
-          update_cmd = "android --silent update sdk --no-ui --filter #{api_level},sysimg-#{api_level.slice(/\d+$/)} --all"
+          update_cmd = "android update sdk --no-ui --filter #{api_level},sysimg-#{api_level.slice(/\d+$/)} --all"
           update_sdk(update_cmd, accept_all)
           check_for_android_platform(api_level)
         end
@@ -437,26 +430,22 @@ module Ruboto
 
       def update_sdk(update_cmd, accept_all)
         if accept_all
-          begin
-            PTY.spawn(update_cmd) do |stdin, stdout, pid|
-              begin
-                output = ''
-                question_pattern = /.*Do you accept the license '[a-z-]+-[0-9a-f]{8}' \[y\/n\]: /m
-                STDOUT.sync = true
-                stdin.each_char do |text|
-                  print text
-                  output << text
-                  if output =~ question_pattern
-                    stdout.puts 'y'
-                    output.sub! question_pattern, ''
-                  end
+          IO.popen(update_cmd, 'r+') do |cmd_io|
+            begin
+              output = ''
+              question_pattern = /.*Do you accept the license '[a-z-]+-[0-9a-f]{8}' \[y\/n\]: /m
+              STDOUT.sync = true
+              cmd_io.each_char do |text|
+                print text
+                output << text
+                if output =~ question_pattern
+                  cmd_io.puts 'y'
+                  output.sub! question_pattern, ''
                 end
-              rescue Errno::EIO
-                # This probably just means that the process has finished giving output.
               end
+            rescue Errno::EIO
+              # This probably just means that the process has finished giving output.
             end
-          rescue PTY::ChildExited
-            puts 'The child process exited!'
           end
         else
           system update_cmd

data/lib/ruboto/util/verify.rb

@@ -88,6 +88,26 @@ module Ruboto
         File.open('ruboto.yml', 'w') {|f| f << YAML.dump(verify_ruboto_config)}
       end
 
+      def verify_project_properties
+        return @project_properties if project_properties
+        abort "cannot find your #{properties_file_name} to extract info from it. Make sure you're in the root directory of your app." unless File.exists? properties_file_name
+      end
+
+      def project_properties
+        return @project_properties if @project_properties
+        properties_file_name = 'project.properties'
+        return nil unless File.exists? properties_file_name
+        @project_properties = File.read(properties_file_name)
+      end
+
+      def project_api_level
+        begin
+          return $1 if project_properties =~ /^target=(.*)$/
+        rescue
+          # ignored
+        end
+      end
+
     end
   end
 end

data/lib/ruboto/version.rb

@@ -1,4 +1,4 @@
 module Ruboto
-  VERSION = '0.13.0.rc.0'
+  VERSION = '0.13.0'
   UPDATE_VERSION_LIMIT = '0.7.0'
 end

data/test/activity/navigation_activity.rb

@@ -1,7 +1,7 @@
 require 'ruboto/activity'
 require 'ruboto/widget'
 
-ruboto_import_widgets :Button, :LinearLayout, :TextView
+ruboto_import_widgets :Button, :LinearLayout, :ScrollView, :TextView
 
 class NavigationActivity
   def onCreate(bundle)
@@ -12,14 +12,19 @@ class NavigationActivity
         linear_layout :orientation => :vertical, :gravity => :center_horizontal do
           text_view :text => 'Navigation', :id => 42, :width => :match_parent,
                     :gravity => :center, :text_size => 48.0
-          button :text => 'Java backed by Java class', :width => :match_parent, :id => 43, :on_click_listener => proc { java_backed_by_java_class }
-          button :text => 'Java backed by Ruby class', :width => :match_parent, :id => 44, :on_click_listener => proc { java_backed_by_ruby_class }
-          button :text => 'Java backed by script name', :width => :match_parent, :id => 45, :on_click_listener => proc { java_backed_by_script_name }
-          button :text => 'Inline block', :width => :match_parent, :id => 46, :on_click_listener => proc { start_inline_activity }
-          button :text => 'Inline block with options', :width => :match_parent, :id => 47, :on_click_listener => proc { start_inline_activity_with_options }
-          button :text => 'Infile class', :width => :match_parent, :id => 48, :on_click_listener => proc { start_infile_activity }
-          button :text => 'Ruby file activity', :width => :match_parent, :id => 49, :on_click_listener => proc { start_ruby_file_activity }
-          button :text => 'RubotoActivity no config', :width => :match_parent, :id => 50, :on_click_listener => proc { start_ruboto_activity_no_config }
+          scroll_view :layout => {:weight= => 1} do
+            linear_layout :orientation => :vertical do
+              button :text => 'Java backed by Java class', :width => :match_parent, :id => 43, :on_click_listener => proc { java_backed_by_java_class }
+              button :text => 'Java backed by Ruby class', :width => :match_parent, :id => 44, :on_click_listener => proc { java_backed_by_ruby_class }
+              button :text => 'Java backed by script name', :width => :match_parent, :id => 45, :on_click_listener => proc { java_backed_by_script_name }
+              button :text => 'Inline block', :width => :match_parent, :id => 46, :on_click_listener => proc { start_inline_activity }
+              button :text => 'Inline block with options', :width => :match_parent, :id => 47, :on_click_listener => proc { start_inline_activity_with_options }
+              button :text => 'Infile class', :width => :match_parent, :id => 48, :on_click_listener => proc { start_infile_activity }
+              button :text => 'Ruby file activity', :width => :match_parent, :id => 49, :on_click_listener => proc { start_ruby_file_activity }
+              button :text => 'RubotoActivity no config', :width => :match_parent, :id => 50, :on_click_listener => proc { start_ruboto_activity_no_config }
+              button :text => 'RubotoActivity', :width => :match_parent, :id => 51, :on_click_listener => proc { start_ruboto_activity('RubyFileActivity') }
+            end
+          end
         end
   end
 
@@ -34,18 +39,14 @@ class NavigationActivity
   def java_backed_by_ruby_class
     i = android.content.Intent.new
     i.setClassName($package_name, 'org.ruboto.RubotoActivity')
-    config_bundle = android.os.Bundle.new
-    config_bundle.put_string('ClassName', 'NavigationTargetActivity')
-    i.putExtra('Ruboto Config', config_bundle)
+    i.putExtra(Ruboto::CLASS_NAME_KEY, 'NavigationTargetActivity')
     startActivity(i)
   end
 
   def java_backed_by_script_name
     i = android.content.Intent.new
     i.setClassName($package_name, 'org.ruboto.RubotoActivity')
-    config_bundle = android.os.Bundle.new
-    config_bundle.put_string('Script', 'navigation_target_activity.rb')
-    i.putExtra('Ruboto Config', config_bundle)
+    i.putExtra(Ruboto::SCRIPT_NAME_KEY, 'navigation_target_activity.rb')
     startActivity(i)
   end
 
@@ -80,18 +81,14 @@ class NavigationActivity
   def start_infile_activity
     i = android.content.Intent.new
     i.setClassName($package_name, 'org.ruboto.RubotoActivity')
-    config_bundle = android.os.Bundle.new
-    config_bundle.put_string('ClassName', 'InfileActivity')
-    i.putExtra('Ruboto Config', config_bundle)
+    i.putExtra(Ruboto::CLASS_NAME_KEY, 'InfileActivity')
     startActivity(i)
   end
 
   def start_ruby_file_activity
     i = android.content.Intent.new
     i.setClassName($package_name, 'org.ruboto.RubotoActivity')
-    config_bundle = android.os.Bundle.new
-    config_bundle.put_string('ClassName', 'RubyFileActivity')
-    i.putExtra('Ruboto Config', config_bundle)
+    i.putExtra(Ruboto::CLASS_NAME_KEY, 'RubyFileActivity')
     startActivity(i)
   end
 

data/test/activity/navigation_activity_test.rb

@@ -54,8 +54,25 @@ test('start ruby file activity again', :ui => false) do |activity|
 end
 
 test('start ruboto activity without config', :ui => false) do |activity|
-  a = start_activity_by_button activity, 50
-  assert_equal 'Ruboto Test App', a.title
+  begin
+    a = start_activity_by_button activity, 50
+    assert_equal 'Ruboto Test App', a.title
+  ensure
+    if a
+      finish_at = Time.now
+      finished = false
+      a.run_on_ui_thread { a.finish; finished = true }
+      loop do
+        break if finished || (Time.now - finish_at > 10)
+        puts 'wait for finish'
+        sleep 0.1
+      end
+    end
+  end
+end
+
+test('start ruboto activity with class name', :ui => false) do |activity|
+  button_activity_text 51, activity, 42, 'This is a Ruby file activity.'
 end
 
 def start_activity_by_button(activity, button_id, activity_class_name = 'org.ruboto.RubotoActivity')

data/test/rake_test.rb

@@ -34,10 +34,10 @@ class RakeTest < Test::Unit::TestCase
 
   def test_that_apk_is_built_if_only_one_ruby_source_file_has_changed
     Dir.chdir APP_DIR do
-      system 'rake install'
+      system 'rake debug'
       apk_timestamp = File.ctime("bin/#{APP_NAME}-debug.apk")
       FileUtils.touch 'src/ruboto_test_app_activity.rb'
-      system 'rake install'
+      system 'rake debug'
       assert_not_equal apk_timestamp, File.ctime("bin/#{APP_NAME}-debug.apk"), 'APK should have been rebuilt'
     end
   end

data/test/ruboto_activity_test.rb

@@ -0,0 +1,27 @@
+require File.expand_path('test_helper', File.dirname(__FILE__))
+
+class RubotoActivityTest < Test::Unit::TestCase
+  def setup
+    generate_app
+  end
+
+  def teardown
+    cleanup_app
+  end
+
+  def test_ruboto_activity_as_entry_point
+    check_platform_installation
+    Dir.chdir APP_DIR do
+      #java_source_file = 'src/org/ruboto/test_app/RubotoTestAppActivity.java'
+      #source = File.read(java_source_file)
+      #assert source.gsub!(/extends org.ruboto.EntryPointActivity/, 'extends org.ruboto.RubotoActivity')
+      #File.open(java_source_file, 'w') { |f| f << source }
+      system 'rake install'
+      #system "adb shell am start -a android.intent.action.MAIN -n org.ruboto.example_test_app/.RubotoActivity"
+      system "adb shell am start -n org.ruboto.test_app/org.ruboto.RubotoActivity -e ClassName RubotoTestAppActivity"
+      assert_equal 0, $?, "tests failed with return code #$?"
+      # FIXME(uwe):  Assert that the activity was started correctly.
+    end
+  end
+
+end

data/test/test_helper.rb

@@ -254,10 +254,6 @@ class Test::Unit::TestCase
   end
 
   def run_app_tests
-    if [7, 8].include? ANDROID_OS
-      puts "Skipping instrumentation tests on #{ANDROID_OS} since they don't work."
-      return
-    end
     check_platform_installation
     Dir.chdir APP_DIR do
       system 'rake test:quick'

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruboto
 version: !ruby/object:Gem::Version
-  version: 0.13.0.rc.0
-  prerelease: 7
+  version: 0.13.0
 platform: ruby
 authors:
 - Daniel Jackoway
@@ -12,50 +11,55 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-25 00:00:00.000000000 Z
+date: 2013-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.7.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'Ruboto (JRuby on Android) is a platform for developing full stand-alone
-  apps for
-
+- !ruby/object:Gem::Dependency
+  name: jruby-jars
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: |
+  Ruboto (JRuby on Android) is a platform for developing full stand-alone apps for
   Android using the Ruby language and libraries.  It includes support libraries
-
   and generators for creating projects, classes, tests, and more.  The complete
-
   APIs of Android, Java, and Ruby are available to you using the Ruby language.
-
-'
 email: ruboto@googlegroups.com
 executables:
 - ruboto
@@ -65,15 +69,21 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- Rakefile
 - README.md
-- assets/libs/dx.jar
+- RELEASE_CANDICATE_DOC
+- RELEASE_DOC
+- Rakefile
+- assets/.DS_Store
+- assets/.gitignore
 - assets/Rakefile
+- assets/libs/dx.jar
 - assets/rakelib/ruboto.rake
-- assets/res/drawable/get_ruboto_core.png
+- assets/res/.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/samples/sample_activity.rb
 - assets/samples/sample_activity_test.rb
@@ -87,6 +97,9 @@ files:
 - assets/src/InheritingBroadcastReceiver.java
 - assets/src/InheritingClass.java
 - assets/src/InheritingService.java
+- assets/src/RubotoActivity.java
+- assets/src/RubotoBroadcastReceiver.java
+- assets/src/RubotoService.java
 - assets/src/org/ruboto/EntryPointActivity.java
 - assets/src/org/ruboto/JRubyAdapter.java
 - assets/src/org/ruboto/Log.java
@@ -106,18 +119,12 @@ files:
 - assets/src/ruboto/util/stack.rb
 - assets/src/ruboto/util/toast.rb
 - assets/src/ruboto/widget.rb
-- assets/src/RubotoActivity.java
-- assets/src/RubotoBroadcastReceiver.java
-- assets/src/RubotoService.java
 - assets/test/src/test_helper.rb
-- assets/.DS_Store
-- assets/.gitignore
-- assets/res/.DS_Store
-- assets/res/drawable/.DS_Store
 - bin/ruboto
 - lib/DalvikProxyClassFactory.java
 - lib/DexClient.java
 - lib/java_class_gen/android_api.xml
+- lib/ruboto.rb
 - lib/ruboto/api.rb
 - lib/ruboto/commands/base.rb
 - lib/ruboto/core_ext/array.rb
@@ -129,6 +136,7 @@ files:
 - lib/ruboto/util/asset_copier.rb
 - lib/ruboto/util/build.rb
 - lib/ruboto/util/code_formatting.rb
+- lib/ruboto/util/emulator.rb
 - lib/ruboto/util/log_action.rb
 - lib/ruboto/util/main_fix.rb
 - lib/ruboto/util/objectspace.rb
@@ -138,7 +146,6 @@ files:
 - lib/ruboto/util/verify.rb
 - lib/ruboto/util/xml_element.rb
 - lib/ruboto/version.rb
-- lib/ruboto.rb
 - test/activity/call_super_activity.rb
 - test/activity/call_super_activity_test.rb
 - test/activity/dir_and_file_activity.rb
@@ -177,6 +184,7 @@ files:
 - test/gem_test.rb
 - test/minimal_app_test.rb
 - test/rake_test.rb
+- test/ruboto_activity_test.rb
 - test/ruboto_gen_test.rb
 - test/ruboto_update_test.rb
 - test/service_test.rb
@@ -187,26 +195,25 @@ files:
 homepage: http://ruboto.org/
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: ruboto/ruboto
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A platform for developing apps using JRuby on Android.
 test_files: []