Merge pull request #125 from pouwerkerk/master

Add flag for disabling labels from the output

Author: lavie

runlike/inspector.py

@@ -11,9 +11,10 @@ def die(message):
 
 class Inspector(object):
 
-    def __init__(self, container=None, no_name=None, use_volume_id=None, pretty=None):
+    def __init__(self, container=None, no_name=None, use_volume_id=None, pretty=None, no_labels=None):
         self.container = container
         self.no_name = no_name
+        self.no_labels = no_labels
         self.use_volume_id = use_volume_id
         self.pretty = pretty
         self.container_facts = None
@@ -287,7 +288,8 @@ def format_cli(self):
         self.parse_links()
         self.parse_restart()
         self.parse_devices()
-        self.parse_labels()
+        if not self.no_labels:
+            self.parse_labels()
         self.parse_log()
         self.parse_extra_hosts()
         self.parse_runtime()

runlike/runlike.py

@@ -22,11 +22,13 @@
     help="Keep the automatically assigned volume id")
 @click.option("-p", "--pretty", is_flag=True)
 @click.option("-s", "--stdin", is_flag=True)
-def cli(container, no_name, use_volume_id, pretty, stdin):
+@click.option("-l", "--no-labels", is_flag=True, help="Do not include labels in output")
+
+def cli(container, no_name, use_volume_id, pretty, stdin, no_labels):
 
     # TODO: -i, -t, -d as added options that override the inspection
     if container or stdin:
-        ins = Inspector(container, no_name, use_volume_id, pretty)
+        ins = Inspector(container, no_name, use_volume_id, pretty, no_labels)
         if container:
             ins.inspect()
         elif stdin:

test_runlike.py

@@ -217,3 +217,11 @@ def setUpClass(cls):
 
     def test_no_name(self):
         self.dont_expect_substr("--name")
+
+class TestRunlikeNoLabels(BaseTest):
+    @classmethod
+    def setUpClass(cls):
+        cls.start_runlike(["--no-labels"])
+
+    def test_no_labels(self):
+        self.dont_expect_substr("--label")