Merge pull request #67 from mekanix/feature/reggae

Improve Reggae support

.gitignore

@@ -22,4 +22,4 @@ test.db
 vars.mk
 
 dist/
-freenit.egg-info/
+*.egg-info/

Makefile

@@ -1,12 +1,7 @@
 .include <name.py>
 
+USE_FREENIT = YES
 SERVICE != echo ${app_name}
 REGGAE_PATH := /usr/local/share/reggae
 
 .include <${REGGAE_PATH}/mk/service.mk>
-
-build_lib:
-	@sudo cbsd jexec jname=${SERVICE} user=devel cmd=/usr/src/bin/build.sh
-
-publish: build_lib
-	@sudo cbsd jexec jname=${SERVICE} user=devel cmd=/usr/src/bin/publish.sh

ansible/roles/devel/vars/main.yml

@@ -1,3 +1,4 @@
 ---
+python_prefix: "py37-"
 devel_packages:
-  - name: py37-sqlite3
+  - name: {{ python_prefix }}-sqlite3

bin/freenit.sh

@@ -37,21 +37,3 @@ mv project ${NAME}
 echo "app_name=\"${NAME}\"  # noqa: E225" >name.py
 echo "ipdb" >requirements_dev.txt
 echo "DEVEL_MODE = YES" >vars.mk
-cat > Makefile << EOF
-.include <name.py>
-
-SERVICE != echo \${app_name}back
-REGGAE_PATH := /usr/local/share/reggae
-SYSPKG := YES
-
-shell: up
-	@sudo cbsd jexec user=devel jname=\${SERVICE} /usr/src/bin/shell.sh
-
-init: up
-	@sudo cbsd jexec jname=\${SERVICE} env OFFLINE=\${offline} SYSPKG=\${SYSPKG} /usr/src/bin/init.sh
-
-do_devel:
-	@sudo cbsd jexec jname=\${SERVICE} env OFFLINE=\${offline} SYSPKG=\${SYSPKG} /usr/src/bin/devel.sh
-
-.include <\${REGGAE_PATH}/mk/service.mk>
-EOF

freenit/project/.gitignore

@@ -1,11 +1,24 @@
+*.egg-info/
+.coverage
+.pytest_cache
+__pycache__
+coverage.xml
+database.db
+local_config.py
+test.db
+
+# Reggae
 .provisioned
 ansible/group_vars/all
 ansible/inventory/inventory
 ansible/roles/*
 ansible/site.yml
 !ansible/roles/.keep
-build/
-cbsd.conf
-site.retry
+fstab
 project.mk
+site.retry
 vars.mk
+
+build/
+cbsd.conf
+dist/

freenit/project/Makefile

@@ -0,0 +1,8 @@
+.include <name.py>
+
+SYSPKG := YES
+USE_FREENIT = YES
+SERVICE != echo \${app_name}back
+REGGAE_PATH := /usr/local/share/reggae
+
+.include <\${REGGAE_PATH}/mk/service.mk>

freenit/project/ansible/group_vars/.keep

@@ -0,0 +1 @@
+

freenit/project/bin/build.sh

@@ -1,8 +1,18 @@
 #!/bin/sh
 
 
-BIN_DIR=`dirname $0`
+set -e
+
+export BIN_DIR=`dirname $0`
+export PROJECT_ROOT="${BIN_DIR}/.."
 . ${BIN_DIR}/common.sh
 setup
 
-flask collect --verbose
+
+if [ "${OFFLINE}" != "yes" ]; then
+  pip install -U -r requirements_dev.txt
+fi
+
+cd ${PROJECT_ROOT}
+rm -rf *.egg-info build dist
+python setup.py sdist bdist_wheel

freenit/project/bin/collect.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+
+BIN_DIR=`dirname $0`
+. ${BIN_DIR}/common.sh
+setup
+
+flask collect --verbose

freenit/project/bin/uwsgi.sh

@@ -10,7 +10,7 @@ export FLASK_ENV="production"
 
 . ${BIN_DIR}/common.sh
 setup
-pip install -U uwsgi
+pip install -U --upgrade-strategy eager uwsgi
 
 
 cd ${PROJECT_ROOT}

freenit/project/provisioners.mk

@@ -1 +1 @@
-.include <${REGGAE_PATH}/mk/shell.mk>
+.include <${REGGAE_PATH}/mk/ansible.mk>

setup.py

@@ -65,6 +65,9 @@
     package_data={
         '': [
             'project/*',
+            'project/ansible/group_vars/*',
+            'project/ansible/inventory/*',
+            'project/ansible/roles/devel/*',
             'project/bin/*',
             'project/project/*',
             'project/project/api/*',