Sync changes from upstream repository

Hubot · Hubot · commit 1a09e827a497 · 2016-02-26T03:12:37.000-08:00
diff --git a/Brewfile b/Brewfile
@@ -0,0 +1,12 @@
+# Helpers
+tap "github/bootstrap"
+
+# Ruby
+brew "openssl"
+brew "autoconf"
+brew "rbenv"
+brew "ruby-build"
+
+# Node
+brew "nodenv"
+brew "node-build"
diff --git a/script/bootstrap b/script/bootstrap
@@ -1,24 +1,32 @@
 #!/bin/sh
-
 set -e
-export CC=gcc
+cd "$(dirname "$0")/.."
 
-command -v bundle >/dev/null 2>&1 || { echo >&2 "Bundler required but not found: gem install bundler"; exit 1; }
+if [ "$(uname -s)" = "Darwin" ] && command -v brew >/dev/null 2>&1; then
+  echo "==> Installing Homebrew dependencies&hellip;"
+  brew update >/dev/null
+  brew bundle check &>/dev/null || brew bundle
 
-echo "==> Installing gem dependencies&hellip;"
+  brew bootstrap-rbenv-ruby
+  brew bootstrap-nodenv-node
+fi
 
+if ! command -v bundle >/dev/null 2>&1; then
+  echo "Bundler required but not found: gem install bundler" >&2
+  exit 1
+fi
+
+echo "==> Installing gem dependencies&hellip;"
 if [ "$RACK_ENV" = "production" ]; then
   export NOKOGIRI_USE_SYSTEM_LIBRARIES=1
   export BUNDLE_JOBS=4
   bundle install --without development staging test benchmark --path vendor/cache --local --deployment
 else
-  bundle check --path vendor/cache 2>&1 || {
+  bundle check --path vendor/cache 2>&1 || \
     bundle install --path vendor/cache
-  }
 fi
 
 echo "==> Installing npm dependencies&hellip;"
-
 if [ "$RACK_ENV" = "production" ]; then
   npm install --production
 else
diff --git a/vendor/cache/html-proofer-2.6.2.gem b/vendor/cache/html-proofer-2.6.2.gem
