From 5fa7b15f726166771f743e2da94fc87da475cfee Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 23 Oct 2012 11:47:19 -0700 Subject: more attempt at 1.9 compatibility --- lib/leap_cli.rb | 7 +++++++ lib/leap_cli/config/manager.rb | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/leap_cli.rb b/lib/leap_cli.rb index e258cf3..a88a8ad 100644 --- a/lib/leap_cli.rb +++ b/lib/leap_cli.rb @@ -21,3 +21,10 @@ unless String.method_defined?(:to_a) def to_a; [self]; end end end + +unless String.method_defined?(:any?) + class String + def any?; self.chars.any?; end + end +end + diff --git a/lib/leap_cli/config/manager.rb b/lib/leap_cli/config/manager.rb index 79ae5b8..8807cc9 100644 --- a/lib/leap_cli/config/manager.rb +++ b/lib/leap_cli/config/manager.rb @@ -176,7 +176,7 @@ module LeapCli # inherit from services if node['services'] - node['services'].sort.each do |node_service| + node['services'].to_a.sort.each do |node_service| service = @services[node_service] if service.nil? log0('Error in node "%s": the service "%s" does not exist.' % [node['name'], node_service]) @@ -189,7 +189,7 @@ module LeapCli # inherit from tags if node['tags'] - node['tags'].sort.each do |node_tag| + node['tags'].to_a.sort.each do |node_tag| tag = @tags[node_tag] if tag.nil? log0('Error in node "%s": the tag "%s" does not exist.' % [node['name'], node_tag]) -- cgit v1.2.3