splight-cli 4.1.0.dev0__tar.gz → 4.1.0.dev2__tar.gz

{splight-cli-4.1.0.dev0 → splight-cli-4.1.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: splight-cli
-Version: 4.1.0.dev0
+Version: 4.1.0.dev2
 Summary: CLI tool to build and run Splight components
 Home-page: UNKNOWN
 Author: Splight

{splight-cli-4.1.0.dev0 → splight-cli-4.1.0.dev2}/cli/solution/apply_exec.py

@@ -51,7 +51,7 @@ class ApplyExecutor:
             local_instance.save()
             remote_instance = model.retrieve(resource_id=local_instance.id)
             return ApplyResult(True, to_dict(remote_instance))
-        return ApplyResult(False, None)
+        return ApplyResult(False, to_dict(local_instance))
 
     def replace_data_addr(self):
         """Replaces assets data addresses in component's routines."""
@@ -171,7 +171,7 @@ class ApplyExecutor:
                     "Do you want to update the local instance?"
                 )
                 if update:
-                    return ApplyResult(True, remote_instance)
+                    return ApplyResult(True, to_dict(remote_instance))
                 bprint(
                     f"\nYou are about to override the remote {model_name} "
                     f"with your local {model_name}:"
@@ -181,12 +181,12 @@ class ApplyExecutor:
                 if update:
                     local_instance.save()
                     return ApplyResult(True, to_dict(local_instance))
-                return ApplyResult(False, None)
+                return ApplyResult(False, to_dict(local_instance))
             bprint(
                 f"Nothing to update, the same {model_name} was found "
                 "remotely"
             )
-            return ApplyResult(False, None)
+            return ApplyResult(False, to_dict(local_instance))
         bprint(f"\nThe following {model_name} was not found remotely")
         print(local_instance)
         self._remove_ids(model_name, local_instance)
@@ -197,7 +197,7 @@ class ApplyExecutor:
             local_instance.save()
             remote_instance = model.retrieve(resource_id=local_instance.id)
             return ApplyResult(True, to_dict(remote_instance))
-        return ApplyResult(False, None)
+        return ApplyResult(False, to_dict(local_instance))
 
     def _remove_ids(self, model: SplightTypes, local_instance: SplightTypes):
         """Removes ids to a given dictionary representing a particular model.

{splight-cli-4.1.0.dev0 → splight-cli-4.1.0.dev2}/cli/solution/solution.py

@@ -48,14 +48,14 @@ class SolutionManager:
         )
 
     def execute(self):
-        console.print("\nStarting plan step...", style=PRINT_STYLE)
-        self._generate_assets_state()
-        self._generate_components_state()
-
         if self._apply:
             console.print("\nStarting apply step...", style=PRINT_STYLE)
             self._apply_assets_state()
             self._apply_components_state()
+        else:
+            console.print("\nStarting plan step...", style=PRINT_STYLE)
+            self._generate_assets_state()
+            self._generate_components_state()
 
     def _generate_state_from_plan(self):
         """Generates the state file if not passed."""
@@ -105,12 +105,12 @@ class SolutionManager:
                 model=Component, local_instance=component
             )
             if result.update:
-                updated_routines = self._apply_routines_state(
-                    component, Component.parse_obj(result.updated_dict)
-                )
                 components_list[i] = Component.parse_obj(result.updated_dict)
-                components_list[i].routines = updated_routines
                 save_yaml(self._state_path, self._state)
+            components_list[i].routines = self._apply_routines_state(
+                component, Component.parse_obj(result.updated_dict)
+            )
+            save_yaml(self._state_path, self._state)
 
     def _apply_routines_state(
         self, component: Component, updated_component: Component

splight-cli-4.1.0.dev2/cli/version.py

@@ -0,0 +1 @@
+__version__ = "4.1.0.dev2"

{splight-cli-4.1.0.dev0 → splight-cli-4.1.0.dev2}/splight_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: splight-cli
-Version: 4.1.0.dev0
+Version: 4.1.0.dev2
 Summary: CLI tool to build and run Splight components
 Home-page: UNKNOWN
 Author: Splight

{splight-cli-4.1.0.dev0 → splight-cli-4.1.0.dev2}/splight_cli.egg-info/requires.txt

@@ -3,6 +3,7 @@ case-converter==1.1.0
 click-default-group==1.2.2
 click==8.0.4
 colorama==0.4.4
+deepdiff==6.3.1
 packaging==23.0
 pathspec==0.11.1
 py7zr==0.18.5

splight-cli-4.1.0.dev0/cli/version.py

@@ -1 +0,0 @@
-__version__ = "4.1.0.dev0"