JGrabClient show JGrab Daemon version information.

renatoathaydes · May 16, 2017 · 5144c37 · 5144c37
1 parent 5ce649e
commit 5144c37
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/jgrab-client/src/main.rs b/jgrab-client/src/main.rs
@@ -93,6 +93,7 @@ fn main() {
             }
             "--version" | "-v" => {
                 println!("JGrab Client Version: {}", VERSION);
+                show_daemon_version();
                 return
             }
             "-e" => usage_error(&format!("-e option missing code snippet")),
@@ -257,6 +258,12 @@ fn check_status(child: &mut Child) {
     }
 }
 
+fn show_daemon_version() {
+    if let Some(_) = send_message(&mut TextInput(Cursor::new("--version".to_string())), false) {
+        println!("(Run the JGrab daemon to see its version)");
+    }
+}
+
 fn log(message: &str) {
     println!("=== JGrab Client - {} ===", message)
 }

diff --git a/jgrab-runner/src/main/java/com/athaydes/jgrab/daemon/JGrabDaemon.java b/jgrab-runner/src/main/java/com/athaydes/jgrab/daemon/JGrabDaemon.java
@@ -26,6 +26,7 @@ public class JGrabDaemon {
 
     private static final Logger logger = LoggerFactory.getLogger( JGrabDaemon.class );
     private static final String STOP_OPTION = "--stop";
+    private static final String VERSION_OPTION = "--version";
 
     private static final PersistentCache libsCache = new PersistentCache();
 
@@ -93,6 +94,14 @@ public static void start( RunArgs runArgs ) {
                             return;
                         }
 
+                        if ( input.equals( VERSION_OPTION ) ) {
+                            logger.info( "--version option received" );
+                            System.setOut( out );
+                            System.setErr( out );
+                            JGrabRunner.version();
+                            continue;
+                        }
+
                         if ( input.startsWith( JGrabRunner.SNIPPET_OPTION ) ) {
                             String snippet = input.substring( JGrabRunner.SNIPPET_OPTION.length() );
                             if ( snippet.isEmpty() ) {

diff --git a/jgrab-runner/src/main/java/com/athaydes/jgrab/runner/JGrabRunner.java b/jgrab-runner/src/main/java/com/athaydes/jgrab/runner/JGrabRunner.java
@@ -66,7 +66,7 @@ private static JGrabOptions error( String reason ) {
         throw new JGrabError( reason + "\n\nUsage: jgrab (-e <java_source>) | java_file" );
     }
 
-    private static JGrabOptions version() {
+    public static JGrabOptions version() {
         URL jarUrl = JGrabRunner.class.getProtectionDomain().getCodeSource().getLocation();
         String version = "UNKNOWN";