Release 0.6.8. Mac OS fix for ini file location. Fix for contains when using INISet facade documents.

Author: brett-smith

README.md

@@ -386,6 +386,12 @@ Thanks to others who have contributed to Jini.
 
 ## Changes
 
+### 0.6.8
+
+ * Mac OS path for user configuration files prefixed with `.` where it should not be.
+ * `contains()` method for `INISet` facade documents would return `true` if a key didn't exists as a value but had a schema entry with no default values.
+ 
+
 ### 0.6.7
 
 * `INISet` gets a `commit()` and `groupWrite(Consumer<INI> callback)` method. The former forces writing of the user settings, and the latter allows a multiple keys and sections to be updated without a write triggering until the task is complete. The `groupWrite` may be moved to the `INI` interface at some point.

config/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>jini</artifactId>
         <groupId>com.sshtools</groupId>
-   		<version>0.6.7</version>
+   		<version>0.6.8</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>jini-config</artifactId>

config/src/main/java/com/sshtools/jini/config/INISet.java

@@ -740,7 +740,7 @@ private static boolean isMacOs() {
 
 	public Path appPathForScope(Scope scope) {
 		var root = rootPathForScope(scope);
-		if (!isLinux() && !isWindows() && scope == Scope.USER) {
+		if (!isLinux() && !isMacOs() && !isWindows() && scope == Scope.USER) {
 			return root.resolve("." + app);
 		} else {
 			return root.resolve(app);

lib/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>jini</artifactId>
         <groupId>com.sshtools</groupId>
-   		<version>0.6.7</version>
+   		<version>0.6.8</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>jini-lib</artifactId>

maven-plugin/pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>com.sshtools</groupId>
 		<artifactId>jini</artifactId>
-		<version>0.6.7</version>
+		<version>0.6.8</version>
 	</parent>
 	<properties>
 		<mavenVersion>3.6.3</mavenVersion>

pom.xml

@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.sshtools</groupId>
     <artifactId>jini</artifactId>
-   	<version>0.6.7</version>
+   	<version>0.6.8</version>
     <name>Jini - Java INI file reader and writer</name>
     <packaging>pom</packaging>
     <properties>

prefs/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>jini</artifactId>
         <groupId>com.sshtools</groupId>
-   		<version>0.6.7</version>
+   		<version>0.6.8</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>jini-prefs</artifactId>

schema/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>jini</artifactId>
         <groupId>com.sshtools</groupId>
-   		<version>0.6.7</version>
+   		<version>0.6.8</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>jini-schema</artifactId>

schema/src/main/java/com/sshtools/jini/schema/INISchema.java

@@ -273,6 +273,9 @@ public AbstractSchemaWrapper(DEL delegate, AbstractSchemaWrapper<?> parent, INIS
 
 		@Override
 		public Optional<Section[]> allSectionsOr(String... path) {
+			if(Arrays.asList(path).contains("pricli")) {
+				System.out.println("brk!");
+			}
 			var allSections = super.allSectionsOr(path).orElse(new Section[0]);
 			var mgr = new LinkedHashMap<String, Section[]>();
 			for(var sec : allSections) {
@@ -311,7 +314,8 @@ public void setKeyComments(String key, String... comments) {
 
 		@Override
 		public boolean contains(String key) {
-			return delegate.contains(key) || userObject.keyOr(this, key).isPresent();
+			return delegate.contains(key) || 
+				( userObject.keyOr(this, key).map(k -> k.defaultValues().length > 0).orElse(false) );
 		}
 
 		@Override

serialization/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>jini</artifactId>
         <groupId>com.sshtools</groupId>
-   		<version>0.6.7</version>
+   		<version>0.6.8</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>jini-serialzation</artifactId>