Added --version option

Signed-off-by: Ole Herman Schumacher Elgesem <ole.elgesem@northern.tech>

Author: olehermanse

.github/workflows/black-check.yml

@@ -31,4 +31,4 @@ jobs:
       - name: Check formatting with black
         run: |
           shopt -s globstar
-          black --check cfengine_cli/ tests/
+          black --check .

.github/workflows/black-format.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Reformat with black
         run: |
           shopt -s globstar
-          black cfengine_cli/ tests/ > black_output.txt 2>&1
+          black . > black_output.txt 2>&1
       - name: Check if there are changes
         run: |
           git diff --exit-code || touch git_diff_exists

cfengine_cli/commands.py

@@ -1,6 +1,6 @@
 from cfengine_cli.shell import user_command
 from cfengine_cli.paths import bin
-from cfengine_cli.version import string as version_string
+from cfengine_cli.version import cfengine_cli_version_string
 
 
 def run() -> int:
@@ -22,5 +22,5 @@ def help() -> int:
 
 
 def version() -> int:
-    print(version_string())
+    print(cfengine_cli_version_string())
     return 0

cfengine_cli/main.py

@@ -3,15 +3,11 @@
 import sys
 
 from cf_remote import log
-from cfengine_cli import version
+from cfengine_cli.version import cfengine_cli_version_string
 from cfengine_cli import commands
 from cfengine_cli.utils import UserError
 
 
-def print_version_info():
-    print("CFEngine CLI version %s" % version.string())
-
-
 def _get_arg_parser():
     ap = argparse.ArgumentParser(
         description="Human-oriented CLI for interacting with CFEngine tools",
@@ -27,10 +23,9 @@ def _get_arg_parser():
     ap.add_argument(
         "--version",
         "-V",
-        help="Print or specify version",
-        nargs="?",
-        type=str,
-        const=True,
+        help="Print version number",
+        action="version",
+        version=f"{cfengine_cli_version_string()}",
     )
 
     command_help_hint = (
@@ -65,6 +60,8 @@ def get_args():
 
 
 def run_command_with_args(command, _) -> int:
+    if not command:
+        raise UserError("No command specified - try 'cfengine help'")
     if command == "run":
         return commands.run()
     if command == "report":
@@ -73,7 +70,7 @@ def run_command_with_args(command, _) -> int:
         return commands.help()
     if command == "version":
         return commands.version()
-    raise UserError("Unknown command: '{}'".format(command))
+    raise UserError(f"Unknown command: '{command}'")
 
 
 def validate_command(_command, _args):

cfengine_cli/version.py

@@ -1,7 +1,7 @@
 import os
 
 
-def string():
+def cfengine_cli_version_number():
     try:
         with open(os.path.dirname(__file__) + "/VERSION", "r", encoding="utf-8") as fh:
             version = fh.read().strip()
@@ -10,3 +10,7 @@ def string():
     except:
         pass
     return "unknown (git checkout)"
+
+
+def cfengine_cli_version_string():
+    return f"CFEngine CLI {cfengine_cli_version_number()}"