Write error to stderr, also return proper exit code #9

jsqry · Jun 19, 2020 · 279df56 · 279df56
1 parent d3c1870
commit 279df56
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 30 deletions.
diff --git a/pom.xml b/pom.xml
@@ -41,41 +41,18 @@
             <version>1.18.12</version>
             <scope>provided</scope>
         </dependency>
-
-        <!--
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-compress</artifactId>
-            <version>1.20</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.xonixx</groupId>
-            <artifactId>java-utils</artifactId>
-            <version>v0.9.1</version>
-        </dependency>
-
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
             <version>5.6.1</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
             <version>3.15.0</version>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.jsoup</groupId>
-            <artifactId>jsoup</artifactId>
-            <version>1.13.1</version>
-            <scope>test</scope>
-        </dependency>-->
     </dependencies>
 
     <build>

diff --git a/src/main/java/com/github/jsqry/cli/App.java b/src/main/java/com/github/jsqry/cli/App.java
@@ -42,7 +42,7 @@ public static void main(String[] args) {
     }
 
     if (cmd.hasOption(version.getLongOpt())) {
-      System.out.println(Constants.getFullVersion());
+      System.out.println(Constants.getVersion());
       System.exit(0);
     }
 
@@ -76,7 +76,10 @@ public static void main(String[] args) {
       Value doWork = context.eval("js", "doWork");
 
       String inputJsonStr = new String(System.in.readAllBytes(), StandardCharsets.UTF_8);
-      doWork.executeVoid(inputJsonStr, query);
+      Value result = doWork.execute(inputJsonStr, query);
+      if (!result.asBoolean()) {
+        System.exit(1);
+      }
     }
   }
 

diff --git a/src/main/resources/app.js b/src/main/resources/app.js
@@ -3,15 +3,16 @@ function doWork(jsonStr, queryStr) {
     try {
         json = JSON.parse(jsonStr);
     } catch (e) {
-        print('error: Wrong JSON');
-        return
+        console.error('error: Wrong JSON');
+        return false;
     }
     let res;
     try {
         res = jsqry.query(json, queryStr);
     } catch (e) {
-        print('error: ' + e);
-        return
+        console.error('error: ' + e);
+        return false;
     }
-    print(JSON.stringify(res, null, 2));
+    console.info(JSON.stringify(res, null, 2));
+    return true;
 }