Merge fb463f2 into 6c2e91e

examples/conditions/.fmf/version

@@ -0,0 +1 @@
+1

examples/conditions/main.fmf

@@ -0,0 +1,15 @@
+release: 7.0
+tags: [default]
+/top:
+  /relevant_everywhere:
+    tags+: [easy]
+  /rhel7:
+    release: 7.1
+    execute:
+      how: dependency
+      components:
+        - curl
+        - apache
+  /rhel8:
+    release: 8.0
+

fmf/base.py

@@ -329,7 +329,7 @@ def find(self, name):
                 return node
         return None
 
-    def prune(self, whole=False, keys=[], names=[], filters=[]):
+    def prune(self, whole=False, keys=[], names=[], filters=[], conditions=[]):
         """ Filter tree nodes based on given criteria """
         for node in self.climb(whole):
             # Select only nodes with key content
@@ -344,6 +344,8 @@ def prune(self, whole=False, keys=[], names=[], filters=[]):
                 if not all([utils.filter(filter, node.data, regexp=True)
                         for filter in filters]):
                     continue
+                if not all([utils.afilter(filter, node) for filter in conditions]):
+                    continue
             # Handle missing attribute as if filter failed
             except utils.FilterError:
                 continue

fmf/cli.py

@@ -84,6 +84,11 @@ def options_select(self):
         group.add_argument(
             "--filter", dest="filters", action="append", default=[],
             help="Apply advanced filter (see 'pydoc fmf.filter')")
+        group.add_argument(
+            "--condition", dest="conditions", action="append", default=[],
+            help="Apply advanced filter based on python logic system. "
+                 "You can use (eg: float(key)==7 or key='value') "
+                 "retyping, logical operands are supported, it is evaluated as bool value")
         group.add_argument(
             "--whole", dest="whole", action="store_true",
             help="Consider the whole tree (leaves only by default)")
@@ -156,7 +161,7 @@ def show(self, brief=False):
             tree = fmf.Tree(path)
             for node in tree.prune(
                     self.options.whole, self.options.keys, self.options.names,
-                    self.options.filters):
+                    self.options.filters, self.options.conditions):
                 if brief:
                     show = node.show(brief=True)
                 else:

fmf/utils.py

@@ -483,6 +483,15 @@ def enabled(self):
         return self._mode == COLOR_ON
 
 
+def afilter(filter, node):
+    locals().update(node.data)
+    try:
+        return eval(filter)
+    except NameError as e:
+        raise FilterError("Key is not defined in data: {}".format(e))
+    except KeyError as e:
+        raise FilterError("Internal key is not defined: {}".format(e))
+
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #  Default Logger
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

tests/test_cli.py

@@ -125,3 +125,17 @@ def test_init(self):
         os.remove(version_path)
         with pytest.raises(utils.FormatError):
             fmf.cli.main("fmf ls", path)
+
+    def test_conditions(self):
+        """ Advanced filters via conditions """
+        CONDS = PATH + "/../examples/conditions"
+        output = fmf.cli.main("fmf ls --condition 'float(release)>=7'", CONDS)
+        assert len(output.splitlines()) == 3
+        output = fmf.cli.main("fmf ls --condition 'float(release)>7'", CONDS)
+        assert len(output.splitlines()) == 2
+        output = fmf.cli.main("""fmf show --condition "execute['how']=='dependency'" --format "comp: {}\n" --value "data['execute']['components']" """, CONDS)
+        assert len(output.splitlines()) == 1
+        assert "'apache'" in output
+        assert "'curl'" in output
+        assert "comp: " in output
+