WIP: Command options

Author: tony

tests/fixtures/config/expand1.py

@@ -36,39 +36,42 @@
         {
             "window_name": "editor",
             "panes": [
-                {"shell_command": ["vim", "top"]},
-                {"shell_command": ["vim"]},
-                {"shell_command": ['cowsay "hey"']},
+                {"shell_command": [{"cmd": "vim"}, {"cmd": "top"}]},
+                {"shell_command": [{"cmd": "vim"}]},
+                {"shell_command": [{"cmd": 'cowsay "hey"'}]},
             ],
             "layout": "main-verticle",
         },
         {
             "window_name": "logging",
-            "panes": [{"shell_command": ["tail -F /var/log/syslog"]}],
+            "panes": [{"shell_command": [{"cmd": "tail -F /var/log/syslog"}]}],
         },
         {
             "start_directory": "/var/log",
             "options": {"automatic-rename": True},
-            "panes": [{"shell_command": ["htop"]}, {"shell_command": ["vim"]}],
+            "panes": [
+                {"shell_command": [{"cmd": "htop"}]},
+                {"shell_command": [{"cmd": "vim"}]},
+            ],
         },
         {
             "start_directory": os.path.normpath(
                 os.path.join(os.path.expanduser("~"), "./")
             ),
-            "panes": [{"shell_command": ["pwd"]}],
+            "panes": [{"shell_command": [{"cmd": "pwd"}]}],
         },
         {
             "start_directory": os.path.normpath(
                 os.path.join(os.path.expanduser("~"), "./asdf")
             ),
-            "panes": [{"shell_command": ["pwd"]}],
+            "panes": [{"shell_command": [{"cmd": "pwd"}]}],
         },
         {
             "start_directory": os.path.normpath(
                 os.path.join(os.path.expanduser("~"), "../")
             ),
-            "panes": [{"shell_command": ["pwd"]}],
+            "panes": [{"shell_command": [{"cmd": "pwd"}]}],
         },
-        {"panes": [{"shell_command": ["top"]}]},
+        {"panes": [{"shell_command": [{"cmd": "top"}]}]},
     ],
 }

tests/fixtures/config/expand2-expanded.yaml

@@ -6,27 +6,27 @@ windows:
   focus: true
   panes:
   - shell_command:
-    - cd ~
+    - cmd: cd ~
   - shell_command:
-    - cd /usr
+    - cmd: cd /usr
     focus: true
   - shell_command:
-    - cd ~
-    - echo "moo"
-    - top
+    - cmd: cd ~
+    - cmd: echo "moo"
+    - cmd: top
 - window_name: window 2
   panes:
   - shell_command:
-    - top
+    - cmd: top
     focus: true
   - shell_command:
-    - echo "hey"
+    - cmd: echo "hey"
   - shell_command:
-    - echo "moo"
+    - cmd: echo "moo"
 - window_name: window 3
   panes:
   - shell_command:
-    - cd /
+    - cmd: cd /
     focus: true
   - shell_command: []
   - shell_command: []

tests/fixtures/config/shell_command_before_session-expected.yaml

@@ -1,23 +1,23 @@
 shell_command_before:
-  - 'echo "hi"'
+  - cmd: 'echo "hi"'
 session_name: 'test'
 windows:
 - window_name: editor
   panes:
   - shell_command:
-    - 'echo "hi"'
-    - vim
-    - :Ex
+    - cmd: 'echo "hi"'
+    - cmd: vim
+    - cmd: :Ex
   - shell_command:
-    - 'echo "hi"'
+    - cmd: 'echo "hi"'
   - shell_command:
-    - 'echo "hi"'
-    - cd /usr
+    - cmd: 'echo "hi"'
+    - cmd: cd /usr
 - window_name: logging
   panes:
   - shell_command:
-    - 'echo "hi"'
+    - cmd: 'echo "hi"'
   - shell_command:
-    - 'echo "hi"'
-    - top
-    - emacs
+    - cmd: 'echo "hi"'
+    - cmd: top
+    - cmd: emacs

tests/fixtures/config/trickle.py

@@ -5,14 +5,17 @@
         {
             "window_name": "editor",
             "start_directory": "log",
-            "panes": [{"shell_command": ["vim"]}, {"shell_command": ['cowsay "hey"']}],
+            "panes": [
+                {"shell_command": [{"cmd": "vim"}]},
+                {"shell_command": [{"cmd": 'cowsay "hey"'}]},
+            ],
             "layout": "main-verticle",
         },
         {
             "window_name": "logging",
             "start_directory": "~",
             "panes": [
-                {"shell_command": ["tail -F /var/log/syslog"]},
+                {"shell_command": [{"cmd": "tail -F /var/log/syslog"}]},
                 {"shell_command": []},
             ],
         },
@@ -26,14 +29,17 @@
         {
             "window_name": "editor",
             "start_directory": "/var/log",
-            "panes": [{"shell_command": ["vim"]}, {"shell_command": ['cowsay "hey"']}],
+            "panes": [
+                {"shell_command": [{"cmd": "vim"}]},
+                {"shell_command": [{"cmd": 'cowsay "hey"'}]},
+            ],
             "layout": "main-verticle",
         },
         {
             "start_directory": "~",
             "window_name": "logging",
             "panes": [
-                {"shell_command": ["tail -F /var/log/syslog"]},
+                {"shell_command": [{"cmd": "tail -F /var/log/syslog"}]},
                 {"shell_command": []},
             ],
         },

tmuxp/config.py

@@ -290,19 +290,23 @@ def expand(sconf, cwd=None, parent=None):
 
             assert isinstance(p, dict)
             if "shell_command" in p:
-                cmd = p["shell_command"]
+                cmds = p["shell_command"]
 
                 if isinstance(p["shell_command"], str):
-                    cmd = [cmd]
+                    cmds = [cmds]
 
-                if not cmd or any(a == cmd for a in [None, "blank", "pane"]):
-                    cmd = []
+                if not cmds or any(a == cmds for a in [None, "blank", "pane"]):
+                    cmds = []
 
-                if isinstance(cmd, list) and len(cmd) == int(1):
-                    if any(a in cmd for a in [None, "blank", "pane"]):
-                        cmd = []
+                if isinstance(cmds, list) and len(cmds) == int(1):
+                    if any(a in cmds for a in [None, "blank", "pane"]):
+                        cmds = []
 
-                p["shell_command"] = cmd
+                for cmd_idx, cmd in enumerate(cmds):
+                    if isinstance(cmd, str):
+                        cmds[cmd_idx] = {"cmd": cmd}
+
+                p["shell_command"] = cmds
             else:
                 p["shell_command"] = []
 

tmuxp/workspacebuilder.py

@@ -365,7 +365,7 @@ def get_pane_shell():
             enter = pconf.get("enter", True)
 
             for cmd in pconf["shell_command"]:
-                p.send_keys(cmd, suppress_history=suppress, enter=enter)
+                p.send_keys(cmd["cmd"], suppress_history=suppress, enter=enter)
 
             if "focus" in pconf and pconf["focus"]:
                 w.select_pane(p["pane_id"])