ivy4r 0.10.1 → 0.10.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/History.txt CHANGED
@@ -1,3 +1,6 @@
1
+ === 0.10.2 / 2010-03-30
2
+ * Fixed nil access exception for undefined user settings of type 'ivy'
3
+
1
4
  === 0.10.1 / 2010-03-30
2
5
  * Some fixes for the rake ivy result caching.
3
6
  * Renamed the targets from ivy:enableresultcache, ivy:disableresultcache and ivy:cleanresultcache
@@ -5,7 +5,15 @@ module Buildr
5
5
 
6
6
  class << self
7
7
  def setting(*keys)
8
- setting = Buildr.settings.build['ivy']
8
+ find_setting(Buildr.settings.build['ivy'], *keys)
9
+ end
10
+
11
+ def user_setting(*keys)
12
+ find_setting(Buildr.settings.user['ivy'], *keys)
13
+ end
14
+
15
+ private
16
+ def find_setting(setting, *keys)
9
17
  keys.each { |key| setting = setting[key] unless setting.nil? }
10
18
  setting
11
19
  end
@@ -70,12 +78,12 @@ module Buildr
70
78
  # Returns if ivy result caching is enabled via build or user properties or by existence of the
71
79
  # marker file.
72
80
  def caching_enabled?
73
- Buildr.settings.user['ivy']['caching.enabled'] || Ivy.setting('caching.enabled') || File.exists?(caching_marker)
81
+ Ivy.user_setting('caching.enabled') || Ivy.setting('caching.enabled') || File.exists?(caching_marker)
74
82
  end
75
83
 
76
84
  # Returns the use ivy result caching marker file
77
85
  def caching_marker
78
- project.path_to('use_ivy_caching')
86
+ @project.path_to('use_ivy_caching')
79
87
  end
80
88
 
81
89
  # Returns the dir to store ivy caching results in.
data/lib/ivy4r.rb CHANGED
@@ -36,7 +36,7 @@ is
36
36
  =end
37
37
  class Ivy4r
38
38
 
39
- VERSION = '0.10.1'
39
+ VERSION = '0.10.2'
40
40
 
41
41
  # Set the ant home directory to load ant classes from if no custom __antwrap__ is provided
42
42
  # and the default provided ant version 1.7.1 should not be used.
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ivy4r
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.10.1
4
+ version: 0.10.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Klaas Prause