initial commit

Author: lindt

.gitignore

@@ -0,0 +1,7 @@
+**/__pycache__
+/dist/
+/*.egg-info
+/*.egg
+build
+tmp
+README.rst

.travis.yml

@@ -0,0 +1,10 @@
+language: python
+python:
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.5-dev"
+before_install:
+ - bundle install
+install: "pip install pyaml flake8 pylint"
+script: "rake test"

Dockerfile

@@ -0,0 +1,17 @@
+FROM alpine:3.3
+MAINTAINER think@hotmail.de
+
+RUN \
+  apk add --no-cache python3 && \
+  apk add --no-cache --virtual=build-dependencies wget ca-certificates && \
+  wget "https://bootstrap.pypa.io/get-pip.py" -O /dev/stdout | python3 && \
+  apk del build-dependencies
+
+RUN pip install --no-cache-dir pyaml
+
+COPY bin /bin
+COPY compose_diff /usr/lib/python3.5/site-packages/compose_diff
+
+RUN chmod +x /bin/compose_diff
+
+ENTRYPOINT ["python3", "/bin/compose_diff"]

Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gem 'rubocop', '~> 0.41.0'
+gem 'rake'
+gem 'aruba'

MANIFEST.in

@@ -0,0 +1,2 @@
+include README.rst
+include features/*.feature

README.md

@@ -1,2 +1,24 @@
+[![Build Status](https://travis-ci.org/funkwerk/compose_diff.svg)](https://travis-ci.org/funkwerk/compose_diff)
+[![](https://badge.imagelayers.io/funkwerk/compose_diff.svg)](https://imagelayers.io/?images=funkwerk/compose_diff:latest 'funkwerk/compose_diff')
+[![PyPi downloads](https://img.shields.io/pypi/dm/compose_diff.svg)](https://pypi.python.org/pypi/compose_diff/)
+[![PyPi version](https://img.shields.io/pypi/v/compose_diff.svg)](https://pypi.python.org/pypi/compose_diff/)
+[![Docker pulls](https://img.shields.io/docker/pulls/funkwerk/compose_diff.svg)](https://hub.docker.com/r/funkwerk/compose_diff/)
 # compose_diff
-Diff Docker Compose Files
+
+Diff docker-compose files.
+
+## Usage
+
+### Via Python
+
+Install it via:
+`pip3 install compose_diff`
+
+After that use it like
+
+`compose_diff --images old.yml new.yml`
+this will print the the differences in the used images between the two versions.
+
+## Features
+ - Support for Version 2 and Version 1.
+ - Diffs Images

Rakefile

@@ -0,0 +1,35 @@
+task default: :test
+
+task test: :audit
+task :test do
+  sh "PYTHONPATH=#{File.expand_path '.'}:$PYTHONPATH cucumber"
+end
+
+desc 'Publishes the PyPi'
+task push: :generate
+task :push do
+  sh 'python3 setup.py sdist upload'
+end
+
+desc 'Checks style'
+task audit: :rubocop
+task :audit do
+  ignores = %w(D100 D101 D102 D103 D104 E501 I201)
+
+  FILES = FileList[%w(bin/compose_diff compose_diff/*.py setup.py)]
+  sh "flake8 --ignore='#{ignores * ','}' #{FILES}"
+  sh "pylint -E #{FILES}"
+end
+
+desc 'Checks ruby style'
+task :rubocop do
+  sh 'rubocop'
+end
+
+task :generate do
+  sh 'pandoc --from=markdown --to=rst --output=README.rst README.md'
+end
+
+task :docker do
+  sh 'docker build --tag=funkwerk/compose_diff  .'
+end

__init__.py

@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+from compose_diff import ComposeDiff
+
+
+if __name__ == '__main__':
+
+    import argparse
+    import sys
+
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        '--images', action='store_const', const=True,
+        help='diffs the images', default=False)
+    parser.add_argument('files', nargs=argparse.REMAINDER)
+    args = parser.parse_args()
+
+    if args.images:
+        if len(args.files) != 2:
+            print('please diff exactly two files. You provided {0} files.'.format(len(args.files)))
+            sys.exit(1)
+
+        old, new = args.files[0], args.files[1]
+
+        ComposeDiff().diff_images(old, new)
+    else:
+        parser.print_help()

bin/compose_diff

@@ -0,0 +1,57 @@
+#!/usr/bin/env python3
+from yaml import load
+
+
+class ComposeDiff:
+
+    def __init__(self):
+        pass
+
+    def diff_images(self, old, new):
+        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()))):
+            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))
+
+    @staticmethod
+    def format_version(old, new):
+        if old is None:
+            return '{0} (new)'.format(new)
+        elif new is None:
+            return '{0} (deleted)'.format(old)
+        elif old == new:
+            return old
+        return '{0} ({1})'.format(new, old)
+
+    @staticmethod
+    def read(path):
+        with open(path, 'r') as file:
+            return load(file.read())
+
+    @staticmethod
+    def images(data):
+        result = {}
+
+        if 'services' in data:
+            data = data['services']
+        for name, content in data.items():
+            if content is None:
+                continue
+            if 'image' not in content:
+                continue
+            image_name, tag = ComposeDiff.split_image(content['image'])
+            result[image_name] = tag
+        return result
+
+    @staticmethod
+    def split_image(data):
+        if ':' not in data:
+            return data, 'latest'
+        return data.split(':')

compose_diff/__init__.py

@@ -0,0 +1,38 @@
+Feature: Images
+  As a Tester
+  I want to see which images have changed
+  so that I know where to test especially
+
+  Scenario: Diff Images
+    Given a file named "A.yml" with:
+      """
+      version: "2"
+      services:
+        one:
+          image: one:1
+        two:
+          image: two:1
+        four:
+          image: four:1
+      """
+    And a file named "B.yml" with:
+      """
+      version: "2"
+      services:
+        one:
+          image: one:1
+        two:
+          image: two:2
+        three:
+          image: three:1
+      """
+    When I run `bin/compose_diff --images A.yml B.yml`
+    Then it should pass with exactly:
+      """
+      | Name | Version |
+      | - | - |
+      | four | 1 (deleted) |
+      | one | 1 |
+      | three | 1 (new) |
+      | two | 2 (1) |
+      """

compose_diff/features/images.feature

@@ -0,0 +1 @@
+require 'aruba/cucumber'

compose_diff/features/support/env.rb

@@ -0,0 +1,2 @@
+[metadata]
+description-file = README.md

setup.cfg

@@ -0,0 +1,28 @@
+from setuptools import setup
+
+
+def readme():
+    with open('README.rst') as file:
+        return file.read()
+
+setup(
+    name='compose_diff',
+    version='0.1.0',
+    description='diff docker-compose files',
+    long_description=readme(),
+    url='http://github.com/funkwerk/compose_diff',
+    author='Stefan Rohe',
+    license='MIT',
+    packages=['compose_diff'],
+    install_requires=['pyaml'],
+    zip_safe=False,
+    classifiers=[
+        'License :: OSI Approved :: MIT License',
+        'Programming Language :: Python :: 3',
+        'Topic :: Software Development',
+        'Environment :: Console',
+        'Operating System :: OS Independent',
+    ],
+    keywords='docker-compose diff docker yml',
+    include_package_data=True,
+    scripts=['bin/compose_diff'])