Fix #28 - shell_command_before in session scope of config causing duplication. New test.

Author: tony

tmuxp/config.py

@@ -238,9 +238,9 @@ def expand(sconf, cwd=None):
                         )
                     )
                 ):
-                        p = sconf['panes'][p_index] = {
-                            'shell_command': []
-                        }
+                    p = sconf['panes'][p_index] = {
+                        'shell_command': []
+                    }
 
         sconf['panes'] = [expand(pane) for pane in sconf['panes']]
 
@@ -292,18 +292,18 @@ def trickle(sconf):
 
             # Prepend shell_command_before to commands
             if 'shell_command_before' in sconf:
-                commands_before = sconf['shell_command_before']
+                commands_before.extend(sconf['shell_command_before'])
             if 'shell_command_before' in windowconfig:
                 commands_before.extend(windowconfig['shell_command_before'])
             if 'shell_command_before' in paneconfig:
                 commands_before.extend(paneconfig['shell_command_before'])
-            if 'shell_command' not in paneconfig:
-                paneconfig['shell_command'] = list()
 
-            if paneconfig['shell_command']:
+            if 'shell_command' in paneconfig:
                 commands_before.extend(paneconfig['shell_command'])
 
-            paneconfig['shell_command'] = commands_before
+            p_index = windowconfig['panes'].index(paneconfig)
+            windowconfig['panes'][p_index]['shell_command'] = commands_before
+            #paneconfig['shell_command'] = commands_before
 
     return sconf
 

tmuxp/testsuite/test_config.py

@@ -664,6 +664,75 @@ def test_shell_command_before(self):
         self.assertDictEqual(test_config, self.config_after)
 
 
+class ShellCommandBeforeSession(TestCase):
+
+    def test_in_session_scope(self):
+
+        yaml_config = """
+        shell_command_before:
+          - 'echo "hi"'
+        session_name: 'test'
+        windows:
+        - window_name: editor
+          panes:
+          - shell_command:
+            - vim
+            - :Ex
+          - pane
+          - cd /usr
+        - window_name: logging
+          panes:
+          - shell_command:
+            -
+          - shell_command:
+            - top
+            - emacs
+        """
+
+        yaml_final_config = """
+        shell_command_before:
+          - 'echo "hi"'
+        session_name: 'test'
+        windows:
+        - window_name: editor
+          panes:
+          - shell_command:
+            - 'echo "hi"'
+            - vim
+            - :Ex
+          - shell_command:
+            - 'echo "hi"'
+          - shell_command:
+            - 'echo "hi"'
+            - cd /usr
+        - window_name: logging
+          panes:
+          - shell_command:
+            - 'echo "hi"'
+          - shell_command:
+            - 'echo "hi"'
+            - top
+            - emacs
+        """
+
+        self.maxDiff = None
+
+        sconfig = kaptan.Kaptan(handler='yaml')
+        sconfig = sconfig.import_config(yaml_config).get()
+
+        config.validate_schema(sconfig)
+
+        self.assertDictEqual(config.expand(sconfig), sconfig)
+
+        self.assertDictEqual(
+            config.expand(config.trickle(sconfig)),
+            self.yaml_to_dict(yaml_final_config)
+        )
+
+    def yaml_to_dict(self, yaml):
+        return kaptan.Kaptan(handler='yaml').import_config(yaml).get()
+
+
 class TrickleRelativeStartDirectory(TestCase):
 
     config_expanded = {  # shell_command_before is string in some areas