Move top-level flask app from turbot/turbot.py to turbot_flask/turbot.py

[turbot] / Makefile

diff --git a/Makefile b/Makefile
index d38a9a984c71be5bb68e37f30c1f122667659ece..8aaad75091914c2f7dbf074a6a1076d7e8307991 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ DEPLOY_HOST=halibut.cworth.org
 DEPLOY_DIR=/srv/halibut.cworth.org/turbot
 export DEPLOY_DIR
 DO_NOT_DEPLOY=env .gitignore
-DO_NOT_DELETE=.turbot.env
+DO_NOT_DELETE=.slack-creds.env .gsheets-creds.json .gsheets-token.pickle
 
 help:
        @echo "Available targets (in rough order of expected use):"
@@ -52,21 +52,38 @@ endif
        pip-compile --no-index --generate-hashes --allow-unsafe
 
 run: require-venv
-       FLASK_APP=turbot FLASK_DEBUG=true flask run
+       FLASK_APP=turbot.turbot FLASK_DEBUG=true flask run
 
 turbot.wsgi: turbot.wsgi.in Makefile
        envsubst < turbot.wsgi.in > turbot.wsgi
 
-deploy:
-       rm -rf .deploy-source
-       git clone . .deploy-source
-       rm -rf .deploy-source/.git
-       make -C .deploy-source turbot.wsgi
-       (cd .deploy-source; rsync -avz \
+.PHONY: deploy-flask
+deploy-flask:
+       rm -rf .deploy-flask-source
+       git clone . .deploy-flask-source
+       rm -rf .deploy-flask-source/.git
+       make -C .deploy-flask-source turbot.wsgi
+       (cd .deploy-flask-source; rsync -avz \
                $(DO_NOT_DEPLOY:%=--exclude=%) \
-               --exclude=$(DO_NOT_DELETE) \
+               $(patsubst %,--exclude %,$(DO_NOT_DELETE)) \
                --delete \
                --delete-after \
                ./ $(DEPLOY_HOST):$(DEPLOY_DIR) )
-       rm -rf .deploy-source
+       rm -rf .deploy-flask-source
        ssh $(DEPLOY_HOST) '(cd $(DEPLOY_DIR); make bootstrap; . env/bin/activate; make reqs)'
+
+.PHONY: deploy-lambda
+deploy-lambda:
+       rm -rf .deploy-lambda-source
+       git clone . .deploy-lambda-source
+       rm -rf .deploy-lambda-source/.git
+       (cd .deploy-lambda-source/turbot_lambda; zip ../turbot.zip lambda_function.py)
+       (cd .deploy-lambda-source; \
+               aws lambda update-function-code \
+               --profile halibut \
+               --function-name turbot \
+               --zip-file fileb://turbot.zip )
+       rm -rf .deploy-lambda-source
+
+.PHONY: deploy
+deploy: deploy-flask deploy-lambda