Commit 99cf3b0c

@@ -1,9 +1,1 @@
 task :ci => ['db:migrate', 'db:test:prepare', 'spec', 'teaspoon']
-
-namespace :ci do
-  namespace :deploy do
-    task :staging => ['deploy:staging']
-    task :production => ['deploy:production']
-  end
-end
-

@@ -1,13 +1,13 @@
 namespace :deploy do
   desc "deploy to staging server"
   task :staging do
-    sh "cap staging deploy:migrations"
+    sh "bundle exec cap staging deploy:migrations"
     sh "curl https://staging.cakeside.com/ > /dev/null"
   end
 
   desc "deploy to production server"
   task :production do
-    sh "cap production deploy:migrations"
+    sh "bundle exec cap production deploy:migrations"
     sh "curl https://www.cakeside.com/ > /dev/null"
   end
 end

@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-cd /home/vagrant
-\curl -L https://get.rvm.io | bash -s stable
-
-source /home/vagrant/.profile
-source /home/vagrant/.rvm/scripts/rvm
-
-rvm install 2.1.1
-rvm use 2.1.1 --default
-
-#gem source -r http://rubygems.org/
-#gem install bundler
-
-source /home/vagrant/.bashrc
-source /home/vagrant/.bash_profile
-source /home/vagrant/.profile
-
-cd /vagrant
-bundle install

@@ -30,5 +30,3 @@ apt-get -y install zlib1g-dev libssl-dev
 apt-get -y install libreadline-gplv2-dev
 # Install some nokogiri dependencies:
 apt-get -y install libxml2 libxml2-dev libxslt1-dev
-
-su -c 'bash /vagrant/script/bootstrap-vagrant.sh' vagrant

@@ -1,3 +1,2 @@
 #!/bin/bash -x
-git checkout master
-bundle exec rake ci:deploy:production --trace
+bundle exec cap production deploy:migrations

@@ -1,2 +1,2 @@
 #!/bin/bash -x
-bundle exec rake ci:deploy:staging --trace
+bundle exec cap staging deploy:migrations