skilleter-thingy 0.2.6__py3-none-any.whl → 0.2.8__py3-none-any.whl

skilleter_thingy/thingy/process.py

@@ -1,111 +1,32 @@
 #! /usr/bin/env python3
 
 ################################################################################
-""" Basic subprocess handling - simplified API to the Python subprocess module
-
-    Copyright (C) 2017-18 John Skilleter
-
-    Licence: GPL v3 or later
+""" Legacy compatibility module for process.py API.
+    This module provides backward compatibility for existing code that used
+    the original process.py module. The actual implementation has been moved
+    to thingy.run with enhanced capabilities.
 """
 ################################################################################
 
-import subprocess
-import sys
-import logging
-
-################################################################################
-
-class RunError(Exception):
-    """ Run exception """
-
-    def __init__(self, msg, status=1):
-        super(RunError, self).__init__(msg)
-        self.msg = msg
-        self.status = status
-
-################################################################################
+from thingy.run import run_process, RunError
 
+# Provide the same API as the original process.py
 def run(command, foreground=False, shell=False):
-    """ Run the specified command and return the output.
-        command - the command to run as an array of command+arguments
-        foreground - set to True to run the command in the foreground, using stdin/err/out
-        shell - set to True to run the command inside a shell (allows the command to be specified
-                as a string, but needs spaces to bew quoted
-        Returns an empty array if foreground is True or an array of the output otherwise. """
-
-    # TODO: for background use subprocess.Popen but use devnull = open('/dev/null', 'w') for stdio and return proc instead of communicating with it?
-
-    logging.info('Running "%s"', ' '.join(command))
-
-    # If running in the foreground, run the command and either return an empty value
-    # on success (output is to the console) or raise a RunError
-
-    if foreground:
-        try:
-            if shell:
-                # TODO: Handle command lines with parameters containing spaces
-                command = ' '.join(command)
-
-            status = subprocess.run(command, shell=shell).returncode
-            if status:
-                raise RunError('Error %d' % status, status)
-            else:
-                return []
-        except OSError as exc:
-            raise RunError(exc)
-    else:
-        # Run the command and capture stdout and stderr
-
-        try:
-            proc = subprocess.run(command, stderr=subprocess.PIPE, stdout=subprocess.PIPE, universal_newlines=True)
-        except OSError as exc:
-            raise RunError(exc)
-
-        logging.info('Stdout: %s', proc.stdout)
-        logging.info('Stderr: %s', proc.stderr)
-
-        # If it returned an error raise a RunError exception with the stdout text as the
-        # exception message
-
-        if proc.returncode:
-            raise RunError(proc.stderr)
-
-        # Otherwise return the stdout data or nothing
-
-        if proc.stdout:
-            output = proc.stdout.split('\n')
-        else:
-            output = []
-
-        # Remove trailing blank lines from the output
-
-        while output and output[-1] == '':
-            output = output[:-1]
-
-        logging.info('Output: %s', output)
-        return output
-
-################################################################################
-
-if __name__ == '__main__':
-    logging.basicConfig(level=logging.INFO)
-
-    print('Run ls -l:')
-
-    cmd_output = run(['ls', '-l'])
+    """
+    Run a command with the original process.py API.
 
-    for o in cmd_output:
-        print(o)
+    Args:
+        command: Command to run (string or list)
+        foreground: If True, run in foreground with output to console
+        shell: Whether to use shell for execution
 
-    print('Run wombat (should fail):')
-    try:
-        run(['wombat'])
-    except RunError as exc:
-        print('Failed with error: %s' % exc.msg)
+    Returns:
+        List of output lines (empty if foreground=True)
 
-    if sys.stdout.isatty():
-        print('Run vi in the foreground')
+    Raises:
+        RunError: If command fails
+    """
+    return run_process(command, foreground=foreground, shell=shell)
 
-        run(['vi'], foreground=True)
-    else:
-        print('Not testing call to run() with foreground=True as stdout is not a TTY')
+# Re-export RunError for compatibility
+__all__ = ['run', 'RunError']

skilleter_thingy/thingy/run.py

@@ -288,6 +288,49 @@ def status(command, shell=False, output=False):
                    shell=shell,
                    exception=False)['status']
 
+################################################################################
+# Legacy compatibility layer for process.py API
+
+def run_process(command, foreground=False, shell=False):
+    """
+    Legacy compatibility function for process.py API.
+
+    Args:
+        command: Command to run (string or list)
+        foreground: If True, run in foreground with output to console
+        shell: Whether to use shell for execution
+
+    Returns:
+        List of output lines (empty if foreground=True)
+
+    Raises:
+        RunError: If command fails
+    """
+    if foreground:
+        # For foreground mode, output directly to console
+        try:
+            status_result = status(command, shell=shell, output=True)
+            if status_result != 0:
+                raise RunError(f"Command failed with return code {status_result}")
+            return []  # process.py returns empty list for foreground mode
+        except Exception as e:
+            if isinstance(e, RunError):
+                raise
+            raise RunError(f"Command failed: {str(e)}")
+    else:
+        # For background mode, capture and return output
+        try:
+            result = run(command, shell=shell, exception=True)
+            if isinstance(result, list):
+                return [line.rstrip() for line in result if line.strip()]
+            elif isinstance(result, str):
+                return [line.rstrip() for line in result.splitlines() if line.strip()]
+            return []
+        except Exception as e:
+            if isinstance(e, RunError):
+                raise
+            raise RunError(f"Command failed: {str(e)}")
+
 ################################################################################
 
 if __name__ == '__main__':

skilleter_thingy/thingy/venv_template.py

@@ -1,5 +1,5 @@
 TEMPLATE = \
-"""#!/usr/bin/env bash
+r"""#!/usr/bin/env bash
 
 set -e
 

skilleter_thingy/trimpath.py

@@ -73,7 +73,7 @@ def trimpath():
         sys.exit(1)
     except BrokenPipeError:
         sys.exit(2)
-    except:
+    except Exception:
         sys.exit(3)
 
 ################################################################################

{skilleter_thingy-0.2.6.dist-info → skilleter_thingy-0.2.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.2.6
+Version: 0.2.8
 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

skilleter_thingy-0.2.8.dist-info/RECORD

@@ -0,0 +1,59 @@
+skilleter_thingy/__init__.py,sha256=rVPTxm8L5w52U0YdTd7r_D44SBP7pS3JCJtsf0iIsow,110
+skilleter_thingy/addpath.py,sha256=4Yhhgjjz1XDI98j0dAiQpNA2ejLefeWUTeSg3nIXQq0,3842
+skilleter_thingy/console_colours.py,sha256=BOS9mo3jChx_FE8L1j488MDoVNgib11KjTRhrz_YRYE,1781
+skilleter_thingy/docker_purge.py,sha256=PRQ7EBXymjYIHuJL4pk4r6KNn09IF28OGZ0ln57xtNg,3314
+skilleter_thingy/ffind.py,sha256=rEgotUaMj9JxDCwz-7H5vdqxH_bXllaHqttwsOUGKj8,19235
+skilleter_thingy/ggit.py,sha256=BL-DhNcz4Nd3sA-3Kl6gZ-zFtbNqOpyufvas-0aD8nk,2465
+skilleter_thingy/ggrep.py,sha256=fnTzOI1Qbf7IY_TnStdx5uqeUhqSDkapxmhYgrONJHw,5887
+skilleter_thingy/git_br.py,sha256=QdFU5HPLoV4YKX0bVLX_j_6Kv00TDenU6o3_ufbQAq8,6004
+skilleter_thingy/git_ca.py,sha256=nkbxPS0BZQ8WXsiqf7dbcUyKXus6Bz4MSJ5olCWNUQQ,5168
+skilleter_thingy/git_cleanup.py,sha256=22wrUNzd4BH3gi2ZL_rdw1vrPUNkJFb0pFFu_tuzhKs,10542
+skilleter_thingy/git_co.py,sha256=Mc-6jEUpVWAJJ-2PTpQ4tjDw03_zJMJDX9SGIxCqzJQ,8404
+skilleter_thingy/git_common.py,sha256=FKXB6aT-y_a3N6wFnnwM6qJi4ClLFvDAivkSQ4iEYP4,2111
+skilleter_thingy/git_hold.py,sha256=coyHdl1bWivrWdmgs7smVPvHRNoXgsgmUjR6n-08lV4,4920
+skilleter_thingy/git_mr.py,sha256=MsrAkIKW27fVTljV__zAjMveIpufvDQ_j0jeKJu2rZM,3426
+skilleter_thingy/git_parent.py,sha256=VqP4v3zsWp6utJvxFxSB_GwCv82xNIiiBlAlkinO1Wk,2938
+skilleter_thingy/git_retag.py,sha256=JT-yD-uU4dL0mxDq9IRynugUKqIxjMCdU1dYDjiBSTU,1828
+skilleter_thingy/git_review.py,sha256=Z_e0wyQJ2AzOSy5cPI3jmAWystpJbHH4ygENjFagepo,52576
+skilleter_thingy/git_update.py,sha256=Z3p3E33ZJ2DVa107UzaFR9V8LXADRuHjJL8TX3IhEa4,14348
+skilleter_thingy/git_wt.py,sha256=tkGN_Bfz80icHNDVG8xuXVeUUR-xyZ3u8jopLRt1Ff4,2355
+skilleter_thingy/gitcmp_helper.py,sha256=MlRimPj-S-ov44ETUvocRvfygs3cArP6WdSJCIJWNCs,11347
+skilleter_thingy/gitprompt.py,sha256=SzSMd0EGI7ftPko80Q2PipwbVA-qjU1jsmdpmTCM5GI,8912
+skilleter_thingy/gl.py,sha256=9zbGpKxw6lX9RghLkdy-Q5sZlqtbB3uGFO04qTu1dH8,5954
+skilleter_thingy/linecount.py,sha256=ehTN6VD76i4U5k6dXuYoiqSRHI67_BP-bziklNAJSKY,4309
+skilleter_thingy/multigit.py,sha256=FDB4MwsCE0DNbRsUXXxVIsFkVrRtFRlljwyy0Q72kYs,34914
+skilleter_thingy/py_audit.py,sha256=4CAdqBAIIVcpTCn_7dGm56bdfGpUtUJofqTGZomClkY,4417
+skilleter_thingy/readable.py,sha256=LcMMOiuzf9j5TsxcMbO0sbj6m1QCuABl91Hrv-YyIww,15422
+skilleter_thingy/remdir.py,sha256=Ueg3a6_m7y50zWykhKk6pcuz4FKPjoLJVPo9gh_dsic,4653
+skilleter_thingy/rmdupe.py,sha256=RWtOHq__zY4yOf6_Y-H-8RRJy31Sr3c8DEyTd6Y4oV4,17213
+skilleter_thingy/rpylint.py,sha256=uAQRvscsW5x85P4COXE6HWk4XykBkRmGowAdViDkwi4,2601
+skilleter_thingy/strreplace.py,sha256=zMhqC38KF0BddTsRM5Pa99HU3KXvxXg942qxRK-LALA,2539
+skilleter_thingy/tfm.py,sha256=xMsqcuNJ32PwKF5vO3SO6etlbJKbCLUJhSdC2w0clwE,33829
+skilleter_thingy/tfparse.py,sha256=rRoinnbq6sLfkT38yzzXi2jQuJgBIJoC--G05TVTDIc,2991
+skilleter_thingy/trimpath.py,sha256=ijLowl-rxV53m0G75tGNuHWobObz5NreBy8yXP9l4eY,2373
+skilleter_thingy/venv_create.py,sha256=EV_oZh3JlDc5hX5h9T1hnt65AEABw6PufaKvPYabR00,1159
+skilleter_thingy/xchmod.py,sha256=T89xiH_po0nvH5T1AGgQOD5yhjKd9-LcHcmez3IORww,4604
+skilleter_thingy/yamlcheck.py,sha256=FXylZ5NtHirDlPVhVEUZUZkTugVR-g51BbjaN06akAc,2868
+skilleter_thingy/thingy/__init__.py,sha256=rVPTxm8L5w52U0YdTd7r_D44SBP7pS3JCJtsf0iIsow,110
+skilleter_thingy/thingy/colour.py,sha256=mxHDpbUYad6xDsOKWco7CL0Nk3J5VKV_IZ3T5VjXwOI,7978
+skilleter_thingy/thingy/dc_curses.py,sha256=fuuQPR11zV_akAhygL_cAhVLC5YAgKgowzlITVbETE8,8539
+skilleter_thingy/thingy/dc_defaults.py,sha256=ahcteQvoWZrO5iTU68zkIY1Zex6iX5uR5ubwI4CCYBk,6170
+skilleter_thingy/thingy/dc_util.py,sha256=Df73imXhHx3HzcPHiRcHAoea0e3HURdLcrolUsMhOFs,1783
+skilleter_thingy/thingy/dircolors.py,sha256=aBcq9ci855GSOIjrZWm8kG0ksCodvUmc4FlIOEOyBcA,12292
+skilleter_thingy/thingy/docker.py,sha256=zFgLLGAmqGsBdy9SWhl6BVkPyng9vZygPe7dJylkTEc,2533
+skilleter_thingy/thingy/files.py,sha256=jNnLpkhfmZ3W2uqdQvt-zI27FSwBLBERwAbsVeQ2TTs,4708
+skilleter_thingy/thingy/git.py,sha256=XvP3vfNCgFEpmomdNwzs0Eu7aVKz1umzXre5WJGx2qQ,42753
+skilleter_thingy/thingy/gitlab.py,sha256=uXAF918xnPk6qQyiwPQDbMZfqtJzhiRqDS7yEtJEIAg,6079
+skilleter_thingy/thingy/path.py,sha256=8uM2Q9zFRWv_SaVOX49PeecQXttl7J6lsmBuRXWsXKY,4732
+skilleter_thingy/thingy/popup.py,sha256=hNfA9yh4jCv2su8XK33udcTWwgf98noBdYRRkFX1mxc,2517
+skilleter_thingy/thingy/process.py,sha256=R8JXKaxJJ6rgnSdJYJIsJ7Ox2e-5nPV1EJ0sjGZGxec,1092
+skilleter_thingy/thingy/run.py,sha256=mqafCzW9op_xKCt8OY3jJ6YltmoOJGh44vzl667mwws,14196
+skilleter_thingy/thingy/tfm_pane.py,sha256=XTTpSm71CyQyGmlVLuCthioOwech0jhUiFUXb-chS_Q,19792
+skilleter_thingy/thingy/tidy.py,sha256=AQ2RawsZJg6WHrgayi_ZptFL9occ7suSdCHbU3P-cys,5971
+skilleter_thingy/thingy/venv_template.py,sha256=ZfUvi8qFNGrk7J030Zy57xjwMtfIArJyqa-MqafyjVk,1016
+skilleter_thingy-0.2.8.dist-info/licenses/LICENSE,sha256=ljOS4DjXvqEo5VzGfdaRwgRZPbNScGBmfwyC8PChvmQ,32422
+skilleter_thingy-0.2.8.dist-info/METADATA,sha256=KO5mUx8lFuo9HCvU6_7mh8ojr7FRv8mZOjwht8RU1FQ,28913
+skilleter_thingy-0.2.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+skilleter_thingy-0.2.8.dist-info/entry_points.txt,sha256=MTNWf8jOx8Fy3tSwVLCZPlEyzlDF36odw-IN-cSefP8,1784
+skilleter_thingy-0.2.8.dist-info/top_level.txt,sha256=8-JhgToBBiWURunmvfpSxEvNkDHQQ7r25-aBXtZv61g,17
+skilleter_thingy-0.2.8.dist-info/RECORD,,