feat: refactor (#25)

adamtabrams · Aug 31, 2024 · 599a222 · 599a222
1 parent c4b6c3b
commit 599a222
Show file tree

Hide file tree

Showing 9 changed files with 310 additions and 327 deletions.
diff --git a/change b/change
diff --git a/scripts/update-version b/scripts/update-version
@@ -1,15 +1,13 @@
 #!/bin/sh
 
 new_version=$1
-version_file="change"
+version_file='change'
 
-[ ! -e $version_file ] &&
-    { echo "$version_file not found in current directory"; exit 1; }
+[ ! -f $version_file ] && echo "$version_file not found in current directory" >&2 && exit 1
 
-sed -i.backup "s|\(^change_version=\"\).*\(\"$\)|\1$new_version\2|" $version_file &&
-    rm "${version_file}.backup" &&
-    git add "$version_file" &&
-    { echo "success - changed version to $new_version"; exit 0; }
+sed -E -i.backup "s,^(version=\").*(\")$,\1$new_version\2," "$version_file" &&
+    rm "$version_file.backup" && git add "$version_file" &&
+    echo "success: changed version to $new_version" && exit
 
-echo "failure - something when wrong"
+echo "failure: something when wrong" >&2
 exit 1
diff --git a/tests/change-err-changelog/setup/exp-stderr b/tests/change-err-changelog/setup/exp-stderr
@@ -1 +1 @@
-couldn't find CHANGELOG.md
+could not find CHANGELOG.md
diff --git a/tests/change-err-repo/setup/exp-stderr b/tests/change-err-repo/setup/exp-stderr
@@ -1 +1 @@
-the current directory doesn't contain .git
+the current directory does not contain .git
diff --git a/tests/change-symbols/setup/CHANGELOG-template.md b/tests/change-symbols/setup/CHANGELOG-template.md
@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Asterisk * escaped asterisk \*.
 - Exclamation ! four backslashes \.
 - 'apostrophe pair' `escaped tick pair`.
-- Tilda ~ escaped tick ` ampersand &.
+- Tilda ~ escaped tick ` ampersand & bar | end.
 
 ### Changed
 - [file link](./run-test).

diff --git a/tests/change-symbols/setup/run-test b/tests/change-symbols/setup/run-test
@@ -9,7 +9,7 @@ git commit --quiet -am "fix: add second file"
 git tag 0.1.0
 
 git add exp-stderr
-git commit --quiet -am "fix: tilda ~ escaped tick \` ampersand &"
+git commit --quiet -am "fix: tilda ~ escaped tick \` ampersand & bar | end"
 git rm --quiet --cached exp-stderr
 git commit --quiet -am "chore: escaped apostrophe \' escaped quote \""
 
@@ -38,7 +38,6 @@ git commit --quiet -am "fix: (paren pair) {curly pair} [square pair]"
 git rm --quiet --cached exp-stderr
 git commit --quiet -am "chore: [file link](./run-test)"
 
-
 git remote add origin https://github.com/adamtabrams/change.git
 
 change >act-stdout 2>act-stderr

diff --git a/tests/init-err-repo/setup/exp-stderr b/tests/init-err-repo/setup/exp-stderr
@@ -1 +1 @@
-the current directory doesn't contain .git
+the current directory does not contain .git
diff --git a/tests/init-err-tag/setup/exp-stderr b/tests/init-err-tag/setup/exp-stderr
@@ -1 +1 @@
-couldn't find any valid version tags
+could not find any valid version tags
diff --git a/tests/init-err-url/setup/exp-stderr b/tests/init-err-url/setup/exp-stderr
@@ -1 +1 @@
-remote url isn't set for this repo
+remote url is not set for this repo