chore: job command completion and cleanup

src/lib/cli.ts

@@ -25,6 +25,7 @@ const cli = {
       parser.isHelp || args.length === empty || currentCommand === emptyCommand;
 
     const invalidCommand =
+      parser.isHelp === false &&
       parser.stripOptions().length > empty &&
       (currentCommand === emptyCommand || currentCommand.run === undefined);
 
@@ -41,6 +42,11 @@ const cli = {
         .check()
         .then(ok => {
           if (ok) {
+            console.log(
+              `Excuting: router ${chalk.bold(currentCommand.fullName)} ${
+                currentCommand.args
+              } ...`
+            );
             currentCommand.run(...currentCommand.args);
           }
         })

src/lib/commandParser.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import flexi, { FlexiPath, Path, PathType, until } from "flexi-path";
+import flexi, { FlexiPath, Path, until } from "flexi-path";
 
-import { Command, CommandParser } from "../types";
+import { Command, CommandParser, CommandDeclaration } from "../types";
 
 const rootCommandPath = flexi.path(__dirname).append("commands/");
 
@@ -37,7 +37,7 @@ const mostSpecificCommand = (path: Path): [FlexiPath, ...string[]] => {
 };
 
 /* eslint-disable import/no-dynamic-require,global-require,@typescript-eslint/no-var-requires */
-const requireContent = (path: FlexiPath): any | undefined =>
+const requireContent = (path: FlexiPath): CommandDeclaration =>
   require(path.path).default;
 /* eslint-enable import/no-dynamic-require,global-require,@typescript-eslint/no-var-requires */
 
@@ -46,10 +46,10 @@ export const empty: Command = {
   description: "",
   fullName: "",
   helpName: "",
-  run: undefined,
+  run: () => {},
   subCommands: [],
   name: "empty",
-  usage: ""
+  hint: ""
 };
 
 const createCommand = (currentPath: Path): Command => {
@@ -72,19 +72,15 @@ const createCommand = (currentPath: Path): Command => {
     parent.isEmpty() || parent.isRoot() ? "" : `${parent.name} `;
   const fullName = `${parentName}${name}`;
 
-  const command: Command = {
-    args,
-    description: content.description,
-    fullName,
-    helpName: content.helpname,
-    name,
-    run: content.run,
-    subCommands: path
-      .children()
-      .filter(x => x !== undefined && !x.isEmpty() && x.name !== "index")
-      .map(x => createCommand(x)),
-    usage: content.usage
-  };
+  const subCommands = path
+    .children()
+    .filter(x => x !== undefined && !x.isEmpty() && x.name !== "index")
+    .map(x => createCommand(x));
+
+  const command = {
+    ...{ args, fullName, name, subCommands },
+    ...content
+  } as Command;
 
   return command;
 };

src/lib/commands/jobs/add.ts

@@ -10,14 +10,12 @@ const add = async (...args: string[]) => {
   command = command || (await promptly.prompt("Command to execute: "));
 
   ssh.execute(`cru a ${id} "${command}"`);
-
-  console.log(`Job with id '${id}' was successfully added`);
 };
 
 const declaration: CommandDeclaration = {
   description: "Creates a new cron job",
   run: (...args) => add(...args),
-  usage: "<uniquieJobId> <command to schedule>"
+  hint: "<unique id> <'min hour day month week command'>"
 };
 
 export default declaration;

src/lib/commands/jobs/remove.ts

@@ -8,15 +8,13 @@ const remove = async (...args: string[]) => {
   let [id] = args;
   id = id || (await promptly.prompt("Id of the job to remove: "));
 
-  // ssh.execute(`cru a ${id} "${command}"`);
-
-  console.log(`Job with id '${id}' was successfully removed`);
+  ssh.execute(`cru d ${id}`);
 };
 
 const declaration: CommandDeclaration = {
   description: "Removes a cron job",
   run: remove,
-  usage: "<id>"
+  hint: "<unique id>"
 };
 
 export default declaration;

src/lib/help.ts

@@ -27,7 +27,7 @@ const help = (command?: Command): void => {
   });
 
   const usage =
-    (!isRootHelp && guardCheckedCommand.usage) || "options [parameters]";
+    (!isRootHelp && guardCheckedCommand.hint) || "options [parameters]";
   const lines = [`Usage: router${commandName} ${usage}`];
 
   const commands = isRootHelp

src/lib/ssh/index.ts

@@ -1,13 +1,20 @@
 #!/usr/bin/env node
+import chalk from "chalk";
+import { ExecResult } from "../../types";
+
 import sh = require("shelljs");
 import config = require("./config");
 
-const execute = (...args: string[]): void => {
+const execute = (...args: string[]): ExecResult => {
   const sshConfig = config.get() || config.empty;
 
   const ssh = `ssh -i  '${sshConfig.privateKey}' ${sshConfig.userName}@${sshConfig.host}`;
 
-  sh.exec(`${ssh} "${args.join(" ")}"`);
+  const command = args.join(" ");
+
+  const result: ExecResult = sh.exec(`${ssh} "${command}"`);
+
+  return result;
 };
 
 const executeInTerminal = (args: any) => {

src/types/Command.ts

@@ -1,11 +1,9 @@
 #!/usr/bin/env node
-export default interface Command {
+import { CommandDeclaration } from ".";
+
+export default interface Command extends Required<CommandDeclaration> {
   args: string[];
-  description: string;
   fullName: string;
-  helpName: string;
   name: string;
-  run: any;
   subCommands: Command[];
-  usage: string;
 }

src/types/CommandDeclaration.ts

@@ -2,5 +2,5 @@ export default interface CommandDeclaration {
   description?: string;
   helpName?: string;
   run?: (...args: string[]) => any;
-  usage?: string;
+  hint?: string;
 }

src/types/ExecResult.ts

@@ -0,0 +1,5 @@
+export default interface ExecResult {
+  code: number;
+  stdout: string;
+  stderr: string;
+}

src/types/index.ts

@@ -2,6 +2,7 @@ export { default as Command } from "./Command";
 export { default as CommandDeclaration } from "./CommandDeclaration";
 export { default as CommandParser } from "./CommandParser";
 export { default as ConfigCreationData } from "./ConfigCreationData";
+export { default as ExecResult } from "./ExecResult";
 export { default as PromptType } from "./PromptType";
 export { default as PromptBody } from "./PromptBody";
 export { default as SshConfig } from "./SshConfig";