ivy4r 0.8.0 → 0.8.1

data/History.txt

@@ -1,3 +1,22 @@
+=== 0.8.1 / 2009-11-12
+
+* the project version is NOT set anymore by the the 'before_define' of the extension. The reason
+  for this are problems with ivy files that contain external references (i.e. include within the conf
+  block). The info task used for this needs more configuration information to work properly so this
+  feature is removed and the user must do it herself.
+   * In our projects we just moved the defintion to a different extension that configures more stuff
+     before setting the version and group:
+     before_define do |project|
+          if project.parent.nil? && project.ivy.enabled?
+            # do more configuration here prior setting the versions
+            info = project.ivy.info
+            project.version = info['ivy.revision']
+            project.group = "#{info['ivy.organisation']}.#{info['ivy.module']}"
+          end
+        end
+    * As an alternative you can set the group and version manually in the build file as it is usally done
+      in buildr.
+
 === 0.8.0 / 2009-10-19
 
 * Moved to gemcutter for hosting of gems 'gem install gemcutter' add it as primary location and you

data/lib/buildr/ivy_extension.rb

@@ -84,7 +84,6 @@ module Buildr
       # Returns the artifacts for given configurations as array
       # this is a post resolve task.
       def deps(*confs)
-        configure
         confs = confs.reject {|c| c.nil? || c.blank? }
         unless confs.empty?
           pathid = "ivy.deps." + confs.join('.')
@@ -590,14 +589,6 @@ For more configuration options see IvyConfig.
         end
       end
 
-      before_define do |project|
-        if project.parent.nil? && project.ivy.enabled?
-          info = project.ivy.info
-          project.version = info['ivy.revision']
-          project.group = "#{info['ivy.organisation']}.#{info['ivy.module']}"
-        end
-      end
-
       after_define do |project|
         if project.ivy.enabled?
           IvyExtension.add_ivy_deps_to_java_tasks(project)

data/lib/ivy4r.rb

@@ -35,7 +35,7 @@ is
   }
 =end
 class Ivy4r
-  VERSION = '0.8.0'
+  VERSION = '0.8.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.
@@ -49,6 +49,10 @@ class Ivy4r
   # defaults to the __lib_dir__
   attr_accessor :project_dir
 
+  # The ant property name to use for references to environment properties in ant and ivy,
+  # defaults to 'env'
+  attr_accessor :environment_property
+
   # To provide a custom __antwrap__ to use instead of default one
   attr_writer :ant
 
@@ -58,6 +62,7 @@ class Ivy4r
     @ant_home = ::Ivy4rJars.ant_home_dir
     @lib_dir = ::Ivy4rJars.lib_dir
     @project_dir = @lib_dir
+    @environment_property = 'env'
     @ant = ant
   end
 
@@ -169,6 +174,7 @@ class Ivy4r
 
   def init(ant)
     @init_done = true
+    ant.property :environment => environment_property
     ant.property :name => 'ivy.project.dir', :value => project_dir
     ant.path :id => 'ivy.lib.path' do
       ant.fileset :dir => lib_dir, :includes => '*.jar'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ivy4r
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors: 
   - Klaas Prause
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-19 00:00:00 +02:00
+date: 2009-11-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -139,5 +139,5 @@ specification_version: 3
 summary: Apache Ivy dependency manager wrapper for ruby (see {Apache Ivy}[http://ant.apache.org/ivy/index.html] for more information)
 test_files: 
   - test/test_ivy4r.rb
-  - test/ivy/test_target.rb
   - test/ivy/test_targets.rb
+  - test/ivy/test_target.rb