style: fix typo within codebase

Lee-W · Lee-W · commit 2c9c8a380edf · 2020-05-23T15:59:21.000+08:00
diff --git a/commitizen/bump.py b/commitizen/bump.py
@@ -138,7 +138,7 @@ def update_version_in_files(
     So for example, your tag could look like `v1.0.0` while your version in
     the package like `1.0.0`.
     """
-    # TODO: sepearte check step and write step
+    # TODO: separate check step and write step
     for location in files:
         filepath, *regexes = location.split(":", maxsplit=1)
         regex = regexes[0] if regexes else None
diff --git a/commitizen/cli.py b/commitizen/cli.py
@@ -114,7 +114,7 @@
                     {
                         "name": "--bump-message",
                         "help": (
-                            "template used to create the release commmit, "
+                            "template used to create the release commit, "
                             "useful when working with CI"
                         ),
                     },
diff --git a/commitizen/commands/bump.py b/commitizen/commands/bump.py
@@ -154,7 +154,7 @@ def __call__(self):  # noqa: C901
         self.config.set_key("version", new_version.public)
         c = git.commit(message, args=self._get_commit_args())
         if c.err:
-            out.error('git.commit errror: "{}"'.format(c.err.strip()))
+            out.error('git.commit error: "{}"'.format(c.err.strip()))
             raise SystemExit(COMMIT_FAILED)
         c = git.tag(new_tag_version)
         if c.err:
diff --git a/commitizen/config/__init__.py b/commitizen/config/__init__.py
@@ -16,7 +16,7 @@ def load_global_conf() -> Optional[IniConfig]:
     if not global_cfg.exists():
         return None
 
-    # global conf doesnt make sense with commitizen bump
+    # global conf doesn't make sense with commitizen bump
     # so I'm deprecating it and won't test it
     message = (
         "Global conf will be deprecated in next major version. "
diff --git a/commitizen/factory.py b/commitizen/factory.py
@@ -11,7 +11,7 @@ def commiter_factory(config: BaseConfig) -> BaseCommitizen:
         _cz = registry[name](config)
     except KeyError:
         msg_error = (
-            "The commiter has not been found in the system.\n\n"
+            "The committer has not been found in the system.\n\n"
             f"Try running 'pip install {name}'\n"
         )
         out.error(msg_error)
diff --git a/commitizen/git.py b/commitizen/git.py
@@ -63,7 +63,7 @@ def get_commits(
     delimiter: str = "----------commit-delimiter----------",
     args: str = "",
 ) -> List[GitCommit]:
-    """Get the commits betweeen start and end."""
+    """Get the commits between start and end."""
     git_log_cmd = f"git log --pretty={log_format}{delimiter} {args}"
 
     if start:
diff --git a/tests/CHANGELOG_FOR_TEST.md b/tests/CHANGELOG_FOR_TEST.md
@@ -29,7 +29,7 @@
 - update given files with new version
 - **config**: new set key, used to set version to cfg
 - support for pyproject.toml
-- first semantic version bump implementaiton
+- first semantic version bump implementation
 
 ### fix
 
@@ -92,11 +92,11 @@
 
 ### refactor
 
-- **conventionalCommit**: moved fitlers to questions instead of message
+- **conventionalCommit**: moved filters to questions instead of message
 
 ### fix
 
-- **manifest**: inluded missing files
+- **manifest**: included missing files
 
 ## v0.9.5 (2018-08-24)
 
@@ -114,7 +114,7 @@
 
 ### feat
 
-- **commiter**: conventional commit is a bit more intelligent now
+- **committer**: conventional commit is a bit more intelligent now
 
 ## v0.9.2 (2017-11-11)
 
diff --git a/tests/commands/test_bump_command.py b/tests/commands/test_bump_command.py
@@ -77,7 +77,7 @@ def test_bump_on_git_with_hooks_no_verify_disabled(mocker, capsys):
         cli.main()
 
     _, err = capsys.readouterr()
-    assert 'git.commit errror: "0.1.0"' in err
+    assert 'git.commit error: "0.1.0"' in err
 
 
 @pytest.mark.usefixtures("tmp_commitizen_project")
diff --git a/tests/test_changelog.py b/tests/test_changelog.py
@@ -125,7 +125,7 @@
     },
     {
         "rev": "3127e05077288a5e2b62893345590bf1096141b7",
-        "title": "feat: first semantic version bump implementaiton",
+        "title": "feat: first semantic version bump implementation",
         "body": "",
     },
     {
@@ -255,12 +255,12 @@
     },
     {
         "rev": "72472efb80f08ee3fd844660afa012c8cb256e4b",
-        "title": "refactor(conventionalCommit): moved fitlers to questions instead of message",
+        "title": "refactor(conventionalCommit): moved filters to questions instead of message",
         "body": "",
     },
     {
         "rev": "b5561ce0ab3b56bb87712c8f90bcf37cf2474f1b",
-        "title": "fix(manifest): inluded missing files",
+        "title": "fix(manifest): included missing files",
         "body": "",
     },
     {
@@ -290,7 +290,7 @@
     },
     {
         "rev": "4368f3c3cbfd4a1ced339212230d854bc5bab496",
-        "title": "feat(commiter): conventional commit is a bit more intelligent now",
+        "title": "feat(committer): conventional commit is a bit more intelligent now",
         "body": "",
     },
     {
@@ -472,7 +472,7 @@ def test_generate_tree_from_commits(gitcommits, tags):
                     {
                         "scope": None,
                         "breaking": None,
-                        "message": "first semantic version bump implementaiton",
+                        "message": "first semantic version bump implementation",
                     },
                 ],
                 "fix": [
@@ -591,14 +591,14 @@ def test_generate_tree_from_commits(gitcommits, tags):
                     {
                         "scope": "conventionalCommit",
                         "breaking": None,
-                        "message": "moved fitlers to questions instead of message",
+                        "message": "moved filters to questions instead of message",
                     }
                 ],
                 "fix": [
                     {
                         "scope": "manifest",
                         "breaking": None,
-                        "message": "inluded missing files",
+                        "message": "included missing files",
                     }
                 ],
             },
@@ -629,7 +629,7 @@ def test_generate_tree_from_commits(gitcommits, tags):
             "changes": {
                 "feat": [
                     {
-                        "scope": "commiter",
+                        "scope": "committer",
                         "breaking": None,
                         "message": "conventional commit is a bit more intelligent now",
                     }
diff --git a/tests/test_cz_customize.py b/tests/test_cz_customize.py
@@ -10,7 +10,7 @@ def config():
     toml_str = r"""
     [tool.commitizen.customize]
     message_template = "{{change_type}}:{% if show_message %} {{message}}{% endif %}"
-    example = "feature: this feature eanable customize through config file"
+    example = "feature: this feature enable customize through config file"
     schema = "<type>: <body>"
     bump_pattern = "^(break|new|fix|hotfix)"
     bump_map = {"break" = "MAJOR", "new" = "MINOR", "fix" = "PATCH", "hotfix" = "PATCH"}
@@ -88,16 +88,16 @@ def test_answer(config):
     cz = CustomizeCommitsCz(config)
     answers = {
         "change_type": "feature",
-        "message": "this feature eanable customize through config file",
+        "message": "this feature enaable customize through config file",
         "show_message": True,
     }
     message = cz.message(answers)
-    assert message == "feature: this feature eanable customize through config file"
+    assert message == "feature: this feature enaable customize through config file"
 
     cz = CustomizeCommitsCz(config)
     answers = {
         "change_type": "feature",
-        "message": "this feature eanable customize through config file",
+        "message": "this feature enaable customize through config file",
         "show_message": False,
     }
     message = cz.message(answers)
@@ -106,7 +106,7 @@ def test_answer(config):
 
 def test_example(config):
     cz = CustomizeCommitsCz(config)
-    assert "feature: this feature eanable customize through config file" in cz.example()
+    assert "feature: this feature enable customize through config file" in cz.example()
 
 
 def test_schema(config):

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@`
`114`	`114`	`{`
`115`	`115`	`"name": "--bump-message",`
`116`	`116`	`"help": (`
`117`		`- "template used to create the release commmit, "`
	`117`	`+ "template used to create the release commit, "`
`118`	`118`	`"useful when working with CI"`
`119`	`119`	`),`
`120`	`120`	`},`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ def commiter_factory(config: BaseConfig) -> BaseCommitizen:`
`11`	`11`	`_cz = registry[name](config)`
`12`	`12`	`except KeyError:`
`13`	`13`	`msg_error = (`
`14`		`- "The commiter has not been found in the system.\n\n"`
	`14`	`+ "The committer has not been found in the system.\n\n"`
`15`	`15`	`f"Try running 'pip install {name}'\n"`
`16`	`16`	`)`
`17`	`17`	`out.error(msg_error)`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@`
`125`	`125`	`},`
`126`	`126`	`{`
`127`	`127`	`"rev": "3127e05077288a5e2b62893345590bf1096141b7",`
`128`		`- "title": "feat: first semantic version bump implementaiton",`
	`128`	`+ "title": "feat: first semantic version bump implementation",`
`129`	`129`	`"body": "",`
`130`	`130`	`},`
`131`	`131`	`{`
`@@ -255,12 +255,12 @@`
`255`	`255`	`},`
`256`	`256`	`{`
`257`	`257`	`"rev": "72472efb80f08ee3fd844660afa012c8cb256e4b",`
`258`		`- "title": "refactor(conventionalCommit): moved fitlers to questions instead of message",`
	`258`	`+ "title": "refactor(conventionalCommit): moved filters to questions instead of message",`
`259`	`259`	`"body": "",`
`260`	`260`	`},`
`261`	`261`	`{`
`262`	`262`	`"rev": "b5561ce0ab3b56bb87712c8f90bcf37cf2474f1b",`
`263`		`- "title": "fix(manifest): inluded missing files",`
	`263`	`+ "title": "fix(manifest): included missing files",`
`264`	`264`	`"body": "",`
`265`	`265`	`},`
`266`	`266`	`{`
`@@ -290,7 +290,7 @@`
`290`	`290`	`},`
`291`	`291`	`{`
`292`	`292`	`"rev": "4368f3c3cbfd4a1ced339212230d854bc5bab496",`
`293`		`- "title": "feat(commiter): conventional commit is a bit more intelligent now",`
	`293`	`+ "title": "feat(committer): conventional commit is a bit more intelligent now",`
`294`	`294`	`"body": "",`
`295`	`295`	`},`
`296`	`296`	`{`
`@@ -472,7 +472,7 @@ def test_generate_tree_from_commits(gitcommits, tags):`
`472`	`472`	`{`
`473`	`473`	`"scope": None,`
`474`	`474`	`"breaking": None,`
`475`		`- "message": "first semantic version bump implementaiton",`
	`475`	`+ "message": "first semantic version bump implementation",`
`476`	`476`	`},`
`477`	`477`	`],`
`478`	`478`	`"fix": [`
`@@ -591,14 +591,14 @@ def test_generate_tree_from_commits(gitcommits, tags):`
`591`	`591`	`{`
`592`	`592`	`"scope": "conventionalCommit",`
`593`	`593`	`"breaking": None,`
`594`		`- "message": "moved fitlers to questions instead of message",`
	`594`	`+ "message": "moved filters to questions instead of message",`
`595`	`595`	`}`
`596`	`596`	`],`
`597`	`597`	`"fix": [`
`598`	`598`	`{`
`599`	`599`	`"scope": "manifest",`
`600`	`600`	`"breaking": None,`
`601`		`- "message": "inluded missing files",`
	`601`	`+ "message": "included missing files",`
`602`	`602`	`}`
`603`	`603`	`],`
`604`	`604`	`},`
`@@ -629,7 +629,7 @@ def test_generate_tree_from_commits(gitcommits, tags):`
`629`	`629`	`"changes": {`
`630`	`630`	`"feat": [`
`631`	`631`	`{`
`632`		`- "scope": "commiter",`
	`632`	`+ "scope": "committer",`
`633`	`633`	`"breaking": None,`
`634`	`634`	`"message": "conventional commit is a bit more intelligent now",`
`635`	`635`	`}`