Merge 37a66b4 into 078069f

MANIFEST.in

@@ -4,6 +4,7 @@ exclude .travis.yml
 include README.rst
 include LICENSE
 include setup.cfg
+include shipami-complete.sh
 prune .cache
 prune .git
 prune build

setup.py

@@ -54,6 +54,12 @@
     keywords='aws ec2 ami marketplace',
 
     packages=find_packages(exclude=['contrib', 'docs', 'tests*']),
+    package_data={
+        'codebuilder': [
+            'shipami-complete.sh'
+        ]
+    },
+    include_package_data=True,
 
     install_requires=[
         'click==6.7',

shipami/cli.py

@@ -28,7 +28,23 @@ def validate_filter(ctx, param, filters):
             raise click.BadParameter('filter must be in format "key=value"')
     return tuple(validated_filters)
 
-@click.group()
+class AliasedGroup(click.Group):
+    ALIASES = {
+        'ls': 'list',
+        'cp': 'copy',
+        'rm': 'delete'
+    }
+
+    def get_command(self, ctx, cmd_name):
+        rv = click.Group.get_command(self, ctx, cmd_name)
+        if rv is not None:
+            return rv
+
+        if self.ALIASES.get(cmd_name, None):
+            return click.Group.get_command(self, ctx, self.ALIASES[cmd_name])
+        return None
+
+@click.group(cls=AliasedGroup)
 @click.version_option(VERSION)
 @click.option('--region')
 @click.option('-v', '--verbose', is_flag=True, default=False)

shipami/shipami-complete.sh

@@ -0,0 +1,8 @@
+_shipami_completion() {
+    COMPREPLY=( $( env COMP_WORDS="${COMP_WORDS[*]}" \
+                   COMP_CWORD=$COMP_CWORD \
+                   _SHIPAMI_COMPLETE=complete $1 ) )
+    return 0
+}
+
+complete -F _shipami_completion -o default shipami;

tests/test_cli.py

@@ -89,6 +89,20 @@ def test_list(self, base_image, released_image):
         assert 'origin' not in lines[1]
         assert 'eu-west-1:{}'.format(base_image.id) in lines[1]
 
+    def test_list_aliased(self, base_image, released_image):
+        r = runner.invoke(shipami, ['ls'])
+
+        lines = r.output.splitlines()
+
+        assert r.exit_code == 0
+        assert base_image.id in lines[2]
+        assert 'origin' in lines[2]
+        assert 'eu-west-1:{}'.format(released_image.id) in lines[2]
+
+        assert released_image.id in lines[1]
+        assert 'origin' not in lines[1]
+        assert 'eu-west-1:{}'.format(base_image.id) in lines[1]
+
     def test_list_quiet(self, base_image, released_image):
         r = runner.invoke(shipami, ['list', '-q'])
 
@@ -187,6 +201,30 @@ def test_copy(self, ec2, base_image):
         assert image.name == base_image.name
         assert sorted(image.tags, key=lambda _: _['Key']) == sorted(expected_tags, key=lambda _: _['Key'])
 
+    def test_copy_aliased(self, ec2, base_image):
+        image_number = len(ec2.meta.client.describe_images()['Images'])
+
+        expected_tags = [
+            {
+                'Key': 'shipami:managed',
+                'Value': 'True'
+            },
+            {
+                'Key': 'shipami:copied_from',
+                'Value': 'eu-west-1:{}'.format(base_image.id)
+            }
+        ]
+
+        r = runner.invoke(shipami, ['cp', base_image.id])
+
+        returned_image_id = r.output.strip()
+        image = ec2.Image(returned_image_id)
+
+        assert r.exit_code == 0
+        assert len(ec2.meta.client.describe_images()['Images']) == image_number + 1
+        assert image.name == base_image.name
+        assert sorted(image.tags, key=lambda _: _['Key']) == sorted(expected_tags, key=lambda _: _['Key'])
+
     def test_copy_wait(self, ec2, base_image):
         image_number = len(ec2.meta.client.describe_images()['Images'])
 
@@ -275,6 +313,16 @@ def test_delete(self, ec2, copied_image):
         assert len(ec2.meta.client.describe_images()['Images']) == 1
         assert returned_image_id == copied_image_id
 
+    def test_delete_aliased(self, ec2, copied_image):
+        copied_image_id = copied_image.id
+        r = runner.invoke(shipami, ['rm', copied_image_id])
+
+        returned_image_id = r.output.strip()
+
+        assert r.exit_code == 0
+        assert len(ec2.meta.client.describe_images()['Images']) == 1
+        assert returned_image_id == copied_image_id
+
     def test_delete_not_managed(self, ec2, base_image):
         base_image_id = base_image.id
         r = runner.invoke(shipami, ['delete', base_image_id])