pyinfra 3.0.1__py2.py3-none-any.whl → 3.0.2__py2.py3-none-any.whl

pyinfra/api/operation.py

@@ -60,7 +60,7 @@ class OperationMeta:
         if self._commands is not None:
             return (
                 "OperationMeta(executed=True, "
-                f"success={self.did_succeed}, hash={self._hash}, commands={len(self._commands)})"
+                f"success={self.did_succeed()}, hash={self._hash}, commands={len(self._commands)})"
             )
         return (
             "OperationMeta(executed=False, "
@@ -87,6 +87,12 @@ class OperationMeta:
         if not self.is_complete():
             raise RuntimeError("Cannot evaluate operation result before execution")
 
+    @property
+    def executed(self) -> bool:
+        if self._commands is None:
+            return False
+        return len(self._commands) > 0
+
     @property
     def will_change(self) -> bool:
         if self._maybe_is_change is not None:
@@ -100,16 +106,12 @@ class OperationMeta:
         self._maybe_is_change = False
         return False
 
-    def _did_change(self) -> bool:
+    def did_change(self) -> bool:
+        self._raise_if_not_complete()
         return bool(self._success and len(self._commands or []) > 0)
 
-    @property
-    def did_change(self):
-        return context.host.when(self._did_change)
-
-    @property
-    def did_not_change(self):
-        return context.host.when(lambda: not self._did_change())
+    def did_not_change(self) -> bool:
+        return not self.did_change()
 
     def did_succeed(self, _raise_if_not_complete=True) -> bool:
         if _raise_if_not_complete:
@@ -124,7 +126,7 @@ class OperationMeta:
     @property
     def changed(self) -> bool:
         if self.is_complete():
-            return self._did_change()
+            return self.did_change()
         return self.will_change
 
     @property

{pyinfra-3.0.1.dist-info → pyinfra-3.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyinfra
-Version: 3.0.1
+Version: 3.0.2
 Summary: pyinfra automates/provisions/manages/deploys infrastructure.
 Home-page: https://pyinfra.com
 Author: Nick / Fizzadar

{pyinfra-3.0.1.dist-info → pyinfra-3.0.2.dist-info}/RECORD

@@ -17,7 +17,7 @@ pyinfra/api/exceptions.py,sha256=cCbUp1qN1QO0d9aAvOAbRgYpLi0vUI5j7ZqSjcD1_P8,186
 pyinfra/api/facts.py,sha256=aMPtkB7vypyXRQDThjwJZzAnEgqjP0wrwyEhRHQf4Js,9449
 pyinfra/api/host.py,sha256=3lRhlZDRKvCNvpziaTglExy2Ep1wd4YdmGDNY4emAdA,13466
 pyinfra/api/inventory.py,sha256=nPITdNEJ7q71adIqS_OKHsMjD7amUuHEuTl6xzgh1Gk,7734
-pyinfra/api/operation.py,sha256=pB0LpjUqbMLGtoDnsckNw0FRoeo1BopL0fnXVDM1JyU,15112
+pyinfra/api/operation.py,sha256=Dp7pH9H3EYs7U1ZvquYUbOtWJPO9iIAa4H7GwXdxFxs,15170
 pyinfra/api/operations.py,sha256=jvz9ISfwmQnAQVUKLnbrRdD9QHIAAfypo9l5b3fYG1w,10894
 pyinfra/api/state.py,sha256=3dXRjeZJXnzLcbP9E4aogkRPwIg3_kK1h4Tf4FVZock,12622
 pyinfra/api/util.py,sha256=qbrC-Hjvzre2_U0l3hHo4wzZBDFN-zcWBNoWQgIyXxE,12272
@@ -127,8 +127,8 @@ pyinfra_cli/commands.py,sha256=J-mCJYvDebJ8M7o3HreB2zToa871-xO6_KjVhPLeHho,1832
 pyinfra_cli/exceptions.py,sha256=iptx9Zj1od7VgSbOyXs7P8tD4zAZ_fwrQFKPlpPrfS0,4806
 pyinfra_cli/inventory.py,sha256=S8aSl8TrF72Ni7eHiB40GjtAJeqyB1VxHobG2k254hQ,10329
 pyinfra_cli/log.py,sha256=7WEGtmf3ncF1BtXL2icUjyxeRKy-7XrCcQ2Hg4GWX5Y,2201
-pyinfra_cli/main.py,sha256=PjZ1Fe3jlodvBsnY-xXU8ASJim2ocU6j6ICQzsoXhRU,19922
-pyinfra_cli/prints.py,sha256=za6V-yjXf-LViBW73qWcyfsajCUnf0NCG-7K0ugOA0k,9170
+pyinfra_cli/main.py,sha256=5VTniMcbKuIfjPTzaUklad5fM1BW7CUEARoSV9tPf1U,19954
+pyinfra_cli/prints.py,sha256=TsRxJRkkF-Trgbm4WgH8Vwr5PcelS5rokcqHDYc2kB0,9169
 pyinfra_cli/util.py,sha256=f3iGIPxlUiQJ5LmUGYbEz0QrySQAKmf9xov9WvHXbrk,6364
 pyinfra_cli/virtualenv.py,sha256=6j9W54JkQLN02SrZZIVwszp0GxlaaDEUWFZjBDHIWNA,2466
 tests/test_api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -144,7 +144,7 @@ tests/test_api/test_api_operations.py,sha256=GUfnuHK2NoTAGdOT4AbytT9R8i3ZZIvGP7K
 tests/test_api/test_api_util.py,sha256=uHv4oLpoy1_tzOoqFA1zpdvC74SvjitZbxQwp0dmjTs,1716
 tests/test_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_cli/test_cli.py,sha256=IeWuhkhLzIkRbOEx5-yaW6xV5l4Y8fxaGaDGlMcOyYE,6016
-tests/test_cli/test_cli_deploy.py,sha256=KBnnDsiD21h7t1S2JXpEDpiMxh0AFqwxaEl0z78IE9E,4858
+tests/test_cli/test_cli_deploy.py,sha256=3tlXpN_ntCvZDeymfQKrZm0kgADkiLUIAGQg5V8-KrU,5079
 tests/test_cli/test_cli_exceptions.py,sha256=02sjC6rMptuqchgcdjdsVNQbSQYW6HwGutSy6Q6sMs4,3088
 tests/test_cli/test_cli_inventory.py,sha256=xlo-p3HdfVPNqxi7SknEZ2mWrKsdDaK3PoVN-tl95Z0,2394
 tests/test_cli/test_cli_util.py,sha256=-Ehnj0cO-EkF-6KLxcPPcFeuAUMTz-fKITrxhuiYhV4,2562
@@ -160,9 +160,9 @@ tests/test_connectors/test_sshuserclient.py,sha256=2PQNLPhNL6lBACc6tQuXmPoog-9L6
 tests/test_connectors/test_terraform.py,sha256=Z5MhgDeRDFumu-GlbjMD0ZRkecwBIPP8C8ZVg-mq7C8,3743
 tests/test_connectors/test_util.py,sha256=hQir0WyjH0LEF6xvIyHNyqdI5pkJX6qUR9287MgO2bY,4647
 tests/test_connectors/test_vagrant.py,sha256=27qRB7ftjEPaj4ejBNZ-rR4Ou1AD1VyVcf2XjwZPG3M,3640
-pyinfra-3.0.1.dist-info/LICENSE.md,sha256=gwC95tUll0gwB32tHNkTAasN7Sb6vjWzXa305NwClbI,1076
-pyinfra-3.0.1.dist-info/METADATA,sha256=vpa6_3c318yjxCjV4OsawHtZFm_ESQ-CuR2ox3hUdQA,8041
-pyinfra-3.0.1.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-pyinfra-3.0.1.dist-info/entry_points.txt,sha256=BraEFyquy05M8ch33HZXOHoH_m2BTqejL3xX3NrpzOM,471
-pyinfra-3.0.1.dist-info/top_level.txt,sha256=2K6D1mK35JTSEBgOfEPV-N-uA2SDErxGiE0J-HUMMVI,26
-pyinfra-3.0.1.dist-info/RECORD,,
+pyinfra-3.0.2.dist-info/LICENSE.md,sha256=gwC95tUll0gwB32tHNkTAasN7Sb6vjWzXa305NwClbI,1076
+pyinfra-3.0.2.dist-info/METADATA,sha256=CeBR5TFvTUFHJfa9l6NgUHm0SKfUXaZLWdAxi921QaU,8041
+pyinfra-3.0.2.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+pyinfra-3.0.2.dist-info/entry_points.txt,sha256=BraEFyquy05M8ch33HZXOHoH_m2BTqejL3xX3NrpzOM,471
+pyinfra-3.0.2.dist-info/top_level.txt,sha256=2K6D1mK35JTSEBgOfEPV-N-uA2SDErxGiE0J-HUMMVI,26
+pyinfra-3.0.2.dist-info/RECORD,,

pyinfra_cli/main.py

@@ -361,6 +361,14 @@ def _main(
         else:
             logger.info("--> Detected changes:")
             print_meta(state)
+            click.echo(
+                """
+    Detected changes may not include every change pyinfra will execute.
+    Hidden side effects of operations may alter behaviour of future operations,
+    this will be shown in the results. The remote state will always be updated
+    to reflect the state defined by the input operations.""",
+                err=True,
+            )
 
     # If --debug-facts or --debug-operations, print and exit
     if debug_facts or debug_operations:
@@ -372,14 +380,6 @@ def _main(
     if dry:
         _exit()
 
-    click.echo(
-        """
-    Detected changes may not include every change pyinfra will execute.
-    Hidden side effects of operations may alter behaviour of future operations,
-    this will be shown in the results. The remote state will always be updated
-    to reflect the state defined by the input operations.""",
-        err=True,
-    )
     if (
         can_diff
         and not yes

pyinfra_cli/prints.py

@@ -278,7 +278,7 @@ def print_results(state: "State"):
 
             op_meta = state.ops[host][op_hash].operation_meta
             if op_meta.did_succeed(_raise_if_not_complete=False):
-                if op_meta._did_change():
+                if op_meta.did_change():
                     hosts_in_op_success.append(host.name)
                 else:
                     hosts_in_op_no_change.append(host.name)

tests/test_cli/test_cli_deploy.py

@@ -33,10 +33,14 @@ class TestCliDeployState(PatchSSHTestCase):
             assert list(op_meta.names)[0] == correct_op_name
 
             for host in state.inventory:
+                executed = False
+                host_op = state.ops[host].get(op_hash)
+                if host_op:
+                    executed = host_op.operation_meta.executed
                 if correct_host_names is True or host.name in correct_host_names:
-                    self.assertIn(op_hash, host.op_hash_order)
+                    assert executed is True
                 else:
-                    self.assertNotIn(op_hash, host.op_hash_order)
+                    assert executed is False
 
     def test_deploy(self):
         task_file_path = path.join("tasks", "a_task.py")
@@ -72,6 +76,7 @@ class TestCliDeployState(PatchSSHTestCase):
             ("Nested order loop 2/1", ("somehost", "anotherhost")),
             ("Nested order loop 2/2", ("somehost", "anotherhost")),
             ("Final limited operation", ("somehost",)),
+            ("Second final limited operation", ("anotherhost", "someotherhost")),
         ]
 
         # Run 3 iterations of the test - each time shuffling the order of the