find-cli 1.4.5 → 1.4.8

package/bin/action/find.js

@@ -5,8 +5,7 @@ const ruleOperation = require("../operation/rule"),
       readConfigurationOperation = require("../operation/readConfiguration");
 
 const { S, EMPTY_STRING } = require("../constants"),
-      { executeOperations } = require("../utilities/operation"),
-      { FAILED_FIND_MESSAGE, SUCCESSFUL_FIND_MESSAGE } = require("../messages");
+      { executeOperations } = require("../utilities/operation");
 
 function findAction(string, dryRun, quietly) {
   const operations = [
@@ -33,17 +32,13 @@ function findAction(string, dryRun, quietly) {
         };
 
   executeOperations(operations, (completed) => {
-    logTottals(context);
+    logLines(context);
 
     if (!completed) {
-      console.log(FAILED_FIND_MESSAGE);
-
       return;
     }
 
-    logLines(context);
-
-    console.log(SUCCESSFUL_FIND_MESSAGE);
+    logTottals(context);
   }, context);
 }
 

package/bin/line.js

@@ -2,7 +2,7 @@
 
 const { arrayUtilities } = require("necessary");
 
-const { grey, blue, yellow } = require("./utilities/log"),
+const { grey, blue, yellow, cyan } = require("./utilities/log"),
       { EMPTY_STRING, SINGLE_SPACE } = require("./constants");
 
 const { backwardsForEach } = arrayUtilities;
@@ -128,7 +128,7 @@ class Line {
 
       gap = grey(gap);  ///
 
-      match = blue(match);  ///
+      match = cyan(match);  ///
 
       string = `${string}${match}${gap}`;
     });
@@ -142,7 +142,8 @@ class Line {
     const filePathLength = this.getFilePathLength(),
           paddingLength = requiredFilePathLength - filePathLength,
           padding = paddingFromPaddingLength(paddingLength),
-          formattedFilePath =  `${this.filePath}${padding}`;
+          filePath =  `${this.filePath}${padding}`,
+          formattedFilePath = blue(filePath);
 
     return formattedFilePath;
   }
@@ -151,7 +152,7 @@ class Line {
     const formattedIndex = this.getFormattedIndex(requiredIndexLength),
           formattedContent = this.getFormattedContent(),
           formattedFilePath = this.getFormattedFilePath(requiredFilePathLength),
-          message = `| ${formattedFilePath}  ${formattedIndex} | ${formattedContent}`;
+          message = `${formattedFilePath}  ${formattedIndex} | ${formattedContent}`;
 
     return message;
   }

package/bin/messages.js

@@ -8,11 +8,9 @@ const NO_ARGUMENT_GIVEN_MESSAGE = "No argument has been given.",
       INVALID_ROOT_DIRECTORY_PATH_MESSAGE = "Additional root directories must be globs of the form '../**/'.",
       INVALID_GLOB_REGEX_OR_STRING_MESSAGE = "The glob, regex or string is invalid.",
       INVALID_ROOT_DIRECTORY_PATH_INDEX_MESSAGE = "The index is either not a number or not within range.",
-      FAILED_FIND_MESSAGE = "Failed to search everything.",
       FAILED_INITIALISE_MESSAGE = "Failed to create a configuration file because one is already present.",
       FAILED_ADD_ROOT_DIRECTORY_MESSAGE = "Failed to add the root directory.",
       FAILED_REMOVE_ROOT_DIRECTORY_MESSAGE = "Failed to remove the root directory.",
-      SUCCESSFUL_FIND_MESSAGE = "Searched everything successfully.",
       SUCCESSFUL_INITIALISE_MESSAGE = "The configuration file has been created successfully.",
       SUCCESSFUL_ADD_ROOT_DIRECTORY_MESSAGE = "Added the root directory successfully.",
       SUCCESSFUL_REMOVE_ROOT_DIRECTORY_MESSAGE = "Removed the root directory successfully.";
@@ -26,11 +24,9 @@ module.exports = {
   INVALID_ROOT_DIRECTORY_PATH_MESSAGE,
   INVALID_GLOB_REGEX_OR_STRING_MESSAGE,
   INVALID_ROOT_DIRECTORY_PATH_INDEX_MESSAGE,
-  FAILED_FIND_MESSAGE,
   FAILED_INITIALISE_MESSAGE,
   FAILED_ADD_ROOT_DIRECTORY_MESSAGE,
   FAILED_REMOVE_ROOT_DIRECTORY_MESSAGE,
-  SUCCESSFUL_FIND_MESSAGE,
   SUCCESSFUL_INITIALISE_MESSAGE,
   SUCCESSFUL_ADD_ROOT_DIRECTORY_MESSAGE,
   SUCCESSFUL_REMOVE_ROOT_DIRECTORY_MESSAGE

package/bin/utilities/log.js

@@ -1,26 +1,34 @@
 "use strict";
 
-const GREY_FOREGROUND_COLOUR = "\u001b[90m",
-      RED_FOREGROUND_COLOUR = "\u001b[31m",
+const RED_FOREGROUND_COLOUR = "\u001b[31m",
+      GREY_FOREGROUND_COLOUR = "\u001b[90m",
       BLUE_FOREGROUND_COLOUR = "\u001b[34m",
+      CYAN_FOREGROUND_COLOUR = "\u001b[36m",
       GREEN_FOREGROUND_COLOUR = "\u001b[32m",
       YELLOW_FOREGROUND_COLOUR = "\u001b[33m",
+      MAGENTA_FOREGROUND_COLOUR = "\u001b[35m",
       RESET_FOREGROUND_COLOUR = "\u001b[39m";
 
-function grey(string) { return `${GREY_FOREGROUND_COLOUR}${string}${RESET_FOREGROUND_COLOUR}`; }
-
 function red(string) { return `${RED_FOREGROUND_COLOUR}${string}${RESET_FOREGROUND_COLOUR}`; }
 
+function grey(string) { return `${GREY_FOREGROUND_COLOUR}${string}${RESET_FOREGROUND_COLOUR}`; }
+
 function blue(string) { return `${BLUE_FOREGROUND_COLOUR}${string}${RESET_FOREGROUND_COLOUR}`; }
 
+function cyan(string) { return `${CYAN_FOREGROUND_COLOUR}${string}${RESET_FOREGROUND_COLOUR}`; }
+
 function green(string) { return `${GREEN_FOREGROUND_COLOUR}${string}${RESET_FOREGROUND_COLOUR}`; }
 
 function yellow(string) { return `${YELLOW_FOREGROUND_COLOUR}${string}${RESET_FOREGROUND_COLOUR}`; }
 
+function magenta(string) { return `${MAGENTA_FOREGROUND_COLOUR}${string}${RESET_FOREGROUND_COLOUR}`; }
+
 module.exports = {
-  grey,
   red,
+  grey,
   blue,
+  cyan,
   green,
-  yellow
+  yellow,
+  magenta
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "find-cli",
   "author": "James Smith",
-  "version": "1.4.5",
+  "version": "1.4.8",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/find-cli",
   "description": "An alternative to grep.",