tmuxp import for cli, wip. update changelog

Author: tony

CHANGES

@@ -9,6 +9,12 @@ Here you can find the recent changes to tmuxp.
 - [import] [tests] initial version of `tmuxinator`_ and `teamocil`_
   config importer. it does not support all options and it not guaranteed
   to fully convert window/pane size and state.
+- [internal] :meth:`config.in_dir` supports a list of ``extensions`` for
+  filetypes to search, i.e. ``['.yaml', '.json']``.
+- [internal] :meth:`config.is_config_file` now supports ``extensions``
+  argument as a string also.
+- [cli] fix ``$ tmuxp load -l`` to work correctly alongside
+  ``$ tmuxp load filename``.
 
 2013-10-25
 ----------

tmuxp/cli.py

@@ -23,7 +23,8 @@
 
 config_dir = os.path.expanduser('~/.tmuxp/')
 cwd_dir = os.getcwd() + '/'
-
+tmuxinator_config_dir = os.path.expanduser('~/.tmuxinator/')
+teamocil_config_dir = os.path.expanduser('~/.teamocil/')
 
 def query_yes_no(question, default="yes"):
     """Ask a yes/no question via raw_input() and return their answer.
@@ -179,12 +180,58 @@ def subcommand_load(args):
 
 
 def subcommand_import_teamocil(args):
-    print(args)
+    if args.list:
+            try:
+                configs_in_user = config.in_dir(teamocil_config_dir, extensions='yml')
+            except OSError:
+                configs_in_user = []
+            configs_in_cwd = config.in_dir(config_dir=cwd_dir, extensions='yml')
+
+            output = ''
+
+            if not os.path.exists(teamocil_config_dir):
+                output += '# %s: \n\tDirectory doesn\'t exist.\n' % teamocil_config_dir
+            elif not configs_in_user:
+                output += '# %s: \n\tNone found.\n' % teamocil_config_dir
+            else:
+                output += '# %s: \n\t%s\n' % (
+                    config_dir, ', '.join(configs_in_user)
+                )
+
+            if configs_in_cwd:
+                output += '# current directory:\n\t%s' % (
+                    ', '.join(configs_in_cwd)
+                )
+
+            print(output)
+
 
 
 def subcommand_import_tmuxinator(args):
-    print(args)
+    if args.list:
+            try:
+                configs_in_user = config.in_dir(tmuxinator_config_dir, extensions='yml')
+            except OSError:
+                configs_in_user = []
+            configs_in_cwd = config.in_dir(config_dir=cwd_dir, extensions='yml')
+
+            output = ''
+
+            if not os.path.exists(tmuxinator_config_dir):
+                output += '# %s: \n\tDirectory doesn\'t exist.\n' % tmuxinator_config_dir
+            elif not configs_in_user:
+                output += '# %s: \n\tNone found.\n' % tmuxinator_config_dir
+            else:
+                output += '# %s: \n\t%s\n' % (
+                    config_dir, ', '.join(configs_in_user)
+                )
 
+            if configs_in_cwd:
+                output += '# current directory:\n\t%s' % (
+                    ', '.join(configs_in_cwd)
+                )
+
+            print(output)
 
 def subcommand_convert(args):
     if args.config:
@@ -365,10 +412,16 @@ def cli_parser():
 
     import_teamocil = importsubparser.add_parser('teamocil')
 
-    import_teamocil.add_argument(
+    import_teamocilgroup = import_teamocil.add_mutually_exclusive_group(required=True)
+    import_teamocilgroup.add_argument(
+        '-l', '--list', dest='list', action='store_true',
+        help='List yaml configs in ~/.teamocil and current working directory.'
+    )
+
+    import_teamocilgroup.add_argument(
         dest='config',
         type=str,
-        default=None,
+        nargs='?',
         help='''\
         Checks current ~/.teamocil and current directory for yaml files.
         '''
@@ -377,14 +430,21 @@ def cli_parser():
 
     import_tmuxinator = importsubparser.add_parser('tmuxinator')
 
-    import_tmuxinator.add_argument(
+    import_tmuxinatorgroup = import_tmuxinator.add_mutually_exclusive_group(required=True)
+    import_tmuxinatorgroup.add_argument(
+        '-l', '--list', dest='list', action='store_true',
+        help='List yaml configs in ~/.tmuxinator and current working directory.'
+    )
+
+    import_tmuxinatorgroup.add_argument(
         dest='config',
         type=str,
-        default=None,
+        nargs='?',
         help='''\
         Checks current ~/.tmuxinator and current directory for yaml files.
         '''
     )
+
     import_tmuxinator.set_defaults(callback=subcommand_import_tmuxinator)
 
     parser.add_argument('--log-level', dest='log_level', default='INFO',
@@ -496,6 +556,20 @@ def config_complete(command, commands, ctext):
                         for c in config.in_dir(config_dir)]
             commands += [c for c in configs if c.startswith(ctext_subargs)]
 
+    def teamocil_config_complete(command, commands, ctext):
+        try:
+            configs_in_user = config.in_dir(teamocil_config_dir, extensions='yml')
+        except OSError:
+            configs_in_user = []
+        configs_in_cwd = config.in_dir(config_dir=cwd_dir, extensions='yml')
+
+    def tmuxinator_config_complete(command, commands, ctext):
+        try:
+            configs_in_user = config.in_dir(tmuxinator_config_dir, extensions='yml')
+        except OSError:
+            configs_in_user = []
+        configs_in_cwd = config.in_dir(config_dir=cwd_dir, extensions='yml')
+
     session_complete('attach-session', commands, ctext)
     session_complete('kill-session', commands, ctext)
     config_complete('load', commands, ctext)

tmuxp/config.py

@@ -48,22 +48,27 @@ def is_config_file(filename, extensions=['.yaml', '.json', '.ini']):
     :param filename: filename to check (e.g. ``mysession.json``).
     :type filename: string
     :param extensions: filetypes to check (e.g. ``['.yaml', '.json']``).
+    :type extensions: list or string
     :rtype: bool
     '''
+
+    extensions = [extensions] if isinstance(extensions, basestring) else extensions
     return any(filename.endswith(e) for e in extensions)
 
 
-def in_dir(config_dir=os.path.expanduser('~/.tmuxp')):
+def in_dir(config_dir=os.path.expanduser('~/.tmuxp'), extensions=['.yaml', '.json', '.ini']):
     '''Find configs in config_dir and current dir
 
     :param config_dir: directory to search
     :type config_dir: string
+    :param extensions: filetypes to check (e.g. ``['.yaml', '.json']``).
+    :type extensions: list
     :rtype: list
     '''
     configs = []
 
     for filename in os.listdir(config_dir):
-        if is_config_file(filename) and not filename.startswith('.'):
+        if is_config_file(filename, extensions) and not filename.startswith('.'):
             configs.append(filename)
 
     return configs