skilleter-thingy 0.1.18__tar.gz → 0.1.19__tar.gz

{skilleter_thingy-0.1.18 → skilleter_thingy-0.1.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: skilleter_thingy
-Version: 0.1.18
+Version: 0.1.19
 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.1.18 → skilleter_thingy-0.1.19}/pyproject.toml

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

{skilleter_thingy-0.1.18 → skilleter_thingy-0.1.19}/skilleter_thingy/ffind.py

@@ -380,10 +380,10 @@ def validate_arguments(args):
 
     if args.git:
         if git.working_tree() is None:
-            colour.error('[RED:ERROR]: The current directory is not inside a git working tree')
+            colour.error('The current directory is not inside a git working tree', prefix=True)
 
         if args.dir:
-            colour.error('[RED:ERROR]: Git does not track directories, so you cannot search for them in a git working tree')
+            colour.error('Git does not track directories, so you cannot search for them in a git working tree', prefix=True)
 
     if args.verbose:
         print(f'Searching directory "{args.path}" for matches with "{args.patterns}"')

{skilleter_thingy-0.1.18 → skilleter_thingy-0.1.19}/skilleter_thingy/ggit.py

@@ -55,7 +55,7 @@ def main():
     try:
         os.chdir(args.path)
     except FileNotFoundError:
-        colour.error(f'[RED:ERROR]: Invalid path [BLUE:{args.path}]')
+        colour.error(f'Invalid path [BLUE:{args.path}]', prefix=True)
 
     # If the current directory is in a working tree and below the top-level
     # directory then we run the git command here as well as in subdirectories

{skilleter_thingy-0.1.18 → skilleter_thingy-0.1.19}/skilleter_thingy/git_br.py

@@ -39,7 +39,7 @@ def parse_command_line():
     args = parser.parse_args()
 
     if args.delete and not args.branches:
-        colour.error('[RED:ERROR]: You must specify the branches to delete')
+        colour.error('You must specify the branches to delete', prefix=True)
 
     return args
 
@@ -172,7 +172,7 @@ def git_br():
     except BrokenPipeError:
         sys.exit(2)
     except git.GitError as exc:
-        colour.error(f'[RED:ERROR]: {exc.msg}', status=exc.status)
+        colour.error(exc.msg, status=exc.status, prefix=True)
 
 ################################################################################
 

{skilleter_thingy-0.1.18 → skilleter_thingy-0.1.19}/skilleter_thingy/git_common.py

@@ -27,12 +27,12 @@ def main():
     args = parser.parse_args()
 
     if args.long and args.short:
-        colour.error('[RED:ERROR]: The [BLUE:--long] and [BLUE:--short] options cannot be used together')
+        colour.error('The [BLUE:--long] and [BLUE:--short] options cannot be used together', prefix=True)
 
     try:
         ancestor = git.find_common_ancestor(args.commit1, args.commit2)
     except git.GitError as exc:
-        colour.error(f'[RED:ERROR]: {exc}', status=exc.status)
+        colour.error(exc, status=exc.status, prefix=True)
 
     if args.short:
         print(ancestor)

{skilleter_thingy-0.1.18 → skilleter_thingy-0.1.19}/skilleter_thingy/git_hold.py

@@ -48,13 +48,13 @@ def archive_branches(branches):
 
     for branch in branches:
         if not git.isbranch(branch):
-            colour.error(f'[RED:ERROR:] Branch {branch} does not exist')
+            colour.error(f'Branch {branch} does not exist', prefix=True)
 
         if archive_tag_name(branch) in tags:
-            colour.error(f'[RED:ERROR:] An archive tag already exists for branch {branch}')
+            colour.error(f'An archive tag already exists for branch {branch}', prefix=True)
 
         if branch == current_branch:
-            colour.error('[RED:ERROR:] Cannot archive the current branch')
+            colour.error('Cannot archive the current branch', prefix=True)
 
     for branch in branches:
         tag_name = archive_tag_name(branch)
@@ -96,7 +96,7 @@ def restore_archive_branches(branches):
 
     for branch in branches:
         if archive_tag_name(branch) not in tags:
-            colour.error(f'[RED:ERROR:] Archive branch {branch} does not exist')
+            colour.error(f'Archive branch {branch} does not exist', prefix=True)
 
     archive_tag_names = []
 
@@ -123,10 +123,10 @@ def main():
     args = parser.parse_args()
 
     if args.list and args.restore:
-        colour.error('[RED:ERROR:] The list and restore options cannot be specified together')
+        colour.error('The list and restore options cannot be specified together', prefix=True)
 
     if not args.branches and not args.list:
-        colour.error('[RED:ERROR:] No branches specified')
+        colour.error('No branches specified', prefix=True)
 
     if args.list:
         list_archive_branches(args.branches)

{skilleter_thingy-0.1.18 → skilleter_thingy-0.1.19}/skilleter_thingy/git_parent.py

@@ -48,7 +48,7 @@ def main():
                         parents.append(more)
 
     except git.GitError as exc:
-        colour.error(f'[RED:ERROR:] {exc.msg}', status=exc.status)
+        colour.error(exc.msg, status=exc.status, prefix=True)
 
     if parents:
         if args.verbose:
@@ -59,7 +59,7 @@ def main():
         else:
             print(', '.join(parents))
     else:
-        colour.error('[RED:Could not determine parent branch]\n')
+        colour.error('Could not determine parent branch\n', prefix=True)
 
 ################################################################################
 

{skilleter_thingy-0.1.18 → skilleter_thingy-0.1.19}/skilleter_thingy/git_review.py

@@ -228,7 +228,11 @@ class GitReview():
 
         # Move to the top-level directory in the working tree
 
-        self.current_dir = os.getcwd()
+        try:
+            self.current_dir = os.getcwd()
+        except FileNotFoundError:
+            raise GitReviewError('Unable to locate current directory')
+
         self.working_tree_dir = git.working_tree()
 
         if not self.working_tree_dir:
@@ -1309,13 +1313,13 @@ def parse_command_line():
     # Make sure that we're actually in a git working tree
 
     if not git.working_tree():
-        colour.error('[RED:ERROR] Not a git repository')
+        colour.error('Not a git repository', prefix=True)
 
     # -C/--change is shorthand for '--commit HEAD^'
 
     if args.change:
         if args.commits:
-            colour.error('[RED:ERROR] The -C/--change option does not take parameters')
+            colour.error('The -C/--change option does not take parameters', prefix=True)
 
         args.commits = ['HEAD^']
 
@@ -1345,7 +1349,7 @@ def parse_command_line():
                     paths.append(entry)
                     parsing_commits = False
                 else:
-                    colour.error(f'[RED:ERROR] Invalid path/commit: {entry}')
+                    colour.error(f'Invalid path/commit: {entry}', prefix=True)
 
         args.commits = commits
         args.paths = paths
@@ -1353,13 +1357,13 @@ def parse_command_line():
     # Validate the commits & paths
 
     if len(args.commits) > 2:
-        colour.error('[RED:ERROR]: No more than 2 commits can be specified')
+        colour.error('No more than 2 commits can be specified', prefix=True)
 
     if (args.branch or args.commit) and args.commits:
-        colour.error('[RED:ERROR]: Additional commits should not be specified in conjunction with the -b/--branch option')
+        colour.error('Additional commits should not be specified in conjunction with the -b/--branch option', prefix=True)
 
     if args.commit and args.branch:
-        colour.error('[RED:ERROR]: The -c/--commit and -b/--branch options are mutually exclusive')
+        colour.error('The -c/--commit and -b/--branch options are mutually exclusive', prefix=True)
 
     # If the -c/--commit option is used, then review against its parent
     # If the -b/--branch option is used, then review against the oldest common ancestor
@@ -1369,7 +1373,7 @@ def parse_command_line():
         try:
             args.commits = [git.find_common_ancestor('HEAD', args.branch)]
         except git.GitError as exc:
-            colour.error(f'[ERROR]: {exc}', status=exc.status)
+            colour.error(exc, status=exc.status, prefix=True)
 
     elif args.commit:
         args.commits = ['%s^' % args.commit, args.commit]
@@ -1387,9 +1391,9 @@ def parse_command_line():
             if len(matches) == 1:
                 args.commits[i] = matches[0]
             else:
-                colour.error(f'[RED:ERROR]: Multiple commits match {entry}')
+                colour.error(f'Multiple commits match {entry}', prefix=True)
         else:
-            colour.error(f'[RED:ERROR] {entry} is not a valid commit ID')
+            colour.error(f'{entry} is not a valid commit ID', prefix=True)
 
     # Things work easier if we always have two commits to compare
 

{skilleter_thingy-0.1.18 → skilleter_thingy-0.1.19}/skilleter_thingy/git_wt.py

@@ -26,15 +26,15 @@ def main():
     parser = argparse.ArgumentParser(description='Report top-level directory of the current git working tree.')
     parser.add_argument('--parent', '-p', action='store_true',
                         help='If we are already at the top of the working tree, check if the parent directory is in a working tree and output the top-level directory of that tree.')
-    parser.add_argument('--dir', '-d', action='store', default=os.getcwd(),
+    parser.add_argument('--dir', '-d', action='store', default=None,
                         help='Find the location of the top-level directory in the working tree starting at the specified directory')
 
     args = parser.parse_args()
 
-    start_dir = os.path.abspath(args.dir)
-
-    if not os.path.isdir(start_dir):
-        sys.stderr.write(f'Unable to locate directory {args.dir}\n')
+    try:
+        start_dir = os.path.abspath(args.dir or os.getcwd())
+    except FileNotFoundError:
+        sys.stderr.write('Unable to determine initial directory\n')
         sys.exit(1)
 
     # Search for a .git directory in the current or parent directories

{skilleter_thingy-0.1.18 → skilleter_thingy-0.1.19}/skilleter_thingy/gitcmp_helper.py

@@ -169,7 +169,12 @@ def main():
 
     # Determine the best way of reporting the path to the file
 
-    working_tree_path = os.getcwd()
+    try:
+        working_tree_path = os.getcwd()
+    except FileNotFoundError:
+        sys.stderr.write('Unable to get current working directory')
+        sys.exit(2)
+
     current_path = os.path.join(working_tree_path, os.getenv('GIT_SUBDIR', ''))
 
     current_file_path = os.path.relpath(args.file_path if args.new_name is None else args.new_name, current_path)

{skilleter_thingy-0.1.18 → skilleter_thingy-0.1.19}/skilleter_thingy/gphotosync.py

@@ -94,7 +94,7 @@ def parse_yyyymm(datestr):
     date_match = YYYY_MM_re.fullmatch(datestr)
 
     if not date_match:
-        colour.error(f'ERROR: Invalid date: {datestr}')
+        colour.error(f'Invalid date: {datestr}', prefix=True)
 
     return datetime.date(int(date_match.group(1)), int(date_match.group(2)), day=1)
 
@@ -387,9 +387,9 @@ def update_cache(args, year, month):
 
             subprocess.run(cmd, check=True)
         except subprocess.CalledProcessError:
-            colour.error(f'[RED:ERROR]: Failed to sync Google photos for month [BLUE:{month}] of year [BLUE:{year}]')
+            colour.error(f'Failed to sync Google photos for month [BLUE:{month}] of year [BLUE:{year}]', prefix=True)
         except FileNotFoundError as exc:
-            colour.error('f[RED:ERROR]: {exc}')
+            colour.error(exc, prefix=True)
 
 ################################################################################
 

{skilleter_thingy-0.1.18 → skilleter_thingy-0.1.19}/skilleter_thingy/localphotosync.py

@@ -73,7 +73,7 @@ def parse_yyyymm(datestr):
     date_match = YYYY_MM_re.fullmatch(datestr)
 
     if not date_match:
-        colour.error(f'ERROR: Invalid date: {datestr}')
+        colour.error(f'Invalid date: {datestr}', prefix=True)
 
     return datetime.date(int(date_match.group(1)), int(date_match.group(2)), day=1)
 
@@ -97,7 +97,7 @@ def parse_command_line():
     args = parser.parse_args()
 
     if not args.path:
-        colour.error('You must specify a source directory')
+        colour.error('You must specify a source directory', prefix=True)
 
     # Configure debugging
 

{skilleter_thingy-0.1.18 → skilleter_thingy-0.1.19}/skilleter_thingy/multigit.py

@@ -133,14 +133,6 @@ class Arguments():
 
 ################################################################################
 
-def error(msg, status=1):
-    """Quit with an error"""
-
-    colour.write(f'[RED:ERROR:] {msg}\n', stream=sys.stderr)
-    sys.exit(status)
-
-################################################################################
-
 def verbose(args, msg):
     """Output a message to stderr if running verbosely"""
 
@@ -174,7 +166,11 @@ def find_configuration(default_config_file):
     if '/' in default_config_file:
         config_file = default_config_file
     else:
-        config_path = os.getcwd()
+        try:
+            config_path = os.getcwd()
+        except FileNotFoundError:
+            colour.error('Unable to determine current directory', prefix=True)
+
         config_file = os.path.join(config_path, default_config_file)
 
         while not os.path.isfile(config_file) and config_path != '/':
@@ -314,10 +310,10 @@ def mg_clone(args, config, console):
     # Sanity checks
 
     if not args.parameters:
-        error('The "clone" subcommand takes 1 or 2 parameters - the repo to clone and, optionally, the branch to check out')
+        colour.error('The "clone" subcommand takes 1 or 2 parameters - the repo to clone and, optionally, the branch to check out', prefix=True)
 
     if args.branched or args.modified:
-        error('The "modified" and "branched" options cannot be used with the "clone" subcommand')
+        colour.error('The "modified" and "branched" options cannot be used with the "clone" subcommand', prefix=True)
 
     # Destination directory is the last portion of the repo URL with the extension removed
 
@@ -325,9 +321,9 @@ def mg_clone(args, config, console):
 
     if os.path.exists(directory):
         if os.path.isdir(directory):
-            error(f'The "[BLUE:{directory}]" directory already exists')
+            colour.error(f'The "[BLUE:{directory}]" directory already exists', prefix=True)
         else:
-            error(f'[BLUE:{directory}]" already exists')
+            colour.error(f'[BLUE:{directory}]" already exists', prefix=True)
 
     # Clone the repo and chdir into it
 
@@ -349,7 +345,7 @@ def mg_clone(args, config, console):
         args.configuration_file = args.default_configuration_file
 
     if not os.path.isfile(args.configuration_file):
-        error(f'Cannot find the configuration file: [BOLD:{args.default_configuration_file}]')
+        colour.error(f'Cannot find the configuration file: [BOLD:{args.default_configuration_file}]', prefix=True)
 
     config.read(args.configuration_file)
 
@@ -383,7 +379,7 @@ def mg_init(args, config, console):
     # Sanity checks
 
     if args.modified or args.branched or args.tag or args.subdirectories:
-        error('The "--tag", "--modified" "--sub", and "--branched" options cannot be used with the "init" subcommand')
+        colour.error('The "--tag", "--modified" "--sub", and "--branched" options cannot be used with the "init" subcommand', prefix=True)
 
     # Search for .git directories and add any that aren't already in the configuration
 
@@ -405,7 +401,7 @@ def mg_init(args, config, console):
             default_branch = git.branch(path=abs_repo_path)
 
             if not default_branch:
-                error(f'Unable to determine default branch in [BLUE:{repo}]')
+                colour.error(f'Unable to determine default branch in [BLUE:{repo}]', prefix=True)
 
             config[repo]['default branch'] = default_branch
 
@@ -451,12 +447,12 @@ def mg_dir(args, config, console):
     verbose(args, f'dir: Parameters: {", ".join(args.parameters)}')
 
     if len(args.parameters) > 1:
-        error('The +dir command takes no more than one parameter - the name of the working tree to search for')
+        colour.error('The +dir command takes no more than one parameter - the name of the working tree to search for', prefix=True)
 
     # TODO: mg_dir _should_ use these options
 
     if args.modified or args.branched or args.tag or args.subdirectories:
-        error('The "--tag", "--modified" "--sub", and "--branched" options cannot be used with the "dir" subcommand')
+        colour.error('The "--tag", "--modified" "--sub", and "--branched" options cannot be used with the "dir" subcommand', prefix=True)
 
     # If a parameter is specified, look for matches, otherwise just return the location of the
     # configuration file
@@ -490,7 +486,7 @@ def mg_dir(args, config, console):
                 destination = destinations
 
         if not destination:
-            error(f'No matches with [BLUE:{search_name}]')
+            colour.error(f'No matches with [BLUE:{search_name}]', prefix=True)
 
         colour.write("\n".join([relative_repo_path(args, d) for d in destination]))
 
@@ -505,7 +501,7 @@ def mg_tag(args, config, console):
     _ = console
 
     if len(args.parameters) > 1:
-        error('The +tag command takes no more than one parameter')
+        colour.error('The +tag command takes no more than one parameter', prefix=True)
 
     for repo in select_git_repos(args, config):
         try:
@@ -529,7 +525,7 @@ def mg_untag(args, config, console):
     _ = console
 
     if len(args.parameters) > 1:
-        error('The +tag command takes no more than one parameter')
+        colour.error('The +tag command takes no more than one parameter', prefix=True)
 
     for repo in select_git_repos(args, config):
         try:
@@ -551,7 +547,7 @@ def mg_config(args, config, console):
     _ = console
 
     if len(args.parameters):
-        error('The +config command does not take parameters')
+        colour.error('The +config command does not take parameters', prefix=True)
 
     colour.write(os.path.relpath(args.configuration_file))
 
@@ -614,28 +610,28 @@ def parse_command_line():
 
             elif param in ('config', 'c'):
                 if params:
-                    error('--config - missing configuration file parameter')
+                    colour.error('--config - missing configuration file parameter', prefix=True)
                 else:
                     try:
                         args.default_configuration_file = arg_list.pop(0)
                     except IndexError:
-                        error('--config - missing configuration file parameter')
+                        colour.error('--config - missing configuration file parameter', prefix=True)
 
             elif param in ('repos', 'r'):
                 if params:
-                    error('--repos - missing repo parameter')
+                    colour.error('--repos - missing repo parameter', prefix=True)
                 try:
                     args.repos.append(arg_list.pop(0))
                 except IndexError:
-                    error('--repos - missing repo parameter')
+                    colour.error('--repos - missing repo parameter', prefix=True)
 
             elif param in ('tag', 't'):
                 if params:
-                    error('--tag - missing tag parameter')
+                    colour.error('--tag - missing tag parameter', prefix=True)
                 try:
                     args.tag.append(arg_list.pop(0))
                 except IndexError:
-                    error('--tag - missing tag parameter')
+                    colour.error('--tag - missing tag parameter', prefix=True)
 
             elif param in ('modified', 'm'):
                 args.modified = True
@@ -654,7 +650,7 @@ def parse_command_line():
                 sys.exit(0)
 
             else:
-                error(f'Invalid option: "{param}"')
+                colour.error(f'Invalid option: "{param}"', prefix=True)
 
     # After the options, we either have a multigit command (prefixed with '+') or a git command
     # followed by parameter
@@ -670,7 +666,7 @@ def parse_command_line():
             args.internal_command = False
 
     except IndexError:
-        error('Missing command')
+        colour.error('Missing command', prefix=True)
 
     # Save the command parameters
 
@@ -702,7 +698,7 @@ def main():
     args = parse_command_line()
 
     if args.internal_command and args.command not in COMMANDS:
-        error(f'Invalid command "{args.command}"')
+        colour.error(f'Invalid command "{args.command}"', prefix=True)
 
     # If the configuration file exists, read it
 
@@ -717,7 +713,7 @@ def main():
             if args.command == 'init':
                 args.configuration_file = os.path.abspath(args.default_configuration_file)
         else:
-            error('Cannot locate configuration file')
+            colour.error('Cannot locate configuration file', prefix=True)
 
     if args.configuration_file and os.path.isfile(args.configuration_file):
         config.read(args.configuration_file)
@@ -736,7 +732,7 @@ def main():
         # Everything except '+init' and '+clone' requires the configuration file
 
         if args.command not in ('init', 'clone') and args.configuration_file is None:
-            error('Configuration file not found')
+            colour.error('Configuration file not found', prefix=True)
 
         COMMANDS[args.command](args, config, console)
 

{skilleter_thingy-0.1.18 → skilleter_thingy-0.1.19}/skilleter_thingy/thingy/colour.py

@@ -184,9 +184,13 @@ def write(txt=None, newline=True, stream=sys.stdout, indent=0, strip=False, clea
 
 ################################################################################
 
-def error(txt, newline=True, stream=sys.stderr, status=1):
+def error(txt, newline=True, stream=sys.stderr, status=1, prefix=False):
     """ Write an error message to the specified stream (defaulting to
-        stderr) and exit with the specified status code (defaulting to 1) """
+        stderr) and exit with the specified status code (defaulting to 1) 
+        Prefix the output with 'ERROR:' in red if prefix==True """
+
+    if prefix:
+        write('[RED:ERROR]: ', newline=False, stream=stream, )
 
     write(txt, newline, stream)
 

{skilleter_thingy-0.1.18 → skilleter_thingy-0.1.19}/skilleter_thingy/trimpath.py

@@ -52,10 +52,11 @@ def main():
 
     # Set the path, defaulting to the current directory
 
-    if args.path:
-        full_path = args.path
-    else:
-        full_path = os.getcwd()
+    try:
+        full_path = args.path or os.getcwd()
+    except FileNotFoundError:
+        logging.critical('Unable to locate directory')
+        sys.exit(1)
 
     trimmed = path.trimpath(full_path, trim_width)
 

{skilleter_thingy-0.1.18 → skilleter_thingy-0.1.19}/skilleter_thingy.egg-info/PKG-INFO

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