Commit ff7670f

authored

Merge pull request #369 from commitizen-tools/weilee/fix-init-linebreak

fix(commands/init): fix toml config format error

2 parents 32916ab + b8bc952 commit ff7670fCopy full SHA for ff7670f

File tree

+16

-5

lines changed

+16

-5

lines changed

Lines changed: 13 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
	`1`	`+import os`
`1`	`2`	`from pathlib import Path`
`2`	`3`	`from typing import Union`
`3`	`4`
`4`		`-from tomlkit import exceptions, parse`
	`5`	`+from tomlkit import exceptions, parse, table`
`5`	`6`
`6`	`7`	`from .base_config import BaseConfig`
`7`	`8`
`@@ -14,8 +15,17 @@ def __init__(self, *, data: Union[bytes, str], path: Union[Path, str]):`
`14`	`15`	`self.add_path(path)`
`15`	`16`
`16`	`17`	`def init_empty_config_content(self):`
`17`		`- with open(self.path, "a") as toml_file:`
`18`		`- toml_file.write("[tool.commitizen]")`
	`18`	`+ if os.path.isfile(self.path):`
	`19`	`+ with open(self.path, "rb") as input_toml_file:`
	`20`	`+ parser = parse(input_toml_file.read())`
	`21`	`+ else:`
	`22`	`+ parser = parse("")`
	`23`	`+`
	`24`	`+ with open(self.path, "wb") as output_toml_file:`
	`25`	`+ if parser.get("tool") is None:`
	`26`	`+ parser["tool"] = table()`
	`27`	`+ parser["tool"]["commitizen"] = table()`
	`28`	`+ output_toml_file.write(parser.as_string().encode("utf-8"))`
`19`	`29`
`20`	`30`	`def set_key(self, key, value):`
`21`	`31`	`"""Set or update a key in the conf.`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ def ask(self):`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`expected_config = (`
	`28`	`+ "[tool]\n"`
`28`	`29`	`"[tool.commitizen]\n"`
`29`	`30`	`'name = "cz_conventional_commits"\n'`
`30`	`31`	`'version = "0.0.1"\n'`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ def test_init_empty_config_content(self, tmpdir):`
`132`	`132`	`toml_config.init_empty_config_content()`
`133`	`133`
`134`	`134`	`with open(path, "r") as toml_file:`
`135`		`- assert toml_file.read() == "[tool.commitizen]"`
	`135`	`+ assert toml_file.read() == "[tool]\n[tool.commitizen]\n"`
`136`	`136`
`137`	`137`	`def test_init_empty_config_content_with_existing_content(self, tmpdir):`
`138`	`138`	`existing_content = "[tool.black]\n" "line-length = 88\n"`
`@@ -143,7 +143,7 @@ def test_init_empty_config_content_with_existing_content(self, tmpdir):`
`143`	`143`	`toml_config.init_empty_config_content()`
`144`	`144`
`145`	`145`	`with open(path, "r") as toml_file:`
`146`		`- assert toml_file.read() == existing_content + "[tool.commitizen]"`
	`146`	`+ assert toml_file.read() == existing_content + "\n[tool.commitizen]\n"`
`147`	`147`
`148`	`148`
`149`	`149`	`class TestJsonConfig:`

Comments

(0)