ivy4r 0.10.1 → 0.10.2

data/History.txt

@@ -1,3 +1,6 @@
+=== 0.10.2 / 2010-03-30
+  * Fixed nil access exception for undefined user settings of type 'ivy'
+
 === 0.10.1 / 2010-03-30
   * Some fixes for the rake ivy result caching.
   * Renamed the targets from ivy:enableresultcache, ivy:disableresultcache and ivy:cleanresultcache

data/lib/buildr/ivy_extension.rb

@@ -5,7 +5,15 @@ module Buildr
     
     class << self
       def setting(*keys)
-        setting = Buildr.settings.build['ivy']
+        find_setting(Buildr.settings.build['ivy'], *keys)
+      end
+      
+      def user_setting(*keys)
+       find_setting(Buildr.settings.user['ivy'], *keys)
+      end
+      
+      private
+      def find_setting(setting, *keys)
         keys.each { |key| setting = setting[key] unless setting.nil? }
         setting
       end
@@ -70,12 +78,12 @@ module Buildr
       # Returns if ivy result caching is enabled via build or user properties or by existence of the
       # marker file.
       def caching_enabled?
-        Buildr.settings.user['ivy']['caching.enabled'] || Ivy.setting('caching.enabled') || File.exists?(caching_marker)
+        Ivy.user_setting('caching.enabled') || Ivy.setting('caching.enabled') || File.exists?(caching_marker)
       end
       
       # Returns the use ivy result caching marker file
       def caching_marker
-        project.path_to('use_ivy_caching')
+        @project.path_to('use_ivy_caching')
       end
       
       # Returns the dir to store ivy caching results in.

data/lib/ivy4r.rb

@@ -36,7 +36,7 @@ is
 =end
 class Ivy4r
 
-  VERSION = '0.10.1'
+  VERSION = '0.10.2'
   
   # 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.10.1
+  version: 0.10.2
 platform: ruby
 authors: 
   - Klaas Prause