Fix configure: no more crash if no vdir configured.

Fixes #579.

CHANGELOG.rst

@@ -7,6 +7,12 @@ Package maintainers and users who have to manually update their installation
 may want to subscribe to `GitHub's tag feed
 <https://github.com/geier/khal/tags.atom>`_.
 
+0.9.3
+=====
+not released yet
+
+* FIX `configure` would crash if neither "import config from vdirsyncer" nor
+  "create locale vdir" was selected
 
 0.9.2
 =====

khal/configwizard.py

@@ -146,12 +146,12 @@ def create_vdir(names=[]):
         print("Could not create directory {} because of {}. Exiting".format(path, error))
         raise
     print("Created new vdir at {}".format(path))
-    return (name, path, 'calendar')
+    return [(name, path, 'calendar')]
 
 
 def create_config(vdirs, dateformat, timeformat):
     config = ['[calendars]']
-    for name, path, type_ in sorted(vdirs) or ():
+    for name, path, type_ in sorted(vdirs or ()):
         config.append('\n[[{name}]]'.format(name=name))
         config.append('path = {path}'.format(path=path))
         config.append('type = {type}'.format(type=type_))
@@ -186,10 +186,13 @@ def configwizard():
     print()
     if not vdirs:
         try:
-            vdirs = [create_vdir()]
+            vdirs = create_vdir()
         except OSError as error:
             raise FatalError(error)
 
+    if not vdirs:
+        print("\nWARNING: no vdir configured, khal will not be usable like this!\n")
+
     config = create_config(vdirs, dateformat=dateformat, timeformat=timeformat)
     config_path = join(xdg.BaseDirectory.xdg_config_home, 'khal', 'config')
     if not confirm(

tests/cli_test.py

@@ -448,7 +448,6 @@ def choices(ordering=0, separator=0, dateconfirm=True,
             create_vdir=False,
             write_config=True):
     """helper function to generate input for testing `configure`"""
-    assert parse_vdirsyncer_conf != create_vdir
     confirm = {True: 'y', False: 'n'}
 
     out = [
@@ -655,6 +654,18 @@ def test_configure_command_cannot_create_vdir(runner):
     assert result.exit_code == 1
 
 
+def test_configure_no_vdir(runner):
+    runner = runner()
+    runner.config_file.remove()
+    result = runner.invoke(
+        main_khal, ['configure'],
+        input=choices(parse_vdirsyncer_conf=False, create_vdir=False),
+    )
+    assert 'khal will not be usable like this' in result.output
+    assert result.exit_code == 0
+    assert not result.exception
+
+
 def test_edit(runner):
     runner = runner()
     result = runner.invoke(main_khal, ['list'])