ivy4r 0.7.0 → 0.7.1

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.7.1 / 2009-08-24
+
+* Fix bug that manual added dependencies are overwritten for package task
+  issue 1: http://github.com/klaas1979/ivy4r/issues#issue/1
+* possible to add manual dependencies for compile and test as for package
+
 === 0.7.0 / 2009-07-20
 
 * It is possible to register +post_resolve+ actions via blocks:

data/lib/buildr/ivy_extension.rb

@@ -115,9 +115,9 @@ module Buildr
       end
 
       # Resolves the configured file once.
-      def resolve
+      def __resolve__
         if @base_ivy
-          @base_ivy.resolve
+          @base_ivy.__resolve__
         else
           unless @resolved
             @resolved = ant.resolve :file => file
@@ -146,9 +146,9 @@ module Buildr
       end
 
       # Publishs the project as defined in ivy file if it has not been published already
-      def publish
+      def __publish__
         if @base_ivy
-          @base_ivy.publish
+          @base_ivy.__publish__
         else
           unless @published
             options = {:status => status, :pubrevision => revision, :artifactspattern => "#{publish_from}/[artifact].[ext]"}
@@ -280,6 +280,10 @@ module Buildr
         end
       end
 
+      # :call-seq:
+      # ivy.publish(package(:jar) => 'new_name_without_version_number.jar')
+      # #deprecated! ivy.name(package(:jar) => 'new_name_without_version_number.jar')
+      #
       # Maps a package to a different name for publishing. This name is used instead of the default name
       # for publishing use a hash with the +package+ as key and the newly mapped name as value. I.e.
       # <tt>ivy.name(package(:jar) => 'new_name_without_version_number.jar')</tt>
@@ -293,6 +297,7 @@ module Buildr
           self
         end
       end
+      alias_method :publish, :name
 
       # Sets the directory to publish artifacts from.
       def publish_from(*publish_dir)
@@ -395,12 +400,12 @@ module Buildr
       
       private
       def target(targets)
-        t = targets.to_s.split('_').find { |t| TARGETS.member? t.to_sym }
+        t = targets.to_s.split('_').find { |target| TARGETS.member? target.to_sym }
         t ? t.to_sym : nil
       end
 
       def type(types)
-        t = types.to_s.split('_').find { |t| TYPES.member? t.to_sym }
+        t = types.to_s.split('_').find { |type| TYPES.member? type.to_sym }
         t ? t.to_sym : nil
       end
 
@@ -465,7 +470,7 @@ For more configuration options see IvyConfig.
             excludes = project.ivy.compile_exclude
             confs = [project.ivy.compile_conf].flatten
             if deps = project.ivy.filter(confs, :include => includes, :exclude => excludes)
-              project.compile.with deps
+              project.compile.with [project.compile.dependencies, deps].flatten
               info "Ivy adding compile dependencies '#{confs.join(', ')}' to project '#{project.name}'"
             end
           end
@@ -477,7 +482,7 @@ For more configuration options see IvyConfig.
             excludes = project.ivy.test_exclude
             confs = [project.ivy.test_conf, project.ivy.compile_conf].flatten.uniq
             if deps = project.ivy.filter(confs, :include => includes, :exclude => excludes)
-              project.test.with deps
+              project.test.with [project.test.dependencies, deps].flatten
               info "Ivy adding test dependencies '#{confs.join(', ')}' to project '#{project.name}'"
             end
           end
@@ -518,7 +523,7 @@ For more configuration options see IvyConfig.
               excludes = project.ivy.package_exclude
               confs = project.ivy.package_conf
               if deps = project.ivy.filter(confs, :include => includes, :exclude => excludes)
-                pkg.with :libs => deps
+                pkg.with :libs => [pkg.libs, deps].flatten
                 info "Adding production libs from conf '#{confs.join(', ')}' to package '#{pkg.name}' in project '#{project.name}'"
               end
             end
@@ -595,7 +600,7 @@ For more configuration options see IvyConfig.
             end
 
             task :resolve => "#{project.name}:ivy:configure" do
-              project.ivy.resolve
+              project.ivy.__resolve__
             end
 
             task :report => "#{project.name}:ivy:resolve" do
@@ -603,7 +608,7 @@ For more configuration options see IvyConfig.
             end
 
             task :publish => "#{project.name}:ivy:resolve" do
-              project.ivy.publish
+              project.ivy.__publish__
             end
           end
         end

data/lib/ivy4r.rb

@@ -35,7 +35,7 @@ is
   }
 =end
 class Ivy4r
-  VERSION = '0.7.0'
+  VERSION = '0.7.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.

data/lib/rake/ivy_extension.rb

@@ -57,7 +57,7 @@ module Rake
       end
 
       # Resolves the configured file once.
-      def resolve
+      def __resolve__
         unless @resolved
           @resolved = ant.resolve :file => file
         end
@@ -69,7 +69,7 @@ module Rake
       end
 
       # Publishs the project as defined in ivy file if it has not been published already
-      def publish
+      def __publish__
         unless @published
           options = {:artifactspattern => "#{publish_from}/[artifact].[ext]"}
           options[:pubrevision] = revision if revision
@@ -233,12 +233,12 @@ module Rake
           
           desc 'Resolves the ivy dependencies'
           task :resolve => "ivy:configure" do
-            Rake.application.ivy.resolve
+            Rake.application.ivy.__resolve__
           end
 
           desc 'Publish the artifacts to ivy repository'
           task :publish => "ivy:resolve" do
-            Rake.application.ivy.publish
+            Rake.application.ivy.__publish__
           end
 
           desc 'Creates a dependency report for the project'

metadata

@@ -1,68 +1,43 @@
 --- !ruby/object:Gem::Specification 
-name: ivy4r
-version: !ruby/object:Gem::Version 
-  version: 0.7.0
-platform: ruby
-authors: 
-- Klaas Prause
-autorequire: 
-bindir: bin
-cert_chain: []
-
-date: 2009-07-21 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: Antwrap
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.7.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: ivy4r-jars
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: facets
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.5.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.2.0
-    version: 
-description: Apache Ivy dependency manager wrapper for ruby (see {Apache Ivy}[http://ant.apache.org/ivy/index.html] for more information). Use {Apache Ivy}[http://ant.apache.org/ivy/index.html] via a ruby wrapper without the need to use Apache Ant. The wrapper uses Antwrap[http://antwrap.rubyforge.org/] to interface with Ivy.  Includes a Extension for Buildr[http://buildr.apache.org/] to use {Apache Ivy}[http://ant.apache.org/ivy/index.html] for dependency management.
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - '>='
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 email: 
 - klaas.prause@googlemail.com
-executables: 
-- ivy4r
-extensions: []
+cert_chain: []
 
+summary: Apache Ivy dependency manager wrapper for ruby (see {Apache Ivy}[http://ant.apache.org/ivy/index.html]
+  for more information)
+post_install_message: 
 extra_rdoc_files: 
 - History.txt
 - Manifest.txt
 - README.txt
+homepage: http://github.com/klaas1979/ivy4r/tree/master
+signing_key: 
+name: ivy4r
+rdoc_options: 
+- --main
+- README.txt
+- --charset=UTF-8
+rubyforge_project: hamburgrb
+autorequire: 
+licenses: []
+
+executables: 
+- ivy4r
+description: |-
+  Apache Ivy dependency manager wrapper for ruby (see {Apache Ivy}[http://ant.apache.org/ivy/index.html] for more information).
+  Use {Apache Ivy}[http://ant.apache.org/ivy/index.html] via a ruby wrapper without the need to use Apache Ant.
+  The wrapper uses Antwrap[http://antwrap.rubyforge.org/] to interface with Ivy.
+
+  Includes a Extension for Buildr[http://buildr.apache.org/] to use {Apache Ivy}[http://ant.apache.org/ivy/index.html]
+  for dependency management.
+specification_version: 3
+default_executable: 
 files: 
 - History.txt
 - Manifest.txt
@@ -101,34 +76,69 @@ files:
 - test/ivy/test_target.rb
 - test/ivy/test_targets.rb
 - test/test_ivy4r.rb
-has_rdoc: true
-homepage: http://github.com/klaas1979/ivy4r/tree/master
-post_install_message: 
-rdoc_options: 
-- --main
-- README.txt
-require_paths: 
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version 
       version: "0"
   version: 
+extensions: []
+
+rubygems_version: 1.3.3
 requirements: []
 
-rubyforge_project: hamburgrb
-rubygems_version: 1.3.1
-signing_key: 
-specification_version: 2
-summary: Apache Ivy dependency manager wrapper for ruby (see {Apache Ivy}[http://ant.apache.org/ivy/index.html] for more information)
+authors: 
+- Klaas Prause
+date: 2009-08-23 22:00:00 +00:00
+platform: ruby
 test_files: 
+- test/test_ivy4r.rb
 - test/ivy/test_target.rb
 - test/ivy/test_targets.rb
-- test/test_ivy4r.rb
+version: !ruby/object:Gem::Version 
+  version: 0.7.1
+require_paths: 
+- lib
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - '>='
+      - !ruby/object:Gem::Version 
+        version: 0.7.0
+    version: 
+  type: :runtime
+  version_requirement: 
+  name: Antwrap
+- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - '>='
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: 
+  type: :runtime
+  version_requirement: 
+  name: ivy4r-jars
+- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - '>='
+      - !ruby/object:Gem::Version 
+        version: 2.5.2
+    version: 
+  type: :runtime
+  version_requirement: 
+  name: facets
+- !ruby/object:Gem::Dependency 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - '>='
+      - !ruby/object:Gem::Version 
+        version: 2.2.0
+    version: 
+  type: :development
+  version_requirement: 
+  name: hoe
+bindir: bin
+has_rdoc: true