Refactor directory structure

dvnrsn · May 18, 2016 · 5323e56 · 5323e56
1 parent 61549bc
commit 5323e56
Show file tree

Hide file tree

Showing 60 changed files with 5 additions and 57 deletions.
diff --git a/.docker/config.json b/.docker/config.json
diff --git a/Dockerfile b/Dockerfile
@@ -1,13 +1,11 @@
-from canopytax/alpine
+FROM canopytax/alpine
 
 RUN apk add --update \
-    nodejs \
     postgresql-dev gcc python3-dev musl-dev \
     python3 && \
     python3 -m ensurepip && \
     rm -rf /var/cache/apk/*
 
-RUN npm install -g nodemon
 COPY . /app/
 RUN python3 -m pip install -r /app/requirements.txt
 

diff --git a/Dockerfile-dev b/Dockerfile-dev
@@ -15,4 +15,4 @@ RUN python3 -m pip install -r /app/requirements.txt
 
 EXPOSE 8445
 WORKDIR /app
-CMD ["dumb-init", "/app/startup.sh"]
+CMD ["dumb-init", "/app/startup.sh"]
diff --git a/serf/alembic.ini → alembic.ini b/serf/alembic.ini → alembic.ini
diff --git a/auth/__init__.py → alembic/__init__.py b/auth/__init__.py → alembic/__init__.py
diff --git a/serf/alembic/env.py → alembic/env.py b/serf/alembic/env.py → alembic/env.py
diff --git a/serf/alembic/script.py.mako → alembic/script.py.mako b/serf/alembic/script.py.mako → alembic/script.py.mako
diff --git a/...ons/21b664b587ce_create_initial_tables.py → ...ons/21b664b587ce_create_initial_tables.py b/...ons/21b664b587ce_create_initial_tables.py → ...ons/21b664b587ce_create_initial_tables.py
diff --git a/meister/__init__.py → alembic/versions/__init__.py b/meister/__init__.py → alembic/versions/__init__.py
diff --git a/auth/auth.py b/auth/auth.py
diff --git a/meister/core.py b/meister/core.py
diff --git a/migrate-db.sh b/migrate-db.sh
@@ -7,7 +7,6 @@ opts="--force"
 fi
 
 while ! nc -z $DATABASE_URL 5432; do sleep 4; done
-cd serf/
 alembic upgrade head
 
 

diff --git a/serf.py → run.py b/serf.py → run.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from serf import core
+from tmeister import core
 
 if __name__ == '__main__':
     core.main()
diff --git a/serf/alembic/README b/serf/alembic/README
diff --git a/serf/alembic/__init__.py b/serf/alembic/__init__.py
diff --git a/serf/alembic/versions/__init__.py b/serf/alembic/versions/__init__.py
diff --git a/startup.sh b/startup.sh
@@ -5,8 +5,8 @@ echo ---Running serf---
 /app/migrate-db.sh
 if [ "$DEBUG" == "true" ];
 then
-  nodemon --exec "python3 -u" /app/serf.py -i /app/serf/static/jspm_packages/
+  nodemon --exec "python3 -u" /app/run.py -i /app/toggle-meister/static/jspm_packages/
 
 else
-exec python3 -u /app/serf.py
+  python3 -u /app/run.py
 fi
diff --git a/serf/__init__.py → tmeister/__init__.py b/serf/__init__.py → tmeister/__init__.py
diff --git a/serf/core.py → tmeister/core.py b/serf/core.py → tmeister/core.py
diff --git a/serf/dataaccess.py → tmeister/dataaccess.py b/serf/dataaccess.py → tmeister/dataaccess.py
diff --git a/serf/db.py → tmeister/db.py b/serf/db.py → tmeister/db.py
diff --git a/serf/environments.py → tmeister/environments.py b/serf/environments.py → tmeister/environments.py
diff --git a/serf/features.py → tmeister/features.py b/serf/features.py → tmeister/features.py
diff --git a/serf/static/bin/build-code → tmeister/static/bin/build-code b/serf/static/bin/build-code → tmeister/static/bin/build-code
diff --git a/serf/static/index.html → tmeister/static/index.html b/serf/static/index.html → tmeister/static/index.html
diff --git a/serf/static/jspm.browser.js → tmeister/static/jspm.browser.js b/serf/static/jspm.browser.js → tmeister/static/jspm.browser.js
diff --git a/serf/static/jspm.config.js → tmeister/static/jspm.config.js b/serf/static/jspm.config.js → tmeister/static/jspm.config.js
diff --git a/serf/static/override.json → tmeister/static/override.json b/serf/static/override.json → tmeister/static/override.json
diff --git a/serf/static/package.json → tmeister/static/package.json b/serf/static/package.json → tmeister/static/package.json
diff --git a/...s/font-awesome-4.3.0/font-awesome.min.css → ...s/font-awesome-4.3.0/font-awesome.min.css b/...s/font-awesome-4.3.0/font-awesome.min.css → ...s/font-awesome-4.3.0/font-awesome.min.css
diff --git a/serf/static/spec/support/jasmine.json → tmeister/static/spec/support/jasmine.json b/serf/static/spec/support/jasmine.json → tmeister/static/spec/support/jasmine.json
diff --git a/serf/static/src/root.routes.js → tmeister/static/src/root.routes.js b/serf/static/src/root.routes.js → tmeister/static/src/root.routes.js
diff --git a/serf/static/src/toggle-meister.js → tmeister/static/src/toggle-meister.js b/serf/static/src/toggle-meister.js → tmeister/static/src/toggle-meister.js
diff --git a/...gles/create/create-env-modal.component.js → ...gles/create/create-env-modal.component.js b/...gles/create/create-env-modal.component.js → ...gles/create/create-env-modal.component.js
diff --git a/...c/src/toggles/create/create-env-modal.css → ...c/src/toggles/create/create-env-modal.css b/...c/src/toggles/create/create-env-modal.css → ...c/src/toggles/create/create-env-modal.css
diff --git a/...rc/toggles/create/create-env.component.js → ...rc/toggles/create/create-env.component.js b/...rc/toggles/create/create-env.component.js → ...rc/toggles/create/create-env.component.js
diff --git a/...s/create/create-toggle-modal.component.js → ...s/create/create-toggle-modal.component.js b/...s/create/create-toggle-modal.component.js → ...s/create/create-toggle-modal.component.js
diff --git a/...rc/toggles/create/create-toggle-modal.css → ...rc/toggles/create/create-toggle-modal.css b/...rc/toggles/create/create-toggle-modal.css → ...rc/toggles/create/create-toggle-modal.css
diff --git a/...toggles/create/create-toggle.component.js → ...toggles/create/create-toggle.component.js b/...toggles/create/create-toggle.component.js → ...toggles/create/create-toggle.component.js
diff --git a/...atic/src/toggles/create/create.actions.js → ...atic/src/toggles/create/create.actions.js b/...atic/src/toggles/create/create.actions.js → ...atic/src/toggles/create/create.actions.js
diff --git a/...atic/src/toggles/create/create.reducer.js → ...atic/src/toggles/create/create.reducer.js b/...atic/src/toggles/create/create.reducer.js → ...atic/src/toggles/create/create.reducer.js
diff --git a/...static/src/toggles/create/create.types.js → ...static/src/toggles/create/create.types.js b/...static/src/toggles/create/create.types.js → ...static/src/toggles/create/create.types.js
diff --git a/...src/toggles/envs/select-envs.component.js → ...src/toggles/envs/select-envs.component.js b/...src/toggles/envs/select-envs.component.js → ...src/toggles/envs/select-envs.component.js
diff --git a/...c/src/toggles/envs/select-envs.helpers.js → ...c/src/toggles/envs/select-envs.helpers.js b/...c/src/toggles/envs/select-envs.helpers.js → ...c/src/toggles/envs/select-envs.helpers.js
diff --git a/...rc/toggles/search/search-box.component.js → ...rc/toggles/search/search-box.component.js b/...rc/toggles/search/search-box.component.js → ...rc/toggles/search/search-box.component.js
diff --git a/.../static/src/toggles/search/search-box.css → .../static/src/toggles/search/search-box.css b/.../static/src/toggles/search/search-box.css → .../static/src/toggles/search/search-box.css
diff --git a/...atic/src/toggles/search/search.actions.js → ...atic/src/toggles/search/search.actions.js b/...atic/src/toggles/search/search.actions.js → ...atic/src/toggles/search/search.actions.js
diff --git a/...atic/src/toggles/search/search.reducer.js → ...atic/src/toggles/search/search.reducer.js b/...atic/src/toggles/search/search.reducer.js → ...atic/src/toggles/search/search.reducer.js
diff --git a/...static/src/toggles/search/search.types.js → ...static/src/toggles/search/search.types.js b/...static/src/toggles/search/search.types.js → ...static/src/toggles/search/search.types.js
diff --git a/...c/toggles/table/toggle-table.component.js → ...c/toggles/table/toggle-table.component.js b/...c/toggles/table/toggle-table.component.js → ...c/toggles/table/toggle-table.component.js
diff --git a/...src/toggles/table/toggle-table.helpers.js → ...src/toggles/table/toggle-table.helpers.js b/...src/toggles/table/toggle-table.helpers.js → ...src/toggles/table/toggle-table.helpers.js
diff --git a/...oggles/table/toggle-table.helpers.spec.js → ...oggles/table/toggle-table.helpers.spec.js b/...oggles/table/toggle-table.helpers.spec.js → ...oggles/table/toggle-table.helpers.spec.js
diff --git a/.../src/toggles/toggle-controls.component.js → .../src/toggles/toggle-controls.component.js b/.../src/toggles/toggle-controls.component.js → .../src/toggles/toggle-controls.component.js
diff --git a/serf/static/src/toggles/toggle-controls.css → ...er/static/src/toggles/toggle-controls.css b/serf/static/src/toggles/toggle-controls.css → ...er/static/src/toggles/toggle-controls.css
diff --git a/serf/static/src/toggles/toggles.actions.js → ...ter/static/src/toggles/toggles.actions.js b/serf/static/src/toggles/toggles.actions.js → ...ter/static/src/toggles/toggles.actions.js
diff --git a/.../static/src/toggles/toggles.container.css → .../static/src/toggles/toggles.container.css b/.../static/src/toggles/toggles.container.css → .../static/src/toggles/toggles.container.css
diff --git a/serf/static/src/toggles/toggles.container.js → ...r/static/src/toggles/toggles.container.js b/serf/static/src/toggles/toggles.container.js → ...r/static/src/toggles/toggles.container.js
diff --git a/serf/static/src/toggles/toggles.reducer.js → ...ter/static/src/toggles/toggles.reducer.js b/serf/static/src/toggles/toggles.reducer.js → ...ter/static/src/toggles/toggles.reducer.js
diff --git a/serf/static/src/toggles/toggles.types.js → tmeister/static/src/toggles/toggles.types.js b/serf/static/src/toggles/toggles.types.js → tmeister/static/src/toggles/toggles.types.js
diff --git a/serf/toggles.py → tmeister/toggles.py b/serf/toggles.py → tmeister/toggles.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,6 @@ opts="--force" @@
     fi
     while ! nc -z $DATABASE_URL 5432; do sleep 4; done
-    cd serf/
     alembic upgrade head
@@ Expand Down @@