Merge pull request #20 from modular-server-manager/0.1.3-dev

0.1.3 dev

Author: AntoineBuirey

.gitignore

@@ -3,7 +3,7 @@ __pycache__/
 *.egg-info/
 dist/
 build/
-mc_srv_manager/
+modular_server_manager/
 *.log
 *.md
 

forge-server-manager.code-workspace

@@ -1,44 +1,21 @@
-.PHONY: all build clean client server tests
+.PHONY: all build clean server tests
 
 all: build
 
 TEMP_DIR = build
 
-WEB_SRC_TS = $(wildcard client/src/**/*.ts)
-WEB_SRC_HTML = $(wildcard client/src/**/*.template.html)
-WEB_SRC_SASS = $(wildcard client/src/**/*.scss)
-WEB_ASSETS = $(wildcard client/src/assets/*)
-
-WEB_DIST_JS = $(patsubst client/src/%.ts,mc_srv_manager/client/%.js,$(WEB_SRC_TS))
-WEB_DIST_HTML = $(patsubst client/src/%.template.html,mc_srv_manager/client/%.html,$(WEB_SRC_HTML))
-WEB_DIST_CSS = $(patsubst client/src/%.scss,mc_srv_manager/client/%.css,$(WEB_SRC_SASS))
-WEB_DIST_ASSETS = $(patsubst client/src/assets/%,mc_srv_manager/client/assets/%,$(WEB_ASSETS))
-WEB_DIST = $(WEB_DIST_JS) $(WEB_DIST_HTML) $(WEB_DIST_CSS) $(WEB_DIST_ASSETS)
-
-WEB_DEV_JS = $(patsubst client/src/%.ts,client/dist/%.js,$(WEB_SRC_TS))
-WEB_DEV_HTML = $(patsubst client/src/%.template.html,client/dist/%.html,$(WEB_SRC_HTML))
-WEB_DEV_CSS = $(patsubst client/src/%.scss,client/dist/%.css,$(WEB_SRC_SASS))
-WEB_DEV_ASSETS = $(patsubst client/src/assets/%,client/dist/assets/%,$(WEB_ASSETS))
 WEB_DEV_DIST = $(WEB_DEV_JS) $(WEB_DEV_HTML) $(WEB_DEV_CSS) $(WEB_DEV_ASSETS)
 
 
 SRV_SRC = $(shell find server/src -type f -name "*.py") server/src/minecraft/properties.xml server/src/bus/events.xml server/src/events_descriptions.json
-SRV_DIST = $(patsubst server/src/%,mc_srv_manager/%,$(SRV_SRC))
+SRV_DIST = $(patsubst server/src/%,modular_server_manager/%,$(SRV_SRC))
 
 CONFIG_SRC = $(wildcard server/src/config.json)
-CONFIG_DIST = $(patsubst server/src/%,mc_srv_manager/%,$(CONFIG_SRC))
+CONFIG_DIST = $(patsubst server/src/%,modular_server_manager/%,$(CONFIG_SRC))
 
 TESTS_PY = $(wildcard tests/*.py) $(wildcard tests/**/*.py)
 
 
-# HTML TEMPLATES DEPENDENCIES
-mc_srv_manager/client/account/index.html:   client/src/metadata.template client/src/header/header.template
-mc_srv_manager/client/dashboard/index.html: client/src/metadata.template client/src/header/header.template
-mc_srv_manager/client/server/index.html:    client/src/metadata.template client/src/header/header.template
-mc_srv_manager/client/login/index.html:     client/src/metadata.template client/src/header/header.template
-
-
-
 PYPROJECT = pyproject.toml
 
 PYTHON_PATH = $(shell if [ -d env/bin ]; then echo "env/bin/"; elif [ -d env/Scripts ]; then echo "env/Scripts/"; else echo ""; fi)
@@ -47,18 +24,17 @@ PYTHON = $(PYTHON_PATH)python
 
 EXECUTABLE_EXTENSION = $(shell if [ -d env/bin ]; then echo ""; elif [ -d env/Scripts ]; then echo ".exe"; else echo ""; fi)
 
-APP_EXECUTABLE = $(PYTHON_PATH)mc-srv-manager$(EXECUTABLE_EXTENSION)
+APP_EXECUTABLE = $(PYTHON_PATH)modular-server-manager$(EXECUTABLE_EXTENSION)
 
 # if not defined, get the version from git
 VERSION ?= $(shell $(PYTHON) get_version.py)
 
 # if version is in the form of x.y.z-dev-aaaa or x.y.z-dev+aaaa, set it to x.y.z-dev
-# VERSION_STR = $(shell echo $(VERSION) | sed 's/-dev-[a-z0-9]*\/\/')
 VERSION_STR = $(shell echo $(VERSION) | sed "s/-dev-[a-z0-9]*//; s/-dev+.*//")
 
 
-WHEEL = mc_srv_manager-$(VERSION_STR)-py3-none-any.whl
-ARCHIVE = mc_srv_manager-$(VERSION_STR).tar.gz
+WHEEL = modular_server_manager-$(VERSION_STR)-py3-none-any.whl
+ARCHIVE = modular_server_manager-$(VERSION_STR).tar.gz
 
 $(PYTHON_LIB)/build:
 	$(PYTHON_PATH)pip install build
@@ -67,71 +43,52 @@ $(PYTHON_LIB)/build:
 print-%:
 	@echo $* = $($*)
 
-mc_srv_manager/client/%.html: client/src/%.template.html
-	@mkdir -p $(@D)
-	@echo "Compiling $< to $@"
-	@$(PYTHON) html_template.py client/src $(subst .template.html,,$(subst client/src/,,$<)) -o $@
-
-mc_srv_manager/client/%.js: client/src/%.ts
-	@mkdir -p $(dir $@)
-	@echo "Compiling $< to $@"
-	@tsc --outDir mc_srv_manager/client $< --module es6 --target es6 --strict
-
-mc_srv_manager/client/%.css: client/src/%.scss
-	@mkdir -p $(@D)
-	@echo "Compiling $< to $@"
-	@sass $< $@ --no-source-map
-
-mc_srv_manager/%.py: server/src/%.py
+modular_server_manager/%.py: server/src/%.py
 	@mkdir -p $(@D)
 	@echo "Copying $< to $@"
 	@cp $< $@
 
-mc_srv_manager/%.json: server/src/%.json
+modular_server_manager/%.json: server/src/%.json
 	@mkdir -p $(@D)
 	@echo "Copying $< to $@"
 	@cp $< $@
 
-mc_srv_manager/client/assets/%: client/src/assets/%
+modular_server_manager/%: server/src/%
 	@mkdir -p $(@D)
 	@echo "Copying $< to $@"
 	@cp $< $@
 
-mc_srv_manager/%: server/src/%
-	@mkdir -p $(@D)
-	@echo "Copying $< to $@"
-	@cp $< $@
+dist:
+	mkdir -p dist
 
-dist/$(WHEEL): $(WEB_DIST) $(SRV_DIST) $(PYPROJECT) $(CONFIG_DIST) $(PYTHON_LIB)/build
+dist/$(WHEEL): $(SRV_DIST) $(PYPROJECT) $(CONFIG_DIST) $(PYTHON_LIB)/build dist
 	mkdir -p $(TEMP_DIR)
 	$(PYTHON) build_package.py --outdir $(TEMP_DIR) --wheel --version $(VERSION_STR)
 	mkdir -p dist
 	mv $(TEMP_DIR)/*.whl dist/$(WHEEL)
 	rm -rf $(TEMP_DIR)
 	@echo "Building wheel package complete."
 
-dist/$(ARCHIVE): $(WEB_DIST) $(SRV_DIST) $(PYPROJECT) $(CONFIG_DIST) $(PYTHON_LIB)/build
+dist/$(ARCHIVE): $(SRV_DIST) $(PYPROJECT) $(CONFIG_DIST) $(PYTHON_LIB)/build dist
 	mkdir -p $(TEMP_DIR)
 	$(PYTHON) build_package.py --outdir $(TEMP_DIR) --sdist --version $(VERSION_STR)
 	mkdir -p dist
 	mv $(TEMP_DIR)/*.tar.gz dist/$(ARCHIVE)
 	rm -rf $(TEMP_DIR)
 	@echo "Building archive package complete."
 
-$(APP_EXECUTABLE) : $(WEB_DIST) $(SRV_DIST) $(PYPROJECT) $(CONFIG_DIST) dist/$(WHEEL)
+$(APP_EXECUTABLE) : dist/$(WHEEL)
 	@echo "Installing package..."
 	@$(PYTHON) -m pip install --upgrade --force-reinstall dist/$(WHEEL)
 	@echo "Package installed."
 
 build: dist/$(WHEEL) dist/$(ARCHIVE)
 
-client: $(WEB_DIST)
-
 server: $(SRV_DIST) $(CONFIG_DIST)
 
 
 
-test-report.xml: $(APP_EXECUTABLE) $(WEB_DIST) $(SRV_DIST) $(PYPROJECT) $(CONFIG_DIST) $(TESTS_PY)
+test-report.xml: $(APP_EXECUTABLE) $(SRV_DIST) $(PYPROJECT) $(CONFIG_DIST) $(TESTS_PY)
 	$(PYTHON) -m pytest --junitxml=test-report.xml tests
 
 
@@ -142,17 +99,17 @@ start: install
 		-c /var/minecraft/config.json \
 		--log-file server.trace.log:TRACE \
 		--log-file server.debug.log:DEBUG \
-		--module-level config:TRACE \
+		--module-level config:DEBUG \
 		--module-level minecraft.properties:DEBUG
 
 tests: clean-tests test-report.xml
 
 
 clean:
-	rm -rf mc_srv_manager
+	rm -rf modular_server_manager
 	rm -rf dist
-	rm -rf $(PYTHON_LIB)/mc_srv_manager
-	rm -rf $(PYTHON_LIB)/mc_srv_manager-*.dist-info
+	rm -rf $(PYTHON_LIB)/modular_server_manager
+	rm -rf $(PYTHON_LIB)/modular_server_manager-*.dist-info
 	rm -rf $(APP_EXECUTABLE)
 
 clean-tests: