Adding version 0.0.2

.gitignore

@@ -14,3 +14,8 @@ gradle
 gradlew
 gradlew.bat
 build
+.gradletasknamecache
+
+#TestNG
+test-output
+

.travis.yml

@@ -1,4 +1,21 @@
 language: java
 
+cache: gradle
+
 jdk:
   - oraclejdk8
+
+env:
+  global:
+    - GH_REPO_NAME: FastChat
+    - GH_REPO_REF: github.com/OHopiak/FastChat.git
+
+script:
+  - gradle assemble
+  - gradle check jacocoTestReport
+  - gradle build javadoc
+
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
+  - cd $TRAVIS_BUILD_DIR
+  - ./scripts/deploy-travis

FastChat.uml

@@ -3,79 +3,40 @@
   <ID>JAVA</ID>
   <OriginalElement />
   <nodes>
-    <node x="200.7759259259259" y="990.0">com.fastchat.FastChat.Loader</node>
-    <node x="311.68333333333334" y="704.0">com.fastchat.FastChat.client.Login</node>
-    <node x="458.575" y="0.0">com.fastchat.FastChat.client.Client</node>
-    <node x="202.00000000000003" y="526.0">com.fastchat.FastChat.server.Server.Status</node>
-    <node x="18.683333333333337" y="668.0">com.fastchat.FastChat.server.Server</node>
-    <node x="222.575" y="180.0">com.fastchat.FastChat.client.OnlineUsers</node>
-    <node x="0.0" y="478.0">com.fastchat.FastChat.server.ServerClient</node>
-    <node x="324.18333333333334" y="466.0">com.fastchat.FastChat.client.ClientWindow</node>
+    <node x="112.5" y="82.0">com.fastchat.FastChat.Loader</node>
+    <node x="144.0" y="0.0">com.fastchat.FastChat.client</node>
+    <node x="283.0" y="0.0">com.fastchat.FastChat.util</node>
+    <node x="0.0" y="207.0">com.fastchat.FastChat.networking</node>
+    <node x="0.0" y="0.0">com.fastchat.FastChat.server</node>
+    <node x="201.0" y="207.0">com.fastchat.FastChat.beans</node>
   </nodes>
   <notes />
   <edges>
-    <edge source="com.fastchat.FastChat.client.Login" target="com.fastchat.FastChat.client.ClientWindow">
-      <point x="-109.5" y="-100.0" />
-      <point x="348.18333333333334" y="643.0" />
-      <point x="356.51666666666665" y="643.0" />
-      <point x="-64.66666666666669" y="76.0" />
-    </edge>
-    <edge source="com.fastchat.FastChat.Loader" target="com.fastchat.FastChat.client.Login">
-      <point x="45.5" y="-52.0" />
-      <point x="337.2759259259259" y="965.0" />
-      <point x="457.68333333333334" y="965.0" />
-      <point x="0.0" y="100.0" />
-    </edge>
-    <edge source="com.fastchat.FastChat.client.ClientWindow" target="com.fastchat.FastChat.client.OnlineUsers">
-      <point x="-24.25" y="-76.0" />
-      <point x="396.93333333333334" y="446.0" />
-      <point x="384.575" y="446.0" />
-      <point x="54.0" y="28.0" />
-    </edge>
-    <edge source="com.fastchat.FastChat.client.Client" target="com.fastchat.FastChat.client.Login">
-      <point x="89.0" y="208.0" />
-      <point x="681.075" y="446.0" />
-      <point x="619.8675925925926" y="446.0" />
-      <point x="619.8675925925926" y="643.0" />
-      <point x="567.1833333333334" y="643.0" />
-      <point x="109.50000000000001" y="-100.0" />
-    </edge>
-    <edge source="com.fastchat.FastChat.Loader" target="com.fastchat.FastChat.server.Server">
-      <point x="-45.5" y="-52.0" />
-      <point x="246.2759259259259" y="965.0" />
-      <point x="155.18333333333334" y="965.0" />
-      <point x="0.0" y="136.0" />
-    </edge>
-    <edge source="com.fastchat.FastChat.server.Server" target="com.fastchat.FastChat.server.ServerClient">
-      <point x="-54.60000000000002" y="-136.0" />
-      <point x="100.58333333333331" y="643.0" />
-      <point x="91.0" y="643.0" />
-      <point x="0.0" y="64.0" />
-    </edge>
-    <edge source="com.fastchat.FastChat.server.Server" target="com.fastchat.FastChat.server.Server.Status">
-      <point x="54.60000000000002" y="-136.0" />
-      <point x="209.78333333333336" y="643.0" />
-      <point x="224.00000000000003" y="643.0" />
-      <point x="-22.0" y="16.0" />
-    </edge>
-    <edge source="com.fastchat.FastChat.client.ClientWindow" target="com.fastchat.FastChat.client.Client">
-      <point x="24.25" y="-76.0" />
-      <point x="445.43333333333334" y="436.0" />
-      <point x="503.075" y="436.0" />
-      <point x="-89.0" y="208.0" />
-    </edge>
-    <edge source="com.fastchat.FastChat.server.Server.Status" target="com.fastchat.FastChat.server.Server">
-      <point x="22.0" y="16.0" />
-      <point x="268.0" y="643.0" />
-      <point x="264.3833333333334" y="643.0" />
-      <point x="109.20000000000005" y="-136.0" />
+    <edge source="com.fastchat.FastChat.Loader" target="com.fastchat.FastChat.server">
+      <point x="-68.25" y="-40.0" />
+      <point x="135.25" y="57.0" />
+      <point x="62.0" y="57.0" />
+      <point x="0.0" y="16.0" />
+    </edge>
+    <edge source="com.fastchat.FastChat.Loader" target="com.fastchat.FastChat.util">
+      <point x="68.25" y="-40.0" />
+      <point x="271.75" y="57.0" />
+      <point x="336.0" y="57.0" />
+      <point x="0.0" y="16.0" />
+    </edge>
+    <edge source="com.fastchat.FastChat.Loader" target="com.fastchat.FastChat.client">
+      <point x="-22.75" y="-40.0" />
+      <point x="180.75" y="57.0" />
+      <point x="173.75" y="57.0" />
+      <point x="-29.75" y="16.0" />
     </edge>
   </edges>
-  <settings layout="Hierarchic Group" zoom="1.134313725490196" x="403.18323249783924" y="719.2333621434746" />
-  <SelectedNodes />
+  <settings layout="Hierarchic Group" zoom="0.9494773519163763" x="245.0" y="277.0" />
+  <SelectedNodes>
+    <node>com.fastchat.FastChat.server</node>
+  </SelectedNodes>
   <Categories>
     <Category>Methods</Category>
-    <Category>Inner Classes</Category>
   </Categories>
   <SCOPE>All</SCOPE>
   <VISIBILITY>private</VISIBILITY>

Jenkinsfile

@@ -13,8 +13,9 @@ pipeline {
     }
     stage('test') {
       steps {
-        sh 'gradle test'
+        sh 'gradle check jacocoTestReport'
         junit(testResults: '**/build/test-results/**/*.xml', allowEmptyResults: true)
+        jacoco(execPattern: '**/build/**.exec')
       }
     }
     stage('deploy') {

README.md

@@ -1,13 +1,11 @@
 FastChat 
 ========
 
-Travis:
 [![Build Status](https://travis-ci.org/OHopiak/FastChat.svg?branch=master)](https://travis-ci.org/OHopiak/FastChat)
-
-Jenkins:
-[![Build Status](http://18.194.57.194:8080/job/FastChat/job/master/4/badge/icon)](http://18.194.57.194:8080/job/FastChat/job/master/4/)
+[![codecov](https://codecov.io/gh/OHopiak/FastChat/branch/dev/graph/badge.svg)](https://codecov.io/gh/OHopiak/FastChat)
 
    This is the simple chatting tool  
+   Feel free to contribute to this project  
 
 Requirements
 ------------

build.gradle

@@ -1,14 +1,19 @@
 apply plugin: 'java'
-apply plugin: 'maven'
+apply plugin: 'jacoco'
 
 group = 'com.fastchat'
-version = '0.0.1'
+version = '0.0.3'
 
 description = """FastChat - a tool for instant chatting that not always works as expected - WIP"""
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
+
+configurations {
+	libraries
+}
+
 jar {
 	manifest {
 		attributes(
@@ -18,6 +23,9 @@ jar {
 		)
 
 	}
+	from {
+		configurations.libraries.collect { it.isDirectory() ? it : zipTree(it) }
+	}
 }
 
 test {
@@ -26,15 +34,34 @@ test {
 }
 
 repositories {
-	maven { url "http://jcenter.bintray.com" }
-	maven { url "http://repo.maven.apache.org/maven2" }
+	jcenter()
 }
 
 dependencies {
-	testCompile group: 'org.testng', name: 'testng', version: '6.9.12'
+	libraries 'com.jgoodies:jgoodies-forms:1.6.0'
+	libraries 'com.google.code.gson:gson:2.8.2'
+//	libraries 'com.intellij:forms_rt:7.0.3'
+	testCompile 'org.testng:testng:6.9.12'
+	testCompile 'com.google.guava:guava:19.0'
+	configurations.compile.extendsFrom(configurations.libraries)
+}
+
+jacocoTestReport {
+	reports {
+		//noinspection GroovyAssignabilityCheck
+		html.enabled true
+		//noinspection GroovyAssignabilityCheck
+		xml.enabled true
+		//noinspection GroovyAssignabilityCheck
+		csv.enabled true
+	}
 }
 
-task printJarName{
+javadoc {
+	failOnError = false
+}
+
+task printJarName {
 	dependsOn 'jar'
 	doLast {
 		println "${project.name}-${project.version}.jar"
@@ -46,4 +73,4 @@ task printArtifactsDirectory {
 	doLast {
 		println "${project.name}/${project.version}"
 	}
-}
+}

deploy/Dockerfile

@@ -0,0 +1,6 @@
+FROM gradle:latest
+
+USER root
+RUN mkdir /opt/artifacts && chown -R gradle:gradle /opt/artifacts
+RUN apt update && apt install -y ssh
+#USER gradle

scripts/deploy

@@ -22,7 +22,7 @@ artifact_jar="build/libs/`gradle printJarName -q 2>/dev/null`"
 artifact_docs="build/docs/javadoc"
 artifact_tests="build/reports/tests/test"
 
-mkdir -p $version_dir
-cp -r $artifact_jar $version_dir
-cp -r $artifact_docs $version_dir/docs
-cp -r $artifact_tests $version_dir/tests
+mkdir -p "$version_dir"
+cp -r "$artifact_jar" "$version_dir"
+cp -r "$artifact_docs" "$version_dir/docs"
+cp -r "$artifact_tests" "$version_dir/tests"

scripts/deploy-travis

@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+
+PROJECT_DIR=$(cd $(dirname "$0")/.. && echo "$PWD")
+BUILD_DIR="$PROJECT_DIR/build"
+GH_PAGES_DIR="$BUILD_DIR/gh-pages"
+BRANCH=$(git branch | grep \* | cut -d ' ' -f2-)
+
+if [ "$BRANCH" == "master" ]; then
+	DEPLOY_DIR="$GH_PAGES_DIR"
+else
+	DEPLOY_DIR="$GH_PAGES_DIR/$BRANCH"
+fi
+
+set -ex
+
+function copy_markdown(){
+	cp "$PROJECT_DIR"/*.md "$DEPLOY_DIR"
+}
+
+function deploy_dir(){
+	local dir=$1
+	if [ -d "$BUILD_DIR/$dir" ]; then
+		if [ -d "$DEPLOY_DIR/$dir" ]; then
+			rm -fr "$DEPLOY_DIR/$dir"
+		fi
+		cp -r "$BUILD_DIR/$dir" "$DEPLOY_DIR/$dir"
+	else
+		echo "Directory $dir doesn't exist"
+	fi
+}
+
+function set_up_git(){
+	# delete directory with pages if it exists
+	if [ -d "$GH_PAGES_DIR" ]; then
+		rm -fr "$GH_PAGES_DIR"
+	fi
+
+	git clone -b gh-pages "https://git@$GH_REPO_REF.git" "$GH_PAGES_DIR"
+
+	cd "$GH_PAGES_DIR"
+	git config --global push.default simple
+	git config user.name "Travis CI"
+	git config user.email "travis@travis-ci.org"
+}
+
+function push_changes(){
+	if ! git diff-index --quiet HEAD --; then
+		git add --all
+		git commit -m "Deploy code docs to GitHub Pages Travis build: ${TRAVIS_BUILD_NUMBER}" -m "Commit: ${TRAVIS_COMMIT}"
+		git push --force "https://${GH_REPO_TOKEN}@${GH_REPO_REF}" > /dev/null 2>&1
+	fi
+}
+
+function main(){
+	if [ ! -d "$PROJECT_DIR/build" ]; then
+		echo "You must build the project before deploying"
+		exit 1
+	fi
+
+	set_up_git
+	mkdir -p "$DEPLOY_DIR"
+	copy_markdown
+	deploy_dir libs
+	deploy_dir docs
+	deploy_dir reports
+	push_changes
+	echo "Deploy is finished successfully"
+}
+
+main