move vendor to lib

bin/compile

@@ -22,8 +22,8 @@ BP_DIR=$(cd "$(dirname "${0:-}")"; cd ..; pwd)
 
 ### Load dependencies
 
-# shellcheck source=etc/vendor/stdlib_v7.sh
-source "$BP_DIR/etc/vendor/stdlib_v7.sh"
+# shellcheck source=lib/vendor/stdlib_v7.sh
+source "$BP_DIR/lib/vendor/stdlib_v7.sh"
 # shellcheck source=lib/output.sh
 source "$BP_DIR/lib/output.sh"
 # shellcheck source=lib/monitor.sh

bin/report

@@ -12,8 +12,8 @@ BP_DIR=$(cd "$(dirname "${0:-}")"; cd ..; pwd)
 
 ### Load dependencies
 
-# shellcheck source=etc/vendor/stdlib_v7.sh
-source "$BP_DIR/etc/vendor/stdlib_v7.sh"
+# shellcheck source=lib/vendor/stdlib_v7.sh
+source "$BP_DIR/lib/vendor/stdlib_v7.sh"
 # shellcheck source=lib/output.sh
 source "$BP_DIR/lib/output.sh"
 # shellcheck source=lib/monitor.sh

buildpack.toml

@@ -5,7 +5,8 @@ name = "Node.js"
   files = [
       "etc/",
       "test/",
+      "spec/",
       ".github/",
       ".travis.yml",
       "makefile"
-  ]
+  ]

lib/binaries.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-RESOLVE="$BP_DIR/etc/vendor/resolve-version-$(get_os)"
+RESOLVE="$BP_DIR/lib/vendor/resolve-version-$(get_os)"
 
 resolve() {
   local binary="$1"

lib/json.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-JQ="$BP_DIR/etc/vendor/jq-$(get_os)"
+JQ="$BP_DIR/lib/vendor/jq-$(get_os)"
 
 read_json() {
   local file="$1"
@@ -9,7 +9,7 @@ read_json() {
   if test -f "$file"; then
     # -c = print on only one line
     # -M = strip any color
-    # --raw-output = if the filter’s result is a string then it will be written directly 
+    # --raw-output = if the filter’s result is a string then it will be written directly
     #                to stdout rather than being formatted as a JSON string with quotes
     # shellcheck disable=SC2002
     cat "$file" | $JQ -c -M --raw-output "$key // \"\"" || return 1

lib/yarn2.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-YQ="$BP_DIR/etc/vendor/yq-$(get_os)"
+YQ="$BP_DIR/lib/vendor/yq-$(get_os)"
 
 detect_yarn2() {
   local uses_yarn="$1"

makefile

@@ -1,16 +1,16 @@
 test: heroku-18 heroku-16 cedar-14
 
 build:
-	@GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w" -v -o ./etc/vendor/resolve-version-darwin ./cmd/resolve-version
-	@GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -v -o ./etc/vendor/resolve-version-linux ./cmd/resolve-version
+	@GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w" -v -o ./lib/vendor/resolve-version-darwin ./cmd/resolve-version
+	@GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -v -o ./lib/vendor/resolve-version-linux ./cmd/resolve-version
 
 build-production:
 	# build go binaries and then compress them
-	@GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w" -v -o ./etc/vendor/resolve-version-darwin ./cmd/resolve-version
-	@GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -v -o ./etc/vendor/resolve-version-linux ./cmd/resolve-version
+	@GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w" -v -o ./lib/vendor/resolve-version-darwin ./cmd/resolve-version
+	@GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -v -o ./lib/vendor/resolve-version-linux ./cmd/resolve-version
 	# https://blog.filippo.io/shrink-your-go-binaries-with-this-one-weird-trick/
-	upx --brute etc/vendor/resolve-version-linux
-	upx --brute etc/vendor/resolve-version-darwin
+	upx --brute lib/vendor/resolve-version-linux
+	upx --brute lib/vendor/resolve-version-darwin
 
 test-binary:
 	go test -v ./cmd/... -tags=integration

spec/spec_helper.rb

@@ -49,7 +49,7 @@ def run!(cmd)
 end
 
 def resolve_binary_path
-  RUBY_PLATFORM.match(/darwin/) ? './etc/vendor/resolve-version-darwin' : './etc/vendor/resolve-version-linux'
+  RUBY_PLATFORM.match(/darwin/) ? './lib/vendor/resolve-version-darwin' : './lib/vendor/resolve-version-linux'
 end
 
 def resolve_node_version(requirements, options = {})

test/unit

@@ -13,9 +13,9 @@ use_memory() {
 
 # print each argument to a separate line on stdout
 print_args() {
-  while (( "$#" )); do 
-    echo $1 
-    shift 
+  while (( "$#" )); do
+    echo $1
+    shift
   done
 }
 
@@ -115,7 +115,7 @@ testKeyValueNoNewLine() {
   store="$(pwd)/test/unit-fixtures/kvstore/no-new-line"
 
   assertEquals "$(printf "%s\n" a=b b=c)" "$(kv_list $store)"
-  assertEquals "$(printf "%s\n" a b)" "$(kv_keys $store)" 
+  assertEquals "$(printf "%s\n" a b)" "$(kv_keys $store)"
 }
 
 testKeyValueEmptyLine() {
@@ -125,7 +125,7 @@ testKeyValueEmptyLine() {
   store="$(pwd)/test/unit-fixtures/kvstore/empty-line"
 
   assertEquals "$(printf "%s\n" a=b b=c)" "$(kv_list $store)"
-  assertEquals "$(printf "%s\n" a b)" "$(kv_keys $store)" 
+  assertEquals "$(printf "%s\n" a b)" "$(kv_keys $store)"
 }
 
 testKeyValueEscaping() {
@@ -276,7 +276,7 @@ testBuildDataPreviousBuild() {
   meta_init "$cache_dir"
   meta_setup
   assertFileExists "$BUILD_DATA_FILE"
-  assertFileExists "$PREVIOUS_BUILD_DATA_FILE" 
+  assertFileExists "$PREVIOUS_BUILD_DATA_FILE"
   assertEquals "$(meta_prev_get test)" "bar"
   assertEquals "$(meta_get test)" ""
 }
@@ -436,7 +436,7 @@ BP_DIR="$(pwd)"
 
 # the modules to be tested
 
-source "$(pwd)"/etc/vendor/stdlib_v7.sh
+source "$(pwd)"/lib/vendor/stdlib_v7.sh
 source "$(pwd)"/lib/uuid.sh
 source "$(pwd)"/lib/environment.sh
 source "$(pwd)"/lib/json.sh