ref(*): use standard project dirs

Author: mboersma

.travis.yml

@@ -27,9 +27,9 @@ before_install:
   - source $HOME/virtualenv/python2.7/bin/activate
   - createdb -U postgres deis
 install:
-  - pip install -r controller/requirements.txt
-  - pip install -r controller/dev_requirements.txt
+  - pip install -r rootfs/requirements.txt
+  - pip install -r rootfs/dev_requirements.txt
   - GLIDE_HOME=/home/travis/.glide make -C client bootstrap
 script:
-  - make -C controller test
-  - make -C client test
+  - make test
+  - make -C client/ test

Makefile

@@ -1,24 +1,47 @@
-include includes.mk
 
-build:
-	$(MAKE) -C client/ build
-	$(MAKE) -C controller/ build
+COMPONENT = workflow
+IMAGE = $(IMAGE_PREFIX)$(COMPONENT):$(BUILD_TAG)
+SHELL_SCRIPTS = $(wildcard rootfs/bin/*) $(shell find "rootfs" -name '*.sh')
 
-clean:
-	$(MAKE) -C client/ clean
-	$(MAKE) -C controller/ clean
+check-docker:
+	@if [ -z $$(which docker) ]; then \
+	  echo "Missing \`docker\` client which is required for development"; \
+	  exit 2; \
+	fi
+
+build: check-docker
+	docker build --rm -t $(IMAGE) rootfs
+
+clean: check-docker
+	docker rmi $(IMAGE)
 
 commit-hook:
 	cp contrib/util/commit-msg .git/hooks/commit-msg
 
+full-clean: check-docker
+	docker images -q $(IMAGE_PREFIX)$(COMPONENT) | xargs docker rmi -f
+
+postgres:
+	docker start postgres || docker run --restart="always" -d -p 5432:5432 --name postgres postgres:9.3
+	docker exec postgres createdb -U postgres deis 2>/dev/null || true
+	@echo "To use postgres for local development:"
+	@echo "    export PGHOST=`docker-machine ip $$(docker-machine active) 2>/dev/null || echo 127.0.0.1`"
+	@echo "    export PGPORT=5432"
+	@echo "    export PGUSER=postgres"
+
+setup-venv:
+	@if [ ! -d venv ]; then virtualenv venv; fi
+	venv/bin/pip install --disable-pip-version-check -q -r rootfs/requirements.txt -r rootfs/dev_requirements.txt
+
 test: test-style test-unit
 
 test-unit:
-	$(MAKE) -C client/ test-unit
-	$(MAKE) -C controller/ test-unit
+	cd rootfs \
+		&& coverage run manage.py test --noinput web registry api \
+		&& coverage report -m
 
 test-style:
-	$(MAKE) -C client/ test-style
-	$(MAKE) -C controller/ test-style
+	cd rootfs && flake8 --show-pep8 --show-source
+	shellcheck $(SHELL_SCRIPTS)
 
-.PHONY: build clean commit-hook test test-unit test-style
+.PHONY: build clean commit-hook full-clean postgres setup-venv test test-unit test-style