remove automatic_rename to reimplement

Author: tony

.tmuxp.yaml

@@ -4,7 +4,6 @@ windows:
   layout: main-horizontal
   options:
     main-pane-height: 50
-  start_directory: ./
   shell_command_before:
     - command -v virtualenv >/dev/null 2>&1 || { pip install virtualenv; }
     - '[ -d .env -a -f .env/bin/activate ] && source .env/bin/activate || virtualenv .env'
@@ -24,8 +23,6 @@ windows:
   layout: main-horizontal
   options:
     main-pane-height: 50
-  start_directory: ./
-  automatic_rename: true
   shell_command_before: 
     - command -v virtualenv >/dev/null 2>&1 || { pip install virtualenv; }
     - '[ -d .env -a -f .env/bin/activate ] && source .env/bin/activate || virtualenv .env'

tmuxp/session.py

@@ -36,7 +36,6 @@ def __init__(self, server=None, **kwargs):
         if not 'session_id' in kwargs:
             raise ValueError('Session requires a `session_id`')
         self._session_id = kwargs['session_id']
-
         self.server._update_windows()
 
     @property
@@ -124,7 +123,6 @@ def rename_session(self, new_name):
 
     def new_window(self,
                    window_name=None,
-                   automatic_rename=False,
                    attach=True):
         '''
         ``$ tmux new-window``
@@ -142,13 +140,11 @@ def new_window(self,
 
         :type window_name: string
 
-        :param automatic_rename: assume automatic_rename if no window_name.
-        :type automatic_rename: bool
-
         :param attach: make new window the current window after creating it,
                        default True.
         :param type: bool
         '''
+
         wformats = ['session_name', 'session_id'] + formats.WINDOW_FORMATS
         tmux_formats = ['#{%s}' % f for f in wformats]
 
@@ -159,7 +155,7 @@ def new_window(self,
         )
 
         if window_name:
-            window_args += ('-n', window_name)
+            window_args += ('-n%s' % window_name,)
 
         if not attach:
             window_args += ('-d',)
@@ -177,9 +173,6 @@ def new_window(self,
         window = dict((k, v) for k, v in window.items() if v)
         window = Window(session=self, **window)
 
-        if automatic_rename:
-            window.set_window_option('automatic-rename', True)
-
         self.server._update_windows()
 
         return window

tmuxp/testsuite/test_cli.py

@@ -154,7 +154,7 @@ def tearDownClass(cls):
          {'shell_command': ['tail -F /var/log/syslog'],
           'start_directory':'/var/log'}
          ]}, {
-            'automatic_rename': True,
+             'options': {'automatic_rename': True, },
             'panes': [
                 {'shell_command': ['htop']}
             ]

tmuxp/testsuite/test_config.py

@@ -31,7 +31,9 @@
          {'shell_command': ['tail -F /var/log/syslog'],
           'start_directory':'/var/log'}
          ]}, {
-            'automatic_rename': True,
+             'options': {
+               'automatic_rename': True,
+             },
             'panes': [
                 {'shell_command': ['htop']}
             ]
@@ -147,7 +149,7 @@ class ExpandTest(unittest.TestCase):
                 ]
             },
             {
-                'automatic_rename': True,
+                'options': { 'automatic_rename': True, },
                 'panes': [
                     {'shell_command': 'htop'},
                     'vim',
@@ -177,7 +179,7 @@ class ExpandTest(unittest.TestCase):
                 ]
             },
             {
-                'automatic_rename': True,
+                'options': { 'automatic_rename': True },
                 'panes': [
                     {'shell_command': ['htop']},
                     {'shell_command': ['vim']}
@@ -220,7 +222,7 @@ class InlineTest(unittest.TestCase):
                 ]
             },
             {
-                'automatic_rename': True,
+                'options': { 'automatic_rename': True, },
                 'panes': [
                     {'shell_command': ['htop']}
                 ]
@@ -249,7 +251,7 @@ class InlineTest(unittest.TestCase):
                 ]
             },
             {
-                'automatic_rename': True,
+                'options': { 'automatic_rename': True, },
                 'panes': [
                     {'shell_command': 'htop'}
                 ]
@@ -301,7 +303,7 @@ class InheritanceTest(unittest.TestCase):
                 ]
             },
             {
-                'automatic_rename': True,
+                'options': { 'automatic_rename': True, },
                 'panes': [
                     {'shell_command': ['htop']}
                 ]
@@ -336,7 +338,7 @@ class InheritanceTest(unittest.TestCase):
                 ]
             },
             {
-                'automatic_rename': True,
+                'options': { 'automatic_rename': True, },
                 'panes': [
                     {'shell_command': ['htop'], 'start_directory':'/'}
                 ]
@@ -412,7 +414,7 @@ class ShellCommandBeforeTest(unittest.TestCase):
                 ]
             },
             {
-                'automatic_rename': True,
+                'options': { 'automatic_rename': True, },
                 'panes': [
                     {'shell_command': ['htop']}
                 ]
@@ -453,7 +455,7 @@ class ShellCommandBeforeTest(unittest.TestCase):
                 ]
             },
             {
-                'automatic_rename': True,
+                'options': { 'automatic_rename': True, },
                 'panes': [
                     {'shell_command': ['htop']}
                 ]
@@ -494,7 +496,7 @@ class ShellCommandBeforeTest(unittest.TestCase):
                 ]
             },
             {
-                'automatic_rename': True,
+                'options': {'automatic_rename': True, },
                 'panes': [
                     {'shell_command': ['htop']}
                 ]

tmuxp/testsuite/test_workspacebuilder.py

@@ -32,7 +32,6 @@ class TwoPaneTest(TmuxTestCase):
         start_directory: /var/log
       window_name: logging
     - window_name: test
-      automatic_rename: true
       panes:
       - shell_command:
         - htop

tmuxp/window.py

@@ -121,8 +121,6 @@ def set_window_option(self, option, value):
 
             $ tmux set-window-option <option> <value>
 
-        :param option: the window option. such as 'automatic_rename'.
-        :type option: string
         :param value: window value. True/False will turn in 'on' and 'off'.
         :type value: string or bool
         '''

tmuxp/workspacebuilder.py

@@ -123,6 +123,10 @@ def build(self, session=None):
             assert(self.sconf['session_name'] == session.get('session_name'))
 
         assert(isinstance(session, Session))
+        if 'options' in self.sconf and isinstance(self.sconf['options'], dict):
+            for key, val in self.sconf['options'].items():
+                s.set_option(key, val)
+
 
         for w, wconf in self.iter_create_windows(session):
             assert(isinstance(w, Window))
@@ -145,10 +149,8 @@ def iter_create_windows(self, s):
         :rtype: :class:`Window`
         '''
         for i, wconf in enumerate(self.sconf['windows'], start=1):
-            automatic_rename = False
             if 'window_name' not in wconf:
                 window_name = None
-                automatic_rename = True
             else:
                 window_name = wconf['window_name']
 
@@ -159,7 +161,6 @@ def iter_create_windows(self, s):
             else:
                 w = s.new_window(
                     window_name=window_name,
-                    automatic_rename=automatic_rename,
                     attach=False  # do not move to the new window
                 )