ivy4r 0.10.3 → 0.10.4

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.10.4 / 2010-03-30
+  * Changes to from version 0.9.14 working preventing a circular dependency error. Buildr.projects
+    is not used anymore but the ivy.publish task works as expected. See 0.9.14 for more details.
+
 === 0.10.3 / 2010-03-30
   * gem yank did not work so needed a new version :(
 

data/lib/buildr/ivy_extension.rb

@@ -9,7 +9,7 @@ module Buildr
       end
       
       def user_setting(*keys)
-       find_setting(Buildr.settings.user['ivy'], *keys)
+        find_setting(Buildr.settings.user['ivy'], *keys)
       end
       
       private
@@ -27,6 +27,8 @@ module Buildr
       
       attr_reader :post_resolve_task_list
       
+      attr_reader :project
+      
       # Hash of all artifacts to publish with mapping from artifact name to ivy publish name
       attr_reader :publish_mappings
       
@@ -630,21 +632,23 @@ module IvyExtension
     end
     
     def add_copy_tasks_for_publish(project)
-      if project.ivy.own_file?
-        Buildr.projects.each do |current|
-          current.packages.each do |pkg|
-            target_file = current.ivy.name[pkg] || File.basename(pkg.name).gsub(/-#{project.version}/, '')
-            taskname = current.path_to(project.ivy.publish_from, target_file)
-            if taskname != pkg.name
-              project.file taskname => pkg.name do
-                verbose "Ivy copying '#{pkg.name}' to '#{taskname}' for publishing"
-                FileUtils.mkdir File.dirname(taskname) unless File.directory?(File.dirname(taskname))
-                FileUtils.cp pkg.name, taskname
-              end
-            end
-            project.task 'ivy:publish' => taskname
+      ivy_project = project
+      until ivy_project.ivy.own_file?
+        ivy_project = ivy_project.parent
+      end
+      
+      project.packages.each do |pkg|
+        target_file = project.ivy.name[pkg] || File.basename(pkg.name).gsub(/-#{project.version}/, '')
+        taskname = project.path_to(project.ivy.publish_from, target_file)
+        if taskname != pkg.name
+          project.file taskname => pkg.name do
+            verbose "Ivy copying '#{pkg.name}' to '#{taskname}' for publishing"
+            FileUtils.mkdir_p File.dirname(taskname) unless File.directory?(File.dirname(taskname))
+            FileUtils.cp pkg.name, taskname
           end
         end
+        
+        ivy_project.task 'ivy:publish' => taskname
       end
     end
   end

data/lib/ivy4r.rb

@@ -36,7 +36,7 @@ is
 =end
 class Ivy4r
 
-  VERSION = '0.10.3'
+  VERSION = '0.10.4'
   
   # 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.3
+  version: 0.10.4
 platform: ruby
 authors: 
   - Klaas Prause
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-30 00:00:00 +02:00
+date: 2010-04-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -52,16 +52,6 @@ dependencies:
           - !ruby/object:Gem::Version 
             version: 2.0.4
       version: 
-  - !ruby/object:Gem::Dependency 
-    name: gemcutter
-    type: :development
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Requirement 
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.5.0
-      version: 
   - !ruby/object:Gem::Dependency 
     name: hoe
     type: :development
@@ -70,7 +60,7 @@ dependencies:
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            version: 2.5.0
+            version: 2.6.0
       version: 
 description: |-
   Apache Ivy dependency manager wrapper for ruby (see {Apache Ivy}[http://ant.apache.org/ivy/index.html] for more information).