skilleter-thingy 0.1.25__tar.gz → 0.1.26__tar.gz

{skilleter_thingy-0.1.25 → skilleter_thingy-0.1.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.1.25
+Version: 0.1.26
 Summary: A collection of useful utilities, mainly aimed at making Git more friendly
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk
@@ -118,6 +118,8 @@ Multigit supports a small list of subcommands, each of which are prefixed with a
 
 `+untag TAG` - Remove the tag from the specified working trees (do nothing if the tag is not applied in the first place).
 
+`+run COMMAND` - Run the specified command in each of the specified working trees
+
 Any command *not* prefixed with `+` is run in each of the working trees (filtered by the various multigit options) as a git command.
 
 For example; `multigit -m commit -ab` would run `git commit -a` in each of the working trees that is branched and contains modified files.

{skilleter_thingy-0.1.25 → skilleter_thingy-0.1.26}/README.md

@@ -95,6 +95,8 @@ Multigit supports a small list of subcommands, each of which are prefixed with a
 
 `+untag TAG` - Remove the tag from the specified working trees (do nothing if the tag is not applied in the first place).
 
+`+run COMMAND` - Run the specified command in each of the specified working trees
+
 Any command *not* prefixed with `+` is run in each of the working trees (filtered by the various multigit options) as a git command.
 
 For example; `multigit -m commit -ab` would run `git commit -a` in each of the working trees that is branched and contains modified files.

{skilleter_thingy-0.1.25 → skilleter_thingy-0.1.26}/pyproject.toml

@@ -7,7 +7,7 @@ name = "skilleter_thingy"
 
 # Version must be incremented to install updated Thingy
 
-version = "0.1.25"
+version = "0.1.26"
 
 authors = [
     {name="John Skilleter", email="john@skilleter.org.uk"},

{skilleter_thingy-0.1.25 → skilleter_thingy-0.1.26}/skilleter_thingy/multigit.py

@@ -6,6 +6,7 @@ import os
 import sys
 import fnmatch
 import configparser
+import subprocess
 
 from dataclasses import dataclass, field
 
@@ -66,7 +67,7 @@ DEFAULT_BRANCH = 'DEFAULT'
 # commands are parameters so we have to manually create the help and parse the command line
 
 HELP_INFO = """usage: multigit [--help|-h] [--verbose|-v] [--quiet|-q] [--config|-c CONFIG] [--repos|-r REPOS] [--modified|-m] [--branched|-b] [--sub|-s] [--tag|-t TAGS] [--continue|-o] [--path|-C PATH]
-                {+clone, +init, +config, +dir, +list, GIT_COMMAND} ...
+                {+clone, +init, +config, +dir, +list, +run, GIT_COMMAND} ...
 
 Run git commands in multiple Git repos. DISCLAIMER: This is beta-quality software, with missing features and liable to fail with a stack trace, but shouldn't eat your data
 
@@ -86,7 +87,7 @@ options:
   --path, -C PATH       Run as if the command was started in PATH instead of the current working directory
 
 Sub-commands:
-  {+clone, +init, +dir, +config, +list, GIT_COMMAND}
+  {+clone, +init, +dir, +config, +list, +run, GIT_COMMAND}
     +clone REPO {BRANCH} Clone a repo containing a multigit configuration file, then clone all the child repos and check out the default branch in each
     +init                Build or update the configuration file using the current branch in each repo as the default branch
     +config              Return the name and location of the configuration file
@@ -94,6 +95,7 @@ Sub-commands:
     +list                Return a list of the top level directories of each of the Git repos
     +tag TAG             Apply a configuration tag to repos filtered by the command line options (list configuration tags if no parameter specified)
     +untag TAG           Remove a configuration tag to repos filtered by the command line options
+    +run COMMAND         Run the specified command in repos filtered by the command line options
     GIT_COMMAND          Any git command, including options and parameters - this is then run in all specified working trees
 
 """
@@ -421,7 +423,8 @@ def mg_init(args, config, console):
             else:
                 config[repo]['repo name'] = os.path.basename(repo)
 
-            colour.write(f'Added [BLUE:{repo}] with default branch [BLUE:{default_branch}]')
+            if not args.quiet:
+                colour.write(f'Added [BLUE:{repo}] with default branch [BLUE:{default_branch}]')
 
     if not args.quiet:
         colour.write(cleareol=True)
@@ -571,12 +574,43 @@ def mg_list(args, config, console):
 
 ################################################################################
 
-def run_git_command(args, config, console):
+def mg_run(args, config, console):
     """Run a command in each of the working trees, optionally continuing if
        there's an error"""
 
     _ = console
 
+    if not args.parameters:
+        colour.error('[BOLD:+run] command - missing parameter(s)')
+
+    # Run the command in each of the working trees
+
+    for repo in select_git_repos(args, config):
+        if not args.quiet:
+            colour.write(f'\n[BLUE:{os.path.relpath(repo.name)}]\n')
+
+        repo_path = absolute_repo_path(args, repo.name)
+
+        try:
+            status = subprocess.run(args.parameters, cwd=repo_path)
+        except FileNotFoundError:
+            err_msg = f'"[BLUE:{args.parameters[0]}]" - Command not found'
+            if args.error_continue:                
+                colour.write(f'[RED:WARNING]: {err_msg}')
+            else:
+                colour.error(f'[RED:ERROR]: {err_msg}')
+        else:
+            if status.returncode and not args.error_continue:
+                sys.exit(status)
+
+################################################################################
+
+def run_git_command(args, config, console):
+    """Run a Git command in each of the working trees, optionally continuing if
+       there's an error"""
+
+    _ = console
+
     for repo in select_git_repos(args, config):
         repo_command = [args.command]
 
@@ -585,9 +619,10 @@ def run_git_command(args, config, console):
         for cmd in args.parameters:
             repo_command.append(branch_name(cmd, repo['default branch']))
 
-        colour.write(f'\n[BLUE:{os.path.relpath(repo.name)}]\n')
+        if not args.quiet:
+            colour.write(f'\n[BLUE:{os.path.relpath(repo.name)}]\n')
 
-        # Run the command in the workng tree
+        # Run the command in the working tree
 
         repo_path = absolute_repo_path(args, repo.name)
 
@@ -680,11 +715,12 @@ def parse_command_line():
                     colour.error('The "[BOLD:--path]" option takes a path parameter')
 
                 try:
-                    os.chdir(arg_list.pop(0))
+                    workingdir = arg_list.pop(0)
+                    os.chdir(workingdir)
                 except IndexError:
                     colour.error('The "[BOLD:-C]" option takes a path parameter', prefix=True)
                 except FileNotFoundError:
-                    colour.error('"[BOLD:--path]" - path not found', prefix=True)
+                    colour.error(f'"[BOLD:--path]" - path "[BLUE:{workingdir}]" not found', prefix=True)
 
             elif option in ('help', 'h'):
                 colour.write(HELP_INFO)
@@ -729,6 +765,7 @@ COMMANDS = {
     'tag': mg_tag,
     'untag': mg_untag,
     'list': mg_list,
+    'run': mg_run,
 }
 
 def main():

{skilleter_thingy-0.1.25 → skilleter_thingy-0.1.26}/skilleter_thingy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.1.25
+Version: 0.1.26
 Summary: A collection of useful utilities, mainly aimed at making Git more friendly
 Author-email: John Skilleter <john@skilleter.org.uk>
 Project-URL: Home, https://skilleter.org.uk
@@ -118,6 +118,8 @@ Multigit supports a small list of subcommands, each of which are prefixed with a
 
 `+untag TAG` - Remove the tag from the specified working trees (do nothing if the tag is not applied in the first place).
 
+`+run COMMAND` - Run the specified command in each of the specified working trees
+
 Any command *not* prefixed with `+` is run in each of the working trees (filtered by the various multigit options) as a git command.
 
 For example; `multigit -m commit -ab` would run `git commit -a` in each of the working trees that is branched and contains modified files.