ruboto 0.11.0 → 0.12.0.rc.0

data/lib/ruboto/util/update.rb

@@ -1,11 +1,13 @@
 require 'ruboto/version'
 require 'ruboto/core_ext/rexml'
+require 'ruboto/sdk_locations'
 
 module Ruboto
   module Util
     module Update
       include Build
       include Ruboto::SdkVersions
+      include Ruboto::SdkLocations
 
       ###########################################################################
       #
@@ -426,11 +428,6 @@ module Ruboto
                 # TODO(uwe): Remove when we stop supporting jruby-jars 1.7.0
                 excluded_core_packages = %w(**/*Darwin* **/*Solaris* **/*windows* **/*Windows* META-INF com/headius com/kenai/constantine com/kenai/jffi 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/provider jnr/ffi/util jnr/ffi/Struct$* jnr/ffi/types jnr/posix/MacOS* jnr/posix/OpenBSD* org/apache org/bouncycastle org/fusesource org/jruby/ant org/jruby/cext org/jruby/compiler/util org/jruby/demo org/jruby/embed/bsf org/jruby/embed/jsr223 org/jruby/embed/osgi org/jruby/ext/ffi/io org/jruby/ext/ffi/jffi org/jruby/ext/openssl org/jruby/javasupport/bsf)
                 # ODOT
-              elsif Gem::Version.new(jruby_core_version) >= Gem::Version.new('1.6.0')
-                # TODO(uwe): Remove when we stop supporting jruby-jars 1.6.x
-                print 'Retaining com.kenai.constantine and removing jnr for JRuby 1.6.x...'
-                excluded_core_packages = %w(META-INF cext com/kenai/jffi com/martiansoftware ext java jline jni jnr jnr/constants/platform/darwin jnr/constants/platform/fake jnr/constants/platform/freebsd jnr/constants/platform/openbsd jnr/constants/platform/sunos jnr/constants/platform/windows jnr/ffi/annotations jnr/ffi/byref jnr/ffi/provider jnr/ffi/util jnr/netdb jnr/ffi/posix/util org/apache org/jruby/ant org/jruby/compiler/ir org/jruby/compiler/util org/jruby/demo org/jruby/embed/bsf org/jruby/embed/jsr223 org/jruby/embed/osgi org/jruby/ext/ffi org/jruby/javasupport/bsf org/jruby/runtime/invokedynamic)
-                # ODOT
               else
                 raise "Unsupported JRuby version: #{jruby_core_version.inspect}."
               end
@@ -466,11 +463,11 @@ module Ruboto
               #end
 
               # Add our proxy class factory
-              android_jar = Dir["#{Ruboto::SdkVersions::ANDROID_HOME}/platforms/*/android.jar"][0]
+              android_jar = Dir["#{ANDROID_HOME}/platforms/*/android.jar"][0]
               unless android_jar
                 puts
                 puts '*' * 80
-                puts "    Could not find any Android platforms in #{Ruboto::SdkVersions::ANDROID_HOME}/platforms."
+                puts "    Could not find any Android platforms in #{ANDROID_HOME}/platforms."
                 puts '    At least one Android Platform SDK must be installed to compile the Ruboto classes.'
                 puts '    Please install an Android Platform SDK using the "android" package manager.'
                 puts '*' * 80
@@ -514,17 +511,13 @@ module Ruboto
               jruby_stdlib_version = Gem::Version.new($1)
 
               if included_stdlibs
+                lib_dirs = %w(1.8 1.9 2.0 shared)
 
-                # TODO(uwe): Simplify when we stop supporting JRuby < 1.7.0
-                if jruby_stdlib_version < Gem::Version.new('1.7.0.preview1')
-                  lib_dirs = %w(1.8 1.9 site_ruby/1.8 site_ruby/1.9 site_ruby/shared)
-                else
-                  lib_dirs = %w(1.8 1.9 shared)
-                end
-                # ODOT
+                # 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
@@ -542,16 +535,10 @@ module Ruboto
               end
 
               if excluded_stdlibs.any?
-
-                # TODO(uwe): Simplify when we stop supporting JRuby < 1.7.0
-                if jruby_stdlib_version < Gem::Version.new('1.7.0.preview1')
-                  lib_dirs = %w(1.8 1.9 site_ruby/1.8 site_ruby/1.9 site_ruby/shared)
-                else
-                  lib_dirs = %w(1.8 1.9 shared)
-                end
-                # ODOT
-
-                lib_dirs.each do |ld|
+                %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

data/lib/ruboto/util/verify.rb

@@ -17,7 +17,10 @@ module Ruboto
       end
 
       def save_manifest
-        File.open("AndroidManifest.xml", 'w') {|f| REXML::Formatters::OrderedAttributes.new(4).write(verify_manifest.document, f)}
+        File.open('AndroidManifest.xml', 'w') do |f|
+          REXML::Formatters::OrderedAttributes.new(4).write(verify_manifest.document, f)
+          f.puts
+        end
       end
       
       def verify_test_manifest
@@ -27,7 +30,7 @@ module Ruboto
       end
 
       def save_test_manifest
-        File.open("test/AndroidManifest.xml", 'w') {|f| verify_test_manifest.document.write(f, 4)}
+        File.open('test/AndroidManifest.xml', 'w') {|f| verify_test_manifest.document.write(f, 4)}
       end
 
       def verify_package
@@ -42,7 +45,7 @@ module Ruboto
 
       def verify_sdk_versions
         verify_manifest
-        @uses_sdk ||= @manifest.elements["uses-sdk"]
+        @uses_sdk ||= @manifest.elements['uses-sdk']
         abort "you must specify your sdk level in the manifest (e.g., <uses-sdk android:minSdkVersion='3' android:targetSdkVersion='8' />)" unless @uses_sdk
         @uses_sdk
       end
@@ -82,7 +85,7 @@ module Ruboto
       end
 
       def save_ruboto_config
-        File.open("ruboto.yml", 'w') {|f| YAML.dump verify_ruboto_config}
+        File.open('ruboto.yml', 'w') {|f| f << YAML.dump(verify_ruboto_config)}
       end
 
     end

data/lib/ruboto/util/xml_element.rb

@@ -19,17 +19,17 @@ module Ruboto
       end
 
       def name
-        self["name"]
+        self['name']
       end
 
       def attribute(name)
-        self["values"][name]
+        self['values'][name]
       end
 
       def add_element(name, attributes)
         new_element = XMLElement.new
-        new_element["name"] = name
-        new_element["values"] = attributes
+        new_element['name'] = name
+        new_element['values'] = attributes
 
         self[name] = [] unless self[name]
         self[name] << new_element
@@ -44,61 +44,61 @@ 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}
+        if a_type == 'either'
+          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
 
       def find_class(package_and_class)
-        find_class_or_interface(package_and_class, "class")
+        find_class_or_interface(package_and_class, 'class')
       end
 
       def find_interface(package_and_interface)
-        find_class_or_interface(package_and_interface, "interface")
+        find_class_or_interface(package_and_interface, 'interface')
       end
 
-      def all_methods(method_base="all", method_include="", method_exclude="", implements="")
+      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'}
 
         # establish the base set of methods
         working_methods = case method_base.to_s
-        when "all" then
+        when 'all' then
           all_methods
-        when "none" then
+        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]/)}
+        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"))}
+        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'))}
 
         # 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"))}
+        exclude_methods = method_exclude.split(',') if method_exclude.is_a?(String)
+        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"))
+        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)}
         end
 
         # get additional methods from interfaces
-        if name =="class" and implements != ""
-          implements.split(",").each do |i|
+        if name =='class' and implements != ''
+          implements.split(',').each do |i|
             interface = root.find_interface(i)
             abort("Unkown interface: #{i}") unless interface
             working_signatures = working_methods.map(&:method_signature)
@@ -110,100 +110,86 @@ 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
+        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
           nil
-        elsif attribute("abstract") == "true"
+        elsif attribute('abstract') == 'true'
           nil
-        elsif name == "method"
-          "super.#{attribute("name")}(#{parameters.map{|i| i[0]}.join(", ")});"
-        elsif name == "constructor"
-          "super(#{parameters.map{|i| i[0]}.join(", ")});"
+        elsif name == 'method'
+          "super.#{attribute('name')}(#{parameters.map{|i| i[0]}.join(', ')});"
+        elsif name == 'constructor'
+          "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
-        else                "return null;"
+        return nil unless attribute('return')
+        case attribute('return')
+        when 'boolean' then 'return false;'
+        when 'int' then 'return 0;'
+        when 'void' then nil
+        else
+          'return null;'
         end
       end
 
       def super_return
         rv = super_string
-        return "{#{rv} return;}" unless attribute("return")
+        return "{#{rv} return;}" unless attribute('return')
         rv ? "return #{rv}" : default_return
       end
 
       def ruby_call(camelize = false)
         params = parameters
-        args = ""
+        args = ''
         if params.size > 1
-          args = ", new Object[]{" + params.map{|i| i[0]}.join(", ") + "}"
+          args = ', new Object[]{' + params.map { |i| i[0] }.join(', ') + '}'
         elsif params.size > 0
-          args = ", " + params.map{|i| i[0]}.join(", ")
+          args = ', ' + params.map { |i| i[0] }.join(', ')
         end
 
-        return_cast = ""
-        convert_return = ""
-        if attribute("return") && attribute("return") != "void"
-          if (attribute("return").include?(".") or attribute("return") == "int[]")
-            return_class = attribute("return")
-          elsif attribute("return") == 'int'
-            return_int = true
+        return_cast = ''
+        convert_return = ''
+        if attribute('return') && attribute('return') != 'void'
+          if attribute('return').include?('.') || attribute('return') == 'int[]'
+            return_class = attribute('return')
+          elsif attribute('return') == 'int'
             return_class = 'Integer'
           else
-            return_class = attribute("return").capitalize
+            return_class = attribute('return').capitalize
           end
-          return_cast = "return (#{return_class.gsub("&lt;", "<").gsub("&gt;", ">")}) " if return_class
+          return_cast = "return (#{return_class.gsub('&lt;', '<').gsub('&gt;', '>')}) " if return_class
           convert_return = "#{return_class.sub(/<.*>$/, '')}.class, "
         end
 
-          method_name = camelize ? attribute("name") : snake_case_attribute
-          global_args = params.map{|i| "$arg_#{i[0]}"}.join(", ")
-              ["// FIXME(uwe): Simplify when we stop support for RubotoCore 0.4.7"] +
-              if_else(
-                  "JRubyAdapter.isJRubyPreOneSeven()",
-                  params.map{|i| "JRubyAdapter.put(\"$arg_#{i[0]}\", #{i[0]});"} +
-                  [
-                      'JRubyAdapter.put("$ruby_instance", scriptInfo.getRubyInstance());',
-                      "#{return_cast}#{'((Number)' if return_int}JRubyAdapter.runScriptlet(\"$ruby_instance.#{method_name}(#{global_args})\")#{').intValue()' if return_int};",
-                  ],
-                  if_else(
-                      "JRubyAdapter.isJRubyOneSeven()",
-                      ["#{return_cast}JRubyAdapter.runRubyMethod(#{convert_return}scriptInfo.getRubyInstance(), \"#{method_name}\"#{args});"],
-                      ['throw new RuntimeException("Unknown JRuby version: " + JRubyAdapter.get("JRUBY_VERSION"));']
-                  )
-              )
+        method_name = camelize ? attribute('name') : snake_case_attribute
+        ["#{return_cast}JRubyAdapter.runRubyMethod(#{convert_return}scriptInfo.getRubyInstance(), \"#{method_name}\"#{args});"]
       end
 
       def snake_case_attribute
-        attribute("name").gsub(/[A-Z]/) { |i| "_#{i}" }.downcase
+        attribute('name').gsub(/[A-Z]/) { |i| "_#{i}" }.downcase
       end
 
       def method_definition(class_name)
         method_call(
-            (attribute("return") ? attribute("return") : "void"),
-            attribute("name"), parameters,
+            (attribute('return') ? attribute('return') : 'void'),
+            attribute('name'), parameters,
             get_elements('exception').map { |m| m.attribute('type') },
             ["if (ScriptLoader.isCalledFromJRuby()) #{super_return}",
-             if_else("!JRubyAdapter.isInitialized()",
+             if_else('!JRubyAdapter.isInitialized()',
                      [%Q{Log.i("Method called before JRuby runtime was initialized: #{class_name}##{attribute('name')}");},
                       super_return]),
              'String rubyClassName = scriptInfo.getRubyClassName();',

data/lib/ruboto/version.rb

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

data/test/activity/image_button_activity_test.rb

@@ -11,7 +11,7 @@ setup do |activity|
 end
 
 test('button changes text') do |activity|
-  assert_equal "What hath Matz wrought?", @text_view.text
+  assert_equal 'What hath Matz wrought?', @text_view.text
   activity.findViewById(43).performClick
-  assert_equal "What hath Matz wrought!", @text_view.text
+  assert_equal 'What hath Matz wrought!', @text_view.text
 end

data/test/activity/image_button_and_button_activity_test.rb

@@ -11,13 +11,13 @@ setup do |activity|
 end
 
 test('button changes text') do |activity|
-  assert_equal "What hath Matz wrought?", @text_view.text
+  assert_equal 'What hath Matz wrought?', @text_view.text
   activity.find_view_by_id(44).perform_click
   assert_equal 'Button pressed', @text_view.text
 end
 
 test('image button changes text') do |activity|
-  assert_equal "What hath Matz wrought?", @text_view.text
+  assert_equal 'What hath Matz wrought?', @text_view.text
   activity.find_view_by_id(43).perform_click
   assert_equal 'Image button pressed', @text_view.text
 end

data/test/activity/json_activity.rb

@@ -12,7 +12,7 @@ class JsonActivity
         linear_layout :orientation => LinearLayout::VERTICAL, :gravity => android.view.Gravity::CENTER do
           text_view :id => 42, :text => with_large_stack { JSON.load('["foo"]')[0] },
                     :text_size => 48.0, :gravity => android.view.Gravity::CENTER
-          text_view :id => 43, :text => with_large_stack { JSON.dump(['foo']) },
+          text_view :id => 43, :text => with_large_stack { JSON.dump(%w(foo)) },
                     :text_size => 48.0, :gravity => android.view.Gravity::CENTER
           text_view :id => 44, :text => with_large_stack { 'foo'.to_json },
                     :text_size => 48.0, :gravity => android.view.Gravity::CENTER

data/test/activity/navigation_activity.rb

@@ -34,18 +34,18 @@ class NavigationActivity
   def java_backed_by_ruby_class
     i = android.content.Intent.new
     i.setClassName($package_name, 'org.ruboto.RubotoActivity')
-    configBundle = android.os.Bundle.new
-    configBundle.put_string('ClassName', 'NavigationTargetActivity')
-    i.putExtra('Ruboto Config', configBundle)
+    config_bundle = android.os.Bundle.new
+    config_bundle.put_string('ClassName', 'NavigationTargetActivity')
+    i.putExtra('Ruboto Config', config_bundle)
     startActivity(i)
   end
 
   def java_backed_by_script_name
     i = android.content.Intent.new
     i.setClassName($package_name, 'org.ruboto.RubotoActivity')
-    configBundle = android.os.Bundle.new
-    configBundle.put_string('Script', 'navigation_target_activity.rb')
-    i.putExtra('Ruboto Config', configBundle)
+    config_bundle = android.os.Bundle.new
+    config_bundle.put_string('Script', 'navigation_target_activity.rb')
+    i.putExtra('Ruboto Config', config_bundle)
     startActivity(i)
   end
 
@@ -80,18 +80,18 @@ class NavigationActivity
   def start_infile_activity
     i = android.content.Intent.new
     i.setClassName($package_name, 'org.ruboto.RubotoActivity')
-    configBundle = android.os.Bundle.new
-    configBundle.put_string('ClassName', 'InfileActivity')
-    i.putExtra('Ruboto Config', configBundle)
+    config_bundle = android.os.Bundle.new
+    config_bundle.put_string('ClassName', 'InfileActivity')
+    i.putExtra('Ruboto Config', config_bundle)
     startActivity(i)
   end
 
   def start_ruby_file_activity
     i = android.content.Intent.new
     i.setClassName($package_name, 'org.ruboto.RubotoActivity')
-    configBundle = android.os.Bundle.new
-    configBundle.put_string('ClassName', 'RubyFileActivity')
-    i.putExtra('Ruboto Config', configBundle)
+    config_bundle = android.os.Bundle.new
+    config_bundle.put_string('ClassName', 'RubyFileActivity')
+    i.putExtra('Ruboto Config', config_bundle)
     startActivity(i)
   end