feat: Prefix and message are no longer demand options

bin/options.js

@@ -1,27 +1,25 @@
 const yargs = require('yargs')
   .usage(
-    `usage: git snapshot --prefix=<path> --branch=<branch> --message=<message> [--tag=<tag>] [--remote=<repository>] [--dry-run] [--cwd=<path>]`
+    `usage: git snapshot --branch=<branch> [--prefix=<path>] [--message=<commit message>] [--tag=<tag name>] [--remote=<repository url|remote name>] [--dry-run] [--cwd=<path>]`
   )
-  .option('prefix', {
-    requiresArg: true,
-    alias: 'p',
-    describe: 'the name of the subdir to split out',
-    type: 'string',
-    group: 'Required'
-  })
   .option('branch', {
     requiresArg: true,
     alias: 'b',
     describe: 'the name of branch for split to',
     type: 'string',
     group: 'Required'
   })
+  .option('prefix', {
+    requiresArg: true,
+    alias: 'p',
+    describe: 'the name of the subdir to split out',
+    type: 'string'
+  })
   .option('message', {
     requiresArg: true,
     alias: 'm',
     describe: 'commit message',
-    type: 'string',
-    group: 'Required'
+    type: 'string'
   })
   .option('author', {
     requiresArg: true,
@@ -59,12 +57,11 @@ const yargs = require('yargs')
     requiresArg: true,
     alias: 'c',
     describe: 'working directory',
-    type: 'string',
-    default: process.cwd()
+    type: 'string'
   })
   .alias('version', 'v')
   .alias('help', 'h')
-  .demandOption(['prefix', 'message', 'branch']);
+  .demandOption(['branch']);
 
 if (yargs.argv.debug) {
   // Debug must be enabled before other requires in order to work

index.js

@@ -21,7 +21,8 @@ const git = require('./lib/git');
  * @param {Boolean} argv.debug output debugging information
  */
 async function gitSnapshot(argv) {
-  const {prefix, branch, message, auther, force, tag, remote, dryRun, cwd} = {cwd: process.cwd(), ...argv};
+  // Apply default options
+  const {prefix, branch, message, auther, force, tag, remote, dryRun, cwd} = {cwd: process.cwd(), prefix: '.', ...argv};
 
   if (argv.debug) {
     // Debug must be enabled before other requires in order to work
@@ -37,6 +38,7 @@ async function gitSnapshot(argv) {
   const onCwdOpts = {cwd};
   const onWorktreeOpts = {cwd: worktreePath};
   const autherOpt = auther ? ['--auther', auther] : [];
+  const messageOpt = message ? ['--message', message] : [];
   const prefixPath = path.resolve(prefix);
   const forceOpt = force ? '--force' : '';
 
@@ -107,7 +109,7 @@ async function gitSnapshot(argv) {
     debug(`Commit files:`);
     await git(['add', '-A', '--ignore-errors'], onWorktreeOpts);
     await git(
-      ['commit', '--amend', '--allow-empty', '--allow-empty-message', '-m', message].concat(autherOpt),
+      ['commit', '--amend', '--allow-empty', '--allow-empty-message'].concat(messageOpt).concat(autherOpt),
       onWorktreeOpts
     );
 
@@ -125,6 +127,8 @@ async function gitSnapshot(argv) {
       if (tag) {
         await git(['push', forceOpt, remote, tag], onWorktreeOpts);
       }
+    } else {
+      await git(['checkout', '-B', branch, workBranch], onWorktreeOpts);
     }
 
     // Completed successflly.