admin-scripts 0.6.1__tar.gz → 0.6.3__tar.gz

{admin_scripts-0.6.1 → admin_scripts-0.6.3}/PKG-INFO

@@ -1,12 +1,26 @@
-Metadata-Version: 1.1
+Metadata-Version: 2.1
 Name: admin_scripts
-Version: 0.6.1
+Version: 0.6.3
 Summary: Administration Scripts
 Home-page: http://admin-scripts.hive.pt
 Author: Hive Solutions Lda.
 Author-email: development@hive.pt
 License: Apache License, Version 2.0
-Description: UNKNOWN
+Description: # [Admin Scripts](http://admin-scripts.hive.pt)
+        
+        Set of scripts for general administration tasks.
+        
+        ## License
+        
+        Admin Scripts is currently licensed under the [Apache License, Version 2.0](http://www.apache.org/licenses/).
+        
+        ## Build Automation
+        
+        [![Build Status](https://app.travis-ci.com/hivesolutions/admin-scripts.svg?branch=master)](https://travis-ci.com/github/hivesolutions/admin-scripts)
+        [![Coverage Status](https://coveralls.io/repos/hivesolutions/admin-scripts/badge.svg?branch=master)](https://coveralls.io/r/hivesolutions/admin-scripts?branch=master)
+        [![PyPi Status](https://img.shields.io/pypi/v/admin-scripts.svg)](https://pypi.python.org/pypi/admin-scripts)
+        [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://www.apache.org/licenses/)
+        
 Keywords: scripts admin public
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
@@ -24,3 +38,4 @@ Classifier: Programming Language :: Python :: 3.4
 Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
+Description-Content-Type: text/markdown

{admin_scripts-0.6.1 → admin_scripts-0.6.3}/README.md

@@ -8,7 +8,7 @@ Admin Scripts is currently licensed under the [Apache License, Version 2.0](http
 
 ## Build Automation
 
-[![Build Status](https://travis-ci.com/hivesolutions/admin_scripts.svg?branch=master)](https://travis-ci.com/hivesolutions/admin_scripts)
-[![Coverage Status](https://coveralls.io/repos/hivesolutions/admin_scripts/badge.svg?branch=master)](https://coveralls.io/r/hivesolutions/admin_scripts?branch=master)
-[![PyPi Status](https://img.shields.io/pypi/v/admin_scripts.svg)](https://pypi.python.org/pypi/admin_scripts)
+[![Build Status](https://app.travis-ci.com/hivesolutions/admin-scripts.svg?branch=master)](https://travis-ci.com/github/hivesolutions/admin-scripts)
+[![Coverage Status](https://coveralls.io/repos/hivesolutions/admin-scripts/badge.svg?branch=master)](https://coveralls.io/r/hivesolutions/admin-scripts?branch=master)
+[![PyPi Status](https://img.shields.io/pypi/v/admin-scripts.svg)](https://pypi.python.org/pypi/admin-scripts)
 [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://www.apache.org/licenses/)

{admin_scripts-0.6.1 → admin_scripts-0.6.3}/setup.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # Hive Administration Scripts
-# Copyright (c) 2008-2020 Hive Solutions Lda.
+# Copyright (c) 2008-2025 Hive Solutions Lda.
 #
 # This file is part of Hive Administration Scripts.
 #
@@ -22,16 +22,7 @@
 __author__ = "João Magalhães <joamag@hive.pt>"
 """ The author(s) of the module """
 
-__version__ = "1.0.0"
-""" The version of the module """
-
-__revision__ = "$LastChangedRevision$"
-""" The revision number of the module """
-
-__date__ = "$LastChangedDate$"
-""" The last change date of the module """
-
-__copyright__ = "Copyright (c) 2008-2020 Hive Solutions Lda."
+__copyright__ = "Copyright (c) 2008-2025 Hive Solutions Lda."
 """ The copyright for the module """
 
 __license__ = "Apache License, Version 2.0"
@@ -41,43 +32,29 @@ import os
 import setuptools
 
 setuptools.setup(
-    name = "admin_scripts",
-    version = "0.6.1",
-    author = "Hive Solutions Lda.",
-    author_email = "development@hive.pt",
-    description = "Administration Scripts",
-    license = "Apache License, Version 2.0",
-    keywords = "scripts admin public",
-    url = "http://admin-scripts.hive.pt",
-    zip_safe = False,
-    packages = [
+    name="admin_scripts",
+    version="0.6.3",
+    author="Hive Solutions Lda.",
+    author_email="development@hive.pt",
+    description="Administration Scripts",
+    license="Apache License, Version 2.0",
+    keywords="scripts admin public",
+    url="http://admin-scripts.hive.pt",
+    zip_safe=False,
+    packages=[
         "admin_scripts",
         "admin_scripts.base",
         "admin_scripts.config",
         "admin_scripts.config.development",
         "admin_scripts.extra",
-        "admin_scripts.test"
+        "admin_scripts.test",
     ],
-    test_suite = "admin_scripts.test",
-    package_dir = {
-        "" : os.path.normpath("src")
-    },
-    package_data = {
-        "admin_scripts" : [
-            "config/extra/*"
-        ]
-    },
-    entry_points = {
-        "console_scripts" : [
-            "cleanup = admin_scripts.base.cleanup:run"
-        ]
-    },
-    install_requires = [
-        "legacy",
-        "pep8",
-        "jsbeautifier"
-    ],
-    classifiers = [
+    test_suite="admin_scripts.test",
+    package_dir={"": os.path.normpath("src")},
+    package_data={"admin_scripts": ["config/extra/*"]},
+    entry_points={"console_scripts": ["cleanup = admin_scripts.base.cleanup:run"]},
+    install_requires=["legacy", "pep8", "jsbeautifier"],
+    classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Topic :: Utilities",
         "License :: OSI Approved :: Apache Software License",
@@ -92,6 +69,10 @@ setuptools.setup(
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.7"
-    ]
+        "Programming Language :: Python :: 3.7",
+    ],
+    long_description=open(os.path.join(os.path.dirname(__file__), "README.md"), "rb")
+    .read()
+    .decode("utf-8"),
+    long_description_content_type="text/markdown",
 )

{admin_scripts-0.6.1 → admin_scripts-0.6.3}/src/admin_scripts/__init__.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # Hive Administration Scripts
-# Copyright (c) 2008-2020 Hive Solutions Lda.
+# Copyright (c) 2008-2025 Hive Solutions Lda.
 #
 # This file is part of Hive Administration Scripts.
 #
@@ -19,16 +19,7 @@
 # You should have received a copy of the Apache License along with
 # Hive Administration Scripts. If not, see <http://www.apache.org/licenses/>.
 
-__version__ = "1.0.0"
-""" The version of the module """
-
-__revision__ = "$LastChangedRevision$"
-""" The revision number of the module """
-
-__date__ = "$LastChangedDate$"
-""" The last change date of the module """
-
-__copyright__ = "Copyright (c) 2008-2020 Hive Solutions Lda."
+__copyright__ = "Copyright (c) 2008-2025 Hive Solutions Lda."
 """ The copyright for the module """
 
 __license__ = "Apache License, Version 2.0"

{admin_scripts-0.6.1 → admin_scripts-0.6.3}/src/admin_scripts/base/__init__.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # Hive Administration Scripts
-# Copyright (c) 2008-2020 Hive Solutions Lda.
+# Copyright (c) 2008-2025 Hive Solutions Lda.
 #
 # This file is part of Hive Administration Scripts.
 #
@@ -19,16 +19,7 @@
 # You should have received a copy of the Apache License along with
 # Hive Administration Scripts. If not, see <http://www.apache.org/licenses/>.
 
-__version__ = "1.0.0"
-""" The version of the module """
-
-__revision__ = "$LastChangedRevision$"
-""" The revision number of the module """
-
-__date__ = "$LastChangedDate$"
-""" The last change date of the module """
-
-__copyright__ = "Copyright (c) 2008-2020 Hive Solutions Lda."
+__copyright__ = "Copyright (c) 2008-2025 Hive Solutions Lda."
 """ The copyright for the module """
 
 __license__ = "Apache License, Version 2.0"

{admin_scripts-0.6.1 → admin_scripts-0.6.3}/src/admin_scripts/base/cleanup.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # Hive Administration Scripts
-# Copyright (c) 2008-2020 Hive Solutions Lda.
+# Copyright (c) 2008-2025 Hive Solutions Lda.
 #
 # This file is part of Hive Administration Scripts.
 #
@@ -22,16 +22,7 @@
 __author__ = "João Magalhães <joamag@hive.pt>"
 """ The author(s) of the module """
 
-__version__ = "1.0.0"
-""" The version of the module """
-
-__revision__ = "$LastChangedRevision$"
-""" The revision number of the module """
-
-__date__ = "$LastChangedDate$"
-""" The last change date of the module """
-
-__copyright__ = "Copyright (c) 2008-2020 Hive Solutions Lda."
+__copyright__ = "Copyright (c) 2008-2025 Hive Solutions Lda."
 """ The copyright for the module """
 
 __license__ = "Apache License, Version 2.0"
@@ -56,21 +47,21 @@ SCRIPTS_LIST = [
     "pysource.py",
     "jssource.py",
     "trailing_spaces.py",
-    "misc.py"
+    "misc.py",
 ]
 """ The list of scripts to be executed by the complete
 cleanup operation, each of the scripts will be executed
 as a separate process in a chained process """
 
 SCRIPTS_CONFIGURATION_MAP = {
-    "stylesheets.py" : "development/stylesheets.py",
-    "encoding.py" : "development/encoding.py",
-    "join.py" : "development/join.py",
-    "pydev.py" : "development/pydev.py",
-    "pysource.py" : "development/pysource.py",
-    "jssource.py" : "development/jssource.py",
-    "trailing_spaces.py" : "development/trailing_spaces.py",
-    "misc.py" : "development/misc.py"
+    "stylesheets.py": "development/stylesheets.py",
+    "encoding.py": "development/encoding.py",
+    "join.py": "development/join.py",
+    "pydev.py": "development/pydev.py",
+    "pysource.py": "development/pysource.py",
+    "jssource.py": "development/jssource.py",
+    "trailing_spaces.py": "development/trailing_spaces.py",
+    "misc.py": "development/misc.py",
 }
 """ The map associating the script name with the name
 of the configuration file, so that during execution
@@ -79,8 +70,8 @@ the proper values are passed to each script """
 CONFIGURATION_RELATIVE_PATH = "../config/"
 """ The relative path to the configuration directory """
 
-PYTHON_COMMAND = "python"
-""" The python (execution) command that is going to
+PYTHON_COMMANDS = ("python", "python3")
+""" The python (execution) commands that are going to
 be run in the execution shell (should be globally accessible) """
 
 CONFIGURATION_FLAG = "-c"
@@ -91,6 +82,7 @@ WINDOWS_PLATFORMS = ("nt", "ce", "dos")
 series of constant values corresponding to the complete
 valid platform values for windows """
 
+
 def run():
     # retrieves the path to the "current" directory
     directory_path = os.path.dirname(__file__)
@@ -131,15 +123,23 @@ def run():
         # creates both the script and the configuration paths
         # note that there's a path normalization process
         script_path = os.path.join(directory_path, script)
-        configuration_path = os.path.join(
-            directory_path,
-            os.path.join(CONFIGURATION_RELATIVE_PATH, script_configuration_file_name)
-        ) if script_configuration_file_name else None
+        configuration_path = (
+            os.path.join(
+                directory_path,
+                os.path.join(
+                    CONFIGURATION_RELATIVE_PATH, script_configuration_file_name
+                ),
+            )
+            if script_configuration_file_name
+            else None
+        )
 
         # resolves both paths as absolute so that the proper value
         # is passed to the underlying command line execution
-        if not script_path == None: script_path = os.path.abspath(script_path)
-        if not configuration_path == None: configuration_path = os.path.abspath(configuration_path)
+        if not script_path == None:
+            script_path = os.path.abspath(script_path)
+        if not configuration_path == None:
+            configuration_path = os.path.abspath(configuration_path)
 
         # creates the arguments list from the various
         # processed arguments
@@ -152,46 +152,70 @@ def run():
         arguments.extend(extra_arguments)
 
         # prints a message and flushes the standard output
-        extra.echo("------------------------------------------------------------------------")
+        extra.echo(
+            "------------------------------------------------------------------------"
+        )
         extra.echo("Executing script file: %s" % script)
-        extra.echo("------------------------------------------------------------------------")
+        extra.echo(
+            "------------------------------------------------------------------------"
+        )
         sys.stdout.flush()
 
         # opens a sub-process for script execution (and waits for the end of it)
         process = subprocess.Popen(
             arguments,
-            stdin = sys.stdin,
-            stdout = sys.stdout,
-            stderr = sys.stderr,
-            shell = shell_value
+            stdin=sys.stdin,
+            stdout=sys.stdout,
+            stderr=sys.stderr,
+            shell=shell_value,
         )
         process.wait()
         sys.stdout.flush()
 
         # in case the return code of the process is not the expected one (zero)
         # the final exit code to be returned by the process is changed to error
-        if not process.returncode == 0: exit_code = 1
+        if not process.returncode == 0:
+            exit_code = 1
 
         # creates the proper prefix message using the return code from the process
         # note that the failed prefix is set for unwanted error codes
         prefix = "Finished" if process.returncode == 0 else "Finished (with errors)"
 
         # print a message and flushes the standard output
-        extra.echo("------------------------------------------------------------------------")
+        extra.echo(
+            "------------------------------------------------------------------------"
+        )
         extra.echo("%s executing script file: %s" % (prefix, script))
-        extra.echo("------------------------------------------------------------------------")
+        extra.echo(
+            "------------------------------------------------------------------------"
+        )
         sys.stdout.flush()
 
     # exits the current process with the code that has been calculated
     # from the execution of the various sub-scripts
     sys.exit(exit_code)
 
+
 def config(target_path):
+    executable = None
+
+    for command in PYTHON_COMMANDS:
+        for path_dir in os.environ.get("PATH", "").split(os.pathsep):
+            full_path = os.path.join(path_dir, command)
+            if os.path.isfile(full_path) and os.access(full_path, os.X_OK):
+                executable = full_path
+                break
+        if executable:
+            break
+
+    if not executable:
+        raise Exception("No python executable found")
+
     config = dict(
-        scripts = list(SCRIPTS_LIST),
-        disabled = [],
-        configuration = dict(SCRIPTS_CONFIGURATION_MAP),
-        command = PYTHON_COMMAND
+        scripts=list(SCRIPTS_LIST),
+        disabled=[],
+        configuration=dict(SCRIPTS_CONFIGURATION_MAP),
+        command=executable,
     )
 
     home_path = "~/.cleanup.json"
@@ -212,11 +236,14 @@ def config(target_path):
     paths = (home_path, base_path, current_path)
 
     for path in paths:
-        if not os.path.exists(path): continue
+        if not os.path.exists(path):
+            continue
 
         file = open(path, "rb")
-        try: data = file.read()
-        finally: file.close()
+        try:
+            data = file.read()
+        finally:
+            file.close()
         data = data.decode("utf-8")
         data_j = json.loads(data)
 
@@ -227,11 +254,13 @@ def config(target_path):
     disabled += config.get("excluded", [])
 
     for name in disabled:
-        if not name in scripts: continue
+        if not name in scripts:
+            continue
         scripts.remove(name)
 
     return config
 
+
 if __name__ == "__main__":
     run()
 else: