ivy4r 0.9.2 → 0.9.3

data/History.txt

@@ -1,3 +1,14 @@
+=== 0.9.3 / 2009-11-18
+
+* Sorting of compile and test dependencies to prevent problems with old jars that are added by
+  buildr automatically, i.e. log4j-1.2.9 for cobertura or JUnit 4.4 if tests are using a newer version.
+  The sort order:
+  1. all project dependencies as classes, resources and this like in the order the are contained in path
+  2. all ivy dependencies
+  3. all dependencies added by buildr to the targets
+* Deleted 'to_ivy_file' functionality because it was not working as expected. The function used the
+  wrong ivy context and was not able to resolve all variables within the file from the correct ivy context.
+
 === 0.9.2 / 2009-11-16
 
 * Added new method to generate an ivy file from a resolved module descriptor, via the java

data/Manifest.txt

@@ -22,7 +22,6 @@ lib/ivy/retrieve.rb
 lib/ivy/settings.rb
 lib/ivy/target.rb
 lib/ivy/targets.rb
-lib/ivy/to_ivy_file.rb
 lib/ivy4r.rb
 lib/rake/ivy_extension.rb
 test/buildlist/p1/buildfile

data/lib/buildr/ivy_extension.rb

@@ -334,17 +334,6 @@ module Buildr
         end
       end
 
-      # Sets the properties for creation of an ivy file from resolved descriptor as an post_resolve task.
-      def to_ivy_file(args)
-        raise "The output file ':file' must be specified for 'to_ivy_file'" unless args.member? :file
-        raise "Only :file and :overwrite are allowed arguments for 'to_ivy_file'" if (args.keys - [:file, :overwrite]).size > 0
-        post_resolve do
-          FileUtils.mkdir_p File.dirname(args[:file])
-          ivy4r.to_ivy_file args
-          @project.send(:info, "Created ivy file: '#{args[:file]}'")
-        end
-      end
-
       # Adds given block as post resolve action that is executed directly after #resolve has been called.
       # Yields this ivy config object into block.
       # <tt>project.ivy.post_resolve { |ivy| p "all deps:" + ivy.deps('all').join(", ") }</tt>
@@ -477,6 +466,7 @@ For more configuration options see IvyConfig.
       include Buildr::Extension
 
       class << self
+
         def add_ivy_deps_to_java_tasks(project)
           resolve_target = project.ivy.file_project.task('ivy:resolve')
           project.task :compiledeps => resolve_target do
@@ -486,6 +476,7 @@ For more configuration options see IvyConfig.
             confs = [project.ivy.compile_conf].flatten
             if deps = project.ivy.filter(confs, :type => types, :include => includes, :exclude => excludes)
               project.compile.with [deps, project.compile.dependencies].flatten
+              sort_dependencies(project.compile.dependencies, deps, project.path_to(''))
               info "Ivy adding compile dependencies '#{confs.join(', ')}' to project '#{project.name}'"
             end
           end
@@ -499,6 +490,8 @@ For more configuration options see IvyConfig.
             confs = [project.ivy.test_conf, project.ivy.compile_conf].flatten.uniq
             if deps = project.ivy.filter(confs, :type => types, :include => includes, :exclude => excludes)
               project.test.with [deps, project.test.dependencies].flatten
+              sort_dependencies(project.test.dependencies, deps, project.path_to(''))
+              sort_dependencies(project.test.compile.dependencies, deps, project.path_to(''))
               info "Ivy adding test dependencies '#{confs.join(', ')}' to project '#{project.name}'"
             end
           end
@@ -518,6 +511,35 @@ For more configuration options see IvyConfig.
           end
         end
 
+        # Sorts the dependencies in #deps replacing the old order.
+        # Sorting is done as follows:
+        # 1. all dependencies that belong to the project identified by #project_path,
+        #    .i.e. instrumented-classes, resources in the order the are contained in the array
+        # 2. all ivy dependencies identified by #ivy_deps
+        # 3. all dependencies added automatically by buildr
+        def sort_dependencies(deps, ivy_deps, project_path)
+          old_deps = deps.dup
+          belongs_to_project = /#{project_path}/
+          deps.sort! do |a, b|
+            a_belongs_to_project = belongs_to_project.match(a.to_s)
+            b_belongs_to_project = belongs_to_project.match(b.to_s)
+            a_ivy = ivy_deps.member? a
+            b_ivy = ivy_deps.member? b
+
+            if a_belongs_to_project && !b_belongs_to_project
+              -1
+            elsif !a_belongs_to_project && b_belongs_to_project
+              1
+            elsif a_ivy && !b_ivy
+              -1
+            elsif !a_ivy && b_ivy
+              1
+            else
+              old_deps.index(a) <=> old_deps.index(b)
+            end
+          end
+        end
+
         def add_manifest_to_distributeables(project)
           pkgs = project.packages.find_all { |pkg| [:jar, :war, :ear].member? pkg.type }
           pkgs.each do |pkg|

data/lib/ivy/targets.rb

@@ -15,7 +15,6 @@ require 'ivy/retrieve'
 require 'ivy/publish'
 require 'ivy/report'
 require 'ivy/buildlist'
-require 'ivy/to_ivy_file'
 
 =begin
 finished

data/lib/ivy4r.rb

@@ -35,7 +35,7 @@ is
   }
 =end
 class Ivy4r
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 
   # 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.
@@ -150,13 +150,7 @@ class Ivy4r
   def report(*params)
     Ivy::Report.new(ant).execute(*params)
   end
-
-  # Creates ivy file for last resolved descriptor using the underlying java facilities 
-  # (ModuleDescriptor.toIvyFile(java.io.File)).
-  def to_ivy_file(*params)
-    Ivy::ToIvyFile.new(ant).execute(*params)
-  end
-
+  
   # Used to get or set ant properties.
   # [set] <tt>property['name'] = value</tt> sets the ant property with name to given value no overwrite
   # [get] <tt>property[matcher]</tt> gets property that is equal via case equality operator (<tt>===</tt>)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ivy4r
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
   - Klaas Prause
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-16 00:00:00 +01:00
+date: 2009-11-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -94,7 +94,6 @@ files:
   - lib/ivy/settings.rb
   - lib/ivy/target.rb
   - lib/ivy/targets.rb
-  - lib/ivy/to_ivy_file.rb
   - lib/ivy4r.rb
   - lib/rake/ivy_extension.rb
   - test/buildlist/p1/buildfile

data/lib/ivy/to_ivy_file.rb

@@ -1,31 +0,0 @@
-require 'ivy/target'
-
-module Ivy
-  class ToIvyFile < Ivy::Target
-    def parameter
-      [
-        Parameter.new(:file, true),
-        Parameter.new(:overwrite, false)
-      ]
-    end
-
-    protected
-    def execute_ivy
-      descriptor = ant_references.find {|tuple| tuple[0] == 'ivy.resolved.descriptor'}
-      raise 'to_ivy_file is a post resolve task but no resolved descriptor was found!' if descriptor.nil?
-      descriptor = descriptor[1]
-      
-      file = params[:file]
-      overwrite = params[:overwrite] && params[:overwrite].to_s == 'true'
-      unless !File.exists?(file) || overwrite
-        raise "Output file '#{file}' exists and ':overwrite' is false or unset: #{params[:overwrite]}"
-      end
-      
-      descriptor.toIvyFile(java.io.File.new(file))
-    end
-
-    def create_return_values
-      nil
-    end
-  end
-end