tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add missing `-q|--quiet` options to increase consistency 

Signed-off-by: Harald Albers <github@albersweb.de>
This commit is contained in:
Harald Albers 2018-01-30 00:57:07 +01:00
parent 520fad331f
commit 6cfbb7ed8a
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compose/cli/main.py
View File

@ -503,14 +503,14 @@ class TopLevelCommand(object):
Usage: images [options] [SERVICE...] Usage: images [options] [SERVICE...]
Options: Options:
-q Only display IDs -q, --quiet Only display IDs
""" """
containers = sorted( containers = sorted(
self.project.containers(service_names=options['SERVICE'], stopped=True) + self.project.containers(service_names=options['SERVICE'], stopped=True) +
self.project.containers(service_names=options['SERVICE'], one_off=OneOffFilter.only), self.project.containers(service_names=options['SERVICE'], one_off=OneOffFilter.only),
key=attrgetter('name')) key=attrgetter('name'))
if options['-q']: if options['--quiet']:
for image in set(c.image for c in containers): for image in set(c.image for c in containers):
print(image.split(':')[1]) print(image.split(':')[1])
else: else:
@ -624,12 +624,12 @@ class TopLevelCommand(object):
Usage: ps [options] [SERVICE...] Usage: ps [options] [SERVICE...]
Options: Options:
-q Only display IDs -q, --quiet Only display IDs
--services Display services --services Display services
--filter KEY=VAL Filter services by a property --filter KEY=VAL Filter services by a property
""" """
if options['-q'] and options['--services']: if options['--quiet'] and options['--services']:
raise UserError('-q and --services cannot be combined') raise UserError('--quiet and --services cannot be combined')
if options['--services']: if options['--services']:
filt = build_filter(options.get('--filter')) filt = build_filter(options.get('--filter'))
@ -644,7 +644,7 @@ class TopLevelCommand(object):
self.project.containers(service_names=options['SERVICE'], one_off=OneOffFilter.only), self.project.containers(service_names=options['SERVICE'], one_off=OneOffFilter.only),
key=attrgetter('name')) key=attrgetter('name'))
if options['-q']: if options['--quiet']:
for container in containers: for container in containers:
print(container.id) print(container.id)
else: else:
@ -676,7 +676,7 @@ class TopLevelCommand(object):
Options: Options:
--ignore-pull-failures Pull what it can and ignores images with pull failures. --ignore-pull-failures Pull what it can and ignores images with pull failures.
--parallel Pull multiple images in parallel. --parallel Pull multiple images in parallel.
--quiet Pull without printing progress information -q, --quiet Pull without printing progress information
""" """
self.project.pull( self.project.pull(
service_names=options['SERVICE'], service_names=options['SERVICE'],

6
contrib/completion/bash/docker-compose
View File

@ -259,7 +259,7 @@ _docker_compose_help() {
_docker_compose_images() { _docker_compose_images() {
case "$cur" in case "$cur" in
-*) -*)
COMPREPLY=( $( compgen -W "--help -q" -- "$cur" ) ) COMPREPLY=( $( compgen -W "--help --quiet -q" -- "$cur" ) )
;; ;;
*) *)
__docker_compose_services_all __docker_compose_services_all
@ -361,7 +361,7 @@ _docker_compose_ps() {
case "$cur" in case "$cur" in
-*) -*)
COMPREPLY=( $( compgen -W "--help -q --services --filter" -- "$cur" ) ) COMPREPLY=( $( compgen -W "--help --quiet -q --services --filter" -- "$cur" ) )
;; ;;
*) *)
__docker_compose_services_all __docker_compose_services_all
@ -373,7 +373,7 @@ _docker_compose_ps() {
_docker_compose_pull() { _docker_compose_pull() {
case "$cur" in case "$cur" in
-*) -*)
COMPREPLY=( $( compgen -W "--help --ignore-pull-failures --parallel --quiet" -- "$cur" ) ) COMPREPLY=( $( compgen -W "--help --ignore-pull-failures --parallel --quiet -q" -- "$cur" ) )
;; ;;
*) *)
__docker_compose_services_from_image __docker_compose_services_from_image

4
tests/acceptance/cli_test.py
View File

@ -207,13 +207,13 @@ class CLITestCase(DockerClientTestCase):
self.base_dir = None self.base_dir = None
result = self.dispatch([ result = self.dispatch([
'-f', 'tests/fixtures/invalid-composefile/invalid.yml', '-f', 'tests/fixtures/invalid-composefile/invalid.yml',
'config', '-q' 'config', '--quiet'
], returncode=1) ], returncode=1)
assert "'notaservice' must be a mapping" in result.stderr assert "'notaservice' must be a mapping" in result.stderr
def test_config_quiet(self): def test_config_quiet(self):
self.base_dir = 'tests/fixtures/v2-full' self.base_dir = 'tests/fixtures/v2-full'
assert self.dispatch(['config', '-q']).stdout == '' assert self.dispatch(['config', '--quiet']).stdout == ''
def test_config_default(self): def test_config_default(self):
self.base_dir = 'tests/fixtures/v2-full' self.base_dir = 'tests/fixtures/v2-full'