Merge pull request #641 from opdemand/godmode

consolidate all projects into opdemand/deis

Author: Matthew Fisher

.coveragerc

@@ -3,20 +3,20 @@ omit =
     */venv/*
     */virtualenv/*
     *tests*
-    api/__init__.py
-    api/docker.py
+    controller/api/__init__.py
+    controller/api/docker.py
     client/__init__.py
     client/models.py
-    cm/__init__.py
-    cm/models.py
-    provider/digitalocean.py
-    provider/ec2.py
-    provider/models.py
-    provider/rackspace.py
-    provider/static.py
-    web/__init__.py
-    web/models.py
-    web/templatetags/__init__.py
+    controller/cm/__init__.py
+    controller/cm/models.py
+    controller/provider/digitalocean.py
+    controller/provider/ec2.py
+    controller/provider/models.py
+    controller/provider/rackspace.py
+    controller/provider/static.py
+    controller/web/__init__.py
+    controller/web/models.py
+    controller/web/templatetags/__init__.py
     # osx library files when not running in virtualenv
     /Library/*
     /System/*
@@ -34,5 +34,5 @@ exclude_lines =
     if __name__ == .__main__.:
 
 [html]
-extra_css = web/static/css/main.css
+extra_css = controller/web/static/css/main.css
 title = Deis Coverage Report

.gitignore

@@ -38,8 +38,8 @@ nosetests.xml
 *.sublime-workspace
 
 # Deis' config file
-deis/local_settings.py
-.secret_key
+controller/deis/local_settings.py
+controller/.secret_key
 
 # deis application logs
 logs/
@@ -53,6 +53,7 @@ venv/
 Vagrantfile.local
 *.swp
 .bundle
+/__init__.py
 
 # Chef setup
 .chef

.gitmodules

@@ -18,13 +18,13 @@ before_install:
   - sudo apt-get install -qq libpq-dev
 
 install:
-  - pip install -r requirements.txt
-  - pip install -r dev_requirements.txt coveralls
+  - pip install -r controller/requirements.txt
+  - pip install -r controller/dev_requirements.txt coveralls
 
 before_script:
   - "psql -c 'create database deis_testing;' -U postgres"
   - |
-    cat > deis/local_settings.py <<EOF
+    cat > controller/deis/local_settings.py <<EOF
     DATABASES = {
         'default': {
             'ENGINE': 'django.db.backends.postgresql_psycopg2',
@@ -39,8 +39,8 @@ before_script:
     EOF
 
 script:
-  - make flake8
-  - make coverage
+  - make -C controller flake8
+  - make -C controller coverage
   - make -C docs
 
 after_success:

.travis.yml

@@ -1,21 +1,2 @@
-runserver:
-	python manage.py runserver
-
-db:
-	python manage.py syncdb --migrate --noinput
-
-test:
-	python manage.py test --noinput api cm provider web
-
-coverage:
-	coverage run manage.py test --noinput api cm provider web
-	coverage html
-
 test_client:
 	python -m unittest discover client.tests
-
-client_binary:
-	cd client && pyinstaller deis.spec
-
-flake8:
-	flake8