opennebula-cli 5.10.3 → 5.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db84680874bbde511e8ffc04129cf914bf23e04b
-  data.tar.gz: ba353a408b6ac968cf13fe5e3cd062d08bb5ed91
+  metadata.gz: ad3060823e13f21b1ee8ae76cbb1f2165c8a0563
+  data.tar.gz: cb2f95a39909fcec43e11d16d9cec82e99c2d08c
 SHA512:
-  metadata.gz: 1709c9dbc7100d21beb1c0ca96f1c8281bdda6758a727f30cbe98b49ffbdafd7ccc659d3bf8db2e46abb70ec9007225478170c7d94c07c454a2e061cfec42975
-  data.tar.gz: 0a1bf968f039c46a6a6b032ef9888caf86c88946361650e2c109bc9ed8006cb62f3056556e10b4fedb9f6d4cd1c3c53b98c74e3b4cf4666e09d254766f69ef71
+  metadata.gz: c92ba1c685bbe0eb77c4a1c9080fb0ecb1001ddfac09c809bb25947aca34decb80d840924037a0e672905fd7ff1a408c50b7e4dd784e5e34f35898e0455dfe9b
+  data.tar.gz: f184df5c44b6fb8c6df50b1ba55411aa623f043e5ff478770cea72c3a4aab4be05b7599d27a328393a7a4c3149ab1f5ef1b8d4068d470a1c8e2ec9fe795f9360

data/lib/cli_helper.rb

@@ -19,6 +19,9 @@ require 'csv'
 # CLI Helper
 module CLIHelper
 
+    # Available operators for filtering operations
+    FILTER_OPS = %w[= != < <= > >= ~]
+
     # CLI general options
     LIST = {
         :name => 'list',
@@ -55,7 +58,10 @@ module CLIHelper
         :large => '--filter x,y,z',
         :format => Array,
         :description => "Filter data. An array is specified with\n" <<
-                        ' ' * 31 << 'column=value pairs.'
+                        ' ' * 31 << 'column=value pairs.' <<
+                        ' ' * 31 << "Valid operators #{FILTER_OPS.join(',')}" <<
+                        ' ' * 31 << 'e.g. NAME=test (match name with test)' <<
+                        ' ' * 31 << 'NAME~test (match test, te, tes..)'
     }
 
     OPERATOR = {
@@ -796,7 +802,7 @@ module CLIHelper
         # @param data    [Array] Array with data to filter
         # @param options [Hash]  Object with CLI user options
         def filter_data!(data, options)
-            operators = /(=|!=|<|<=|>|>=)/
+            operators = /(#{FILTER_OPS.join('|')})/
             filter    = options[:filter]
 
             if options.key?(:operator)
@@ -819,7 +825,7 @@ module CLIHelper
                             :index      => index
                         }
                     else
-                        CLIHelper.fail("Column '#{left}' not found")
+                        CLIHelper.fail("Column '#{m[1]}' not found")
                     end
                 else
                     CLIHelper.fail("Expression '#{s}' incorrect")
@@ -830,7 +836,14 @@ module CLIHelper
                 pass = true
 
                 stems.each do |s|
-                    s[:operator] == '=' ? op = '==' : op = s[:operator]
+                    case s[:operator]
+                    when '='
+                        op = '=='
+                    when '~'
+                        op = 'include?'
+                    else
+                        op = s[:operator]
+                    end
 
                     if d[s[:index]].public_send(op, s[:right])
                         if log_operator == 'OR'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.10.3
+  version: 5.10.4
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-08 00:00:00.000000000 Z
+date: 2020-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.10.3
+        version: 5.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.10.3
+        version: 5.10.4
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables: