align repo msg (#250)

* align repo msg

* fix unit tests

Makefile

@@ -3,7 +3,7 @@
 install:
 	pip3 install -e .
 test:
-	pytest tests --cov=./gita $(TEST_ARGS) -n=auto
+	pytest tests --cov=./gita $(TEST_ARGS) -n=auto -vv
 dist:
 	python3 setup.py sdist
 twine:

gita/info.py

@@ -198,9 +198,10 @@ def get_commit_time(prop: Dict[str, str]) -> str:
 def get_repo_status(prop: Dict[str, str], no_colors=False) -> str:
     head = get_head(prop["path"])
     dirty, staged, untracked, color = _get_repo_status(prop, no_colors)
+    info = f"{head:<10} [{dirty+staged+untracked}]"
     if color:
-        return f"{color}{head+' ['+dirty+staged+untracked+']':<13}{Color.end}"
-    return f"{head+' ['+dirty+staged+untracked+']':<13}"
+        return f"{color}{info:<17}{Color.end}"
+    return f"{info:<17}"
 
 
 def get_repo_branch(prop: Dict[str, str]) -> str:

setup.py

@@ -7,7 +7,7 @@
 setup(
     name="gita",
     packages=["gita"],
-    version="0.16.4",
+    version="0.16.4.2",
     license="MIT",
     description="Manage multiple git repos with sanity",
     long_description=long_description,

tests/test_main.py

@@ -130,12 +130,12 @@ def test_ls(self, monkeypatch, capfd):
         [
             (
                 PATH_FNAME,
-                "repo1 cmaster [dsu] \x1b[0m msg \nrepo2 cmaster [dsu] \x1b[0m msg \nxxx   cmaster [dsu] \x1b[0m msg \n",
+                "repo1 cmaster     [dsu] \x1b[0m msg \nrepo2 cmaster     [dsu] \x1b[0m msg \nxxx   cmaster     [dsu] \x1b[0m msg \n",
             ),
             (PATH_FNAME_EMPTY, ""),
             (
                 PATH_FNAME_CLASH,
-                "repo1 cmaster [dsu] \x1b[0m msg \nrepo2 cmaster [dsu] \x1b[0m msg \n",
+                "repo1 cmaster     [dsu] \x1b[0m msg \nrepo2 cmaster     [dsu] \x1b[0m msg \n",
             ),
         ],
     )

tests/test_utils.py

@@ -115,17 +115,17 @@ def test_auto_group(repos, paths, expected):
         (
             [{"abc": {"path": "/root/repo/", "type": "", "flags": []}}, False],
             True,
-            "abc \x1b[31mrepo [*+?]   \x1b[0m msg xx",
+            "abc \x1b[31mrepo       [*+?] \x1b[0m msg xx",
         ),
         (
             [{"abc": {"path": "/root/repo/", "type": "", "flags": []}}, True],
             True,
-            "abc repo [*+?]    msg xx",
+            "abc repo       [*+?]  msg xx",
         ),
         (
             [{"repo": {"path": "/root/repo2/", "type": "", "flags": []}}, False],
             False,
-            "repo \x1b[32mrepo [?]     \x1b[0m msg xx",
+            "repo \x1b[32mrepo       [?]   \x1b[0m msg xx",
         ),
     ],
 )