chore: v1.2.2

Author: exadmin

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.exadmin</groupId>
     <artifactId>cyberferret</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
     <name>cyber-ferret</name>
 
     <properties>

src/main/java/com/github/exadmin/cyberferret/CyberFerretApp.java

@@ -8,17 +8,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.io.InputStream;
 import java.nio.file.Paths;
-import java.util.Properties;
 
 import static com.github.exadmin.cyberferret.persistence.PersistentPropertiesManager.*;
+import static com.github.exadmin.cyberferret.utils.MiscUtils.loadApplicationVersion;
 
 public class CyberFerretApp extends Application {
     private static final Logger log = LoggerFactory.getLogger(CyberFerretApp.class);
     private static final String APPLICATION_PERSISTENT_CONTEXT_FILENAME = "app.properties";
-    private static final String VERSION_PROPERTIES_RESOURCE = "/version.properties";
+
 
     @Override
     public void start(Stage stage) {
@@ -53,19 +51,5 @@ public static void main(String[] args) {
         launch();
     }
 
-    private String loadApplicationVersion() {
-        Properties props = new Properties();
-        try (InputStream input = getClass().getResourceAsStream(VERSION_PROPERTIES_RESOURCE)) {
-            if (input == null) {
-                log.error("Resource {} is not found on the classpath", VERSION_PROPERTIES_RESOURCE);
-                return "UNDEFINED";
-            }
-            props.load(input);
-            return props.getProperty("application.version");
-        } catch (IOException ex) {
-            log.error("Error while loading {}", VERSION_PROPERTIES_RESOURCE, ex);
-        }
 
-        return "UNDEFINED";
-    }
 }

src/main/java/com/github/exadmin/cyberferret/CyberFerretCLI.java

@@ -26,9 +26,9 @@ public class CyberFerretCLI {
 
     private static void printUsage() {
         String errMsg = """
-                    Usage: CyberFerretCLI $PATH_TO_REPOSITORY_TO_SCAN $PATH_TO_FILE_WITH_LIST_OF_FILES(optional)"
-                    Also, note that '{}' System Environment variable must be set
-                    """;
+                Usage: CyberFerretCLI $PATH_TO_REPOSITORY_TO_SCAN $PATH_TO_FILE_WITH_LIST_OF_FILES(optional)"
+                Also, note that '{}' System Environment variable must be set
+                """;
         errMsg = ConsoleUtils.format(errMsg, SYS_ENV_VAR_PASSWORD);
         System.out.println(errMsg);
     }
@@ -46,9 +46,11 @@ public static void main(String[] args) {
         // Step5: Decrypt dictionary
         // Step6: Run check over the git-repository
 
+        String appVer = MiscUtils.loadApplicationVersion();
+        ConsoleUtils.info("CyberFerretCLI version: " + appVer);
 
         // Step1: Check required program arguments are set
-        if (args.length < 1 || args.length > 2) {
+        if (args.length != 2) {
             ConsoleUtils.error("Unexpected number of command line arguments");
             printUsage();
             terminateAppWithErrorCode();
@@ -70,20 +72,25 @@ public static void main(String[] args) {
         }
 
         List<Path> stagedFiles = new ArrayList<>();
-        if (args.length > 1) {
-            Path stagedFilesListPath = Path.of(args[1]);
-            if (!Files.isRegularFile(stagedFilesListPath)) {
-                ConsoleUtils.error("Invalid path to file list {}", stagedFilesListPath);
-                printUsage();
-                terminateAppWithErrorCode();
-            }
-            try {
-                stagedFiles = loadStagedFiles(rootPathToScan, stagedFilesListPath);
-            } catch (IOException ex) {
-                ConsoleUtils.error("Error while reading staged files list. " + ex.getMessage());
-                terminateAppWithErrorCode();
-            }
+
+        Path stagedFilesListPath = Path.of(args[1]);
+        if (!Files.isRegularFile(stagedFilesListPath)) {
+            ConsoleUtils.error("Invalid path to file list {}", stagedFilesListPath);
+            printUsage();
+            terminateAppWithErrorCode();
         }
+        try {
+            stagedFiles = loadStagedFiles(rootPathToScan, stagedFilesListPath);
+        } catch (IOException ex) {
+            ConsoleUtils.error("Error while reading staged files list. " + ex.getMessage());
+            terminateAppWithErrorCode();
+        }
+
+        if (stagedFiles.isEmpty()) {
+            ConsoleUtils.error("No staged files found in the file {}", stagedFilesListPath);
+            terminateAppWithErrorCode();
+        }
+
 
         // Step3: Ensure actual dictionary is downloaded
         RunnableCheckOnlineDictionary dictionaryDownloader = new RunnableCheckOnlineDictionary(true);
@@ -133,7 +140,7 @@ public static void main(String[] args) {
             }
         }
 
-        ConsoleUtils.debug("Scan is completed. Errors are " + (runnableScanner.isAnySignatureFound() ? "found (-). Breaking commit!" : "NOT found (+)"));
+        ConsoleUtils.info("Scan is completed. Errors are " + (runnableScanner.isAnySignatureFound() ? "found :( Breaking commit!" : "not found :)"));
 
         if (runnableScanner.isAnySignatureFound()) {
             terminateAppWithErrorCode();

src/main/java/com/github/exadmin/cyberferret/utils/MiscUtils.java

@@ -7,6 +7,7 @@
 import java.nio.file.Path;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.Properties;
 
 public class MiscUtils {
     public static String getSHA256AsHex(String str) {
@@ -69,4 +70,23 @@ public static boolean isEmpty(String str) {
     public static boolean isNotEmpty(String str) {
         return !isEmpty(str);
     }
+
+    private static final String VERSION_PROPERTIES_RESOURCE = "/version.properties";
+
+    public static String loadApplicationVersion() {
+        Properties props = new Properties();
+        try (InputStream input = MiscUtils.class.getResourceAsStream(VERSION_PROPERTIES_RESOURCE)) {
+            if (input == null) {
+                // log.error("Resource {} is not found on the classpath", VERSION_PROPERTIES_RESOURCE);
+                throw new RuntimeException("Resource '" + VERSION_PROPERTIES_RESOURCE + "' not found");
+            }
+            props.load(input);
+            return props.getProperty("application.version");
+        } catch (IOException ex) {
+            throw new RuntimeException(ex);
+            // log.error("Error while loading {}", VERSION_PROPERTIES_RESOURCE, ex);
+        }
+
+        // return "UNDEFINED";
+    }
 }