ivy4r 0.12.9 → 0.12.10

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 0.12.10 / 2011-01-21
+  * Default folder for settings file changed to '@extension_dir/iyvsettings.xml'
+  * Default ivy.home property is left empty to use default '${user.home}/.ivy2'
+
 === 0.12.9 / 2011-01-17
   * Added missing 'install' target, use it as defined in Ivy documentation
 

data/lib/buildr/ivy_extension.rb

@@ -142,8 +142,8 @@ module Buildr
           @base_ivy.configure
         else
           unless @configured
-            ivy4r.property['ivy.status'] = status
-            ivy4r.property['ivy.home'] = home
+            ivy4r.property['ivy.status'] = status if status
+            ivy4r.property['ivy.home'] = home if home
             properties.each {|key, value| ivy4r.property[key.to_s] = value }
             @configured = ivy4r.settings :file => settings if settings
           end
@@ -208,7 +208,7 @@ module Buildr
       end
       
       def home
-        @ivy_home_dir ||= Ivy.setting('home.dir') || "#{@extension_dir}/ivy-home"
+        @ivy_home_dir ||= Ivy.setting('home.dir')
       end
       
       def lib_dir
@@ -216,7 +216,7 @@ module Buildr
       end
       
       def settings
-        @settings ||= Ivy.setting('settings.file') || "#{@extension_dir}/ant-scripts/ivysettings.xml"
+        @settings ||= Ivy.setting('settings.file') || "#{@extension_dir}/ivysettings.xml"
       end
       
       # The basic file name to use in project dir as ivy.xml file. Normally this should be __ivy.xml__

data/lib/ivy/install.rb

@@ -1,33 +1,33 @@
-require 'ivy/target'
-
-module Ivy
-  class Install < Ivy::Target
-    def parameter
-      [
-        Parameter.new(:from, true),
-        Parameter.new(:to, true),
-        Parameter.new(:organisation, true),
-        Parameter.new(:module, true),
-        Parameter.new(:branch, false),
-        Parameter.new(:revision, true),
-        Parameter.new(:type, false),
-        Parameter.new(:validate, false),
-        Parameter.new(:overwrite, false),
-        Parameter.new(:transitive, false),
-        Parameter.new(:matcher, false),
-        Parameter.new(:settingsRef, false),
-        Parameter.new(:haltonfailure, false)
-      ]
-    end
-    
-    protected
-    def execute_ivy
-      call_nested :ivy_install => params
-    end
-
-    def create_return_values
-      nil
-    end
-
-  end
+require 'ivy/target'
+
+module Ivy
+  class Install < Ivy::Target
+    def parameter
+      [
+        Parameter.new(:from, true),
+        Parameter.new(:to, true),
+        Parameter.new(:organisation, true),
+        Parameter.new(:module, true),
+        Parameter.new(:branch, false),
+        Parameter.new(:revision, true),
+        Parameter.new(:type, false),
+        Parameter.new(:validate, false),
+        Parameter.new(:overwrite, false),
+        Parameter.new(:transitive, false),
+        Parameter.new(:matcher, false),
+        Parameter.new(:settingsRef, false),
+        Parameter.new(:haltonfailure, false)
+      ]
+    end
+    
+    protected
+    def execute_ivy
+      call_nested :ivy_install => params
+    end
+
+    def create_return_values
+      nil
+    end
+
+  end
 end

data/lib/ivy4r/version.rb

@@ -1,3 +1,3 @@
 class Ivy4r
-  VERSION = "0.12.9"
+  VERSION = "0.12.10"
 end

data/lib/rake/ivy_extension.rb

@@ -92,8 +92,8 @@ module Rake
       # Configures the ivy instance with additional properties and loading the settings file if it was provided
       def configure
         unless @configured
-          ivy4r.property['ivy.status'] = status
-          ivy4r.property['ivy.home'] = home
+          ivy4r.property['ivy.status'] = status if status
+          ivy4r.property['ivy.home'] = home if home
           properties.each {|key, value| ivy4r.property[key.to_s] = value }
           @configured = ivy4r.settings :file => settings if settings
         end
@@ -126,11 +126,11 @@ module Rake
       end
       
       def home
-        @ivy_home_dir ||= "#{@extension_dir}/ivy-home"
+        @ivy_home_dir
       end
       
       def settings
-        @settings ||= "#{@extension_dir}/ant-scripts/ivysettings.xml"
+        @settings ||= "#{@extension_dir}/ivysettings.xml"
       end
       
       def file

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 12
-    - 9
-  version: 0.12.9
+    - 10
+  version: 0.12.10
 platform: ruby
 authors: 
   - Klaas Reineke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 +01:00
+date: 2011-01-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency