ivy4r 0.8.1 → 0.9.0

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.9.0 / 2009-11-16
+
+* Add a new configuration option for compile, test and package with name 'type'. The type can
+  be used as defined in ivy to only get artifacts of given type(s). One or more types can be
+  set as an array to this option. If no type is given all artifacts are retrieved.
+
 === 0.8.1 / 2009-11-12
 
 * the project version is NOT set anymore by the the 'before_define' of the extension. The reason

data/lib/buildr/ivy_extension.rb

@@ -3,32 +3,17 @@ require 'ivy4r'
 module Buildr
   module Ivy
 
-    # TODO extend extension to download ivy stuff with dependencies automatically
-    #    VERSION = '2.1.0-rc1'
-
     class << self
-
       def setting(*keys)
         setting = Buildr.settings.build['ivy']
         keys.each { |key| setting = setting[key] unless setting.nil? }
         setting
       end
-
-      #      def version
-      #        setting['version'] || VERSION
-      #      end
-      #      def dependencies
-      #        @dependencies ||= [
-      #          "org.apache.ivy:ivy:jar:#{version}",
-      #          'com.jcraft:jsch:jar:1.41',
-      #          'oro:oro:jar:2.08'
-      #        ]
-      #      end
     end
     
     class IvyConfig
       TARGETS = [:compile, :test, :package]
-      TYPES = [:conf, :include, :exclude]
+      TYPES = [:conf, :type, :include, :exclude]
 
       attr_accessor :extension_dir, :resolved
 
@@ -83,11 +68,26 @@ module Buildr
 
       # Returns the artifacts for given configurations as array
       # this is a post resolve task.
-      def deps(*confs)
-        confs = confs.reject {|c| c.nil? || c.blank? }
+      # the arguments are checked for the following:
+      # 1. if exactly two arrays are given args[0] is used for confs and args[1] is used for types
+      # 2. if not exactly two arrays all args are used as confs
+      def deps(*args)
+        if args.size == 2 && args[0].kind_of?(Array) && args[1].kind_of?(Array)
+          confs, types = args[0], args[1]
+        else
+          confs, types = args.flatten, []
+        end
+        
+        [confs, types].each do |t|
+          t.reject! {|c| c.nil? || c.blank? }
+        end
+        
         unless confs.empty?
-          pathid = "ivy.deps." + confs.join('.')
-          ivy4r.cachepath :conf => confs.join(','), :pathid => pathid
+          pathid = "ivy.deps." + confs.join('.') + '.' + types.join('.')
+          params = {:conf => confs.join(','), :pathid => pathid}
+          params[:type] = types.join(',') unless types.nil? || types.size == 0
+
+          ivy4r.cachepath params
         end
       end
 
@@ -346,12 +346,12 @@ module Buildr
       # <tt>project.ivy.filter('server', 'client', :include => /b.*.jar/, :exclude => [/a\.jar/, /other.*\.jar/])</tt>
       def filter(*confs)
         filter = confs.last.kind_of?(Hash) ? confs.pop : {}
-        unless (filter.keys - [:include, :exclude]).empty?
+        unless (filter.keys - (TYPES - [:conf])).empty?
           raise ArgumentError, "Invalid filter use :include and/or :exclude only: given #{filter.keys.inspect}"
         end
-        includes, excludes = filter[:include] || [], filter[:exclude] || []
+        includes, excludes, types = filter[:include] || [], filter[:exclude] || [], filter[:type] || []
 
-        artifacts = deps(*confs.flatten)
+        artifacts = deps(confs.flatten, types.flatten)
         if artifacts
           artifacts = artifacts.find_all do |lib|
             lib = File.basename(lib)
@@ -471,8 +471,9 @@ For more configuration options see IvyConfig.
           project.task :compiledeps => resolve_target do
             includes = project.ivy.compile_include
             excludes = project.ivy.compile_exclude
+            types = project.ivy.compile_type
             confs = [project.ivy.compile_conf].flatten
-            if deps = project.ivy.filter(confs, :include => includes, :exclude => excludes)
+            if deps = project.ivy.filter(confs, :type => types, :include => includes, :exclude => excludes)
               project.compile.with [deps, project.compile.dependencies].flatten
               info "Ivy adding compile dependencies '#{confs.join(', ')}' to project '#{project.name}'"
             end
@@ -483,8 +484,9 @@ For more configuration options see IvyConfig.
           project.task :testdeps => resolve_target do
             includes = project.ivy.test_include
             excludes = project.ivy.test_exclude
+            types = project.ivy.test_type
             confs = [project.ivy.test_conf, project.ivy.compile_conf].flatten.uniq
-            if deps = project.ivy.filter(confs, :include => includes, :exclude => excludes)
+            if deps = project.ivy.filter(confs, :type => types, :include => includes, :exclude => excludes)
               project.test.with [deps, project.test.dependencies].flatten
               info "Ivy adding test dependencies '#{confs.join(', ')}' to project '#{project.name}'"
             end
@@ -523,8 +525,9 @@ For more configuration options see IvyConfig.
             task = project.task "#{pkg.name}deps" => project.ivy.file_project.task('ivy:resolve') do
               includes = project.ivy.package_include
               excludes = project.ivy.package_exclude
+              types = project.ivy.package_type
               confs = project.ivy.package_conf
-              if deps = project.ivy.filter(confs, :include => includes, :exclude => excludes)
+              if deps = project.ivy.filter(confs, :type => types, :include => includes, :exclude => excludes)
                 pkg.with :libs => [deps, pkg.libs].flatten
                 info "Adding production libs from conf '#{confs.join(', ')}' to WAR '#{pkg.name}' in project '#{project.name}'"
               end

data/lib/ivy4r.rb

@@ -35,7 +35,7 @@ is
   }
 =end
 class Ivy4r
-  VERSION = '0.8.1'
+  VERSION = '0.9.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.8.1
+  version: 0.9.0
 platform: ruby
 authors: 
   - Klaas Prause
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-12 00:00:00 +01:00
+date: 2009-11-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency