Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update to Loquacious 1.6.x

- resulted in a work around for noisy undefined values in config
  • Loading branch information...
commit e9c764970c4f3dd1cb4211cd3f37fdb065d7a77c 1 parent 172e8f8
@copiousfreetime authored
View
4 HISTORY.rdoc
@@ -1,4 +1,8 @@
= Changelog
+== Version 1.6.0 2010-06-17
+
+* update to loquacious 1.6.x
+
== Version 1.5.1 2010-05-19
* update to logging 1.4.x
View
6 TODO.taskpaper
@@ -4,4 +4,8 @@ Tyrant Manager:
- startup script generation -- simple shell, executes the tyrant-manager
- main command line -- all the commands, and they take an optional instance
or all -- no default
- - remove -- not yet
+ - remove -- not yet
+ Configuration:
+ - Fix cascading config so it is not a work around for Loquacious
+ nattering on about undefined values. A proper merged config
+ would be better.
View
6 gemspec.rb
@@ -20,9 +20,9 @@
spec.executables = pkg.files.bin.collect { |b| File.basename(b) }
# add dependencies here
- spec.add_dependency( "loquacious", "~> 1.3.0")
- spec.add_dependency( "rufus-tokyo", "~> 1.0.0")
- spec.add_dependency( "logging", "~> 1.4.0" )
+ spec.add_dependency( "loquacious", "~> 1.6.4")
+ spec.add_dependency( "rufus-tokyo", "~> 1.0.1")
+ spec.add_dependency( "logging", "~> 1.4.3" )
spec.add_dependency( "main", "~> 4.2.0" )
# development dependencies
View
11 lib/tyrant_manager/tyrant_instance.rb
@@ -457,8 +457,17 @@ def append_to_home_if_not_absolute( p )
# retrieve the cascading option from our config or the managers config if we
# don't have it.
#
+ # FIXME: For now this is a workaround for the warnings that are printed
+ # in loquacious 1.6.x for accessing undefined items. Better
+ # solution would be a merged config that does not alter the manager's
+ # config
+ #
def cascading_config( name )
- configuration[name] || manager.configuration.instance_defaults[name]
+ if configuration.respond_to?( name ) then
+ configuration[name] || manager.configuration.instance_defaults[name]
+ else
+ manager.configuration.instance_defaults[name]
+ end
end
end
end
View
4 lib/tyrant_manager/version.rb
@@ -6,8 +6,8 @@
class TyrantManager
module Version
MAJOR = 1
- MINOR = 5
- BUILD = 1
+ MINOR = 6
+ BUILD = 0
def to_a
[MAJOR, MINOR, BUILD]
Please sign in to comment.
Something went wrong with that request. Please try again.