Merge branch 'master' into cache-signature-stack

.travis.yml

@@ -2,5 +2,8 @@ language: bash
 sudo: required
 services:
   - docker
-install: docker pull heroku/cedar:14
-script: make test
+env:
+  - STACK=heroku-16
+  - STACK=cedar-14
+install: docker pull "heroku/${STACK/-/:}"
+script: make test-${STACK}

CHANGELOG.md

@@ -3,6 +3,8 @@
 ## Master
 
 - Add `$STACK` to the cache signature (#445)
+- Log output now differentiates between an empty cache and a new cache signature
+
 
 ## v106 (2017-06-19)
 

lib/cache.sh

@@ -19,6 +19,8 @@ load_signature() {
 get_cache_status() {
   if ! ${NODE_MODULES_CACHE:-true}; then
     echo "disabled"
+  elif ! test -d "${CACHE_DIR}/node/"; then
+    echo "not-found"
   elif [ "$(create_signature)" != "$(load_signature)" ]; then
     echo "new-signature"
   else

test/run

@@ -54,7 +54,7 @@ testBuildWithCache() {
   cache=$(mktmpdir)
 
   compile "stable-node" $cache
-  assertCaptured "Skipping cache restore (new-signature"
+  assertCaptured "Skipping cache restore (not-found)"
   assertEquals "1" "$(ls -1 $cache/node/node_modules | grep hashish | wc -l | tr -d ' ')"
   assertCapturedSuccess