Remove Config class

Author: fi-javis

cli/src/main/java/dev/starfix/Starfix.java

@@ -4,36 +4,46 @@
 //DEPS io.quarkus:quarkus-picocli:2.1.0.CR1
 //DEPS org.zeroturnaround:zt-exec:1.12
 //FILES application.properties=../../../resources/application.properties
+//SOURCES YAMLDefaultProvider.java
 
 package dev.starfix;
-import io.quarkus.runtime.annotations.RegisterForReflection;
 import org.zeroturnaround.exec.ProcessExecutor;
 import org.zeroturnaround.exec.ProcessResult;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.ExitCode;
 import picocli.CommandLine.Parameters;
 
+import java.io.UnsupportedEncodingException;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URI;
+import java.net.URLDecoder;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.io.File;
+import java.util.Properties;
 import java.util.concurrent.TimeoutException;
 import java.util.regex.Pattern;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 
-@CommandLine.Command(mixinStandardHelpOptions = true)
+@CommandLine.Command(name = "starfix", mixinStandardHelpOptions = true, defaultValueProvider = YAMLDefaultProvider.class)
 public class Starfix implements Runnable{
 
     @Parameters(arity = "0..1")
     String uri;
-    
+
+    // Holds path to destination Where the Repository Must Be Clonned
+    @CommandLine.Option(names = "--clone-path", descriptionKey = "clone_path")
+    String clone_path;
+
+    @CommandLine.Option(names = "--editor", descriptionKey = "ide")
+    String ide = ""; // Holds command for IDE to open
+
     @Command
     public int config() throws Exception {
         editConfig();
@@ -42,7 +52,6 @@ public int config() throws Exception {
 
     @Command(name = "clone")
     public int cloneCmd(@Parameters(index = "0") String url) {
-
         if (url.startsWith("ide://")) {
             // stripping out ide:// to simplify launcher scripts.
             url = url.substring(6);
@@ -54,31 +63,13 @@ public int cloneCmd(@Parameters(index = "0") String url) {
             throw new IllegalArgumentException("Not a valid URI for git repository");
         }
 
-        // Configuration identifiers
-        String clone_path = "";// Holds path to destination Where the Repository Must Be Clonned
-        String ide = ""; // Holds command for IDE to open upon
-
-        File configFile = getConfigFile();// Calling functiono to fetch config file
-
-        // Reading Configuration File
-        try {
-            if (!configFile.exists()) {
-                // Incase no config file exists
-                editConfig(); // Calling function that lets user to configure
-            }
-
-            // System.out.println("\nLoading configurations.....\n");
-            ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
-
-            XConfig config = mapper.readValue(configFile, XConfig.class);
 
-            ide = config.ide;
-            clone_path = config.clone_path;
-            if (ide == null || clone_path == null)
-                editConfig(); // Incase of absence of configuration in file Launch Config
+        if(ide==null) {
+            throw new IllegalArgumentException("Editor not specifed, please specify via --editor or use config to set it up.");
+        }
 
-        } catch (Exception e) {
-            e.printStackTrace();
+        if(clone_path==null) {
+            throw new IllegalArgumentException("Clone path not specifed, please specify via --clone-path or use config to set it up.");
         }
 
         try {
@@ -87,13 +78,12 @@ public int cloneCmd(@Parameters(index = "0") String url) {
             if(isBlob(url))
             {   // Example URL : https://github.com/starfixdev/starfix/blob/master/cli/pom.xml
                 // Example URL2: https://github.com/hexsum/Mojo-Webqq/blob/master/script/check_dependencies.pl#L17
-
                 String temp = url.substring(url.indexOf("blob/")+5);
                 branch = temp.substring(0,temp.indexOf("/"));
                 filePath = temp.substring(temp.indexOf("/")+1);
+                filePath = URLDecoder.decode(filePath,"UTF-8");
                 url = url.substring(0,url.indexOf("/blob"));
             }
-
             URI uri = new URI(url);
 
             // extract name of repository
@@ -102,7 +92,6 @@ public int cloneCmd(@Parameters(index = "0") String url) {
 
             String originUrl = url;
             Path directory = Paths.get(clone_path, repo_name);
-
             if (!Files.exists(directory)) // Check if the user cloned the repo previously and in that case no cloning is
                                           // needed
                 gitClone(directory, originUrl);
@@ -112,7 +101,7 @@ public int cloneCmd(@Parameters(index = "0") String url) {
 
             // Launching Editor on the Cloned Directory
             System.out.println("Launching  Editor Now...");
-            launch_editor(directory, ide, directory.toAbsolutePath().toString(),filePath);
+            getIDE(ide).launch_editor(directory, ide, directory.toAbsolutePath().toString(),filePath);
         } catch (Exception e) {
             throw new IllegalStateException(e);
         }
@@ -159,12 +148,14 @@ public static File getConfigFile() {
 
     // Function to edit configuration and serves for command line starfix config
     // editor
-    public static void editConfig() throws Exception {
+    public  void editConfig() throws Exception {
         System.out.println("\n-------------------------------------------------------");
         System.out.println("\t\tStarfix Configuration Editor");
         System.out.println("-------------------------------------------------------\n");
-        String clone_path = "";// Holds path to destination Where the Repository Must Be Clonned
-        String ide = ""; // Holds command for IDE to open upon
+        //String clone_path = "";// Holds path to destination Where the Repository Must Be Clonned
+        //String ide = ""; // Holds command for IDE to open upon
+        System.out.println("IDE: "+ide);
+        System.out.println("Clone Path: "+clone_path);
 
         File configFile = getConfigFile();
 
@@ -178,11 +169,11 @@ public static void editConfig() throws Exception {
                 System.out.println(
                         "\n-New  configuration file will be created at: " + configFile.getAbsolutePath() + "\n");
                 configFile.createNewFile();
-            }else{
+            }/*else{
                 XConfig config = new ObjectMapper(new YAMLFactory()).readValue(configFile, XConfig.class);
                 ide = config.getIde();
                 clone_path = config.getClone_path();
-            }
+            }*/
 
             // --------------------------First we'll input preferred IDE from
             // user------------------------------
@@ -234,7 +225,9 @@ public static void editConfig() throws Exception {
             }
             // ----------Now we'll write configurations to the YAML FILE------------
             ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
-            XConfig configuration = new XConfig(ide, clone_path);
+            Properties configuration = new Properties();
+            configuration.put("ide", ide);
+            configuration.put("clone_path", clone_path);
             mapper.writeValue(configFile, configuration); // Writing to YAML File
 
         } catch (Exception e) {
@@ -246,13 +239,14 @@ public static void editConfig() throws Exception {
 
     public static void gitClone(Path directory, String originUrl) throws IOException, InterruptedException {
         // Function for git clonning
-        runCommand(directory.getParent(), "git", "clone", originUrl, directory.getFileName().toString());
+        runCommand(directory.getParent(), "git", "clone", originUrl, directory.toString());
     }
 
     public static String runCommand(Path directory, String... command) throws IOException, InterruptedException {
         // Function to Run Commands using Process Builder
         ProcessResult presult;
         try {
+            System.out.println("Running " + String.join(" ", command));
             presult = new ProcessExecutor().command(command).redirectOutput(System.out).redirectErrorStream(true).readOutput(true)
                     .execute();
         } catch (TimeoutException e) {
@@ -268,70 +262,80 @@ public static String runCommand(Path directory, String... command) throws IOExce
         return presult.outputUTF8();
     }
 
-    @RegisterForReflection
-    public static class XConfig {
-        public String ide;
-        public String clone_path;
-
-        public XConfig() {
-            // Default constructor
-        }
 
-        public XConfig(String ide, String clone_path) {
-            this.ide = ide;
-            this.clone_path = clone_path;
+    public static abstract class IDE{
+        public abstract void launch_editor(Path directory, String ide, String path, String filePath)throws IOException, InterruptedException;  
 
-        }
-
-        public String getIde() {
-            return ide;
-        }
-
-        public void setIde(String ide) {
-            this.ide = ide;
-        }
-
-        public String getClone_path() {
-            return clone_path;
-        }
+    }
 
-        public void setClone_path(String clone_path) {
-            this.clone_path = clone_path;
+    public static IDE getIDE(String ide){
+        // Will return IDE based on String
+        switch(ide){
+            case "code":
+            case "code.cmd":
+                return new VsCode();
+
+           case "idea":
+           case "idea64.exe":
+                return new IntelliJIdea();
+
+           case "eclipse":
+           case "eclipse.exe":
+                return new Eclipse();
+           default:
+                throw new IllegalArgumentException("IDE not supported");
         }
 
     }
 
-    public static void launch_editor(Path directory, String ide, String path, String filePath) throws IOException, InterruptedException {
-
-        if(filePath.indexOf("#")>0){
-            filePath = filePath.replace("#L","#");
-            // ==== VS CODE ====
-            // code -g file:line
-            if(ide.equals("code")||ide.equals("code.cmd")){
+    public static class VsCode extends IDE{
+        
+        public  void launch_editor(Path directory, String ide, String path, String filePath) throws IOException, InterruptedException {
+            if(filePath.indexOf("#")>0){
+                // code -g file:line
+                filePath = filePath.replace("#L","#");
                 filePath = filePath.replace("#",":");
                 runCommand(directory.getParent(), ide,"-g",path,filePath);
             }
-            // ===== IntelliJ =====
-            // idea64.exe [--line <number>] [--column <number>] <path ...>
-            // idea /home/fahad/MyProjects/testings/jbang --line 3 /home/fahad/MyProjects/testings/jbang/otp.java
-            if(ide.equals("idea")||ide.equals("idea.exe")||ide.equals("idea64.exe")){
+            else{
+                runCommand(directory.getParent(),ide,path,filePath);
+            }
+        }
+    }
+
+    public static class IntelliJIdea extends IDE{
+
+        public  void launch_editor(Path directory, String ide, String path, String filePath) throws IOException, InterruptedException {
+            if(filePath.indexOf("#")>0){
+                filePath = filePath.replace("#L","#");
+                // idea64.exe [--line <number>] [--column <number>] <path ...>
+                // idea /home/fahad/MyProjects/testings/jbang --line 3 /home/fahad/MyProjects/testings/jbang/otp.java
                 String lineNumber  = filePath.substring(filePath.lastIndexOf("#")+1);
                 filePath = filePath.substring(0,filePath.lastIndexOf("#"));
                 runCommand(directory.getParent(), ide,path,"--line",lineNumber,filePath);
             }
-            // === Eclipse =====
-            // eclipse.exe file.txt:22
-            if(ide.equals("eclipse")){
-                filePath = filePath.replace("#",":");
-                runCommand(directory.getParent(), ide,path,filePath);
+            else{
+                runCommand(directory.getParent(),ide,path,filePath);
             }
-
-        }
-        else{
-            runCommand(directory.getParent(),ide,path,filePath);// Launching the editor now
         }
     }
 
+    public static class Eclipse extends IDE{
 
+        public  void launch_editor(Path directory, String ide, String path, String filePath) throws IOException, InterruptedException {
+            if(filePath.indexOf("#")>0){
+                filePath = filePath.replace("#L","#");
+                // eclipse.exe file.txt:22
+                if(ide.equals("eclipse")){
+                    filePath = filePath.replace("#",":");
+                    runCommand(directory.getParent(), ide,path,filePath);
+                }
+
+            }
+            else{
+                runCommand(directory.getParent(),ide,path,filePath);
+            }
+        }
+    }
 
 }