ivy4r 0.10.5 → 0.11.0

data/History.txt

@@ -1,3 +1,8 @@
+=== 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.
+  * The multi ivy.xml file support should work now. 
+
 === 0.10.5 / 2010-04-26
   * Fix a bug where artifacts for sub-projects have not been copied correctly to the publish directory
     defined for ivy.

data/README.txt

@@ -57,19 +57,41 @@ the variable "ivy: caching.enabled: true".
 For Rake the targets ivy:enable_result_cache, ivy:disable_result_cache and ivy:clean_result_cache have been added as
 well. For Rake there is no other way to enable the caching beside this targets.
 
+== Notes about usage and testing:
+A few information how this project is used and what parts are well tested and what parts are nearly never used.
+
+=== Buildr extension:
+The buildr extension is tested only on projects with a single ivy.xml, the multi ivy.xml file support was added
+but was never tested extensively!
+
+=== Rake extension:
+Note that the rake extension is only test in JRuby Rails projects to publish a java WAR file into the repository.
+It does not offer as many features as the buildr extension.
+
 == SYNOPSIS:
 
+ivy4r plain:
   To init a new Ivy4r instance set the ANT_HOME and the Ivy lib dir
     ivy4r = Ivy4r.new
     ivy4r.ant_home = 'PATH TO YOUR ANTHOME'
     ivy4r.lib_dir = 'PATH TO IVY LIB DIR'
   as an alternative to setting the ANT_HOME you can set an +Antwrap+ instance directly:
     ivy4r.ant = Buildr.ant('ivy')
+    
+buildr:
+  TODO add buildr example
+
+rake:
+  TODO add rake example
 
 == REQUIREMENTS:
 
+Plain ivy4r:
 * Installed Apache Ant, to call Ivy via Antwrap
 * Ivy and dependencies in a single directory. Dependencies depends on used features, see the ivy homepage for more information.
+* JRuby is well tested, MRI support has been added with version 0.11.0 so use it at your own risk.
+* Rake to use the rake extension
+* Buildr to use the buildr extension
 
 == INSTALL:
 

data/lib/buildr/ivy_extension.rb

@@ -35,24 +35,22 @@ module Buildr
       # Store the current project and initialize ivy ant wrapper
       def initialize(project)
         @project = project
-        if project.parent.nil?
-          @extension_dir = @project.base_dir
-          @post_resolve_task_list = []
-        else
-          @extension_dir = @project.parent.ivy.extension_dir
-          @base_ivy = @project.parent.ivy unless own_file?
-        end
+        @post_resolve_task_list = []
+        @extension_dir = project.parent.nil? ? @project.base_dir : @project.parent.ivy.extension_dir
+        @base_ivy = @project.parent.ivy unless own_file? 
         @target_config = Hash.new do
           |hash, key| hash[key] = {}
         end
+        
       end
       
       def enabled?
-        @enabled ||= Ivy.setting('enabled') || true
+        setting = Ivy.setting('enabled')
+        @enabled ||= setting.nil? ? true : setting
       end
       
       def own_file?
-        @own_file ||= File.exists?(@project.path_to(file))
+        @own_file ||= File.exists?(file)
       end
       
       # Returns the correct ivy4r instance to use, if project has its own ivy file uses the ivy file
@@ -160,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
@@ -197,8 +195,8 @@ module Buildr
           @base_ivy.__publish__
         else
           unless @published
-            options = {:status => status, :pubrevision => revision, :artifactspattern => "#{publish_from}/[artifact].[ext]"}
-            options = publish_options * options
+            base_options = {:status => status, :pubrevision => revision, :artifactspattern => "#{publish_from}/[artifact].[ext]"}
+            options = publish_options * base_options
             ivy4r.publish options
             @published = true
           end
@@ -217,10 +215,17 @@ module Buildr
         @settings ||= Ivy.setting('settings.file') || "#{@extension_dir}/ant-scripts/ivysettings.xml"
       end
       
-      def file
+      # 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
         @ivy_file ||= Ivy.setting('ivy.file') || 'ivy.xml'
       end
       
+      # Returns the absolute ivy file path to use
+      def file
+        @project.path_to(ivy_xml_filename)
+      end
+      
       # Sets the revision to use for the project, this is useful for development revisions that
       # have an appended timestamp or any other dynamic revisioning.
       #
@@ -284,7 +289,7 @@ module Buildr
           if @publish_options_calc
             @publish_options ||= @publish_options_calc.call(self)
           else
-            @publish_options ||= Ivy.setting('publish.options')
+            @publish_options ||= Ivy.setting('publish.options') || {}
           end
         else
           raise "Could not set 'publish_options' for '#{@project.name}' without own ivy file!" unless own_file?

data/lib/ivy/target.rb

@@ -137,14 +137,29 @@ module Ivy
       end
       
       def ant_properties
-        @ant.project.properties
+        p = @ant.project.properties
+        p.respond_to?(:map) ? p : java_map_to_ruby_hash(p)
       end
       
       def ant_references
-        @ant.project.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
       end
     end
     
+    
+    
     COMMA_SPLITTER = Proc.new {|value| value.to_s.split(',').map(&:strip)}
     
     Parameter = Struct.new(:symbol, :mandatory) do

data/lib/ivy4r.rb

@@ -36,7 +36,7 @@ is
 =end
 class Ivy4r
 
-  VERSION = '0.10.5'
+  VERSION = '0.11.0'
   
   # 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.10.5
+  version: 0.11.0
 platform: ruby
 authors: 
   - Klaas Prause
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-26 00:00:00 +02:00
+date: 2010-05-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency