tyrantmanager 1.5.1 → 1.6.0
Sign up to get free protection for your applications and to get access to all the features.
- data/HISTORY.rdoc +4 -0
- data/gemspec.rb +3 -3
- data/lib/tyrant_manager/tyrant_instance.rb +10 -1
- data/lib/tyrant_manager/version.rb +2 -2
- metadata +5 -5
data/HISTORY.rdoc
CHANGED
data/gemspec.rb
CHANGED
@@ -20,9 +20,9 @@ TyrantManager::GEM_SPEC = Gem::Specification.new do |spec|
|
|
20
20
|
spec.executables = pkg.files.bin.collect { |b| File.basename(b) }
|
21
21
|
|
22
22
|
# add dependencies here
|
23
|
-
spec.add_dependency( "loquacious", "~> 1.
|
24
|
-
spec.add_dependency( "rufus-tokyo", "~> 1.0.
|
25
|
-
spec.add_dependency( "logging", "~> 1.4.
|
23
|
+
spec.add_dependency( "loquacious", "~> 1.6.4")
|
24
|
+
spec.add_dependency( "rufus-tokyo", "~> 1.0.1")
|
25
|
+
spec.add_dependency( "logging", "~> 1.4.3" )
|
26
26
|
spec.add_dependency( "main", "~> 4.2.0" )
|
27
27
|
|
28
28
|
# development dependencies
|
@@ -457,8 +457,17 @@ class TyrantManager
|
|
457
457
|
# retrieve the cascading option from our config or the managers config if we
|
458
458
|
# don't have it.
|
459
459
|
#
|
460
|
+
# FIXME: For now this is a workaround for the warnings that are printed
|
461
|
+
# in loquacious 1.6.x for accessing undefined items. Better
|
462
|
+
# solution would be a merged config that does not alter the manager's
|
463
|
+
# config
|
464
|
+
#
|
460
465
|
def cascading_config( name )
|
461
|
-
configuration
|
466
|
+
if configuration.respond_to?( name ) then
|
467
|
+
configuration[name] || manager.configuration.instance_defaults[name]
|
468
|
+
else
|
469
|
+
manager.configuration.instance_defaults[name]
|
470
|
+
end
|
462
471
|
end
|
463
472
|
end
|
464
473
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: tyrantmanager
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.6.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jeremy Hinegardner
|
@@ -9,7 +9,7 @@ autorequire:
|
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
11
|
|
12
|
-
date: 2010-
|
12
|
+
date: 2010-06-17 00:00:00 -06:00
|
13
13
|
default_executable:
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
@@ -20,7 +20,7 @@ dependencies:
|
|
20
20
|
requirements:
|
21
21
|
- - ~>
|
22
22
|
- !ruby/object:Gem::Version
|
23
|
-
version: 1.
|
23
|
+
version: 1.6.4
|
24
24
|
version:
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: rufus-tokyo
|
@@ -30,7 +30,7 @@ dependencies:
|
|
30
30
|
requirements:
|
31
31
|
- - ~>
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 1.0.
|
33
|
+
version: 1.0.1
|
34
34
|
version:
|
35
35
|
- !ruby/object:Gem::Dependency
|
36
36
|
name: logging
|
@@ -40,7 +40,7 @@ dependencies:
|
|
40
40
|
requirements:
|
41
41
|
- - ~>
|
42
42
|
- !ruby/object:Gem::Version
|
43
|
-
version: 1.4.
|
43
|
+
version: 1.4.3
|
44
44
|
version:
|
45
45
|
- !ruby/object:Gem::Dependency
|
46
46
|
name: main
|