Try set-option default-path before creation if -c entered. Add util.check_version. Expecting 1.9 to fail on this. wip

Author: tony

tmuxp/server.py

@@ -85,17 +85,7 @@ def __list_sessions(self):
         )
 
         if proc.stderr:
-            if 'unknown option -- F' in proc.stderr[0]:
-                proc = self.tmux(
-                    'list-sessions',
-                )
-
-                if proc.stderr:
-                    raise Exception(proc.stderr)
-                else:
-                    return 'hi'
-            else:
-                raise Exception(proc.stderr)
+            raise Exception(proc.stderr)
         else:
             session_info = proc.stdout[0]
 

tmuxp/session.py

@@ -148,24 +148,32 @@ def new_window(self,
         wformats = ['session_name', 'session_id'] + formats.WINDOW_FORMATS
         tmux_formats = ['#{%s}' % f for f in wformats]
 
-        window_args = (
-            '-t%s' % self.get('session_id'),
-            '-P',
-        )
+        window_args = tuple()
+
 
         if not attach:
             window_args += ('-d',)
 
+        window_args += (
+            '-P',
+        )
+
         if start_directory:
-            # start_directory = pipes.quote(start_directory)
+            self.tmux('set-option', 'default-path', start_directory)
+            self.server.tmux('set-option', 'default-path', start_directory)
+            #start_directory = pipes.quote(start_directory)
             logger.error(start_directory)
-            window_args += ('-c %s' % start_directory,)
+            #window_args += ('-c%s' % start_directory,)
+
 
+        window_args += (
+            '-F"%s"' % '\t'.join(tmux_formats),  # output
+        )
         if window_name:
             window_args += ('-n%s' % window_name,)
 
         window_args += (
-            '-F%s' % '\t'.join(tmux_formats),  # output
+            '-t%s' % self.get('session_id'),
         )
 
         proc = self.tmux('new-window', *window_args)

tmuxp/testsuite/test_workspacebuilder.py

@@ -269,24 +269,34 @@ def test_automatic_rename_option(self):
 
 
 class StartDirectoryTest(TmuxTestCase):
-
     yaml_config = '''
     session_name: sampleconfig
-    start_directory: '~'
+    #start_directory: '/home/tony'
     windows:
     - window_name: test
-      start_directory: /var/log
+      start_directory: '/var/log'
       layout: main-horizontal
+      options:
+          main-pane-height: 50
       panes:
       - shell_command:
-        - vim
+        - echo "hey"
+      - shell_command:
+        - echo "moo"
+    - window_name: testsa
+      start_directory: '/dev'
+      layout: main-horizontal
+      panes:
+      - shell_command:
+        - pwd
       - shell_command:
         - echo "hey"
       - shell_command:
         - echo "moo"
     '''
 
     def test_start_directory(self):
+
         sconfig = kaptan.Kaptan(handler='yaml')
         sconfig = sconfig.import_config(self.yaml_config).get()
         #sconfig = config.expand(sconfig)
@@ -296,12 +306,12 @@ def test_start_directory(self):
 
         assert(self.session == builder.session)
         logger.error(self.session)
-        self.assertEqual(1, len(self.session.windows))
+        #self.assertEqual(1, len(self.session.windows))
         for window in self.session.windows:
             for p in window.panes:
                 logger.error(dict(p))
                 logger.error(p.get('pane_start_path'))
-                self.assertEqual('/var/log', p.get('pane_start_path'))
+                self.assertTrue(any(p.get('pane_start_path', ['/var/log', '/dev/'])))
 
 if __name__ == '__main__':
     unittest.main()

tmuxp/util.py

@@ -53,14 +53,14 @@ def __init__(self, *args, **kwargs):
             self.process = subprocess.Popen(
                 cmd,
                 stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE
+                stderr=subprocess.PIPE,
             )
             self.process.wait()
             stdout = self.process.stdout.read()
             stderr = self.process.stderr.read()
         except Exception as e:
             logger.error('Exception for %s: \n%s' % (
-                cmd,
+                subprocess.list2cmdline(cmd),
                 e.message)
             )
         self.stdout = stdout.decode().split('\n')
@@ -221,8 +221,25 @@ def which(exe=None):
     logger.error('No executable was passed to be searched by which')
     return None
 
+def get_version(version):
+    """ Return True if tmux version installed.
+
+    :param version: version, '1.8'
+    :param type: string
+    """
+    proc = tmux('-V')
+
+    if proc.stderr:
+        raise Exception(proc.stderr)
+
+    installed_version = proc.stdout[0].split('tmux ')[1]
+
+    return StrictVersion(installed_version) == StrictVersion(version)
 
 def version():
+    """
+    check to see if tmux is version >1.8 or above
+    """
     proc = tmux('-V')
 
     if proc.stderr:

tmuxp/workspacebuilder.py

@@ -164,6 +164,7 @@ def iter_create_windows(self, s):
             w1 = None
             if i == int(1):  # if first window, use window 1
                 w1 = s.attached_window()
+                w1.attached_pane().send_keys('la')
             w = s.new_window(
                 window_name=window_name,
                 start_directory=wconf['start_directory'] if 'start_directory' in wconf else None,
@@ -241,8 +242,8 @@ def freeze(session):
             pconf = {}
             pconf['shell_command'] = []
             if 'shell_command_before' not in wconf:
-                pconf['shell_command'].append(
-                    'cd ' + p.get('pane_current_path'))
+               pconf['shell_command'].append(
+                   'cd ' + p.get('pane_current_path'))
             pconf['shell_command'].append(p.get('pane_current_command'))
             wconf['panes'].append(pconf)
             # logger.error(p)