update demo Makefiles

Author: rambasnet

Makefile

@@ -7,7 +7,7 @@ DEMO = './demo-assignments'
 
 .PHONY: all
 all: check-style check-type run-test-coverage clean
-	@echo "All checks passed"
+	@echo "All checks passed!"
 
 .PHONY: check-type
 check-type:

demo-assignments/A0-OOP/hello/Makefile

@@ -1,22 +1,35 @@
 # provide path to where plantuml.jar is downloaded
 PLANTUML = java -jar ~/plantuml.jar
 DOCS = docs
-PROBLEM = hello
 PYTHON = python3
 
 .PHONY: all
-all: check-style fix-style check-types run-test create-docs create-uml
+all: check-style fix-style check-types run-test run-test-coverage create-docs create-uml clean
 	@echo "All done!"
 
+.PHONY: check-style
+check-style:
+	flake8 .
+
+.PHONY: fix-style
+fix-style:
+	autopep8 --in-place --recursive --aggressive --aggressive .
+
 .PHONY: run-test
 run-test:
 ifeq ($(shell which pytest), ) # if pytest not found
 	@echo "pytest not found. Installing..."
 	pip install pytest
 endif
-	pytest --verbose --color=yes --cov --cov-report term --cov-report html tests/
+	pytest --verbose --color=yes tests/
 	@echo "All unittests passed!"
 
+.PHONY: run-test-coverage
+run-test-coverage: create-doc-folder
+	pytest --verbose --color=yes --cov --cov-report term-missing --cov-report=html:$(DOCS)/test-cov tests/
+	@echo "All unittests passed!"
+
+
 .PHONY: check-types
 check-types:
 # use shell command which to check if mypy is installed and is in $PATH
@@ -33,8 +46,8 @@ create-doc-folder:
 
 .PHONY: create-docs
 create-docs: create-doc-folder
-	pdoc -o ./docs main.py hello.py # creates .md docs inside docs
-	@echo "html docs created and saved in $(DOCS)"
+	pdoc --output-dir $(DOCS)/code-docs hello.py main.py # creates html docs
+	@echo "html docs created and saved in $(DOCS)/code-docs"
 
 .PHONY: create-uml
 create-uml: create-doc-folder
@@ -47,15 +60,17 @@ ifeq ($(wildcard ~/plantuml.jar), )
 	@echo "Downloading plantuml.jar in home folder..."
 	curl -L -o ~/plantuml.jar https://sourceforge.net/projects/plantuml/files/plantuml.jar/download
 endif
-	$(PLANTUML) uml/HelloWorld.plantuml
-	$(PLANTUML) uml/Main.plantuml
-	$(PLANTUML) uml/solution.plantuml
+	$(PLANTUML) ./uml/HelloWorld.plantuml
+	$(PLANTUML) ./uml/Main.plantuml
+	$(PLANTUML) ./uml/solution.plantuml
 	@echo "UML diagrams created and saved in uml folder"
 
-.PHONY: check-style
-check-style:
-	flake8 .
 
-.PHONY: fix-style
-fix-style:
-	autopep8 --in-place --recursive --aggressive --aggressive .
+.PHONY: clean
+clean:
+	# remove all caches recursively
+	rm -rf `find . -type d -name __pycache__` # remove all pycache
+	rm -rf `find . -type d -name .pytest_cache` # remove all pytest cache
+	rm -rf `find . -type d -name .mypy_cache` # remove all mypy cache
+	rm -rf `find . -type d -name .hypothesis` # remove all hypothesis cache
+	rm -rf `find . -name .coverage` # remove all coverage cache 

demo-assignments/A0-OOP/hello/docs/hello.html renamed to demo-assignments/A0-OOP/hello/docs/code-docs/hello.html

@@ -0,0 +1,56 @@
+DOCS = docs
+PYTHON = python3
+
+.PHONY: all
+all: check-style fix-style check-types run-test run-test-coverage create-docs clean
+	@echo "All done!"
+
+.PHONY: check-style
+check-style:
+	flake8 .
+
+.PHONY: fix-style
+fix-style:
+	autopep8 --in-place --recursive --aggressive --aggressive .
+
+.PHONY: run-test
+run-test:
+ifeq ($(shell which pytest), ) # if pytest not found
+	@echo "pytest not found. Installing..."
+	pip install pytest
+endif
+	pytest --verbose --color=yes tests/
+	@echo "All unittests passed!"
+
+.PHONY: run-test-coverage
+run-test-coverage: create-doc-folder
+	pytest --verbose --color=yes --cov --cov-report term-missing --cov-report=html:$(DOCS)/test-cov tests/
+	@echo "All unittests passed!"
+
+.PHONY: check-types
+check-types:
+# use shell command which to check if mypy is installed and is in $PATH
+ifeq ($(shell which mypy), )
+	@echo "mypy not found. Installing mypy..."
+	pip install mypy
+endif
+	mypy --disallow-untyped-defs --strict .
+	@echo "Type checking done."
+
+.PHONY: create-doc-folder
+create-doc-folder:
+	@mkdir -p $(DOCS) # creates all folder(s) if not exists
+
+.PHONY: create-docs
+create-docs: create-doc-folder
+	pdoc --output-dir $(DOCS)/code-docs hello.py # creates html docs
+	@echo "html docs created and saved in $(DOCS)/code-docs"
+
+.PHONY: clean
+clean:
+	# remove all caches recursively
+	rm -rf `find . -type d -name __pycache__` # remove all pycache
+	rm -rf `find . -type d -name .pytest_cache` # remove all pytest cache
+	rm -rf `find . -type d -name .mypy_cache` # remove all mypy cache
+	rm -rf `find . -type d -name .hypothesis` # remove all hypothesis cache
+	rm -rf `find . -name .coverage` # remove all coverage cache