Merge pull request #16 from github/do-less-during-bootstrap-and-update

Do less during bootstrap and update

Author: maddox

script/bootstrap

@@ -8,17 +8,15 @@ set -e
 cd "$(dirname "$0")/.."
 
 if [ -f "Brewfile" ] && [ "$(uname -s)" = "Darwin" ]; then
-  echo "==> Installing Homebrew dependencies…"
-  brew update
-  brew tap homebrew/bundle 2>/dev/null
   brew bundle check 2>&1 >/dev/null || {
+    echo "==> Installing Homebrew dependencies…"
     brew bundle
   }
 fi
 
 if [ -f ".ruby-version" ] && [ -z "$(rbenv version-name 2>/dev/null)" ]; then
   echo "==> Installing Ruby…"
-  rbenv install
+  rbenv install --skip-existing 
   which bundle 2>&1 >/dev/null || {
     gem install bundler
     rbenv rehash

script/setup

@@ -7,11 +7,16 @@ set -e
 
 cd "$(dirname "$0")/.."
 
+if [ -f "Brewfile" ] && [ "$(uname -s)" = "Darwin" ]; then
+  brew update
+  brew tap homebrew/bundle 2>/dev/null
+fi
+
 script/bootstrap
 
 echo "===> Setting up DB..."
 # reset database to a fresh state.
-bin/rake db:reset
+bin/rake db:create db:reset
 
 if [ -z "$RAILS_ENV" ] && [ -z "$RACK_ENV" ]; then
   # Only things for a development environment will run inside here

script/update

@@ -10,4 +10,4 @@ script/bootstrap
 
 echo "==> Updating db..."
 # run all database migrations to ensure everything is up to date.
-bin/rake db:create db:migrate
+bin/rake db:migrate