squash more

Author: tony

src/vcspull/cli/__init__.py

@@ -20,51 +20,36 @@ def create_parser():
     parser = argparse.ArgumentParser(prog="vcspull")
     parser.add_argument(
         "--version",
+        "-V",
         action="version",
         version=f"%(prog)s {__version__}, libvcs {libvcs_version}",
     )
-    parser.add_argument("--log-level", action="store", default="INFO")
+    parser.add_argument(
+        "--log-level",
+        action="store",
+        default="INFO",
+        help="Log level (DEBUG, INFO, WARNING, ERROR, CRITICAL)",
+    )
     subparsers = parser.add_subparsers(dest="subparser_name")
     sync_parser = subparsers.add_parser("sync")
     create_sync_subparser(sync_parser)
 
     return parser
 
 
-# @click.group(
-#     context_settings={
-#         "obj": {},
-#         "help_option_names": ["-h", "--help"],
-#     }
-# )
-# @click.option(
-#     "--log-level",
-#     default="INFO",
-#     help="Log level (DEBUG, INFO, WARNING, ERROR, CRITICAL)",
-# )
-# @click.version_option(
-#     __version__,
-#     "-V",
-#     "--version",
-#     message=f"%(prog)s %(version)s, libvcs {libvcs_version}",
-# )
 def cli(args=None):
     parser = create_parser()
     args = parser.parse_args(args)
 
     setup_logger(log=log, level=args.log_level.upper())
 
-    print(f"args: {args}")
-    print(f"args: {args.__dict__}")
     if args.subparser_name is None:
         parser.print_help()
+        return
     elif args.subparser_name == "sync":
         sync(
             repo_terms=args.repo_terms,
             config=args.config,
             exit_on_error=args.exit_on_error,
+            parser=parser,
         )
-
-
-# # Register sub-commands here
-# cli.add_command(sync)

src/vcspull/cli/sync.py

@@ -91,52 +91,58 @@ def create_sync_subparser(parser: argparse.ArgumentParser) -> argparse.ArgumentP
     parser.add_argument("--config", "-c", help="Specify config")
     parser.add_argument("repo_terms", nargs="+", help="Specify config")
     parser.add_argument(
-        "--exit-on_error", "-x", dest="exit_on_error", help="Specify config"
+        "--exit-on-error",
+        "-x",
+        action="store_true",
+        dest="exit_on_error",
+        help="Specify config",
     )
     return parser
 
 
-def sync(repo_terms, config, exit_on_error: bool) -> None:
+def sync(
+    repo_terms,
+    config,
+    exit_on_error: bool,
+    parser: argparse.ArgumentParser | None = None,
+) -> None:
     if config:
         configs = load_configs([config])
     else:
         configs = load_configs(find_config_files(include_home=True))
     found_repos = []
 
-    if repo_terms:
-        for repo_term in repo_terms:
-            dir, vcs_url, name = None, None, None
-            if any(repo_term.startswith(n) for n in ["./", "/", "~", "$HOME"]):
-                dir = repo_term
-            elif any(repo_term.startswith(n) for n in ["http", "git", "svn", "hg"]):
-                vcs_url = repo_term
-            else:
-                name = repo_term
-
-            # collect the repos from the config files
-            found = filter_repos(configs, dir=dir, vcs_url=vcs_url, name=name)
-            if len(found) == 0:
-                click.echo(NO_REPOS_FOR_TERM_MSG.format(name=name))
-            found_repos.extend(
-                filter_repos(configs, dir=dir, vcs_url=vcs_url, name=name)
-            )
-    else:
-        click.echo(ctx.get_help(), color=ctx.color)
-        ctx.exit()
+    for repo_term in repo_terms:
+        dir, vcs_url, name = None, None, None
+        if any(repo_term.startswith(n) for n in ["./", "/", "~", "$HOME"]):
+            dir = repo_term
+        elif any(repo_term.startswith(n) for n in ["http", "git", "svn", "hg"]):
+            vcs_url = repo_term
+        else:
+            name = repo_term
+
+        # collect the repos from the config files
+        found = filter_repos(configs, dir=dir, vcs_url=vcs_url, name=name)
+        if len(found) == 0:
+            print(NO_REPOS_FOR_TERM_MSG.format(name=name))
+        found_repos.extend(filter_repos(configs, dir=dir, vcs_url=vcs_url, name=name))
 
     for repo in found_repos:
         try:
             update_repo(repo)
         except Exception:
-            click.echo(
+            print(
                 f'Failed syncing {repo.get("name")}',
             )
             if log.isEnabledFor(logging.DEBUG):
                 import traceback
 
                 traceback.print_exc()
             if exit_on_error:
-                raise click.ClickException(EXIT_ON_ERROR_MSG)
+                if parser is not None:
+                    parser.exit(status=1, message=EXIT_ON_ERROR_MSG)
+                else:
+                    raise SystemExit(EXIT_ON_ERROR_MSG)
 
 
 def progress_cb(output, timestamp):