Add option to require a specific version to be running (#2300)

[etc/vim.git] / src / black_primer / cli.py

diff --git a/src/black_primer/cli.py b/src/black_primer/cli.py
index 010ea6c7af2e26ec5c23c609760bada411db6e23..f0997049d2159c1bddfcfaaaba4a6809ea8e618e 100644 (file)
--- a/src/black_primer/cli.py
+++ b/src/black_primer/cli.py
@@ -1,10 +1,9 @@
-#!/usr/bin/env python3
+# coding=utf8

 
 import asyncio
 import logging
 import sys
 from datetime import datetime
 
 import asyncio
 import logging
 import sys
 from datetime import datetime

-from os import cpu_count

 from pathlib import Path
 from shutil import rmtree, which
 from tempfile import gettempdir
 from pathlib import Path
 from shutil import rmtree, which
 from tempfile import gettempdir


@@ -14,6 +13,14 @@ import click
 
 from black_primer import lib
 
 
 from black_primer import lib
 

+# If our environment has uvloop installed lets use it
+try:
+    import uvloop
+
+    uvloop.install()
+except ImportError:
+    pass
+

 
 DEFAULT_CONFIG = Path(__file__).parent / "primer.json"
 _timestamp = datetime.now().strftime("%Y%m%d%H%M%S")
 
 DEFAULT_CONFIG = Path(__file__).parent / "primer.json"
 _timestamp = datetime.now().strftime("%Y%m%d%H%M%S")


@@ -40,6 +47,7 @@ async def async_main(
     debug: bool,
     keep: bool,
     long_checkouts: bool,
     debug: bool,
     keep: bool,
     long_checkouts: bool,

+    no_diff: bool,

     rebase: bool,
     workdir: str,
     workers: int,
     rebase: bool,
     workdir: str,
     workers: int,


@@ -50,20 +58,26 @@ async def async_main(
         work_path.mkdir()
 
     if not which("black"):
         work_path.mkdir()
 
     if not which("black"):

-        LOG.error(f"Can not find 'black' executable in PATH. No point in running")
+        LOG.error("Can not find 'black' executable in PATH. No point in running")

         return -1
 
     try:
         ret_val = await lib.process_queue(
         return -1
 
     try:
         ret_val = await lib.process_queue(

-            config, work_path, workers, keep, long_checkouts, rebase
+            config,
+            work_path,
+            workers,
+            keep,
+            long_checkouts,
+            rebase,
+            no_diff,

         )
         return int(ret_val)
     finally:
         if not keep and work_path.exists():
             LOG.debug(f"Removing {work_path}")
         )
         return int(ret_val)
     finally:
         if not keep and work_path.exists():
             LOG.debug(f"Removing {work_path}")

-            rmtree(work_path)
+            rmtree(work_path, onerror=lib.handle_PermissionError)

 
 

-    return -1
+    return -2

 
 
 @click.command(context_settings={"help_option_names": ["-h", "--help"]})
 
 
 @click.command(context_settings={"help_option_names": ["-h", "--help"]})


@@ -96,6 +110,12 @@ async def async_main(
     show_default=True,
     help="Pull big projects to test",
 )
     show_default=True,
     help="Pull big projects to test",
 )

+@click.option(
+    "--no-diff",
+    is_flag=True,
+    show_default=True,
+    help="Disable showing source file changes in black output",
+)

 @click.option(
     "-R",
     "--rebase",
 @click.option(
     "-R",
     "--rebase",


@@ -109,21 +129,21 @@ async def async_main(
     default=str(DEFAULT_WORKDIR),
     type=click.Path(exists=False),
     show_default=True,
     default=str(DEFAULT_WORKDIR),
     type=click.Path(exists=False),
     show_default=True,

-    help="Directory Path for repo checkouts",
+    help="Directory path for repo checkouts",

 )
 @click.option(
     "-W",
     "--workers",
 )
 @click.option(
     "-W",
     "--workers",

-    default=int((cpu_count() or 4) / 2) or 1,
+    default=2,

     type=int,
     show_default=True,
     help="Number of parallel worker coroutines",
 )
 @click.pass_context
 def main(ctx: click.core.Context, **kwargs: Any) -> None:
     type=int,
     show_default=True,
     help="Number of parallel worker coroutines",
 )
 @click.pass_context
 def main(ctx: click.core.Context, **kwargs: Any) -> None:

-    """primer - prime projects for blackening ... 🏴"""
+    """primer - prime projects for blackening... 🏴"""

     LOG.debug(f"Starting {sys.argv[0]}")
     LOG.debug(f"Starting {sys.argv[0]}")

-    # TODO: Change to asyncio.run when black >= 3.7 only
+    # TODO: Change to asyncio.run when Black >= 3.7 only

     loop = asyncio.get_event_loop()
     try:
         ctx.exit(loop.run_until_complete(async_main(**kwargs)))
     loop = asyncio.get_event_loop()
     try:
         ctx.exit(loop.run_until_complete(async_main(**kwargs)))


@@ -131,5 +151,5 @@ def main(ctx: click.core.Context, **kwargs: Any) -> None:
         loop.close()
 
 
         loop.close()
 
 

-if __name__ == "__main__":
+if __name__ == "__main__":  # pragma: nocover

     main()
     main()