.editorconfig

@@ -0,0 +1,19 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+insert_final_newline = true
+indent_style = tab
+indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = true
+
+[.rultor.yml]
+indent_style = space
+indent_size = 2
+
+[*.sh]
+indent_style = space
+indent_size = 2

.rultor/deploy.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -e
 
 version=${tag}
 # Release version
@@ -20,6 +21,9 @@ changelog_f=$(grep -E -e '# [0-9.]+' -n CHANGELOG.md | cut -d ':' -f1 | head --l
 changelog_s=$[${changelog_s} + 2]
 changelog_f=$[${changelog_f} - 1]
 changelog_l=$[${changelog_f} - ${changelog_s}]
+if [ "${changelog_l}" -lt "0" ] ; then
+  changelog_l=0
+fi
 changelog=$(cat CHANGELOG.md | tail --lines=+${changelog_s} | head --lines=${changelog_l})
 
 gpg_pass=$(cat ../settings.xml | grep 'gpg.passphrase' | grep --only-matching '>.*<' | cut -c 2- | rev | cut -c 2- | rev)
@@ -57,11 +61,15 @@ mvn --batch-mode clean install -P release -Dgpg.passphrase=${gpg_pass}
 
 # Commit and tag
 git commit -am "Release version ${version}"
-GIT_AUTHOR_NAME='Valeriy.Vyrva'
-GIT_AUTHOR_EMAIL='valery1707@gmail.com'
+old_name=$(git config --get user.name)
+old_email=$(git config --get user.email)
+git config user.name 'Valeriy.Vyrva'
+git config user.email 'valery1707@gmail.com'
 git tag --local-user='valery1707@gmail.com' -m "Release version ${version}" v${version}
-unset GIT_AUTHOR_NAME
-unset GIT_AUTHOR_EMAIL
+git config user.name ${old_name}
+git config user.email ${old_email}
+unset old_name
+unset old_email
 
 # Deploy artifact to Maven Central
 mvn --batch-mode deploy -P release -Dmaven.test.skip=true -Dgpg.passphrase=${gpg_pass} --settings ../settings.xml

.travis.yml

@@ -1,4 +1,5 @@
 language: java
+dist: trusty
 
 jdk:
   - oraclejdk8

CHANGELOG.md

@@ -2,6 +2,15 @@ Change log for releases.
 
 # CURRENT
 
+# 0.1.13
+
+* Add string validators
+* Add NIO validators
+
+# 0.1.11
+
+# 0.1.10
+
 # 0.1.9
 
 # 0.1.8

README.md

@@ -1,9 +1,12 @@
-[![Build Status](https://travis-ci.org/valery1707/jcommander-ext.svg)](https://travis-ci.org/valery1707/jcommander-ext)
-[![Coverage Status](https://coveralls.io/repos/valery1707/jcommander-ext/badge.svg)](https://coveralls.io/r/valery1707/jcommander-ext)
-
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/name.valery1707/jcommander-ext/badge.svg)](https://maven-badges.herokuapp.com/maven-central/name.valery1707/jcommander-ext)
 [![License](https://img.shields.io/github/license/valery1707/jcommander-ext.svg)](http://opensource.org/licenses/MIT)
 
+[![Build Status](https://travis-ci.org/valery1707/jcommander-ext.svg?branch=master)](https://travis-ci.org/valery1707/jcommander-ext)
+[![Coverage Status](https://coveralls.io/repos/github/valery1707/jcommander-ext/badge.svg?branch=master)](https://coveralls.io/github/valery1707/jcommander-ext?branch=master)
+[![CodeBeat badge](https://codebeat.co/badges/5cf75d4f-dcc4-4141-abe3-1cbfb54b1407)](https://codebeat.co/projects/github.aaakk.us.kg-valery1707-jcommander-ext-master)
+
+[![Waffle.io - Columns and their card count](https://badge.waffle.io/valery1707/jcommander-ext.svg?columns=all)](https://waffle.io/valery1707/jcommander-ext)
+
 [JCommander](https://github.com/cbeust/jcommander) is very good command line parsing framework for Java.
 
 > "Because life is too short to parse command line parameters"
@@ -35,10 +38,18 @@ Validators list:
     1. Greater: `GreaterThan`, `GreaterThanOrEqualTo`
     1. Less: `LessThan`, `LessThanOrEqualTo`
     1. Zero-compare: `EqualToZero`, `NotEqualToZero`, `GreaterThanZero`, `GreaterThanOrEqualToZero`, `LessThanZero`, `LessThanOrEqualToZero`
+1. [String](http://www.javadoc.io/doc/name.valery1707/jcommander-validator-string)
+	1. Simple: `NotBlank`, `NotEmpty`
+	1. Pattern based: `PatternContains`, `PatternNotContains`, `PatternMatched`, `PatternNotMatched`
 1. [IO](http://www.javadoc.io/doc/name.valery1707/jcommander-validator-io)
     1. Base: `Exists`, `NotExists`
     1. File: `ExistsFile`, `ExistsFileReadable`, `ExistsFileWritable`, `ExistsFileExecutable`
     1. Directory: `ExistsDirectory`, `ExistsDirectoryReadable`, `ExistsDirectoryWritable`, `ExistsDirectoryExecutable`
+1. [NIO](http://www.javadoc.io/doc/name.valery1707/jcommander-validator-nio)
+    1. Base: `Exists`, `NotExists`
+    1. File: `ExistsFile`, `ExistsFileReadable`, `ExistsFileWritable`, `ExistsFileExecutable`
+    1. Directory: `ExistsDirectory`, `ExistsDirectoryReadable`, `ExistsDirectoryWritable`, `ExistsDirectoryExecutable`
+    1. Link: `ExistsLink`, `ExistsLinkReadable`, `ExistsLinkWritable`, `ExistsLinkExecutable`
 
 ### Build
 

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>name.valery1707</groupId>
 	<artifactId>jcommander-ext</artifactId>
-	<version>0.1.9</version>
+	<version>0.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>JCommander extension library</name>
@@ -48,7 +48,9 @@
 		<module>validator-test</module>
 		<module>validator-core</module>
 		<module>validator-number</module>
+		<module>validator-string</module>
 		<module>validator-io</module>
+		<module>validator-nio</module>
 		<module>validator</module>
 	</modules>
 
@@ -68,28 +70,38 @@
 			<dependency>
 				<groupId>name.valery1707</groupId>
 				<artifactId>jcommander-validator-test</artifactId>
-				<version>0.1.9</version>
+				<version>0.2.0-SNAPSHOT</version>
 				<scope>test</scope>
 			</dependency>
 			<dependency>
 				<groupId>name.valery1707</groupId>
 				<artifactId>jcommander-validator-core</artifactId>
-				<version>0.1.9</version>
+				<version>0.2.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>name.valery1707</groupId>
 				<artifactId>jcommander-validator-number</artifactId>
-				<version>0.1.9</version>
+				<version>0.2.0-SNAPSHOT</version>
+			</dependency>
+			<dependency>
+				<groupId>name.valery1707</groupId>
+				<artifactId>jcommander-validator-string</artifactId>
+				<version>0.2.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>name.valery1707</groupId>
 				<artifactId>jcommander-validator-io</artifactId>
-				<version>0.1.9</version>
+				<version>0.2.0-SNAPSHOT</version>
+			</dependency>
+			<dependency>
+				<groupId>name.valery1707</groupId>
+				<artifactId>jcommander-validator-nio</artifactId>
+				<version>0.2.0-SNAPSHOT</version>
 			</dependency>
 			<dependency>
 				<groupId>name.valery1707</groupId>
 				<artifactId>jcommander-validator</artifactId>
-				<version>0.1.9</version>
+				<version>0.2.0-SNAPSHOT</version>
 			</dependency>
 
 			<!--JCommander-->
@@ -147,7 +159,43 @@
 					<generateBackupPoms>false</generateBackupPoms>
 				</configuration>
 			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-install-plugin</artifactId>
+				<version>2.5.2</version>
+				<configuration>
+					<!--Still not worked for unknown reason. Use separate plugin for checksum generation.-->
+					<createChecksum>true</createChecksum>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>net.nicoulaj.maven.plugins</groupId>
+				<artifactId>checksum-maven-plugin</artifactId>
+			</plugin>
 		</plugins>
+
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>net.nicoulaj.maven.plugins</groupId>
+					<artifactId>checksum-maven-plugin</artifactId>
+					<version>1.8</version>
+					<executions>
+						<execution>
+							<goals>
+								<goal>artifacts</goal>
+							</goals>
+						</execution>
+					</executions>
+					<configuration>
+						<!--Root project don't have any artifact-->
+						<failOnError>false</failOnError>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 	</build>
 
 	<distributionManagement>
@@ -183,7 +231,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
-						<version>2.10.4</version>
+						<version>3.0.1</version>
 						<executions>
 							<execution>
 								<id>attach-javadocs</id>
@@ -257,6 +305,7 @@
 									</includes>
 									<excludes>
 										<exclude>**/jcommander-*-test-*.*</exclude>
+										<exclude>**/staging/**</exclude>
 									</excludes>
 								</fileSet>
 							</fileSets>

validator-core/pom.xml

@@ -7,11 +7,11 @@
 	<parent>
 		<groupId>name.valery1707</groupId>
 		<artifactId>jcommander-ext</artifactId>
-		<version>0.1.9</version>
+		<version>0.2.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>jcommander-validator-core</artifactId>
-	<version>0.1.9</version>
+	<version>0.2.0-SNAPSHOT</version>
 	<description>Core utils for validators</description>
 
 	<dependencies>

validator-core/src/main/java/name/valery1707/jcommander/validators/NotChecker.java

@@ -1,8 +1,10 @@
 package name.valery1707.jcommander.validators;
 
-public class NotChecker<T> extends ValueChecker<T> {
+@SuppressWarnings("WeakerAccess")
+public abstract class NotChecker<T> extends ValueChecker<T> {
 	private final ValueChecker<T> checker;
 
+	@SuppressWarnings("WeakerAccess")
 	protected NotChecker(ValueChecker<T> checker) {
 		this.checker = checker;
 	}

validator-core/src/main/java/name/valery1707/jcommander/validators/common/CollectionChecker.java

@@ -0,0 +1,39 @@
+package name.valery1707.jcommander.validators.common;
+
+import name.valery1707.jcommander.validators.ValueChecker;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+abstract class CollectionChecker<T> extends ValueChecker<T> {
+	private final Collection<? extends T> collection;
+	private final boolean reverse;
+
+	CollectionChecker(Collection<? extends T> collection, boolean reverse) {
+		this.collection = collection;
+		this.reverse = reverse;
+	}
+
+	@Override
+	protected boolean check(T value) {
+		boolean check = collection.contains(value);
+		return reverse != check;//reverse ? !check : check
+	}
+
+	@Override
+	protected String error() {
+		Iterator<? extends T> it = collection.iterator();
+		StringBuilder str = new StringBuilder(2 + collection.size() * 5).append('[');
+		while (it.hasNext()) {
+			str.append(String.valueOf(it.next()));
+			if (it.hasNext()) {
+				str.append(',');
+			}
+		}
+		str.append(']');
+		String message = reverse
+			? "must be not in collection "
+			: "must be in collection ";
+		return message + str.toString();
+	}
+}

validator-core/src/main/java/name/valery1707/jcommander/validators/common/InCollection.java

@@ -1,34 +1,18 @@
 package name.valery1707.jcommander.validators.common;
 
-import name.valery1707.jcommander.validators.ValueChecker;
-
+import java.util.Arrays;
 import java.util.Collection;
-import java.util.Iterator;
 
-public class InCollection<T> extends ValueChecker<T> {
-	private final Collection<? extends T> collection;
+@SuppressWarnings("WeakerAccess")
+public abstract class InCollection<T> extends CollectionChecker<T> {
 
 	@SuppressWarnings("WeakerAccess")
 	protected InCollection(Collection<? extends T> collection) {
-		this.collection = collection;
-	}
-
-	@Override
-	protected boolean check(T value) {
-		return collection.contains(value);
+		super(collection, false);
 	}
 
-	@Override
-	protected String error() {
-		Iterator<? extends T> it = collection.iterator();
-		StringBuilder str = new StringBuilder(2 + collection.size() * 5).append('[');
-		while (it.hasNext()) {
-			str.append(String.valueOf(it.next()));
-			if (it.hasNext()) {
-				str.append(',');
-			}
-		}
-		str.append(']');
-		return "must be in collection " + str.toString();
+	@SuppressWarnings("WeakerAccess")
+	protected InCollection(T... collection) {
+		this(Arrays.asList(collection));
 	}
 }

validator-core/src/main/java/name/valery1707/jcommander/validators/common/InRange.java

@@ -1,51 +1,10 @@
 package name.valery1707.jcommander.validators.common;
 
-import name.valery1707.jcommander.validators.ValueChecker;
-
-public class InRange<T extends Comparable<T>> extends ValueChecker<T> {
-	//Nullable
-	private final T min;
-	private final boolean minInclusive;
-	//Nullable
-	private final T max;
-	private final boolean maxInclusive;
+@SuppressWarnings("WeakerAccess")
+public abstract class InRange<T extends Comparable<T>> extends RangeChecker<T> {
 
 	@SuppressWarnings("WeakerAccess")
 	protected InRange(T min, boolean minInclusive, T max, boolean maxInclusive) {
-		this.min = min;
-		this.minInclusive = minInclusive;
-		this.max = max;
-		this.maxInclusive = maxInclusive;
-		if (min == null && max == null) {
-			throw new IllegalArgumentException("At least one border must be not null");
-		}
-		if (min != null && max != null && min.compareTo(max) > 0) {
-			throw new IllegalArgumentException("Left border must be less ot equal to right border");
-		}
-	}
-
-	@Override
-	protected boolean check(T raw) {
-		boolean valid = true;
-		if (min != null) {
-			int compare = min.compareTo(raw);
-			valid = minInclusive ? compare <= 0 : compare < 0;
-		}
-		if (max != null) {
-			int compare = max.compareTo(raw);
-			valid = valid && (maxInclusive ? compare >= 0 : compare > 0);
-		}
-		return valid;
-	}
-
-	@Override
-	protected String error() {
-		return "be in range "
-			   + (min != null && minInclusive ? "[" : "(")
-			   + (min != null ? min : "...")
-			   + ", "
-			   + (max != null ? max : "...")
-			   + (max != null && maxInclusive ? "]" : ")")
-				;
+		super(min, minInclusive, max, maxInclusive, false);
 	}
 }