added filter mechanism

Author: lindt

bin/compose_diff

@@ -11,6 +11,9 @@ if __name__ == '__main__':
     parser.add_argument(
         '--images', action='store_const', const=True,
         help='diffs the images', default=False)
+    parser.add_argument(
+        '--filter', action='store',
+        help='just consider specific items', default=None)
     parser.add_argument('files', nargs=argparse.REMAINDER)
     args = parser.parse_args()
 
@@ -21,6 +24,6 @@ if __name__ == '__main__':
 
         old, new = args.files[0], args.files[1]
 
-        ComposeDiff().diff_images(old, new)
+        ComposeDiff().diff_images(old, new, args.filter)
     else:
         parser.print_help()

compose_diff/__init__.py

@@ -7,18 +7,23 @@ class ComposeDiff:
     def __init__(self):
         pass
 
-    def diff_images(self, old, new):
+    def diff_images(self, old, new, filter):
         old = self.images(self.read(old))
         new = self.images(self.read(new))
 
         print('| {0} | {1} |'.format('Name', 'Version'))
         print('| - | - |')
         for key in sorted(set(list(old.keys()) + list(new.keys()))):
+            if filter is not None:
+                if filter not in key:
+                    continue
             version = self.format_version(
                 old=old[key] if key in old else None,
                 new=new[key] if key in new else None)
 
-            print('| {0} | {1} |'.format(key, version))
+            key = key.replace('_', '\_')
+            version = version.replace('_', '\_')
+            print('| {0} | {1} |'.format(key.split('/')[-1], version))
 
     @staticmethod
     def format_version(old, new):
@@ -52,6 +57,7 @@ def images(data):
 
     @staticmethod
     def split_image(data):
-        if ':' not in data:
+        if ':' not in data.split('/')[-1]:
             return data, 'latest'
-        return data.split(':')
+        splitted = data.split(':')
+        return ':'.join(splitted[:-1]), splitted[-1]

features/images.feature

@@ -36,3 +36,30 @@ Feature: Images
       | three | 1 (new) |
       | two | 2 (1) |
       """
+
+  Scenario: Filter
+    Given a file named "A.yml" with:
+      """
+      version: "2"
+      services:
+        one:
+          image: one:1
+        two:
+          image: two:1
+      """
+    And a file named "B.yml" with:
+      """
+      version: "2"
+      services:
+        one:
+          image: one:2
+        two:
+          image: two:2
+      """
+    When I run `bin/compose_diff --images --filter one A.yml B.yml`
+    Then it should pass with exactly:
+      """
+      | Name | Version |
+      | - | - |
+      | one | 2 (1) |
+      """

setup.py

@@ -8,7 +8,7 @@ def readme():
 
 setup(
     name='compose_diff',
-    version='0.1.0',
+    version='0.2.0',
     description='diff docker-compose files',
     long_description=readme(),
     url='http://github.com/funkwerk/compose_diff',