Git-Mirrors/rnsh
1
0
Fork 0
mirror of https://github.com/markqvist/rnsh.git synced 2025-01-24 13:11:01 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Align version numbers

Browse Source
This commit is contained in:
Aaron Heise 2023-02-12 23:50:06 -06:00
parent 49603e6d76
commit 39ba482720
4 changed files with 13 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -86,14 +86,14 @@ Options:
-N --no-id Disable identify on connect -N --no-id Disable identify on connect
-m --mirror Client returns with code of remote process -m --mirror Client returns with code of remote process
-w TIME --timeout TIME Specify client connect and request timeout in seconds -w TIME --timeout TIME Specify client connect and request timeout in seconds
-v --verbose Increase verbosity -q --quiet Increase quietness (move level up), multiple increases effect
DEFAULT LEVEL DEFAULT LOGGING LEVEL
CRITICAL CRITICAL (silent)
Initiator -> ERROR Initiator -> ERROR
WARNING WARNING
Listener -> INFO Listener -> INFO
DEBUG DEBUG (insane)
-q --quiet Increase quietness -v --verbose Increase verbosity (move level down), multiple increases effect
--version Show version --version Show version
-h --help Show this help -h --help Show this help
``` ```

2
pyproject.toml
View File

@ -1,6 +1,6 @@
[tool.poetry] [tool.poetry]
name = "rnsh" name = "rnsh"
version = "0.0.3" version = "0.0.4"
description = "Shell over Reticulum" description = "Shell over Reticulum"
authors = ["acehoss <acehoss@acehoss.net>"] authors = ["acehoss <acehoss@acehoss.net>"]
license = "MIT" license = "MIT"

23
rnsh/__version.py
View File

@ -1,23 +0,0 @@
# MIT License
#
# Copyright (c) 2023 Aaron Heise
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
__version__ = "0.0.1"

14
rnsh/rnsh.py
View File

@ -27,6 +27,7 @@ from __future__ import annotations
import asyncio import asyncio
import base64 import base64
import functools import functools
import importlib.metadata
import logging as __logging import logging as __logging
import os import os
import signal import signal
@ -42,7 +43,6 @@ import rnsh.process as process
import rnsh.retry as retry import rnsh.retry as retry
import rnsh.rnslogging as rnslogging import rnsh.rnslogging as rnslogging
import rnsh.hacks as hacks import rnsh.hacks as hacks
from rnsh.__version import __version__
module_logger = __logging.getLogger(__name__) module_logger = __logging.getLogger(__name__)
@ -885,14 +885,14 @@ Options:
-N --no-id Disable identify on connect -N --no-id Disable identify on connect
-m --mirror Client returns with code of remote process -m --mirror Client returns with code of remote process
-w TIME --timeout TIME Specify client connect and request timeout in seconds -w TIME --timeout TIME Specify client connect and request timeout in seconds
-v --verbose Increase verbosity -q --quiet Increase quietness (move level up), multiple increases effect
DEFAULT LEVEL DEFAULT LOGGING LEVEL
CRITICAL CRITICAL (silent)
Initiator -> ERROR Initiator -> ERROR
WARNING WARNING
Listener -> INFO Listener -> INFO
DEBUG DEBUG (insane)
-q --quiet Increase quietness -v --verbose Increase verbosity (move level down), multiple increases effect
--version Show version --version Show version
-h --help Show this help -h --help Show this help
''' '''
@ -902,7 +902,7 @@ Options:
argv.append(program_args[0]) argv.append(program_args[0])
program_args = program_args[1:] program_args = program_args[1:]
args = docopt.docopt(usage, argv=argv[1:], version=f"rnsh {__version__}") args = docopt.docopt(usage, argv=argv[1:], version=f"rnsh {importlib.metadata.version('rnsh')}")
# json.dump(args, sys.stdout) # json.dump(args, sys.stdout)
args_service_name = args.get("--service", None) or "default" args_service_name = args.get("--service", None) or "default"