Added helpers to make starting the app in one command easier

just3ws · just3ws · commit dd6708dc6d73 · 2014-09-25T12:32:53.000-05:00
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -254,7 +254,7 @@ GEM
     fog-softlayer (0.3.15)
       fog-core
       fog-json
-    foreman (0.74.0)
+    foreman (0.75.0)
       dotenv (~> 0.11.1)
       thor (~> 0.19.1)
     formatador (0.2.5)
diff --git a/Vagrantfile b/Vagrantfile
@@ -10,8 +10,8 @@ puts custom_settings.inspect
 
 VAGRANTFILE_API_VERSION = "2"
 
-$box = 'coderwall'
-$box_url = 'https://s3.amazonaws.com/coderwall-assets-0/vagrant/coderwall.box' # The box is 1GB. Prepare your
+$box = 'coderwall_v2'
+$box_url = 'https://s3.amazonaws.com/coderwall-assets-0/vagrant/coderwall_v2.box' # The box is 1.4GB.
 $provision = 'vagrant/bootstrap.sh'
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
diff --git a/run.bat b/run.bat
@@ -0,0 +1 @@
+vagrant ssh -c ". /home/vagrant/web/vagrant/run"
diff --git a/run.sh b/run.sh
@@ -0,0 +1 @@
+vagrant ssh -c ". /home/vagrant/web/vagrant/run"
diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh
@@ -6,7 +6,8 @@ su -c '/usr/bin/pg_ctl start -l /var/pgsql/data/log/logfile -D /var/pgsql/data'
 
 sudo su - vagrant <<-'EOF'
   cd ~/web
-  bundle check && bundle install
+  bundle check || bundle install
+  # Force the app to use the internal Postgres port number and ignore .env
   DEV_POSTGRES_PORT=5432 bundle exec rake db:migrate
   DEV_POSTGRES_PORT=5432 bundle exec rake db:test:prepare
 EOF
diff --git a/vagrant/run b/vagrant/run
@@ -0,0 +1,14 @@
+#!/bin/bash -e
+
+cd /home/vagrant/web 
+
+rvm current
+bundle check || bundle install
+bundle clean --force
+
+bundle exec foreman check
+
+bundle exec rake db:migrate
+bundle exec rake db:test:prepare
+
+bundle exec foreman start all

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+vagrant ssh -c ". /home/vagrant/web/vagrant/run"`