Transforming bin/check-dnsui-users and bin/check-puppet-env to the new schema

diff --git a/bin/check-dnsui-users b/bin/check-dnsui-users
index 4f019f92a638f4cd39ad50e2499fad179340f9eb..852ef222e613f2155bc3c134024951a513013b0f 100755 (executable)
--- a/bin/check-dnsui-users
+++ b/bin/check-dnsui-users
@@ -48,7 +48,7 @@ if module_dir.exists():
 from pp_lib.dnsui_users import DnsuiUsersApp
 
 __author__ = 'Frank Brehm <frank.brehm@pixelpark.com>'
-__copyright__ = '(C) 2018 by Frank Brehm, Pixelpark GmbH, Berlin'
+__copyright__ = '(C) 2021 by Frank Brehm, Pixelpark GmbH, Berlin'
 
 appname = os.path.basename(sys.argv[0])
 

diff --git a/bin/check-puppet-env b/bin/check-puppet-env
index 641a3c0c1640706d6702a937232375e5368516d2..605a95cc400a0e66d6402ecf051897a65a2a2301 100755 (executable)
--- a/bin/check-puppet-env
+++ b/bin/check-puppet-env
@@ -1,30 +1,54 @@
 #!/usr/bin/env python3
 
+from __future__ import print_function
+
 # Standard modules
 import sys
+
+__exp_py_version_major__ = 3
+__min_py_version_minor__ = 4
+
+if sys.version_info[0] != __exp_py_version_major__:
+    print("This script is intended to use with Python {}.".format(
+            __exp_py_version_major__), file=sys.stderr)
+    print("You are using Python: {0}.{1}.{2}-{3}-{4}.".format(
+        *sys.version_info) + "\n", file=sys.stderr)
+    sys.exit(1)
+
+if sys.version_info[1] < __min_py_version_minor__:
+    print("A minimal Python version of {maj}.{min} is necessary to execute this script.".format(
+        maj=__exp_py_version_major__, min=__min_py_version_minor__), file=sys.stderr)
+    print("You are using Python: {0}.{1}.{2}-{3}-{4}.".format(
+        *sys.version_info) + "\n", file=sys.stderr)
+    sys.exit(1)
+
+# Standard modules
 import os
-import logging
 import locale
 
+try:
+    import pathlib
+    from pathlib import Path
+except ImportError:
+    from pathlib2 import Path
+    import pathlib2 as pathlib
+
 # own modules:
-cur_dir = os.getcwd()
-base_dir = cur_dir
-
-if sys.argv[0] != '' and sys.argv[0] != '-c':
-    bin_dir = os.path.dirname(os.path.realpath(sys.argv[0]))
-else:
-    bin_dir = os.path.dirname(os.path.realpath(__file__))
-base_dir = os.path.abspath(os.path.join(bin_dir, '..'))
-module_dir = os.path.join(base_dir, 'pp_lib')
-if os.path.exists(module_dir):
-    sys.path.insert(0, base_dir)
 
-from pp_lib.check_puppet_env_app import CheckPuppetEnvApp
+my_path = Path(__file__)
+my_real_path = my_path.resolve()
+bin_path = my_real_path.parent
+base_dir = bin_path.parent
+lib_dir = base_dir.joinpath('lib')
+module_dir = lib_dir.joinpath('pp_lib')
 
-log = logging.getLogger(__name__)
+if module_dir.exists():
+    sys.path.insert(0, str(lib_dir))
+
+from pp_lib.check_puppet_env_app import CheckPuppetEnvApp
 
 __author__ = 'Frank Brehm <frank.brehm@pixelpark.com>'
-__copyright__ = '(C) 2018 by Frank Brehm, Pixelpark GmbH, Berlin'
+__copyright__ = '(C) 2021 by Frank Brehm, Pixelpark GmbH, Berlin'
 
 appname = os.path.basename(sys.argv[0])
 

diff --git a/lib/pp_lib/check_puppet_env_app.py b/lib/pp_lib/check_puppet_env_app.py
index 8025c204ced297efa102817f8efd12ca47cfd3d4..a94bd18e6ef30694472b7ca8090656f58315268a 100644 (file)
--- a/lib/pp_lib/check_puppet_env_app.py
+++ b/lib/pp_lib/check_puppet_env_app.py
@@ -3,7 +3,7 @@
 """
 @author: Frank Brehm
 @contact: frank.brehm@pixelpark.com
-@copyright: © 2018 by Frank Brehm, Berlin
+@copyright: © 2021 by Frank Brehm, Berlin
 @summary: The module the check-puppet-env application
 """
 from __future__ import absolute_import
@@ -33,17 +33,18 @@ from six.moves import configparser
 from configparser import Error as ConfigParseError
 
 # Own modules
+from fb_tools.common import pp, to_bool, RE_DOT_AT_END
+from fb_tools.app import BaseApplication
+
 from .global_version import __version__ as __global_version__
 
 from .errors import PpAppError
 
-from .common import pp, to_bool, RE_DOT_AT_END
-
 from .merge import merge_structure
 
-from .app import PpApplication
+# from .app import PpApplication
 
-__version__ = '0.6.2'
+__version__ = '0.6.3'
 LOG = logging.getLogger(__name__)
 
 
@@ -56,7 +57,7 @@ class CheckPuppetEnvError(PpAppError):
 
 
 # =============================================================================
-class CheckPuppetEnvApp(PpApplication):
+class CheckPuppetEnvApp(BaseApplication):
     """
     Class for the check-puppet-env application objects.
     """

diff --git a/lib/pp_lib/dnsui_users.py b/lib/pp_lib/dnsui_users.py
index 2f72638d09b96df0b7e4bb5a788cba23e121d6be..1cb0de6cdfce51e153e7566cb9ccf17e8427d048 100644 (file)
--- a/lib/pp_lib/dnsui_users.py
+++ b/lib/pp_lib/dnsui_users.py
@@ -3,7 +3,7 @@
 """
 @author: Frank Brehm
 @contact: frank.brehm@pixelpark.com
-@copyright: © 2018 by Frank Brehm, Berlin
+@copyright: © 2021 by Frank Brehm, Berlin
 @summary: The module for the check-dnsui-users application object.
 """
 from __future__ import absolute_import
@@ -22,11 +22,11 @@ from ldap3 import ObjectDef
 import psycopg2
 
 # Own modules
-from .common import pp
+from fb_tools.common import pp
 
 from .ldap_app import PpLdapAppError, PpLdapApplication
 
-__version__ = '0.4.5'
+__version__ = '0.4.6'
 LOG = logging.getLogger(__name__)