ivy4r 0.9.13 → 0.9.14

data/History.txt

@@ -1,3 +1,10 @@
+=== 0.9.14 / 2010-03-16
+
+* Fix for circular build dependency errors in buildr thanks to Pepijn Van Eeckhoudt for the patch.
+  The culprit is the call to Buildr.projects in add_copy_tasks_for_publish. This can cause a call
+  to project.invoke on the project being defined itself. Buildr.projects should not be called from
+  before/after define callbacks as Pepijn found out from the Buildr developers.
+
 === 0.9.13 / 2010-02-16
 
 * Fix problems with Facets and ActiveSupport. We now only include the required core extensions,

data/lib/buildr/ivy_extension.rb

@@ -598,21 +598,19 @@ For more configuration options see IvyConfig.
         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.ivy.file_project
+
+          project.packages.each do |pkg|
+            target_file = project.ivy.publish[pkg] || ivy_project.ivy.publish[pkg] || File.basename(pkg.name).gsub(/-#{project.version}/, '')
+            taskname = ivy_project.path_to(ivy_project.ivy.publish_from, target_file)
+            if taskname != pkg.name
+              ivy_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
+            ivy_project.task 'ivy:publish' => taskname
           end
         end
       end

data/lib/ivy4r.rb

@@ -35,7 +35,7 @@ is
   }
 =end
 class Ivy4r
-  VERSION = '0.9.13'
+  VERSION = '0.9.14'
 
   # 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.9.13
+  version: 0.9.14
 platform: ruby
 authors: 
   - Klaas Prause
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 +01:00
+date: 2010-03-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -42,6 +42,26 @@ dependencies:
           - !ruby/object:Gem::Version 
             version: 2.5.2
       version: 
+  - !ruby/object:Gem::Dependency 
+    name: rubyforge
+    type: :development
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !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
@@ -50,7 +70,7 @@ dependencies:
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            version: 2.3.3
+            version: 2.5.0
       version: 
 description: |-
   Apache Ivy dependency manager wrapper for ruby (see {Apache Ivy}[http://ant.apache.org/ivy/index.html] for more information).
@@ -117,7 +137,6 @@ post_install_message:
 rdoc_options: 
   - --main
   - README.txt
-  - --charset=UTF-8
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement