Merge pull request #39 from devilbox/release-1.0.0

Release 1.0.0
devilbox · Jan 23, 2020 · bc9090f · bc9090f
2 parents 2242f29 + 2c36804
commit bc9090f
Show file tree

Hide file tree

Showing 19 changed files with 1,398 additions and 1,138 deletions.
diff --git a/.ci/fuzzy.sh b/.ci/fuzzy.sh
@@ -43,14 +43,14 @@ function fuzzy() {
 		###
 		### 1 Argument
 		###
-		cmd="${MY_PATH}/../bin/vhost_gen.py -${arg1} ${val1}"
+		cmd="${MY_PATH}/../bin/vhost-gen -${arg1} ${val1}"
 		out="$( eval "${cmd}" 2>&1 || true )"
 		if errored "${out}"; then
 			printf "[%04d] %s\n" "${count}" "${cmd}"
 			echo "${out}"
 			exit 1
 		fi
-		cmd="${MY_PATH}/../bin/vhost_gen.py -p ${val1}"
+		cmd="${MY_PATH}/../bin/vhost-gen -p ${val1}"
 		out="$( eval "${cmd}" 2>&1 || true )"
 		if errored "${out}"; then
 			printf "[%04d] %s\n" "${count}" "${cmd}"
@@ -61,14 +61,14 @@ function fuzzy() {
 		###
 		### 2 Arguments
 		###
-		cmd="${MY_PATH}/../bin/vhost_gen.py -${arg1} ${val1} -${arg2} ${val2}"
+		cmd="${MY_PATH}/../bin/vhost-gen -${arg1} ${val1} -${arg2} ${val2}"
 		out="$( eval "${cmd}" 2>&1 || true )"
 		if errored "${out}"; then
 			printf "[%04d] %s\n" "${count}" "${cmd}"
 			echo "${out}"
 			exit 1
 		fi
-		cmd="${MY_PATH}/../bin/vhost_gen.py -p ${val1} -n NAME"
+		cmd="${MY_PATH}/../bin/vhost-gen -p ${val1} -n NAME"
 		out="$( eval "${cmd}" 2>&1 || true )"
 		if errored "${out}"; then
 			printf "[%04d] %s\n" "${count}" "${cmd}"
@@ -79,14 +79,14 @@ function fuzzy() {
 		###
 		### 3 Arguments
 		###
-		cmd="${MY_PATH}/../bin/vhost_gen.py -${arg1} ${val1} -${arg2} ${val2} -${arg3} ${val3}"
+		cmd="${MY_PATH}/../bin/vhost-gen -${arg1} ${val1} -${arg2} ${val2} -${arg3} ${val3}"
 		out="$( eval "${cmd}" 2>&1 || true )"
 		if errored "${out}"; then
 			printf "[%04d] %s\n" "${count}" "${cmd}"
 			echo "${out}"
 			exit 1
 		fi
-		cmd="${MY_PATH}/../bin/vhost_gen.py -p ${val1} -n NAME -${arg3} ${val3}"
+		cmd="${MY_PATH}/../bin/vhost-gen -p ${val1} -n NAME -${arg3} ${val3}"
 		out="$( eval "${cmd}" 2>&1 || true )"
 		if errored "${out}"; then
 			printf "[%04d] %s\n" "${count}" "${cmd}"
@@ -97,14 +97,14 @@ function fuzzy() {
 		###
 		### 4 Arguments
 		###
-		cmd="${MY_PATH}/../bin/vhost_gen.py -${arg1} ${val1} -${arg2} ${val2} -${arg3} ${val3} -${arg4} ${val4}"
+		cmd="${MY_PATH}/../bin/vhost-gen -${arg1} ${val1} -${arg2} ${val2} -${arg3} ${val3} -${arg4} ${val4}"
 		out="$( eval "${cmd}" 2>&1 || true )"
 		if errored "${out}"; then
 			printf "[%04d] %s\n" "${count}" "${cmd}"
 			echo "${out}"
 			exit 1
 		fi
-		cmd="${MY_PATH}/../bin/vhost_gen.py -p ${val1} -n NAME -${arg3} ${val3} -${arg4} ${val4}"
+		cmd="${MY_PATH}/../bin/vhost-gen -p ${val1} -n NAME -${arg3} ${val3} -${arg4} ${val4}"
 		out="$( eval "${cmd}" 2>&1 || true )"
 		if errored "${out}"; then
 			printf "[%04d] %s\n" "${count}" "${cmd}"
@@ -115,14 +115,14 @@ function fuzzy() {
 		###
 		### 5 Arguments
 		###
-		cmd="${MY_PATH}/../bin/vhost_gen.py -${arg1} ${val1} -${arg2} ${val2} -${arg3} ${val3} -${arg4} ${val4}  -${arg5} ${val5}"
+		cmd="${MY_PATH}/../bin/vhost-gen -${arg1} ${val1} -${arg2} ${val2} -${arg3} ${val3} -${arg4} ${val4}  -${arg5} ${val5}"
 		out="$( eval "${cmd}" 2>&1 || true )"
 		if errored "${out}"; then
 			printf "[%04d] %s\n" "${count}" "${cmd}"
 			echo "${out}"
 			exit 1
 		fi
-		cmd="${MY_PATH}/../bin/vhost_gen.py -p ${val1} -n NAME -${arg3} ${val3} -${arg4} ${val4}  -${arg5} ${val5}"
+		cmd="${MY_PATH}/../bin/vhost-gen -p ${val1} -n NAME -${arg3} ${val3} -${arg4} ${val4}  -${arg5} ${val5}"
 		out="$( eval "${cmd}" 2>&1 || true )"
 		if errored "${out}"; then
 			printf "[%04d] %s\n" "${count}" "${cmd}"

diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -0,0 +1,35 @@
+---
+
+###
+### Lints all generic and json files in the whole git repository
+###
+
+name: linting
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+    tags:
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: False
+      matrix:
+        target:
+          - pycodestyle
+          - pydocstyle
+          - black
+
+    name: "[ ${{ matrix.target }} ]"
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@master
+
+      - name: Lint
+        run: |
+          make ${target}
+        env:
+          target: ${{ matrix.target }}
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -0,0 +1,39 @@
+---
+
+###
+### Lints all generic and json files in the whole git repository
+###
+
+name: testing
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+    tags:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: False
+      matrix:
+        version:
+          - '2.7'
+          - '3.6'
+          - '3.7'
+          - '3.8'
+        target:
+          - test
+
+    name: "[ ${{ matrix.target }} ${{ matrix.version}} ]"
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@master
+
+      - name: Lint
+        run: |
+          make ${target} VERSION=${version}
+        env:
+          target: ${{ matrix.target }}
+          version: ${{ matrix.version }}
diff --git a/.gitignore b/.gitignore
@@ -1,86 +1,5 @@
-# Note:
-# To effectively apply the changes you will have
-# to re-index the git index (if there are already
-# commited files)
-#
-# $ git rm -r --cached .
-# $ git add .
-# $ git commit -m ".gitignore index rebuild"
-#
-
-
-######################################
-# CUSTOM
-######################################
-*.pyc
-
-
-######################################
-# GENERIC
-######################################
-
-###### std ######
-.lock
-*.log
-
-###### patches/diffs ######
-*.patch
-*.diff
-*.orig
-*.rej
-
-
-######################################
-# Operating Systems
-######################################
-
-###### OSX ######
-._*
-.DS*
-.Spotlight-V100
-.Trashes
-
-###### Windows ######
-Thumbs.db
-ehthumbs.db
-Desktop.ini
-$RECYCLE.BIN/
-*.lnk
-*.shortcut
-
-######################################
-# Editors
-######################################
-
-###### Sublime ######
-*.sublime-workspace
-*.sublime-project
-
-###### Eclipse ######
-.classpath
-.buildpath
-.project
-.settings/
-
-###### Netbeans ######
-/nbproject/
-
-###### Intellij IDE ######
-.idea/
-.idea_modules/
-
-###### vim ######
-*.swp
-*.swo
-*.swn
-*.swm
-*~
-
-###### TextMate ######
-.tm_properties
-*.tmproj
-
-###### BBEdit ######
-*.bbprojectd
-*.bbproject
-
+vhost_gen.egg-info/
+build/
+dist/
+.*pyc
+__pycache__/
diff --git a/.travis.yml b/.travis.yml
@@ -70,8 +70,8 @@ install:
 ###
 before_script:
   # Show versions
-  - ./bin/vhost_gen.py --help
-  - ./bin/vhost_gen.py --version
+  - ./bin/vhost-gen --help
+  - ./bin/vhost-gen --version
 
 
 ###
@@ -85,19 +85,19 @@ script:
   - make test
 
   # Saving (nginx)
-  - ./bin/vhost_gen.py -p ./ -n name -t etc/templates/ -c etc/conf.yml -s
+  - ./bin/vhost-gen -p ./ -n name -t etc/templates/ -c etc/conf.yml -s
   - cat /etc/nginx/conf.d/name.conf
 
   # Saving (nginx example)
-  - ./bin/vhost_gen.py -p ./ -n name -t etc/templates/ -c examples/conf.nginx.yml -s
+  - ./bin/vhost-gen -p ./ -n name -t etc/templates/ -c examples/conf.nginx.yml -s
   - cat /etc/nginx/conf.d/name.conf
 
   # Saving (apache22 example)
-  - ./bin/vhost_gen.py -p ./ -n name -t etc/templates/ -c examples/conf.apache22.yml -s
+  - ./bin/vhost-gen -p ./ -n name -t etc/templates/ -c examples/conf.apache22.yml -s
   - cat /etc//httpd/conf.d/name.conf
 
   # Saving (apache24 example)
-  - ./bin/vhost_gen.py -p ./ -n name -t etc/templates/ -c examples/conf.apache24.yml -s
+  - ./bin/vhost-gen -p ./ -n name -t etc/templates/ -c examples/conf.apache24.yml -s
   - cat /etc/apache2/conf.d/name.conf
 
   # Find flaws via fuzzying (before installing config files)