Updated for v0.5.1 release.

ianblenke · Mar 7, 2014 · 798eb3c · 798eb3c
2 parents 0e8a795 + e3ab738
commit 798eb3c
Show file tree

Hide file tree

Showing 61 changed files with 757 additions and 649 deletions.
diff --git a/.gitignore b/.gitignore
@@ -59,10 +59,4 @@ Vagrantfile.local
 contrib/vagrant/knife-config/admin.pem
 contrib/vagrant/knife-config/chef-validator.pem
 contrib/vagrant/nodes/
-
-# Broken symlinks that appear when mounting the codebase onto a vagrant VM
-# See Vagrantfile.local.example
-logs
-venv
-static
-!static/
+contrib/vagrant/.host_nodes_dir
diff --git a/.travis.yml b/.travis.yml
@@ -20,6 +20,7 @@ before_install:
   - sudo apt-get install -qq libpq-dev
 
 install:
+  - pip install -r requirements.txt coveralls
   - pip install -r dev_requirements.txt coveralls
 
 before_script:

diff --git a/Berksfile b/Berksfile
@@ -1,9 +1,10 @@
 site :opscode
 
 cookbook 'apt'
+cookbook 'docker'
 cookbook 'rsyslog'
 cookbook 'sudo'
-cookbook 'deis', '~> 0.5.0'
+cookbook 'deis', '~> 0.5.1'
 
 # development cookbook
 #cookbook 'deis', git: 'https://github.com/opdemand/deis-cookbook.git', branch: 'master'
diff --git a/Berksfile.lock b/Berksfile.lock
@@ -1,7 +1,10 @@
 {
   "sources": {
     "apt": {
-      "locked_version": "2.3.6"
+      "locked_version": "2.3.8"
+    },
+    "docker": {
+      "locked_version": "0.31.0"
     },
     "rsyslog": {
       "locked_version": "1.10.2"
@@ -10,10 +13,7 @@
       "locked_version": "2.3.0"
     },
     "deis": {
-      "locked_version": "0.5.0"
-    },
-    "docker": {
-      "locked_version": "0.30.1"
+      "locked_version": "0.5.1"
     },
     "git": {
       "locked_version": "2.9.0"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.16)
+    activesupport (3.2.17)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.3.5)
@@ -59,13 +59,13 @@ GEM
       faraday_middleware (~> 0.9.0)
       json
       rash
-    em-winrm (0.5.4)
-      eventmachine (= 1.0.0.beta.3)
+    em-winrm (0.5.5)
+      eventmachine (~> 1.0.0)
       mixlib-log (>= 1.3.0)
       uuidtools (~> 2.1.1)
-      winrm (~> 1.1.0)
+      winrm (~> 1.1.2)
     erubis (2.7.0)
-    eventmachine (1.0.0.beta.3)
+    eventmachine (1.0.3)
     excon (0.25.3)
     faraday (0.8.9)
       multipart-post (~> 1.2.0)
@@ -89,7 +89,7 @@ GEM
     gyoku (1.1.1)
       builder (>= 2.1.2)
     hashie (2.0.5)
-    highline (1.6.20)
+    highline (1.6.21)
     hitimes (1.2.1)
     httpclient (2.3.4.1)
     httpi (0.9.7)
@@ -109,8 +109,8 @@ GEM
       chef (>= 0.10.10)
       fog (~> 1.12)
       knife-windows
-    knife-windows (0.5.14)
-      em-winrm (= 0.5.4)
+    knife-windows (0.5.15)
+      em-winrm (~> 0.5, >= 0.5.4)
     little-plugger (1.1.3)
     logging (1.8.2)
       little-plugger (>= 1.1.3)
@@ -124,7 +124,7 @@ GEM
     mixlib-config (1.1.2)
     mixlib-log (1.6.0)
     mixlib-shellout (1.3.0)
-    multi_json (1.8.4)
+    multi_json (1.9.0)
     multipart-post (1.2.0)
     net-http-persistent (2.9.4)
     net-scp (1.1.2)

diff --git a/Makefile b/Makefile
@@ -14,5 +14,8 @@ coverage:
 test_client:
 	python -m unittest discover client.tests
 
+client_binary:
+	cd client && pyinstaller deis.spec
+
 flake8:
 	flake8
diff --git a/Vagrantfile b/Vagrantfile
diff --git a/Vagrantfile.local.example b/Vagrantfile.local.example
diff --git a/api/fixtures/deis_dev.sql b/api/fixtures/deis_dev.sql