another guard clause refactor; add another unit test

pyinfra-dev · Oct 27, 2023 · ddd4112 · ddd4112
1 parent c57ba48
commit ddd4112
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 16 deletions.
diff --git a/pyinfra/operations/brew.py b/pyinfra/operations/brew.py
@@ -195,22 +195,24 @@ def tap(src, present=True, url=None):
     taps = host.get_fact(BrewTaps)
     is_tapped = src in taps
 
-    if present:
-        if is_tapped:
+    if is_tapped:
+        if present:
             host.noop("tap {0} already exists".format(src))
             return
 
-        cmd = "brew tap {0}".format(src)
-
-        if url:
-            cmd = " ".join([cmd, url])
-
-        yield cmd
-        taps.append(src)
-        return
-
-    if is_tapped:
         yield "brew untap {0}".format(src)
         taps.remove(src)
         return
-    host.noop("tap {0} does not exist".format(src))
+
+    if not present:
+        host.noop("tap {0} does not exist".format(src))
+        return
+
+    cmd = "brew tap {0}".format(src)
+
+    if url is not None:
+        cmd = " ".join([cmd, url])
+
+    yield cmd
+    taps.append(src)
+    return
diff --git a/tests/operations/brew.tap/add_tap_url.json b/tests/operations/brew.tap/add_tap_url.json
@@ -6,9 +6,7 @@
         "url": "https://github.com/homebrew/cask"
     },
     "facts": {
-        "brew.BrewTaps": [
-            "homebrew/cask"
-        ]
+        "brew.BrewTaps": []
     },
     "commands": [
         "brew tap homebrew/cask https://github.com/homebrew/cask"

diff --git a/tests/operations/brew.tap/add_tap_url_exists.json b/tests/operations/brew.tap/add_tap_url_exists.json
@@ -0,0 +1,15 @@
+{
+    "args": [
+        "homebrew/cask"
+    ],
+    "kwargs": {
+        "url": "https://github.com/homebrew/cask"
+    },
+    "facts": {
+        "brew.BrewTaps": [
+            "homebrew/cask"
+        ]
+    },
+    "commands": [],
+    "noop_description": "tap homebrew/cask already exists"
+}