ruboto 0.15.0 → 0.16.0

data/lib/ruboto/util/update.rb

@@ -353,6 +353,10 @@ module Ruboto
 
       def update_core_classes(force = nil)
         generate_core_classes(:class => 'all', :method_base => 'on', :method_include => '', :method_exclude => '', :force => force, :implements => '')
+        if File.exists?('ruboto.yml')
+          FileUtils.touch 'ruboto.yml'
+          system 'rake jruby_adapter'
+        end
       end
 
       def read_ruboto_version
@@ -407,7 +411,7 @@ module Ruboto
               `jar -xf #{jruby_core}`
               raise "Unpacking jruby-core jar failed: #$?" unless $? == 0
               File.delete jruby_core
-              if Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.5.dev')
+              if Gem::Version.new(jruby_core_version) >= Gem::Version.new('9000.dev')
                 #noinspection RubyLiteralArrayInspection
                 excluded_core_packages = [
                     '**/*Darwin*',
@@ -439,7 +443,6 @@ module Ruboto
                     'jnr/posix/OpenBSD*',
                     'jnr/x86asm',
                     'org/jruby/ant',
-                    'org/jruby/cext',
                     # 'org/jruby/compiler',      # Needed for initialization, but should not be necessary
                     # 'org/jruby/compiler/impl', # Needed for initialization, but should not be necessary
                     'org/jruby/compiler/impl/BaseBodyCompiler*',
@@ -448,11 +451,7 @@ module Ruboto
                     'org/jruby/embed/bsf',
                     'org/jruby/embed/jsr223',
                     'org/jruby/embed/osgi',
-                    # 'org/jruby/ext/ffi', # Used by several JRuby core classes, but should not be needed unless we add FFI support
-                    'org/jruby/ext/ffi/AbstractMemory*',
-                    'org/jruby/ext/ffi/io',
-                    'org/jruby/ext/ffi/jffi',
-                    'org/jruby/ext/tracepoint',
+                    # 'org/jruby/ext/tracepoint',
                     'org/jruby/javasupport/bsf',
                     # 'org/jruby/management', # should be excluded
                     # 'org/jruby/runtime/invokedynamic', # Should be excluded
@@ -460,6 +459,8 @@ module Ruboto
                     # 'org/jruby/runtime/opto/OptoFactory*', # What is this?
                     'org/yecht',
                 ]
+              elsif Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.5')
+                excluded_core_packages = %w(**/*Darwin* **/*Solaris* **/*windows* **/*Windows* META-INF com/headius com/kenai/constantine com/kenai/jffi com/kenai/jnr/x86asm com/martiansoftware jni jnr/constants/platform/darwin jnr/constants/platform/fake jnr/constants/platform/freebsd jnr/constants/platform/openbsd jnr/constants/platform/sunos jnr/ffi/annotations jnr/ffi/byref jnr/ffi/mapper jnr/ffi/provider jnr/ffi/util jnr/ffi/Struct$* jnr/ffi/types jnr/posix/Aix* jnr/posix/FreeBSD* jnr/posix/MacOS* jnr/posix/OpenBSD* jnr/x86asm org/jruby/ant org/jruby/cext org/jruby/compiler/impl/BaseBodyCompiler* org/jruby/compiler/util org/jruby/demo org/jruby/embed/bsf org/jruby/embed/jsr223 org/jruby/embed/osgi org/jruby/ext/ffi/AbstractMemory* org/jruby/ext/ffi/io org/jruby/ext/ffi/jffi org/jruby/ext/tracepoint org/jruby/javasupport/bsf org/yecht)
               elsif Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.4')
                 excluded_core_packages = %w(**/*Darwin* **/*Solaris* **/*windows* **/*Windows* META-INF com/headius com/kenai/constantine com/kenai/jffi com/kenai/jnr/x86asm com/martiansoftware jline jni jnr/constants/platform/darwin jnr/constants/platform/fake jnr/constants/platform/freebsd jnr/constants/platform/openbsd jnr/constants/platform/sunos jnr/ffi/annotations jnr/ffi/byref jnr/ffi/mapper jnr/ffi/provider jnr/ffi/util jnr/ffi/Struct$* jnr/ffi/types jnr/posix/Aix* jnr/posix/FreeBSD* jnr/posix/MacOS* jnr/posix/OpenBSD* jnr/x86asm org/apache org/fusesource org/jruby/ant org/jruby/cext org/jruby/compiler/impl/BaseBodyCompiler* org/jruby/compiler/util org/jruby/demo org/jruby/embed/bsf org/jruby/embed/jsr223 org/jruby/embed/osgi org/jruby/ext/ffi/AbstractMemory* org/jruby/ext/ffi/io org/jruby/ext/ffi/jffi org/jruby/ext/ripper org/jruby/ext/tracepoint org/jruby/javasupport/bsf org/yecht)
               elsif Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.7.3')
@@ -535,8 +536,8 @@ module Ruboto
       # - Moves ruby stdlib to the root of the jruby-stdlib jar
       def reconfigure_jruby_stdlib
         min_sdk_version = verify_manifest.elements['uses-sdk'].attributes['android:minSdkVersion'].to_i
-        included_stdlibs = verify_ruboto_config[:included_stdlibs]
-        excluded_stdlibs = [*verify_ruboto_config[:excluded_stdlibs]].compact
+        included_stdlibs = verify_ruboto_config['included_stdlibs']
+        excluded_stdlibs = [*verify_ruboto_config['excluded_stdlibs']].compact
         Dir.chdir 'libs' do
           jruby_stdlib = Dir['jruby-stdlib-*.jar'][-1]
           log_action("Reformatting #{jruby_stdlib}") do
@@ -551,45 +552,37 @@ module Ruboto
               FileUtils.move 'old/META-INF/jruby.home/lib', 'new/jruby.home/lib'
               FileUtils.rm_rf 'new/jruby.home/lib/ruby/gems'
 
-              jruby_stdlib_version = Gem::Version.new(JRubyJars::VERSION)
-
-              if included_stdlibs
-                lib_dirs = %w(1.8 1.9 2.0 shared)
-
-                # FIXME(uwe): Remove when we stop testing JRuby < 1.7.4.dev
-                lib_dirs.delete('2.0') if jruby_stdlib_version < Gem::Version.new('1.7.4.dev')
-                # EMXIF
-
-                print 'excluded...'
-                lib_dirs.each do |ld|
-                  Dir.chdir "new/jruby.home/lib/ruby/#{ld}" do
-                    libs = Dir['*'].map { |d| d.sub /\.(rb|jar)$/, '' }.uniq
-                    libs.each do |d|
-                      next if included_stdlibs.include? d
-                      FileUtils.rm_rf d if File.exists? d
-                      file = "#{d}.rb"
-                      FileUtils.rm_rf file if File.exists? file
-                      jarfile = "#{d}.jar"
-                      FileUtils.rm_rf jarfile if File.exists? jarfile
-                      print "#{d}..."
+              Dir.chdir 'new/jruby.home/lib/ruby' do
+                ruby_stdlib_versions = Dir['*'] - %w(gems)
+                if included_stdlibs
+                  print 'excluded...'
+                  ruby_stdlib_versions.each do |ld|
+                    Dir.chdir ld do
+                      libs = Dir['*'].map { |d| d.sub /\.(rb|jar)$/, '' }.uniq
+                      libs.each do |d|
+                        next if included_stdlibs.include? d
+                        FileUtils.rm_rf d if File.exists? d
+                        file = "#{d}.rb"
+                        FileUtils.rm_rf file if File.exists? file
+                        jarfile = "#{d}.jar"
+                        FileUtils.rm_rf jarfile if File.exists? jarfile
+                        print "#{d}..."
+                      end
                     end
                   end
                 end
-              end
 
-              if excluded_stdlibs.any?
-                %w(1.8 1.9 2.0 shared).each do |ld|
-                  # FIXME(uwe): Remove when we stop testing JRuby < 1.7.4.dev
-                  next if ld == '2.0' && jruby_stdlib_version < Gem::Version.new('1.7.4.dev')
-                  # EMXIF
-                  excluded_stdlibs.each do |d|
-                    dir = "new/jruby.home/lib/ruby/#{ld}/#{d}"
-                    FileUtils.rm_rf dir if File.exists? dir
-                    file = "#{dir}.rb"
-                    FileUtils.rm_rf file if File.exists? file
+                if excluded_stdlibs.any?
+                  ruby_stdlib_versions.each do |ld|
+                    excluded_stdlibs.each do |d|
+                      dir = "#{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
-                print "excluded #{excluded_stdlibs.join(' ')}..."
               end
 
               Dir.chdir 'new' do

data/lib/ruboto/util/xml_element.rb

@@ -44,12 +44,12 @@ module Ruboto
       def find_class_or_interface(klass, a_type)
         abort "ERROR: Can't parse package from #{klass}" unless klass.match(/([a-z.]+)\.([A-Z][A-Za-z.]+)/)
 
-        package = self['package'].find{|i| i.attribute('name') == $1}
+        package = self['package'].find { |i| i.attribute('name') == $1 }
         abort "ERROR: Can't find package #{$1}" unless package
         if a_type == 'either'
-          package['class'].find{|i| i.attribute('name') == $2} or package['interface'].find{|i| i.attribute('name') == $2}
+          package['class'].find { |i| i.attribute('name') == $2 } or package['interface'].find { |i| i.attribute('name') == $2 }
         else
-          package[a_type].find{|i| i.attribute('name') == $2}
+          package[a_type].find { |i| i.attribute('name') == $2 }
         end
       end
 
@@ -63,37 +63,37 @@ module Ruboto
 
       def all_methods(method_base='all', method_include='', method_exclude='', implements='')
         # get all the methogs
-        all_methods = get_elements('method').select{|m| m.attribute('static') != 'true'}
+        all_methods = get_elements('method').select { |m| m.attribute('static') != 'true' }
 
         # establish the base set of methods
         working_methods = case method_base.to_s
-        when 'all' then
-          all_methods
-        when 'none' then
-          []
-        when 'abstract' then
-          all_methods.select{|i| i.attribute('abstract') == 'true'}
-        when 'on' then
-          all_methods.select{|i| i.attribute('name').match(/^on[A-Z]/)}
-        end
+                          when 'all' then
+                            all_methods
+                          when 'none' then
+                            []
+                          when 'abstract' then
+                            all_methods.select { |i| i.attribute('abstract') == 'true' }
+                          when 'on' then
+                            all_methods.select { |i| i.attribute('name').match(/^on[A-Z]/) }
+                          end
 
         # make sure to include requested methods
         include_methods = method_include.split(',') if method_include.is_a?(String)
-        all_methods.each{|i| working_methods << i if include_methods.include?(i.attribute('name'))}
+        all_methods.each { |i| working_methods << i if include_methods.include?(i.attribute('name')) }
 
         # make sure to exclude rejected methods
         exclude_methods = method_exclude.split(',') if method_exclude.is_a?(String)
-        working_methods = working_methods.select{|i| not exclude_methods.include?(i.attribute('name'))}
+        working_methods = working_methods.select { |i| not exclude_methods.include?(i.attribute('name')) }
 
         # remove methods marked final
-        working_methods = working_methods.select{|i| (not i.attribute('final')) or i.attribute('final') == 'false'}
+        working_methods = working_methods.select { |i| (not i.attribute('final')) or i.attribute('final') == 'false' }
 
         # get additional methods from parent
         if name =='class' and attribute('extends')
           parent = root.find_class(attribute('extends'))
           parent_methods = parent.all_methods(method_base, method_include, method_exclude)
           working_signatures = working_methods.map(&:method_signature)
-          working_methods += parent_methods.select{|i| not working_signatures.include?(i.method_signature)}
+          working_methods += parent_methods.select { |i| not working_signatures.include?(i.method_signature) }
         end
 
         # get additional methods from interfaces
@@ -102,7 +102,7 @@ module Ruboto
             interface = root.find_interface(i)
             abort("Unkown interface: #{i}") unless interface
             working_signatures = working_methods.map(&:method_signature)
-            working_methods += interface.all_methods.select{|j| not working_signatures.include?(j.method_signature)}
+            working_methods += interface.all_methods.select { |j| not working_signatures.include?(j.method_signature) }
           end
         end
 
@@ -110,37 +110,40 @@ module Ruboto
       end
 
       def parameters
-        get_elements('parameter').map {|p| [p.attribute('name'), p.attribute('type').gsub('&lt;', '<').gsub('&gt;', '>')]}
+        get_elements('parameter').map { |p| [p.attribute('name'), p.attribute('type').gsub('&lt;', '<').gsub('&gt;', '>')] }
       end
 
       def method_signature
-        "#{attribute('name')}(#{parameters.map{|i| i[1]}.join(',')})"
+        "#{attribute('name')}(#{parameters.map { |i| i[1] }.join(',')})"
       end
 
       def constant_string
-        'CB_' + attribute('name').gsub(/[A-Z]/) {|i| "_#{i}"}.upcase.gsub(/^ON_/, '')
+        'CB_' + attribute('name').gsub(/[A-Z]/) { |i| "_#{i}" }.upcase.gsub(/^ON_/, '')
       end
 
       def super_string
         if attribute('api_added') and
-          attribute('api_added').to_i > verify_min_sdk.to_i and
-          attribute('api_added').to_i <= verify_target_sdk.to_i
+            attribute('api_added').to_i > verify_min_sdk.to_i and
+            attribute('api_added').to_i <= verify_target_sdk.to_i
           nil
         elsif attribute('abstract') == 'true'
           nil
         elsif name == 'method'
-          "super.#{attribute('name')}(#{parameters.map{|i| i[0]}.join(', ')});"
+          "super.#{attribute('name')}(#{parameters.map { |i| i[0] }.join(', ')});"
         elsif name == 'constructor'
-          "super(#{parameters.map{|i| i[0]}.join(', ')});"
+          "super(#{parameters.map { |i| i[0] }.join(', ')});"
         end
       end
 
       def default_return
         return nil unless attribute('return')
         case attribute('return')
-        when 'boolean' then 'return false;'
-        when 'int' then 'return 0;'
-        when 'void' then nil
+        when 'boolean' then
+          'return false;'
+        when 'int' then
+          'return 0;'
+        when 'void' then
+          nil
         else
           'return null;'
         end
@@ -152,7 +155,7 @@ module Ruboto
         rv ? "return #{rv}" : default_return
       end
 
-      def ruby_call(camelize = false)
+      def ruby_call(snake_case = false)
         params = parameters
         args = ''
         if params.size > 1
@@ -175,7 +178,7 @@ module Ruboto
           convert_return = "#{return_class.sub(/<.*>$/, '')}.class, "
         end
 
-        method_name = camelize ? attribute('name') : snake_case_attribute
+        method_name = snake_case ? snake_case_attribute : attribute('name')
         ["#{return_cast}JRubyAdapter.runRubyMethod(#{convert_return}scriptInfo.getRubyInstance(), \"#{method_name}\"#{args});"]
       end
 
@@ -195,12 +198,21 @@ module Ruboto
              'String rubyClassName = scriptInfo.getRubyClassName();',
              "if (rubyClassName == null) #{super_return}",
              if_else(
-                 "(Boolean)JRubyAdapter.runScriptlet(rubyClassName + \".instance_methods(false).any?{|m| m.to_sym == :#{snake_case_attribute}}\")",
+                 "(Boolean)JRubyAdapter.runScriptlet(rubyClassName + \".instance_methods(false).any?{|m| m.to_sym == :#{attribute('name')}}\")",
                  ruby_call,
                  if_else(
-                     "(Boolean)JRubyAdapter.runScriptlet(rubyClassName + \".instance_methods(false).any?{|m| m.to_sym == :#{attribute('name')}}\")",
+                     "(Boolean)JRubyAdapter.runScriptlet(rubyClassName + \".instance_methods(false).any?{|m| m.to_sym == :#{snake_case_attribute}}\")",
                      ruby_call(true),
-                     [super_return]
+                     if_else(
+                         "(Boolean)JRubyAdapter.runScriptlet(rubyClassName + \".instance_methods(true).any?{|m| m.to_sym == :#{snake_case_attribute}}\")",
+                         ruby_call(true),
+                         # FIXME(uwe):  Can the method be unimplemented?  Is the Ruby instance always an instance of this class?
+                         #if_else(
+                         #    "(Boolean)JRubyAdapter.runScriptlet(rubyClassName + \".instance_methods(true).any?{|m| m.to_sym == :#{attribute('name')}}\")",
+                             ruby_call,
+                         #    [super_return]
+                         #)
+                     )
                  )
              )
             ]

data/lib/ruboto/version.rb

@@ -1,4 +1,4 @@
 module Ruboto
-  VERSION = '0.15.0'
+  VERSION = '0.16.0'
   UPDATE_VERSION_LIMIT = '0.7.0'
 end

data/test/activity/call_super_activity.rb

@@ -20,7 +20,7 @@ class CallSuperActivity
   end
 
   # FIXME(uwe):  We should test that super is not called implicitly
-  # def on_resume
+  # def onResume
   #   super
   # end
 

data/test/activity/dialog_fragment_activity.rb

@@ -0,0 +1,37 @@
+require 'ruboto/widget'
+
+ruboto_import_widgets :LinearLayout, :TextView
+
+class DialogFragmentActivity
+  def onCreate(bundle)
+    super
+    set_title 'Dialog Fragment Test'
+
+    self.content_view =
+        linear_layout :orientation => :vertical, :gravity => :center do
+          text_view :id => 42, :text => title, :text_size => 48.0,
+                    :gravity => :center
+        end
+    ft = getFragmentManager.beginTransaction
+    ft.addToBackStack(nil)
+    ExampleDialogFragment.new.show(ft, 'example_dialog')
+  end
+end
+
+class ExampleDialogFragment < android.app.DialogFragment
+  def onCreate(bundle)
+    super
+    @some_var = 'Ruboto does fragments!'
+  end
+
+  def onCreateView(inflater, container, bundle)
+    dialog.title = @some_var
+
+    linear_layout :orientation => :vertical do
+      linear_layout :gravity => :center, :layout => {:width= => :fill_parent} do
+        text_view :text => @some_var, :id => 43, :text_size => 40.0,
+                  :gravity => :center
+      end
+    end
+  end
+end

data/test/activity/dialog_fragment_activity_test.rb

@@ -0,0 +1,19 @@
+activity org.ruboto.test_app.DialogFragmentActivity
+
+setup do |activity|
+  start = Time.now
+  loop do
+    @text_view = activity.findViewById(42)
+    wait_for_idle_sync
+    fragment = activity.fragment_manager.findFragmentByTag('example_dialog')
+    @fragment_text = fragment.view.findViewById(43) if fragment
+    break if (@text_view && @fragment_text) || (Time.now - start > 60)
+    sleep 1
+  end
+  assert @text_view && @fragment_text
+end
+
+test 'start fragment', :ui => false do |activity|
+  assert_equal 'Dialog Fragment Test', @text_view.text.to_s
+  assert_equal 'Ruboto does fragments!', @fragment_text.text.to_s
+end

data/test/activity/image_button_activity.rb

@@ -6,7 +6,8 @@ ruboto_import_widgets :ImageButton, :LinearLayout, :TextView
 class ImageButtonActivity
   def onCreate(bundle)
     super
-    set_title File.basename(__FILE__).chomp('_activity.rb').split('_').map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
+    set_title File.basename(__FILE__).chomp('_activity.rb').split('_').
+                  map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
 
     click_handler = proc do |view|
       @text_view.setText 'What hath Matz wrought!'

data/test/activity/navigation_activity_test.rb

@@ -87,7 +87,8 @@ def start_activity_by_button(activity, button_id, activity_class_name = 'org.rub
       btn.request_focus
       btn.perform_click
     end
-    current_activity = wait_for_monitor_with_timeout(monitor, 5000)
+    waitForIdleSync
+    current_activity = wait_for_monitor_with_timeout(monitor, 10000)
   ensure
     removeMonitor(monitor)
   end

data/test/activity/no_on_create_activity.rb

@@ -0,0 +1,17 @@
+require 'ruboto/widget'
+
+ruboto_import_widgets :LinearLayout, :TextView
+
+class NoOnCreateActivity
+  def onResume
+    super
+    set_title File.basename(__FILE__).chomp('_activity.rb').split('_').
+                  map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
+
+    self.content_view = linear_layout :orientation => :vertical,
+                                      :gravity => android.view.Gravity::CENTER do
+      text_view :id => 42, :text => title, :text_size => 48.0,
+                :gravity => android.view.Gravity::CENTER
+    end
+  end
+end

data/test/activity/no_on_create_activity_test.rb

@@ -0,0 +1,15 @@
+activity org.ruboto.test_app.NoOnCreateActivity
+
+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('activity starts without onCreate implemented') do |activity|
+  assert_equal 'No On Create', @text_view.text.to_s
+end

data/test/activity/spinner_activity.rb

@@ -0,0 +1,51 @@
+require 'ruboto/widget'
+
+ruboto_import_widgets :LinearLayout, :Spinner, :TextView
+
+class SpinnerActivity
+  def onCreate(bundle)
+    super
+    set_title File.basename(__FILE__).chomp('_activity.rb').split('_').
+                  map { |s| "#{s[0..0].upcase}#{s[1..-1]}" }.join(' ')
+
+    click_handler = proc do |parent, view, position, id|
+      @text_view.text = parent.adapter.get_item(position)
+    end
+
+    self.content_view =
+        linear_layout :orientation => :vertical, :gravity => :center_horizontal do
+          spinner :width => :match_parent, :id => 42
+          plain_spinner = spinner :width => :match_parent, :id => 43,
+                                  :on_item_selected_listener => click_handler
+          plain_spinner.adapter = android.widget.ArrayAdapter.new(self, R::layout::simple_spinner_item)
+
+          # FIXME(uwe): Simplify when we stop supporting Android < 4.0.3
+          if android.os.Build::VERSION::SDK_INT < 11
+            ['Plain Spinner', 'Plain Item'].each do |i|
+              plain_spinner.adapter.add(i)
+            end
+          else
+            plain_spinner.adapter.add_all(['Plain Spinner', 'Plain Item'])
+          end
+          # EMXIF
+
+          spinner :width => :match_parent, :id => 44,
+                  :on_item_selected_listener => click_handler,
+                  :adapter => android.widget.ArrayAdapter.new(self, R::layout::simple_spinner_item, ['Adapter Spinner', 'Adapter Item'])
+          spinner :width => :match_parent, :id => 45  ,
+                  :on_item_selected_listener => click_handler,
+                  :list => ['List Spinner', 'List Item']
+          spinner :width => :match_parent, :id => 46  ,
+                  :on_item_selected_listener => click_handler,
+                  :list => ['List Spinner', 'List Item'],
+                  :item_layout => R::layout::simple_spinner_dropdown_item
+          spinner :width => :match_parent, :id => 47  ,
+                  :on_item_selected_listener => click_handler,
+                  :list => ['List Spinner', 'List Item'],
+                  :item_layout => R::layout::simple_spinner_dropdown_item,
+                  :dropdown_layout => R::layout::simple_spinner_item
+          @text_view = text_view :text => 'Spinning?', :id => 69, :width => :match_parent,
+                                 :gravity => :center, :text_size => 48.0
+        end
+  end
+end