klaas1979-ivy4r 0.4.0 → 0.5.0

data/Manifest.txt

@@ -3,9 +3,6 @@ Manifest.txt
 README.txt
 Rakefile
 bin/ivy4r
-jars/lib/ant-1.7.1.jar
-jars/lib/ant-launcher-1.7.1.jar
-jars/lib/ant-trax-1.7.1.jar
 lib/buildr/ivy_extension.rb
 lib/ivy/artifactproperty.rb
 lib/ivy/artifactreport.rb

data/Rakefile

@@ -4,12 +4,13 @@ $:.unshift File.join(File.dirname(__FILE__), 'lib')
 require 'rubygems'
 require 'hoe'
 require 'ivy4r'
-
+  
 hoe = Hoe.spec 'ivy4r' do |p|
   # self.rubyforge_name = 'ivy4rx' # if different than 'ivy4r'
   p.developer('Klaas Prause', 'klaas.prause@googlemail.com')
   p.remote_rdoc_dir = '' # Release to root only one project
-  p.extra_deps = [['Antwrap', '>=0.7.0']]
+  p.extra_deps << ['Antwrap', '>=0.7.0']
+  p.extra_deps << ['ivy4r-jars', '>=1.0.0']
   File.open(File.join(File.dirname(__FILE__), 'VERSION'), 'w') do |file|
     file.puts Ivy4r::VERSION
   end

data/lib/buildr/ivy_extension.rb

@@ -55,7 +55,7 @@ module Buildr
         unless @ant
           if own_file?
             @ant = ::Ivy4r.new(@project.ant('ivy'))
-            @ant.lib_dir = lib_dir
+            @ant.lib_dir = lib_dir if lib_dir
             @ant.project_dir = @extension_dir
           else
             @ant = @project.parent.ivy.ant
@@ -148,7 +148,7 @@ module Buildr
       end
 
       def lib_dir
-        @lib_dir ||= Ivy.setting('lib.dir') || "#{home}/jars"
+        @lib_dir ||= Ivy.setting('lib.dir')
       end
       
       def settings

data/lib/ivy4r.rb

@@ -1,3 +1,4 @@
+require 'ivy4r_jars'
 require 'antwrap'
 require 'ivy/targets'
 
@@ -34,7 +35,7 @@ is
   }
 =end
 class Ivy4r
-  VERSION = '0.4.0'
+  VERSION = '0.5.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.
@@ -44,14 +45,20 @@ class Ivy4r
   # Defines the directory to load ivy libs and its dependencies from
   attr_accessor :lib_dir
 
+  # Optional ant variable <tt>ivy.project.dir</tt> to add to ant environment before loading ivy
+  # defaults to the __lib_dir__
   attr_accessor :project_dir
 
   # To provide a custom __antwrap__ to use instead of default one
   attr_writer :ant
 
-  def initialize(*opts)
-    @ant = opts[0] if opts.size == 1
-    raise "To many parameters to create Ivy4r use none, or 1 to set ANT!" if opts.size > 1
+  # Initalizes ivy4r with optional ant wrapper object. Sets ant home dir and ivy lib dir
+  # to default values from __Ivy4rJars__ gem.
+  def initialize(ant = nil)
+    @ant_home = ::Ivy4rJars.ant_home_dir
+    @lib_dir = ::Ivy4rJars.lib_dir
+    @project_dir = @lib_dir
+    @ant = ant
   end
 
   # Calls the __cleancache__ ivy target with given parameters.
@@ -149,7 +156,7 @@ class Ivy4r
   # Returns the __antwrap__ instance to use for all internal calls creates a default
   # instance if no instance has been set before.
   def ant
-    @ant ||= ::Antwrap::AntProject.new(:ant_home => ant_home || File.expand_path(File.join(File.dirname(__FILE__), '..', 'jars')),
+    @ant ||= ::Antwrap::AntProject.new(:ant_home => ant_home,
       :name => "ivy-ant", :basedir => Dir.pwd, :declarative => true)
     init(@ant) if should_init?
     @ant

data/lib/rake/ivy_extension.rb

@@ -8,6 +8,9 @@ module Rake
   module Ivy
     class IvyConfig
 
+      # The directory to load ivy jars and its dependencies from, leave __nil__ to use default
+      attr_accessor :lib_dir
+
       # The extension directory containing ivy settings, the local repository and cache
       attr_accessor :extension_dir
 
@@ -24,7 +27,7 @@ module Rake
       def ant
         unless @ant
           @ant = ::Ivy4r.new
-          @ant.lib_dir = lib_dir
+          @ant.lib_dir = lib_dir if lib_dir
           @ant.project_dir = @extension_dir
         end
         @ant
@@ -81,10 +84,6 @@ module Rake
         @ivy_home_dir ||= "#{@extension_dir}/ivy-home"
       end
 
-      def lib_dir
-        @lib_dir ||= "#{home}/jars"
-      end
-
       def settings
         @settings ||= "#{@extension_dir}/ant-scripts/ivysettings.xml"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: klaas1979-ivy4r
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Klaas Prause
@@ -22,6 +22,16 @@ dependencies:
       - !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: hoe
   type: :development
@@ -49,9 +59,6 @@ files:
 - README.txt
 - Rakefile
 - bin/ivy4r
-- jars/lib/ant-1.7.1.jar
-- jars/lib/ant-launcher-1.7.1.jar
-- jars/lib/ant-trax-1.7.1.jar
 - lib/buildr/ivy_extension.rb
 - lib/ivy/artifactproperty.rb
 - lib/ivy/artifactreport.rb