From de35f210f2f6336707a840b3478771a9439dbb92 Mon Sep 17 00:00:00 2001 From: etienne-napoleone Date: Wed, 13 Mar 2019 16:23:24 +0700 Subject: [PATCH 1/3] feat: ask if volume exists closes #9 --- create_tomochain_masternode/main.py | 6 +++++- create_tomochain_masternode/templates/compose.py | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/create_tomochain_masternode/main.py b/create_tomochain_masternode/main.py index 1dd6c04..d66df82 100644 --- a/create_tomochain_masternode/main.py +++ b/create_tomochain_masternode/main.py @@ -104,8 +104,12 @@ def ask() -> Dict[str, str]: exists=True, file_okay=False, resolve_path=True, - ) if answers["storage"] == 'host directory' else click.STRING + ) if answers['storage'] == 'host directory' else click.STRING ) + if answers['storage'] == 'docker volume': + answers['external'] = str(click.confirm( + f'{bullet} The volume already exists', + )) answers['expose_rpc'] = click.confirm( f'{bullet} Expose RPC', ) diff --git a/create_tomochain_masternode/templates/compose.py b/create_tomochain_masternode/templates/compose.py index baf2db6..e9a1232 100644 --- a/create_tomochain_masternode/templates/compose.py +++ b/create_tomochain_masternode/templates/compose.py @@ -26,9 +26,12 @@ {%- endif %} restart: always -{% if storage == "docker volume" -%} +{%- if storage == "docker volume" -%} volumes: {{ data }}: + {%- if external == "True" %} + external: true + {%- endif %} {%- endif %} """ From 8512e10a8672e3485e75cbba038ce395bc2bc873 Mon Sep 17 00:00:00 2001 From: etienne-napoleone Date: Wed, 13 Mar 2019 16:50:27 +0700 Subject: [PATCH 2/3] fix: change spacing in template --- create_tomochain_masternode/templates/compose.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/create_tomochain_masternode/templates/compose.py b/create_tomochain_masternode/templates/compose.py index e9a1232..29733b7 100644 --- a/create_tomochain_masternode/templates/compose.py +++ b/create_tomochain_masternode/templates/compose.py @@ -25,13 +25,11 @@ - 8546:8546 {%- endif %} restart: always - -{%- if storage == "docker volume" -%} +{% if storage == "docker volume" %} volumes: {{ data }}: {%- if external == "True" %} external: true {%- endif %} -{%- endif %} - +{% endif %} """ From 97a31ab03f17261a03467a9f3b6fa50798ad4d92 Mon Sep 17 00:00:00 2001 From: etienne-napoleone Date: Mon, 18 Mar 2019 10:30:44 +0700 Subject: [PATCH 3/3] chore: bump version --- create_tomochain_masternode/__init__.py | 2 +- pyproject.toml | 2 +- tests/test_create_tomochain_masternode.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/create_tomochain_masternode/__init__.py b/create_tomochain_masternode/__init__.py index b3ddbc4..58d478a 100644 --- a/create_tomochain_masternode/__init__.py +++ b/create_tomochain_masternode/__init__.py @@ -1 +1 @@ -__version__ = '1.1.1' +__version__ = '1.2.0' diff --git a/pyproject.toml b/pyproject.toml index fc7e1aa..57bdd93 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "create-tomochain-masternode" -version = "1.1.1" +version = "1.2.0" description = "Set up a TomoChain masternode by running one command." readme = "README.md" license = "GPL-3.0+" diff --git a/tests/test_create_tomochain_masternode.py b/tests/test_create_tomochain_masternode.py index 854feaf..9962e6b 100644 --- a/tests/test_create_tomochain_masternode.py +++ b/tests/test_create_tomochain_masternode.py @@ -14,7 +14,7 @@ def runner(): def test_version(): - assert __version__ == '1.1.1' + assert __version__ == '1.2.0' def test_produced_yml(runner):