Merge branch 'master' of gitlab.com:pisquared/oshipka

bootstrap/config.py

@@ -13,6 +13,8 @@ TASKS_PROC_DIR = os.path.join(TASKS_DIR, "proc")
 DATABASE_FILE = os.path.join(DATA_DIR, "db.sqlite")
 SQLALCHEMY_DATABASE_URI = 'sqlite:///{}'.format(DATABASE_FILE)
 
+SEARCH_INDEX_PATH = os.path.join(DATA_DIR, "search_index")
+
 TEMPLATES_FOLDER = os.path.join(basepath, "webapp", "templates")
 STATIC_FOLDER = os.path.join(basepath, "webapp", "static")
 

bootstrap/requirements.txt

@@ -1 +0,0 @@
-git+https://gitlab.com/pisquared/oshipka

oshipka.sh

@@ -11,8 +11,11 @@ HELP="
 Usage $0 [ bootstrap | worker | web | venv | install | link | cert ]
 
     bootstrap [PROJECT_PATH]     Create a new project in PROJECT_PATH
+    init                         Install dev env
+
     worker                       Start worker
     web                          Start webapp
+
     venv                         Init venv
     install                      Install requirements
     link                         Link dev oshipka
@@ -43,6 +46,13 @@ install_reqs() {
 link_dev_oshipka() {
   source venv/bin/activate
   pip install -e ${OSHIPKA_PATH}
+  pip install -e ${TWW_PATH}
+}
+
+init() {
+  init_venv
+  install_reqs
+  link_dev_oshipka
 }
 
 install_cert() {
@@ -102,6 +112,8 @@ command_main() {
     case "$INITIAL_COMMAND" in
         bootstrap) bootstrap "$@"
         ;;
+        init) init "$@"
+        ;;
         worker) worker "$@"
         ;;
         web) web "$@"

requirements.txt

@@ -30,5 +30,6 @@ SQLAlchemy==1.3.15
 SQLAlchemy-Utils==0.36.3
 watchdog==0.10.2
 Werkzeug==1.0.0
+whooshalchemy==0.3.1
 WTForms==2.2.1
 zipp==3.1.0