ivy4r 0.11.0 → 0.11.1

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.11.1 / 2010-06-09
+  * Fixed a bug reported by Rhett Sutphin that prevented the use of MRI.
+  * Added mapping from java to ruby via RJB and source example from
+    Stanford Parser Ruby Wrapper by William Patrick McNeill.
+  
 === 0.11.0 / 2010-05-31
   * Fixed a few bugs and issues reported by Rhett Sutphin. See issues on github 3-6.
   * Ivy4r should work with MRI and JRuby, previously only JRuby was supported.

data/Manifest.txt

@@ -1,39 +1,40 @@
-History.txt
-Manifest.txt
-README.txt
-Rakefile
-bin/ivy4r
-lib/buildr/ivy_extension.rb
-lib/ivy/artifactproperty.rb
-lib/ivy/artifactreport.rb
-lib/ivy/buildlist.rb
-lib/ivy/buildnumber.rb
-lib/ivy/cachepath.rb
-lib/ivy/cleancache.rb
-lib/ivy/configure.rb
-lib/ivy/findrevision.rb
-lib/ivy/info.rb
-lib/ivy/java/all_version_matcher.rb
-lib/ivy/listmodules.rb
-lib/ivy/makepom.rb
-lib/ivy/publish.rb
-lib/ivy/report.rb
-lib/ivy/resolve.rb
-lib/ivy/retrieve.rb
-lib/ivy/settings.rb
-lib/ivy/target.rb
-lib/ivy/targets.rb
-lib/ivy4r.rb
-lib/ivy4r_java_extensions.rb
-lib/rake/ivy_extension.rb
-test/buildlist/p1/buildfile
-test/buildlist/p1/ivy.xml
-test/buildlist/sub/p2/buildfile
-test/buildlist/sub/p2/ivy.xml
-test/buildlist/sub/p3/buildfile
-test/buildlist/sub/p3/ivy.xml
-test/ivy/ivysettings.xml
-test/ivy/ivytest.xml
-test/ivy/test_target.rb
-test/ivy/test_targets.rb
-test/test_ivy4r.rb
+History.txt
+Manifest.txt
+README.txt
+Rakefile
+bin/ivy4r
+lib/buildr/ivy_extension.rb
+lib/ivy/artifactproperty.rb
+lib/ivy/artifactreport.rb
+lib/ivy/buildlist.rb
+lib/ivy/buildnumber.rb
+lib/ivy/cachepath.rb
+lib/ivy/cleancache.rb
+lib/ivy/configure.rb
+lib/ivy/findrevision.rb
+lib/ivy/info.rb
+lib/ivy/java/all_version_matcher.rb
+lib/ivy/java/java_object_wrapper.rb
+lib/ivy/listmodules.rb
+lib/ivy/makepom.rb
+lib/ivy/publish.rb
+lib/ivy/report.rb
+lib/ivy/resolve.rb
+lib/ivy/retrieve.rb
+lib/ivy/settings.rb
+lib/ivy/target.rb
+lib/ivy/targets.rb
+lib/ivy4r.rb
+lib/ivy4r_java_extensions.rb
+lib/rake/ivy_extension.rb
+test/buildlist/p1/buildfile
+test/buildlist/p1/ivy.xml
+test/buildlist/sub/p2/buildfile
+test/buildlist/sub/p2/ivy.xml
+test/buildlist/sub/p3/buildfile
+test/buildlist/sub/p3/ivy.xml
+test/ivy/ivysettings.xml
+test/ivy/ivytest.xml
+test/ivy/test_target.rb
+test/ivy/test_targets.rb
+test/test_ivy4r.rb

data/lib/buildr/ivy_extension.rb

@@ -158,7 +158,7 @@ module Buildr
           @base_ivy.__resolve__
         else
           unless @resolved
-            @resolved = ivy4r.resolve :file => file
+            @resolved = ivy4r.resolve :file => file
             @project.send(:info, "Calling '#{post_resolve_tasks.size}' post_resolve tasks for '#{@project.name}'")
             post_resolve_tasks.each { |p| p.call(self) }
           end
@@ -217,7 +217,7 @@ module Buildr
       
       # The basic file name to use in project dir as ivy.xml file. Normally this should be __ivy.xml__
       # If the file resides in a sub directory the relative path from project can be set with this method
-      def ivy_xml_filename
+      def ivy_xml_filename
         @ivy_file ||= Ivy.setting('ivy.file') || 'ivy.xml'
       end
       

data/lib/ivy/java/java_object_wrapper.rb

@@ -0,0 +1,160 @@
+# Extenions to the {Ruby-Java Bridge}[http://rjb.rubyforge.org/] module that
+# add a generic Java object wrapper class for transparent access of java objects
+# from ruby using RJB.
+#
+# This file was part of the Stanford Parser Ruby Wrapper by William Patrick McNeill.
+# Only a few modifications have been done to make it compatible with ivy4r and the
+# Java Ant objects that are accessed.
+module Rjb
+  class JavaObjectWrapper
+    include Enumerable
+    
+    # The underlying Java object.
+    attr_reader :java_object
+    
+    # Initialize with a Java object <em>obj</em>.  If <em>obj</em> is a
+    # String, treat it as a Java class name and instantiate it.  Otherwise,
+    # treat <em>obj</em> as an instance of a Java object.
+    def initialize(obj, *args)
+      @java_object = obj.class == String ? Rjb::import(obj).send(:new, *args) : obj
+    end
+    
+    # Enumerate all the items in the object using its iterator.  If the object
+    # has no iterator, this function yields nothing.
+    def each
+      if @java_object.getClass.getMethods.any? {|m| m.getName == "iterator"}
+        i = @java_object.iterator
+        while i.hasNext
+          yield wrap_java_object(i.next)
+        end
+      end
+    end # each
+    
+    # Reflect unhandled method calls to the underlying Java object and wrap
+    # the return value in the appropriate Ruby object.
+    def method_missing(m, *args)
+      begin
+        JavaObjectWrapper.wrap_java_object(@java_object.send(m, *args))
+      rescue RuntimeError => e
+        # The instance method failed.  See if this is a static method.
+        if not e.message.match(/^Fail: unknown method name/).nil?
+          getClass.send(m, *args)
+        end
+      end
+    end
+    
+    # Checks if underlying java object responds to method prior using standard respond_to? method.
+    def respond_to?(sym)
+      java = @java_object.getClass.getMethods.any? {|m| m.getName == sym.to_s} || super.respond_to?(sym)
+    end
+    
+    # Show the classname of the underlying Java object.
+    def inspect
+      "<#{@java_object._classname}>"
+    end
+    
+    # Use the underlying Java object's stringification.
+    def to_s
+      toString
+    end
+    
+    # All wrapping is done at class level and not at instance level this deviates from the base
+    # implementation
+    class << self
+      # Convert a value returned by a call to the underlying Java object to the
+      # appropriate Ruby object.
+      #
+      # If the value is a JavaObjectWrapper, convert it using a protected
+      # function with the name wrap_ followed by the underlying object's
+      # classname with the Java path delimiters converted to underscores. For
+      # example, a <tt>java.util.ArrayList</tt> would be converted by a function
+      # called wrap_java_util_ArrayList.
+      #
+      # If the value lacks the appropriate converter function, wrap it in a
+      # generic JavaObjectWrapper.
+      #
+      # If the value is not a JavaObjectWrapper, return it unchanged.
+      #
+      # This function is called recursively for every element in an Array.
+      def wrap_java_object(object)
+        if object.kind_of?(Array)
+          object.collect {|item| wrap_java_object(item)}
+        elsif object.respond_to?(:_classname)
+          # Ruby-Java Bridge Java objects all have a _classname member
+          find_converter(object) || JavaObjectWrapper.new(object)
+        else
+          object
+        end
+      end
+      
+      protected
+      # Checks if any class in objects class hierachy or interface of class has a converter method defined
+      # if converter exists returns converted object.
+      def find_converter(object)
+        classnames_to_check(object).each do |name|
+          wrapper = wrapper_name(name)
+          if respond_to? wrapper
+            return send(wrapper, object)
+          end
+        end
+        
+        nil
+      end
+      
+      # Returns all java classnames that should be checked for an adequate mapper for given object.
+      def classnames_to_check(object)
+        names = []
+        clazz = object.getClass
+        while clazz
+          names << clazz.getName
+          clazz.getInterfaces.each {|i| names << i.getName}
+          clazz = clazz.getSuperclass
+        end
+        
+        names.uniq
+      end
+      
+      # Returns the wrapper name for given java classname.
+      def wrapper_name(java_classname)
+        ("convert_" + java_classname.gsub(/\./, "_")).downcase.to_sym
+      end
+      
+      # Convert <tt>java.util.List</tt> objects to Ruby Array objects.
+      def convert_java_util_list(object)
+        array_list = []
+        object.size.times do
+          |i| array_list << wrap_java_object(object.get(i))
+        end
+        array_list
+      end
+      
+      # Convert <tt>java.util.Set</tt> objects to Ruby array object with no duplicates.
+      def convert_java_util_set(object)
+        set = []
+        i = object.iterator
+        while i.hasNext
+          set << wrap_java_object(i.next)
+        end
+        set.uniq
+      end
+      
+      # Convert <tt>java.util.Map</tt> objects to Ruby Hash object.
+      def convert_java_util_map(object)
+        hash = {}
+        i = object.entrySet.iterator
+        while i.hasNext
+          entry = i.next
+          hash[wrap_java_object(entry.getKey)] = wrap_java_object(entry.getValue)
+        end
+        hash
+      end
+      
+      # Convert <tt>java.lang.String</tt> objects to Ruby String.
+      def convert_java_lang_string(object)
+        object.toString
+      end
+      
+    end
+  end
+  
+end

data/lib/ivy/target.rb

@@ -5,6 +5,8 @@ require 'facets/hash/update_values'
 
 require 'digest/md5'
 
+require 'ivy/java/java_object_wrapper'
+
 module Ivy
   
   # Base class with general logic to call a Ivy ant target
@@ -137,24 +139,11 @@ module Ivy
       end
       
       def ant_properties
-        p = @ant.project.properties
-        p.respond_to?(:map) ? p : java_map_to_ruby_hash(p)
+        Rjb::JavaObjectWrapper.wrap_java_object @ant.project.properties
       end
       
       def ant_references
-        r = @ant.project.references
-        r.respond_to?(:map) ? r : java_map_to_ruby_hash(r)
-      end
-      
-      private
-      def java_map_to_ruby_hash(java_map)
-        iterator = java_map.entry_set.iterator
-        result = {}
-        while iterator.has_next
-          entry = iterator.next
-          result[entry.key.to_string] = entry.value.to_string
-        end
-        result
+        Rjb::JavaObjectWrapper.wrap_java_object @ant.project.references
       end
     end
     

data/lib/ivy4r.rb

@@ -36,7 +36,7 @@ is
 =end
 class Ivy4r
 
-  VERSION = '0.11.0'
+  VERSION = '0.11.1'
   
   # Set the ant home directory to load ant classes from if no custom __antwrap__ is provided
   # and the default provided ant version 1.7.1 should not be used.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ivy4r
 version: !ruby/object:Gem::Version 
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors: 
   - Klaas Prause
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-31 00:00:00 +02:00
+date: 2010-06-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -96,6 +96,7 @@ files:
   - lib/ivy/findrevision.rb
   - lib/ivy/info.rb
   - lib/ivy/java/all_version_matcher.rb
+  - lib/ivy/java/java_object_wrapper.rb
   - lib/ivy/listmodules.rb
   - lib/ivy/makepom.rb
   - lib/ivy/publish.rb