multitool 0.4.0__tar.gz → 0.6.0__tar.gz

{multitool-0.4.0 → multitool-0.6.0}/PKG-INFO

@@ -1,32 +1,30 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: multitool
-Version: 0.4.0
-Summary: General-purpose command-line interface with plugins support
-Home-page: https://github.com/mdelotavo/multitool
-Author: Matthew Delotavo
-Author-email: matthew.t.delotavo@gmail.com
-License: MIT
+Version: 0.6.0
+Summary: Quickly create and distribute command-line tools.
+Author-email: Matthew Delotavo <matthew.t.delotavo@gmail.com>
+License-Expression: MIT
+Project-URL: Homepage, https://github.com/mdelotavo/multitool
+Project-URL: Repository, https://github.com/mdelotavo/multitool
+Keywords: cli,tooling,automation
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.7
 Requires-Python: >=3.7
+Description-Content-Type: text/x-rst
 License-File: LICENSE
+Requires-Dist: click>=8.1.3
+Requires-Dist: click-aliases>=1.0.1
+Requires-Dist: click-option-group>=0.5.5
+Requires-Dist: GitPython>=3.1.30
+Dynamic: license-file
 
 multitool
 =========
 
-Multitool is a general-purpose command-line interface with plugins support.
-
---------------------
-Why does this exist?
---------------------
-
-I built this tool so that I can quickly create and distribute command-line tools for consulting work and personal use.
-
-The plugins manager uses ``git`` to manage plugins installed from remote ``git`` repositories.
+Quickly create and distribute command-line tools with plugins.
 
 -----
 Usage
@@ -36,20 +34,14 @@ Usage
 
     Usage: multitool [OPTIONS] COMMAND [ARGS]...
 
-      Welcome to the Multitool command-line interface!
-
-      PyPI:   https://pypi.org/project/multitool/
-      GitHub: https://github.com/mdelotavo/multitool
+      Quickly create and distribute command-line tools.
 
     Options:
       -V, --version  Show the version and exit.
       -h, --help     Show this message and exit.
 
     Commands:
-      plugins  Simple plugins manager for distributing commands.
-
-.. ..
-    The plugins features are based off those found in the `apigeecli`_.
+      plugins  Plugins manager for distributing commands.
 
 ----------------
 Managing plugins
@@ -122,7 +114,7 @@ This will install and update plugins.
 Pruning
 ^^^^^^^
 
-If you specified the ``-a`` option when running ``multitool plugins configure`` then the removal of plugins will occur automatically.
+If you remove plugins from the config file or comment them out, and you then specified the ``-a`` option when running ``multitool plugins configure`` then the removal of plugins will occur automatically.
 Otherwise you can run::
 
      multitool plugins prune
@@ -146,6 +138,17 @@ In order for this to work, the plugin needs to have the ``Requires`` key in the
 
     pip3 install $(multitool plugins show -n PLUGIN_NAME --show-dependencies-only)
 
+^^^^^^^^^^^^^^^
+Troubleshooting
+^^^^^^^^^^^^^^^
+
+If you encounter issues with plugins or commands, you can find more detailed debug information and error messages in the log file:
+::
+
+    ~/.multitool/multitool.log
+
+Reviewing this file can help you diagnose installation problems, missing dependencies, or Git-related errors.
+
 .. ..
     ----------------------------
     Create a virtual environment
@@ -167,6 +170,5 @@ In order for this to work, the plugin needs to have the ``Requires`` key in the
         deactivate
 
 .. _`click`: https://click.palletsprojects.com/
-.. _`apigeecli`: https://pypi.org/project/apigeecli/
 .. _`multitool-plugins`: https://github.com/mdelotavo/multitool-plugins
 .. _`public plugins repository`: https://github.com/mdelotavo/multitool-plugins

{multitool-0.4.0 → multitool-0.6.0}/README.rst

@@ -1,15 +1,7 @@
 multitool
 =========
 
-Multitool is a general-purpose command-line interface with plugins support.
-
---------------------
-Why does this exist?
---------------------
-
-I built this tool so that I can quickly create and distribute command-line tools for consulting work and personal use.
-
-The plugins manager uses ``git`` to manage plugins installed from remote ``git`` repositories.
+Quickly create and distribute command-line tools with plugins.
 
 -----
 Usage
@@ -19,20 +11,14 @@ Usage
 
     Usage: multitool [OPTIONS] COMMAND [ARGS]...
 
-      Welcome to the Multitool command-line interface!
-
-      PyPI:   https://pypi.org/project/multitool/
-      GitHub: https://github.com/mdelotavo/multitool
+      Quickly create and distribute command-line tools.
 
     Options:
       -V, --version  Show the version and exit.
       -h, --help     Show this message and exit.
 
     Commands:
-      plugins  Simple plugins manager for distributing commands.
-
-.. ..
-    The plugins features are based off those found in the `apigeecli`_.
+      plugins  Plugins manager for distributing commands.
 
 ----------------
 Managing plugins
@@ -105,7 +91,7 @@ This will install and update plugins.
 Pruning
 ^^^^^^^
 
-If you specified the ``-a`` option when running ``multitool plugins configure`` then the removal of plugins will occur automatically.
+If you remove plugins from the config file or comment them out, and you then specified the ``-a`` option when running ``multitool plugins configure`` then the removal of plugins will occur automatically.
 Otherwise you can run::
 
      multitool plugins prune
@@ -129,6 +115,17 @@ In order for this to work, the plugin needs to have the ``Requires`` key in the
 
     pip3 install $(multitool plugins show -n PLUGIN_NAME --show-dependencies-only)
 
+^^^^^^^^^^^^^^^
+Troubleshooting
+^^^^^^^^^^^^^^^
+
+If you encounter issues with plugins or commands, you can find more detailed debug information and error messages in the log file:
+::
+
+    ~/.multitool/multitool.log
+
+Reviewing this file can help you diagnose installation problems, missing dependencies, or Git-related errors.
+
 .. ..
     ----------------------------
     Create a virtual environment
@@ -150,6 +147,5 @@ In order for this to work, the plugin needs to have the ``Requires`` key in the
         deactivate
 
 .. _`click`: https://click.palletsprojects.com/
-.. _`apigeecli`: https://pypi.org/project/apigeecli/
 .. _`multitool-plugins`: https://github.com/mdelotavo/multitool-plugins
 .. _`public plugins repository`: https://github.com/mdelotavo/multitool-plugins

{multitool-0.4.0 → multitool-0.6.0}/multitool/__init__.py

@@ -1,7 +1,7 @@
 APP = 'multitool'
-__version__ = '0.4.0'
-description = 'General-purpose command-line interface with plugins support'
-# long_description = 'General-purpose command-line interface with plugins support'
+__version__ = "0.6.0"
+description = 'Quickly create and distribute command-line tools.'
+long_description = 'Quickly create and distribute command-line tools with plugins.'
 
 import builtins
 from pathlib import Path

{multitool-0.4.0 → multitool-0.6.0}/multitool/__main__.py

@@ -8,28 +8,16 @@ from multitool import __version__ as version
 from multitool.cls import AliasedGroup
 from multitool.exceptions import wrap_with_exception_handling
 from multitool.plugins.commands import plugins
-from multitool.utils import (import_plugins_from_directory,
-                             execute_function_on_directory_files, configure_global_logger)
+from multitool.utils import (configure_global_logger, execute_function_on_directory_files, import_plugins_from_directory)
 
 CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
 
 
-@click.group(
-    context_settings=CONTEXT_SETTINGS, cls=AliasedGroup, invoke_without_command=False, chain=False
-)
+@click.group(context_settings=CONTEXT_SETTINGS, cls=AliasedGroup, invoke_without_command=False, chain=False)
 @click.version_option(version, '-V', '--version')
 @click.pass_context
 def cli(ctx):
-    """Welcome to the Multitool command-line interface!
-
-    \b
-    PyPI:   https://pypi.org/project/multitool/
-    GitHub: https://github.com/mdelotavo/multitool
-
-    \f
-
-    :param click.core.Context ctx: Click context.
-    """
+    """Quickly create and distribute command-line tools."""
     ctx.ensure_object(dict)
 
 
@@ -40,10 +28,10 @@ def main():
     cli_commands = {plugins}
 
     execute_function_on_directory_files(
-        MULTITOOL_PLUGINS_DIRECTORY,
-        import_plugins_from_directory,
-        args=(cli_commands,),
-        glob='[!.][!__]*/__init__.py',
+      MULTITOOL_PLUGINS_DIRECTORY,
+      import_plugins_from_directory,
+      args=(cli_commands, ),
+      glob='[!.][!__]*/__init__.py',
     )
 
     for command in cli_commands:

{multitool-0.4.0 → multitool-0.6.0}/multitool/cls.py

@@ -2,6 +2,7 @@ import click
 
 
 class AliasedGroup(click.Group):
+
     def get_command(self, ctx, cmd_name):
         rv = click.Group.get_command(self, ctx, cmd_name)
         if rv is not None:

multitool-0.6.0/multitool/console.py

@@ -0,0 +1,25 @@
+import builtins
+import sys
+
+
+def echo(
+  *message,
+  exit_status=None,
+  make_silent=False,
+  current_verbosity=0,
+  expected_verbosity=0,
+  line_ending="\n",
+  should_flush=False,
+):
+    if make_silent or builtins.MULTITOOL_TOGGLE_SILENT:
+        if exit_status is not None:
+            sys.exit(exit_status)
+        return
+
+    verbosity = max(current_verbosity, builtins.MULTITOOL_TOGGLE_VERBOSE)
+
+    if verbosity >= expected_verbosity:
+        print(*message, end=line_ending, flush=should_flush)
+
+    if exit_status is not None:
+        sys.exit(exit_status)

{multitool-0.4.0 → multitool-0.6.0}/multitool/exceptions.py

@@ -7,6 +7,7 @@ from multitool import console
 
 
 def wrap_with_exception_handling(func):
+
     @functools.wraps(func)
     def wrapper(*args, **kwargs):
         try:

multitool-0.6.0/multitool/plugins/commands.py

@@ -0,0 +1,224 @@
+import configparser
+import os
+import shutil
+import stat
+import sys
+from pathlib import Path
+
+import click
+from click_option_group import MutuallyExclusiveOptionGroup, optgroup
+
+from multitool import (
+  APP,
+  MULTITOOL_PLUGINS_CONFIG_FILE,
+  MULTITOOL_PLUGINS_DIRECTORY,
+  MULTITOOL_PLUGINS_PATH,
+  console,
+)
+from multitool.silent import common_silent_options
+from multitool.utils import (
+  create_directory,
+  create_empty_file,
+  execute_function_on_directory_files,
+  is_directory,
+  is_regular_file,
+  read_file_content,
+)
+from multitool.verbose import common_verbose_options
+
+try:
+    from git import Repo
+
+    HAS_GIT = True
+    HELP = "Plugins manager for distributing commands."
+except ImportError:
+    HAS_GIT = False
+    HELP = "Plugins manager. Git is required."
+
+
+def require_git():
+    if not HAS_GIT:
+        sys.exit(0)
+
+
+def init():
+    create_directory(MULTITOOL_PLUGINS_DIRECTORY)
+    create_empty_file(MULTITOOL_PLUGINS_PATH)
+    create_empty_file(MULTITOOL_PLUGINS_CONFIG_FILE)
+
+
+def config(section="sources"):
+    cfg = configparser.ConfigParser(allow_no_value=True)
+    cfg.read(MULTITOOL_PLUGINS_CONFIG_FILE)
+    return dict(cfg._sections.get(section, {}))
+
+
+def clone():
+    init()
+    for name, uri in config().items():
+        dest = Path(MULTITOOL_PLUGINS_DIRECTORY) / name
+        if is_directory(dest):
+            continue
+
+        console.echo(f"Installing {name}... ", line_ending="", should_flush=True)
+        try:
+            Repo.clone_from(uri, dest)
+            console.echo("Done")
+        except Exception as e:
+            console.echo(e)
+
+
+def update_repos():
+
+    def fn(p):
+        if not is_directory(p):
+            return
+
+        console.echo(f"Updating {Path(p).stem}... ", line_ending="", should_flush=True)
+
+        try:
+            repo = Repo(p)
+            if not repo.bare:
+                repo.remotes["origin"].pull()
+            console.echo("Done")
+        except Exception as e:
+            console.echo(e)
+
+    execute_function_on_directory_files(MULTITOOL_PLUGINS_DIRECTORY, fn, glob="[!.][!__]*")
+
+
+def prune():
+    sources = config()
+
+    def fn(p):
+        if not is_directory(p):
+            return
+
+        name = Path(p).stem
+        if name in sources:
+            return
+
+        console.echo(f"Removing {name}... ", line_ending="", should_flush=True)
+
+        try:
+            shutil.rmtree(p, onerror=_chmod)
+            console.echo("Done")
+        except Exception as e:
+            console.echo(e)
+
+    execute_function_on_directory_files(MULTITOOL_PLUGINS_DIRECTORY, fn, glob="[!.][!__]*")
+
+
+def _chmod(func, p, _):
+    os.chmod(p, stat.S_IRWXU)
+    func(p)
+
+
+# def prune():
+#     sources = config()
+
+#     def fn(p):
+#         if not is_directory(p):
+#             return
+
+#         name = Path(p).stem
+#         if name in sources:
+#             return
+
+#         console.echo(f"Removing {name}... ", line_ending="", should_flush=True)
+
+#         try:
+#             shutil.rmtree(p, onexc=_chmod)
+#             console.echo("Done")
+#         except Exception as e:
+#             console.echo(e)
+
+#     execute_function_on_directory_files(PLUGINS_DIR, fn, glob="[!.][!__]*")
+
+# def _chmod(func, path, exc):
+#     os.chmod(path, stat.S_IRWXU)
+#     func(path)
+
+
+def plugin_info(name):
+    f = Path(MULTITOOL_PLUGINS_DIRECTORY) / name / f"{APP}-info.json"
+
+    if not is_regular_file(f):
+        return None
+
+    return read_file_content(f, type="json")
+
+
+def print_commit(name):
+    repo = Repo(Path(MULTITOOL_PLUGINS_DIRECTORY) / name)
+    console.echo(repo.git.log("--pretty=format:%h - %s (%cr) <%an>", "-1"))
+
+
+@click.group(help=HELP)
+def plugins():
+    pass
+
+
+@plugins.command()
+@common_silent_options
+@common_verbose_options
+@click.option("-a/-A", "--apply-changes/--no-apply-changes", default=False)
+def configure(silent, verbose, apply_changes):
+    require_git()
+    init()
+
+    click.edit(filename=MULTITOOL_PLUGINS_CONFIG_FILE)
+
+    if apply_changes:
+        clone()
+        prune()
+    else:
+        console.echo(f"\nRun `{APP} plugins update` to apply changes.\n")
+
+
+@plugins.command()
+@common_silent_options
+@common_verbose_options
+def update(silent, verbose):
+    require_git()
+    clone()
+    update_repos()
+
+
+@plugins.command()
+@common_silent_options
+@common_verbose_options
+@click.option("-n", "--name")
+@optgroup.group("Filter options", cls=MutuallyExclusiveOptionGroup)
+@optgroup.option("--show-commit-only/--no-show-commit-only", default=False)
+@optgroup.option("--show-dependencies-only/--no-show-dependencies-only", default=False)
+def show(silent, verbose, name, show_commit_only, show_dependencies_only):
+    if not name:
+        for k, v in config().items():
+            console.echo(f"{k}: {v}")
+        return
+
+    info = plugin_info(name)
+    if not info:
+        return
+
+    if show_commit_only:
+        require_git()
+        print_commit(name)
+        return
+
+    if show_dependencies_only:
+        if info.get("Requires"):
+            console.echo(info["Requires"])
+        return
+
+    for k, v in info.items():
+        console.echo(f"{k}: {v}")
+
+
+@plugins.command()
+@common_silent_options
+@common_verbose_options
+def prune_cmd(silent, verbose):
+    require_git()
+    prune()

{multitool-0.4.0 → multitool-0.6.0}/multitool/silent.py

@@ -9,10 +9,10 @@ def silent_callback(ctx, param, value):
 
 def common_silent_options(func):
     func = click.option(
-        '--silent',
-        show_default='toggle silent output',
-        flag_value=True,
-        default=False,
-        callback=silent_callback,
+      '--silent',
+      show_default='toggle silent output',
+      flag_value=True,
+      default=False,
+      callback=silent_callback,
     )(func)
     return func

{multitool-0.4.0 → multitool-0.6.0}/multitool/utils.py

@@ -15,7 +15,7 @@ def apply_function_on_iterable(iterable, func, state_op="append", args=(), kwarg
         kwargs = {}
     state = []
     for item in iterable:
-        _tuple = (item,)
+        _tuple = (item, )
         result = func(*(_tuple + args), **kwargs)
         if result:
             getattr(state, state_op)(result)
@@ -26,9 +26,9 @@ def configure_global_logger(log_file):
     create_empty_file(log_file)
     remove_file_if_above_size(log_file, size_kb=1000)
     logging.basicConfig(
-        filename=log_file,
-        level=logging.WARNING,
-        format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
+      filename=log_file,
+      level=logging.WARNING,
+      format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
     )
 
 
@@ -57,7 +57,7 @@ def execute_function_on_directory_files(dir, func, glob="**/*", args=(), kwargs=
         kwargs = {}
     state = []
     for file_path in Path(get_resolved_directory_path(dir)).resolve().glob(glob):
-        _tuple = (str(file_path),)
+        _tuple = (str(file_path), )
         result = func(*(_tuple + args), **kwargs)
         if result:
             state.append(result)
@@ -72,23 +72,22 @@ def get_resolved_directory_path(target_directory=None):
     return os.getcwd()
 
 
-def import_plugins_from_directory(plugins_init_file, existing_commands):
+def import_plugins_from_directory(init_file, commands):
     try:
-        spec = importlib.util.spec_from_file_location('plugins_modules', plugins_init_file)
+        spec = importlib.util.spec_from_file_location("plugins_modules", init_file)
         module = importlib.util.module_from_spec(spec)
         sys.modules[spec.name] = module
         spec.loader.exec_module(module)
-        import plugins_modules # type: ignore
-        from plugins_modules import __all__ as all_plugins_modules # type: ignore
 
-        for module in all_plugins_modules:
-            _module = getattr(plugins_modules, module)
-            if isinstance(_module, (click.core.Command, click.core.Group)):
-                existing_commands.add(_module)
+        plugins = getattr(module, "__all__", [])
+
+        for name in plugins:
+            obj = getattr(module, name)
+            if isinstance(obj, (click.Command, click.Group)):
+                commands.add(obj)
+
     except ImportError:
-        logging.warning(
-            f'{inspect.stack()[0][3]}; will skip loading plugin: {module}', exc_info=True
-        )
+        logging.warning("Failed to load plugin", exc_info=True)
 
 
 def is_directory(d):

{multitool-0.4.0 → multitool-0.6.0}/multitool/verbose.py

@@ -14,10 +14,10 @@ def verbose_callback(ctx, param, value):
 
 def common_verbose_options(func):
     func = click.option(
-        '-v',
-        '--verbose',
-        show_default='toggle verbose output',
-        count=True,
-        callback=verbose_callback,
+      '-v',
+      '--verbose',
+      show_default='toggle verbose output',
+      count=True,
+      callback=verbose_callback,
     )(func)
     return func

{multitool-0.4.0 → multitool-0.6.0}/multitool.egg-info/PKG-INFO

@@ -1,32 +1,30 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: multitool
-Version: 0.4.0
-Summary: General-purpose command-line interface with plugins support
-Home-page: https://github.com/mdelotavo/multitool
-Author: Matthew Delotavo
-Author-email: matthew.t.delotavo@gmail.com
-License: MIT
+Version: 0.6.0
+Summary: Quickly create and distribute command-line tools.
+Author-email: Matthew Delotavo <matthew.t.delotavo@gmail.com>
+License-Expression: MIT
+Project-URL: Homepage, https://github.com/mdelotavo/multitool
+Project-URL: Repository, https://github.com/mdelotavo/multitool
+Keywords: cli,tooling,automation
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3.7
 Requires-Python: >=3.7
+Description-Content-Type: text/x-rst
 License-File: LICENSE
+Requires-Dist: click>=8.1.3
+Requires-Dist: click-aliases>=1.0.1
+Requires-Dist: click-option-group>=0.5.5
+Requires-Dist: GitPython>=3.1.30
+Dynamic: license-file
 
 multitool
 =========
 
-Multitool is a general-purpose command-line interface with plugins support.
-
---------------------
-Why does this exist?
---------------------
-
-I built this tool so that I can quickly create and distribute command-line tools for consulting work and personal use.
-
-The plugins manager uses ``git`` to manage plugins installed from remote ``git`` repositories.
+Quickly create and distribute command-line tools with plugins.
 
 -----
 Usage
@@ -36,20 +34,14 @@ Usage
 
     Usage: multitool [OPTIONS] COMMAND [ARGS]...
 
-      Welcome to the Multitool command-line interface!
-
-      PyPI:   https://pypi.org/project/multitool/
-      GitHub: https://github.com/mdelotavo/multitool
+      Quickly create and distribute command-line tools.
 
     Options:
       -V, --version  Show the version and exit.
       -h, --help     Show this message and exit.
 
     Commands:
-      plugins  Simple plugins manager for distributing commands.
-
-.. ..
-    The plugins features are based off those found in the `apigeecli`_.
+      plugins  Plugins manager for distributing commands.
 
 ----------------
 Managing plugins
@@ -122,7 +114,7 @@ This will install and update plugins.
 Pruning
 ^^^^^^^
 
-If you specified the ``-a`` option when running ``multitool plugins configure`` then the removal of plugins will occur automatically.
+If you remove plugins from the config file or comment them out, and you then specified the ``-a`` option when running ``multitool plugins configure`` then the removal of plugins will occur automatically.
 Otherwise you can run::
 
      multitool plugins prune
@@ -146,6 +138,17 @@ In order for this to work, the plugin needs to have the ``Requires`` key in the
 
     pip3 install $(multitool plugins show -n PLUGIN_NAME --show-dependencies-only)
 
+^^^^^^^^^^^^^^^
+Troubleshooting
+^^^^^^^^^^^^^^^
+
+If you encounter issues with plugins or commands, you can find more detailed debug information and error messages in the log file:
+::
+
+    ~/.multitool/multitool.log
+
+Reviewing this file can help you diagnose installation problems, missing dependencies, or Git-related errors.
+
 .. ..
     ----------------------------
     Create a virtual environment
@@ -167,6 +170,5 @@ In order for this to work, the plugin needs to have the ``Requires`` key in the
         deactivate
 
 .. _`click`: https://click.palletsprojects.com/
-.. _`apigeecli`: https://pypi.org/project/apigeecli/
 .. _`multitool-plugins`: https://github.com/mdelotavo/multitool-plugins
 .. _`public plugins repository`: https://github.com/mdelotavo/multitool-plugins

{multitool-0.4.0 → multitool-0.6.0}/multitool.egg-info/SOURCES.txt

@@ -1,6 +1,6 @@
 LICENSE
 README.rst
-setup.py
+pyproject.toml
 multitool/__init__.py
 multitool/__main__.py
 multitool/cls.py

multitool-0.6.0/multitool.egg-info/requires.txt

@@ -0,0 +1,4 @@
+click>=8.1.3
+click-aliases>=1.0.1
+click-option-group>=0.5.5
+GitPython>=3.1.30

{multitool-0.4.0 → multitool-0.6.0}/multitool.egg-info/top_level.txt

@@ -1,2 +1 @@
 multitool
-tests

multitool-0.6.0/pyproject.toml

@@ -0,0 +1,45 @@
+[build-system]
+requires = ["setuptools>=61", "wheel"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "multitool"
+version = "0.6.0"
+description = "Quickly create and distribute command-line tools."
+readme = { file = "README.rst", content-type = "text/x-rst" }
+requires-python = ">=3.7"
+license = "MIT"
+
+authors = [
+  { name = "Matthew Delotavo", email = "matthew.t.delotavo@gmail.com" }
+]
+
+keywords = ["cli", "tooling", "automation"]
+
+classifiers = [
+  "Development Status :: 4 - Beta",
+  "Environment :: Console",
+  "Intended Audience :: Developers",
+  "Operating System :: OS Independent",
+  "Programming Language :: Python :: 3.7"
+]
+
+dependencies = [
+  "click>=8.1.3",
+  "click-aliases>=1.0.1",
+  "click-option-group>=0.5.5",
+  "GitPython>=3.1.30"
+]
+
+[project.urls]
+Homepage = "https://github.com/mdelotavo/multitool"
+Repository = "https://github.com/mdelotavo/multitool"
+
+[project.scripts]
+multitool = "multitool.__main__:main"
+
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.packages.find]
+include = ["multitool*"]

{multitool-0.4.0 → multitool-0.6.0}/tests/test_utils.py

@@ -5,6 +5,7 @@ from unittest.mock import patch
 
 from multitool.utils import show_message
 
+
 class TestUtils(TestCase):
 
     @patch('builtins.print')

multitool-0.4.0/multitool/console.py

@@ -1,23 +0,0 @@
-import builtins
-import sys
-
-
-def echo(
-    *message,
-    exit_status=None,
-    make_silent=False,
-    current_verbosity=0,
-    expected_verbosity=0,
-    line_ending="\n",
-    should_flush=False
-):
-    toggle_silent = builtins.MULTITOOL_TOGGLE_SILENT
-    toggle_verbose = builtins.MULTITOOL_TOGGLE_VERBOSE
-    if make_silent or toggle_silent:
-        if exit_status:
-            sys.exit(exit_status)
-        return
-    if current_verbosity or toggle_verbose >= expected_verbosity:
-        print(*message, end=line_ending, flush=should_flush)
-    if exit_status:
-        sys.exit(exit_status)

multitool-0.4.0/multitool/plugins/commands.py

@@ -1,229 +0,0 @@
-import configparser
-import os
-import shutil
-import stat
-import sys
-from os import path
-from pathlib import Path
-
-import click
-from click_option_group import MutuallyExclusiveOptionGroup, optgroup
-
-from multitool import (MULTITOOL_PLUGINS_CONFIG_FILE,
-                       MULTITOOL_PLUGINS_DIRECTORY, MULTITOOL_PLUGINS_PATH,
-                       console)
-from multitool.silent import common_silent_options
-from multitool.utils import (is_directory, is_regular_file, create_directory, read_file_content,
-                             execute_function_on_directory_files, create_empty_file)
-from multitool.verbose import common_verbose_options
-
-is_git_installed = False
-plugins_command_help = 'Simple plugins manager for distributing commands.'
-
-try:
-    from git import Repo
-
-    is_git_installed = True
-except ImportError:
-    plugins_command_help = '[Git not found! Please install Git first.] Simple plugins manager for distributing commands. This command requires Git to be installed.'
-
-
-def chmod_directory(directory, mode):
-    """
-    Recursively changes the permissions of a directory and its contents.
-
-    Reference: https://stackoverflow.com/a/58878271
-    
-    Args:
-        directory (str): Path to the directory.
-        mode (int): Permissions to be set (e.g., 0o0700).
-
-    """
-    for root, dirs, files in os.walk(directory):
-        for dir in dirs:
-            os.chmod(path.join(root, dir), mode)
-        for file in files:
-            os.chmod(path.join(root, file), mode)
-
-
-def clone_plugin_repositories(section="sources"):
-    initialize_MULTITOOL_plugins()
-    config = load_plugin_config()
-    if not config._sections:
-        return
-    sources = dict(config._sections[section])
-    for name, uri in sources.items():
-        dest = Path(MULTITOOL_PLUGINS_DIRECTORY) / name
-        if is_directory(dest):
-            continue
-        try:
-            console.echo(f"Installing {name}... ", line_ending="", should_flush=True)
-            Repo.clone_from(uri, dest)
-            console.echo("Done")
-        except Exception as e:
-            console.echo(e)
-
-
-def exit_quietly_if_git_not_installed():
-    if not is_git_installed:
-        sys.exit(0)
-
-
-def initialize_and_save_plugin_config():
-    initialize_MULTITOOL_plugins()
-    config = load_plugin_config()
-    if not config._sections:
-        return
-
-
-def initialize_MULTITOOL_plugins():
-    create_directory(MULTITOOL_PLUGINS_DIRECTORY)
-    create_empty_file(MULTITOOL_PLUGINS_PATH)
-    create_empty_file(MULTITOOL_PLUGINS_CONFIG_FILE)
-
-
-def load_plugin_config(config_file=MULTITOOL_PLUGINS_CONFIG_FILE):
-    config = configparser.ConfigParser(allow_no_value=True)
-    config.read(config_file)
-    return config
-
-
-def prune_unused_plugin_directories(section="sources"):
-    initialize_MULTITOOL_plugins()
-    config = load_plugin_config()
-    if not config._sections:
-        return
-    sources = dict(config._sections[section])
-
-    def _func(path):
-        if not is_directory(path):
-            return
-        name = Path(path).stem
-        if name in sources:
-            return
-        console.echo(f"Removing {name}... ", line_ending="", should_flush=True)
-        plugin_directory = Path(MULTITOOL_PLUGINS_DIRECTORY) / name
-        try:
-            chmod_directory(str(Path(plugin_directory) / ".git"), stat.S_IRWXU)
-            shutil.rmtree(plugin_directory)
-            console.echo("Done")
-        except Exception as e:
-            console.echo(e)
-
-    return execute_function_on_directory_files(MULTITOOL_PLUGINS_DIRECTORY, _func, glob="[!.][!__]*")
-
-
-def update_plugin_repositories():
-    def _func(path):
-        if not is_directory(path):
-            return
-        console.echo(f"Updating {Path(path).stem}... ", line_ending="", should_flush=True)
-        repo = Repo(path)
-        if repo.bare:
-            return
-        try:
-            repo.remotes["origin"].pull()
-            console.echo("Done")
-        except Exception as e:
-            console.echo(e)
-
-    return execute_function_on_directory_files(MULTITOOL_PLUGINS_DIRECTORY, _func, glob="[!.][!__]*")
-
-
-@click.group(help=plugins_command_help)
-def plugins():
-    pass
-
-
-@plugins.command(help="Edit config file manually.")
-@common_silent_options
-@common_verbose_options
-@click.option(
-    "-a/-A",
-    "--apply-changes/--no-apply-changes",
-    default=False,
-    help="Install plugins from new sources after exiting the editor.",
-    show_default=True,
-)
-def configure(silent, verbose, apply_changes):
-    exit_quietly_if_git_not_installed()
-    initialize_MULTITOOL_plugins()
-    click.edit(filename=MULTITOOL_PLUGINS_CONFIG_FILE)
-    if apply_changes:
-        clone_plugin_repositories()
-        prune_unused_plugin_directories()
-    else:
-        console.echo("\n  Run `apigee plugins update` to apply any changes,")
-        console.echo("    or rerun `apigee plugins configure` with `-a`")
-        console.echo("    to apply changes automatically.\n")
-
-
-@plugins.command(help="Update or install plugins.")
-@common_silent_options
-@common_verbose_options
-def update(silent, verbose, section="sources"):
-    exit_quietly_if_git_not_installed()
-    clone_plugin_repositories()
-    update_plugin_repositories()
-
-
-@plugins.command(help="Show plugins information.")
-@common_silent_options
-@common_verbose_options
-@click.option("-n", "--name", help="name of the plugins package")
-@optgroup.group(
-    "Filter options", cls=MutuallyExclusiveOptionGroup, help="The filter options"
-)
-@optgroup.option(
-    "--show-commit-only/--no-show-commit-only",
-    default=False,
-    help="only print latest Git commit log",
-)
-@optgroup.option(
-    "--show-dependencies-only/--no-show-dependencies-only",
-    default=False,
-    help="only print list of required packages",
-)
-def show(
-    silent,
-    verbose,
-    name,
-    section="sources",
-    show_commit_only=False,
-    show_dependencies_only=False,
-):
-    if not name:
-        config = load_plugin_config()
-        if not config._sections:
-            return
-        sources = dict(config._sections[section])
-        for name, uri in sources.items():
-            console.echo(f"{name}: {uri}")
-        return
-    plugins_info_file = Path(MULTITOOL_PLUGINS_DIRECTORY) / name / "apigee-cli.info"
-    if not is_regular_file(plugins_info_file):
-        return
-    plugins_info = read_file_content(plugins_info_file, type="json")
-    if show_commit_only:
-        exit_quietly_if_git_not_installed()
-        console.echo(
-            Repo(Path(MULTITOOL_PLUGINS_DIRECTORY) / name).git.log(
-                "--pretty=format:%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset",
-                "-1",
-            )
-        )
-        return
-    if show_dependencies_only:
-        if plugins_info.get("Requires"):
-            console.echo(plugins_info.get("Requires"))
-        return
-    for k, v in plugins_info.items():
-        console.echo(f"{k}: {v}")
-
-
-@plugins.command(help="Prune plugins with removed sources.")
-@common_silent_options
-@common_verbose_options
-def prune(silent, verbose, section="sources"):
-    exit_quietly_if_git_not_installed()
-    prune_unused_plugin_directories()

multitool-0.4.0/multitool.egg-info/requires.txt

@@ -1,11 +0,0 @@
-requests>=2.28.1
-click>=8.1.3
-click-aliases>=1.0.1
-click-option-group>=0.5.5
-colorama>=0.4.6
-pyotp>=2.8.0
-tqdm>=4.64.1
-tabulate>=0.9.0
-pyjwt>=2.6.0
-python-gnupg>=0.4.9
-gitpython>=3.1.30

multitool-0.4.0/setup.py

@@ -1,53 +0,0 @@
-import os
-
-from multitool import APP
-from multitool import __version__ as version
-from multitool import description
-
-readme = os.path.join(os.path.dirname(__file__), 'README.rst')
-long_description = open(readme).read()
-
-SETUP_ARGS = dict(
-    name=APP,
-    version=version,
-    description=(description),
-    long_description=long_description,
-    url='https://github.com/mdelotavo/multitool',
-    author='Matthew Delotavo',
-    author_email='matthew.t.delotavo@gmail.com',
-    license='MIT',
-    include_package_data=True,
-    classifiers=[
-        'Development Status :: 4 - Beta',
-        'Environment :: Console',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: MIT License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python :: 3.7',
-    ],
-    entry_points = {
-        'console_scripts': [
-            'multitool=multitool.__main__:main'
-        ]
-    },
-    install_requires = [
-        'requests>=2.28.1',
-        'click>=8.1.3',
-        'click-aliases>=1.0.1',
-        'click-option-group>=0.5.5',
-        'colorama>=0.4.6',
-        'pyotp>=2.8.0',
-        'tqdm>=4.64.1',
-        'tabulate>=0.9.0',
-        'pyjwt>=2.6.0',
-        'python-gnupg>=0.4.9',
-        'gitpython>=3.1.30'
-    ],
-    python_requires=">=3.7",
-)
-
-if __name__ == '__main__':
-    from setuptools import setup, find_packages
-
-    SETUP_ARGS['packages'] = find_packages()
-    setup(**SETUP_ARGS)