remove file parsing and obtain version from git by default

Author: silverwind

Makefile

@@ -27,15 +27,15 @@ update: node_modules
 	@touch node_modules
 
 patch: node_modules test
-	node bin/versions.js -Cc 'make build' patch
+	node bin/versions.js -c 'make build' patch package.json package-lock.json
 	@$(MAKE) --no-print-directory publish
 
 minor: node_modules test
-	node bin/versions.js -Cc 'make build' minor
+	node bin/versions.js -c 'make build' minor package.json package-lock.json
 	@$(MAKE) --no-print-directory publish
 
 major: node_modules test
-	node bin/versions.js -Cc 'make build' major
+	node bin/versions.js -c 'make build' major package.json package-lock.json
 	@$(MAKE) --no-print-directory publish
 
 .PHONY: lint test unittest build publish deps update patch minor major

README.md

@@ -3,8 +3,6 @@
 
 > CLI to flexibly increment a project's version
 
-Supports projects with `package.json` and `pyproject.toml` (poetry).
-
 ## Installation
 ```
 npm i -D versions
@@ -15,29 +13,20 @@ npx versions --help
 ```
 usage: versions [options] patch|minor|major [files...]
 
-  Semantically increment a project's version in multiple files.
-
-  Arguments:
-   files                  Files to do version replacement in. The nearest package.json and
-                          package-lock.json will always be included unless the -P argument is given
   Options:
-    -a, --all             Add all changed files to the commit instead of only the ones currently modified
-    -b, --base <version>  Base version to use. Default is parsed from the nearest package.json
-    -C, --changelog       Generate a changelog since the base version tag or if absent, the latest tag
-    -c, --command <cmd>   Run a command after files are updated but before git commit and tag
-    -d, --date [<date>]   Replace dates in format YYYY-MM-DD with current or given date
-    -m, --message <str>   Custom tag and commit message. Token _VER_ is available to fill the new version
+    -a, --all             Add all changed files to the commit
+    -b, --base <version>  Base version. Default is from latest git tag or 0.1.0
     -p, --prefix          Prefix git tags with a "v" character
-    -r, --replace <str>   Additional replacement in the format "s#regexp#replacement#flags"
-    -g, --gitless         Do not perform any git action like creating commit and tag
-    -G, --globless        Do not process globs in the file arguments
-    -P, --packageless     Do not include package.json and package-lock.json unless explicitely given
+    -c, --command <cmd>   Run command after files are updated but before git commit and tag
+    -d, --date [<date>]   Replace dates in format YYYY-MM-DD with current or given date
+    -m, --message <str>   Custom tag and commit message. Token _VER_ is available
+    -r, --replace <str>   Additional replacements in the format "s#regexp#replacement#flags"
     -v, --version         Print the version
     -h, --help            Print this help
 
   Examples:
     $ versions patch
-    $ versions -Cc 'npm run build' -m 'Release _VER_' minor file.css
+    $ versions -c 'npm run build' -m 'Release _VER_' minor file.css
 ```
 
 ## Signing commits and tags
@@ -57,7 +46,7 @@ To automatically sign commits and tags created by `versions` with GPG add this t
 
 ## CI environments
 
-CI environments usually do shallow git checkout. To use `--changelog` unshallow the repository first:
+CI environments usually do shallow git checkout. Unshallow the repository first:
 
 ```bash
 git fetch --unshallow --quiet --tags

package-lock.json

@@ -18,7 +18,6 @@
     "eslint": "8.25.0",
     "eslint-config-silverwind": "59.0.0",
     "execa": "6.1.0",
-    "fast-glob": "3.2.12",
     "minimist": "1.2.7",
     "toml": "3.0.0",
     "updates": "13.1.9",

package.json

@@ -7,10 +7,6 @@ import toml from "toml";
 const pkgFile = new URL("package.json", import.meta.url);
 const pyFile = new URL("fixtures/pyproject.toml", import.meta.url);
 const testFile = new URL("testfile", import.meta.url);
-const script = `bin/versions.js`;
-const prefix = `testfile v`;
-const fromSuffix = ` (1999-01-01)`;
-const toSuffix = ` (${(new Date()).toISOString().substring(0, 10)})`;
 let pkgStr;
 
 afterAll(async () => {
@@ -20,7 +16,7 @@ afterAll(async () => {
 
 test("version", async () => {
   const {version: expected} = JSON.parse(readFileSync(new URL("package.json", import.meta.url), "utf8"));
-  const {stdout, exitCode} = await execa("node", [script, "-v"]);
+  const {stdout, exitCode} = await execa("node", ["bin/versions.js", "-v"]);
   expect(stdout).toEqual(expected);
   expect(exitCode).toEqual(0);
 });
@@ -47,36 +43,38 @@ test("semver", async () => {
 });
 
 async function run(args) {
-  return await execa(`node ${script} ${args}`, {shell: true});
+  return await execa(`node bin/versions.js ${args}`, {shell: true});
 }
 
 async function verify(version) {
-  expect(await readFile(testFile, "utf8")).toEqual(`${prefix}${version}${toSuffix}`);
+  expect(await readFile(testFile, "utf8")).toEqual(
+    `testfile v${version} (${(new Date()).toISOString().substring(0, 10)})`
+  );
   return version;
 }
 
 test("versions", async () => {
   pkgStr = await readFile(pkgFile, "utf8");
   let {version} = await JSON.parse(pkgStr);
 
-  await writeFile(testFile, `${prefix}${version}${fromSuffix}`);
+  await writeFile(testFile, `testfile v${version} (1999-01-01)`);
 
-  await run(`-P patch -d -g testfile`);
+  await run(`--date --base ${version} --gitless patch testfile`);
   version = await verify(incrementSemver(version, "patch"));
 
-  await run(`-b ${version} -P -C --date --gitless minor testfile`);
+  await run(`--date --base ${version} --gitless minor testfile`);
   version = await verify(incrementSemver(version, "minor"));
 
-  await run(`-b ${version} --packageless --gitless --date major testfile`);
+  await run(`--date --base ${version} --gitless major testfile`);
   version = await verify(incrementSemver(version, "major"));
 
-  await run(`-b ${version} -g -C -P -d major t*stf*le`);
+  await run(`--date --base ${version} --gitless major t*stf*le`);
   version = await verify(incrementSemver(version, "major"));
 
-  await run(`-b ${version} -d -g -P major testfile testfile`);
+  await run(`--date --base ${version} --gitless major testfile testfile`);
   version = await verify(incrementSemver(version, "major"));
 
-  await run(`-b ${version} -dgPGC minor testfile`);
+  await run(`--date --base ${version} --gitless minor testfile`);
   version = await verify(incrementSemver(version, "minor"));
 });
 
@@ -91,7 +89,7 @@ test("pyproject.toml", async () => {
   const tmpFile = new URL("pyproject.toml", import.meta.url);
   await writeFile(tmpFile, str);
   // todo: eliminate need for -b
-  await run(`-P minor -d -g pyproject.toml -b ${versionBefore}`);
+  await run(`minor --gitless --date --base ${versionBefore} pyproject.toml`);
 
   const dataAfter = toml.parse(await readFile(tmpFile, "utf8"));
   const versionAfter = incrementSemver(versionBefore, "minor");