fix xdg path and bump version to 2.1

strogiyotec · Aug 11, 2020 · 479bd56 · 479bd56
1 parent ae9798b
commit 479bd56
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,8 +6,7 @@
 
     <groupId>jfill</groupId>
     <artifactId>jfill</artifactId>
-    <packaging>jar</packaging>
-    <version>2.0</version>
+    <version>2.1</version>
 
 
     <properties>

diff --git a/src/main/java/jfill/Defaults.java b/src/main/java/jfill/Defaults.java
@@ -9,11 +9,11 @@ public interface Defaults {
 
     String NO_TAG = "noTag";
 
-    String VERSION = "jfillin 2.0";
+    String VERSION = "jfillin 2.1";
 
     String CACHE_PATH = Optional.ofNullable(System.getenv("XDG_CONFIG_HOME"))
             .or(() -> Optional.of(System.getProperty("user.home")))
-            .map(path -> path + "/.config/jfillin/fillin.json")
+            .map(path -> path + "/jfillin/fillin.json")
             .get();
 
 }
diff --git a/src/main/java/jfill/ResolvedValuesStorage.java b/src/main/java/jfill/ResolvedValuesStorage.java
@@ -1,5 +1,6 @@
 package jfill;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -57,7 +58,8 @@ String getValueByTag(final String tag, final String key) {
      *
      * @param cache Cache
      */
-    void flush(final Cache cache) {
+    void flush(final Cache cache) throws IOException {
         this.storage.forEach(cache::addEntry);
+        cache.save();
     }
 }
diff --git a/src/test/java/jfill/ExecuteTestCase.java b/src/test/java/jfill/ExecuteTestCase.java
@@ -29,7 +29,7 @@ void testVersion() throws Exception {
                                 new Cache()
                         )
                 ).execute();
-                Assertions.assertTrue(stream.toString().contains("jfillin 2.0"));
+                Assertions.assertTrue(stream.toString().contains(Defaults.VERSION));
             }
         }
     }