more attempt at 1.9 compatibility

diff --git a/lib/leap_cli.rb b/lib/leap_cli.rb
index e258cf33902c52a2c1836f6e8c26039f0ffd30bc..a88a8adc3f3ad5d5314c5d202cf99d4a6586415b 100644 (file)
--- 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 79ae5b8fa4baf1e8fa571f230282bdec3e5b8bae..8807cc9223a76d71f5c83fb21c4ee6629d937d31 100644 (file)
--- 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])