Skip to content

Commit ecc69d6

Browse files
aesteve-rhnirs
authored andcommitted
ovirt-img: add --version option
Add --version option to ovirt-img tool to show current version: $ ./ovirt-img -h usage: ovirt-img [-h] [--version] {download-disk,upload-disk} ... Transfer disk images optional arguments: -h, --help show this help message and exit --version show program's version number and exit commands: {download-disk,upload-disk} download-disk Download disk upload-disk Upload disk $ ./ovirt-img --version ovirt-img 2.4.6 Fixes: #125 Signed-off-by: Albert Esteve <aesteve@redhat.com>
1 parent 33dca85 commit ecc69d6

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

ovirt_imageio/client/_options.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import getpass
1414
from collections import namedtuple
1515

16+
from .. _internal import version
1617
from .. _internal.units import KiB, MiB, GiB, TiB
1718
from . _api import MAX_WORKERS, BUFFER_SIZE
1819

@@ -135,6 +136,10 @@ def __init__(self):
135136
self._parser = argparse.ArgumentParser(
136137
description="Transfer disk images")
137138
self._parser.set_defaults(command=None)
139+
self._parser.add_argument(
140+
'--version',
141+
action='version',
142+
version=f'%(prog)s {version.string}')
138143
self._commands = self._parser.add_subparsers(title="commands")
139144

140145
def add_sub_command(self, name, help, func, transfer_options=True):

test/client_options_test.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import pytest
1414

1515
from ovirt_imageio._internal.units import KiB, MiB, GiB, TiB
16+
from ovirt_imageio._internal import version
1617
from ovirt_imageio.client import _options
1718

1819

@@ -337,3 +338,13 @@ def test_auto_help(capsys):
337338
err2 = capsys.readouterr().err
338339

339340
assert err1 == err2
341+
342+
343+
def test_version(capsys):
344+
parser = _options.Parser()
345+
parser.add_sub_command("test", "help", lambda x: None)
346+
with pytest.raises(SystemExit):
347+
parser.parse(["--version"])
348+
out = capsys.readouterr().out
349+
350+
assert version.string in out

0 commit comments

Comments
 (0)