merged bower cache

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Pending
 
 Fixes modules-checked-in reference URL
+When cache restoration is disabled, avoids uploading to the cache as well
 
 ## v82 (2015-09-30)
 

bin/compile

@@ -8,6 +8,10 @@ set -o pipefail   # don't ignore exit codes when piping output
 set -o nounset    # fail on unset variables
 unset GIT_DIR     # Avoid GIT_DIR leak from previous build steps
 
+### Constants
+
+DEFAULT_CACHE="node_modules bower_components"
+
 ### Configure directories
 
 BUILD_DIR=${1:-}
@@ -99,8 +103,8 @@ restore_cache() {
   if [ "$cache_status" == "valid" ]; then
     local cache_directories=$(get_cache_directories)
     if [ "$cache_directories" == "" ]; then
-      echo "Loading 1 from cacheDirectories (default):"
-      restore_cache_directories "$BUILD_DIR" "$CACHE_DIR" "node_modules"
+      echo "Loading 2 from cacheDirectories (default):"
+      restore_cache_directories "$BUILD_DIR" "$CACHE_DIR" "$DEFAULT_CACHE"
     else
       echo "Loading $(echo $cache_directories | wc -w | xargs) from cacheDirectories (package.json):"
       restore_cache_directories "$BUILD_DIR" "$CACHE_DIR" $cache_directories
@@ -130,12 +134,11 @@ cache_build() {
 
   echo "Clearing previous node cache"
   clear_cache
-
   if ! ${NODE_MODULES_CACHE:-true}; then
     echo "Skipping cache save (disabled by config)"
   elif [ "$cache_directories" == "" ]; then
-    echo "Saving 1 cacheDirectories (default):"
-    save_cache_directories "$BUILD_DIR" "$CACHE_DIR" "node_modules"
+    echo "Saving 2 cacheDirectories (default):"
+    save_cache_directories "$BUILD_DIR" "$CACHE_DIR" "$DEFAULT_CACHE"
   else
     echo "Saving $(echo $cache_directories | wc -w | xargs) cacheDirectories (package.json):"
     save_cache_directories "$BUILD_DIR" "$CACHE_DIR" $cache_directories

test/run

@@ -12,13 +12,13 @@ testDisableCache() {
 
   compile "node-modules-cache-2" $cache
   assertCaptured "lodash@1.0.0"
-  assertCaptured "Saving 1 cacheDirectories"
+  assertCaptured "Saving 2 cacheDirectories"
   assertCapturedSuccess
 
   echo "false" > $env_dir/NODE_MODULES_CACHE
   compile "node-modules-cache-2" $cache $env_dir
   assertCaptured "lodash@1.3.1"
-  assertNotCaptured "Saving 1 cacheDirectories"
+  assertNotCaptured "Saving 2 cacheDirectories"
   assertCapturedSuccess
 }
 
@@ -42,6 +42,17 @@ testBadJson() {
   assertCapturedError 1 "Unable to parse"
 }
 
+testNodeModulesCached() {
+  cache=$(mktmpdir)
+
+  compile "caching" $cache
+  assertCaptured "Saving 2 cacheDirectories (default)"
+  assertCaptured "- node_modules"
+  assertCaptured "- bower_components (nothing to cache)"
+  assertEquals "1" "$(ls -1 $cache/node | grep node_modules | wc -l | tr -d ' ')"
+  assertCapturedSuccess
+}
+
 testBuildWithUserCacheDirectoriesCamel() {
   cache=$(mktmpdir)
 
@@ -314,16 +325,6 @@ testInvalidDependency() {
   assertCapturedError 1 ""
 }
 
-testNodeModulesCached() {
-  cache=$(mktmpdir)
-
-  compile "caching" $cache
-  assertCaptured "Saving 1 cacheDirectories (default)"
-  assertCaptured "- node_modules"
-  assertEquals "1" "$(ls -1 $cache/node | grep node_modules | wc -l | tr -d ' ')"
-  assertCapturedSuccess
-}
-
 testBuildWithUserCacheDirectories() {
   cache=$(mktmpdir)