fix(config): handle empty config file

Lee-W · Lee-W · commit 1d4a4d626b94 · 2019-12-18T16:52:02.000+08:00
diff --git a/commitizen/config/__init__.py b/commitizen/config/__init__.py
@@ -44,18 +44,19 @@ def read_cfg() -> dict:
             data: str = f.read()
 
         if "toml" in filename:
-            conf = TomlConfig(data=data, path=filename)
+            _conf = TomlConfig(data=data, path=filename)
         else:
             warnings.warn(
                 ".cz, setup.cfg, and .cz.cfg will be deprecated "
                 "in next major version. \n"
                 'Please use "pyproject.toml", ".cz.toml" instead'
             )
-            conf = IniConfig(data=data, path=filename)
+            _conf = IniConfig(data=data, path=filename)
 
-        if not conf:
+        if _conf.is_empty_config:
             continue
         else:
+            conf = _conf
             break
 
     if not conf.path:
diff --git a/commitizen/config/ini_config.py b/commitizen/config/ini_config.py
@@ -18,6 +18,7 @@ class IniConfig(BaseConfig):
 
     def __init__(self, *, data: str, path: str):
         super(IniConfig, self).__init__()
+        self.is_empty_config = False
         self._parse_setting(data)
         self._path = path
 
@@ -65,4 +66,4 @@ def _parse_setting(self, data: str) -> dict:
 
             self._settings.update(_data)
         except KeyError:
-            pass
+            self.is_empty_config = True
diff --git a/commitizen/config/toml_config.py b/commitizen/config/toml_config.py
@@ -6,6 +6,7 @@
 class TomlConfig(BaseConfig):
     def __init__(self, *, data: str, path: str):
         super(TomlConfig, self).__init__()
+        self.is_empty_config = False
         self._parse_setting(data)
         self._path = path
 
@@ -35,4 +36,4 @@ def _parse_setting(self, data: str) -> dict:
         try:
             self._settings.update(doc["tool"]["commitizen"])
         except exceptions.NonExistentKey:
-            pass
+            self.is_empty_config = True
diff --git a/tests/test_conf.py b/tests/test_conf.py
@@ -106,9 +106,6 @@ def test_load_conf(config_files_manager, configure_supported_files):
     assert cfg.settings == _settings
 
 
-@pytest.mark.skip(
-    msg="Empty config is broken due to refactor. Will fix it in next commit"
-)
 def test_conf_is_loaded_with_empty_pyproject_but_ok_cz(
     empty_pyproject_ok_cz, configure_supported_files
 ):
