vercel · Sep 23, 2022 · Sep 23, 2022 · Sep 25, 2022 · Sep 26, 2022 · Sep 26, 2022
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -103,6 +103,15 @@
       "program": "${workspaceRoot}/cli/cmd/turbo",
       "cwd": "${workspaceRoot}",
       "args": ["run", "build", "--force"]
+    },
+    {
+      "name": "Testbed",
+      "type": "go",
+      "request": "launch",
+      "mode": "debug",
+      "program": "${workspaceRoot}/cli/cmd/turbo",
+      "cwd": "${workspaceRoot}/cli/testbed",
+      "args": ["run", "build", "--single-package"]
     }
   ]
 }
diff --git a/cli/.gitignore b/cli/.gitignore
@@ -11,3 +11,4 @@
 
 /scripts/turbo-*
 /.cram_env
+testbed
diff --git a/cli/Makefile b/cli/Makefile
@@ -179,3 +179,13 @@ INTEGRATION_TEST_FILES = $(shell find integration_tests -name "*.t")
 
 integration-tests: $(CRAM_ENV)/bin/prysk turbo $(INTEGRATION_TEST_FILES)
 	$(CRAM_ENV)/bin/prysk --shell=`which bash` $(INTEGRATION_TEST_FILES)
+
+# use target testbed-<some directory under integration_tests> to set up the testbed directory
+.PHONY=testbed-%
+testbed-%:
+	$(eval $@_TEST := $(@:testbed-%=%))
+	@echo "testbed setup $($@_TEST)"
+	rm -rf testbed
+	mkdir -p testbed
+	./integration_tests/$($@_TEST)/setup.sh testbed
+
diff --git a/cli/cmd/turbo/version.go b/cli/cmd/turbo/version.go
@@ -1,3 +1,3 @@
 package main
 
-const turboVersion = "1.5.3"
+const turboVersion = "1.5.4"
diff --git a/cli/integration_tests/logged_in.sh b/cli/integration_tests/logged_in.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 read -r -d '' CONFIG <<- EOF
 {

diff --git a/cli/integration_tests/setup.sh b/cli/integration_tests/setup.sh
@@ -1,2 +1,7 @@
-#!/bin/sh
-TURBO=${TESTDIR}/../turbo
+#!/usr/bin/env bash
+
+DIR=${TESTDIR}
+while [ $(basename $DIR) != "cli" ]; do
+  DIR=$(dirname $DIR)
+done
+TURBO=${DIR}/turbo
diff --git a/cli/integration_tests/setup_git.sh b/cli/integration_tests/setup_git.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+TARGET_DIR=$1
+git init ${TARGET_DIR} --quiet
+GIT_ARGS="--git-dir=${TARGET_DIR}/.git --work-tree=${TARGET_DIR}"
+git ${GIT_ARGS} config user.email "turbo-test@example.com"
+git ${GIT_ARGS} config user.name "Turbo Test"
+echo "script-shell=$(which bash)" > ${TARGET_DIR}/.npmrc
+npm --prefix=${TARGET_DIR} install --silent
+git ${GIT_ARGS} add .
+git ${GIT_ARGS} commit -m "Initial" --quiet
diff --git a/cli/integration_tests/single_package/dry-run.t b/cli/integration_tests/single_package/dry-run.t
@@ -0,0 +1,35 @@
+Setup
+  $ . ${TESTDIR}/../setup.sh
+  $ . ${TESTDIR}/setup.sh $(pwd)
+
+Check
+  $ ${TURBO} run build --dry --single-package
+
+  Tasks to Run
+  build
+    Task            = build                  
+    Hash            = e491d0044f4b9b90       
+    Cached (Local)  = false                  
+    Cached (Remote) = false                  
+    Command         = echo 'building' > foo  
+    Outputs         = foo                    
+    Log File        = .turbo/turbo-build.log 
+    Dependencies    =                        
+    Dependendents   =                        
+
+  $ ${TURBO} run build --dry=json --single-package
+  {
+    "tasks": [
+      {
+        "task": "build",
+        "hash": "e491d0044f4b9b90",
+        "command": "echo 'building' \u003e foo",
+        "outputs": [
+          "foo"
+        ],
+        "logFile": ".turbo/turbo-build.log",
+        "dependencies": [],
+        "dependents": []
+      }
+    ]
+  }
diff --git a/cli/integration_tests/single_package/graph.t b/cli/integration_tests/single_package/graph.t
@@ -0,0 +1,15 @@
+Setup
+  $ . ${TESTDIR}/../setup.sh
+  $ . ${TESTDIR}/setup.sh $(pwd)
+
+Graph
+  $ ${TURBO} run build --single-package --graph
+
+  digraph {
+  \tcompound = "true" (esc)
+  \tnewrank = "true" (esc)
+  \tsubgraph "root" { (esc)
+  \t\t"[root] build" -> "[root] ___ROOT___" (esc)
+  \t} (esc)
+  }
+
diff --git a/cli/integration_tests/single_package/my-pkg/.gitignore b/cli/integration_tests/single_package/my-pkg/.gitignore
@@ -0,0 +1,4 @@
+node_modules/
+.turbo
+foo
+.npmrc
diff --git a/cli/integration_tests/single_package/my-pkg/package.json b/cli/integration_tests/single_package/my-pkg/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "my-pkg",
+  "scripts": {
+    "build": "echo 'building' > foo"
+  }
+}
diff --git a/cli/integration_tests/single_package/my-pkg/turbo.json b/cli/integration_tests/single_package/my-pkg/turbo.json
@@ -0,0 +1,8 @@
+{
+  "$schema": "https://turborepo.org/schema.json",
+  "pipeline": {
+    "build": {
+      "outputs": ["foo"]
+    }
+  }
+}
diff --git a/cli/integration_tests/single_package/run.t b/cli/integration_tests/single_package/run.t
@@ -0,0 +1,30 @@
+Setup
+  $ . ${TESTDIR}/../setup.sh
+  $ . ${TESTDIR}/setup.sh $(pwd)
+
+Check
+  $ ${TURBO} run build --single-package
+  \xe2\x80\xa2 Running build (esc)
+  build: cache miss, executing e491d0044f4b9b90
+  build: 
+  build: > build
+  build: > echo 'building' > foo
+  build: 
+
+   Tasks:    1 successful, 1 total
+  Cached:    0 cached, 1 total
+    Time:\s*[\.0-9]+m?s  (re)
+
+Run a second time, verify caching works because there is a config
+  $ ${TURBO} run build --single-package
+  \xe2\x80\xa2 Running build (esc)
+  build: cache hit, replaying output e491d0044f4b9b90
+  build: 
+  build: > build
+  build: > echo 'building' > foo
+  build: 
+
+   Tasks:    1 successful, 1 total
+  Cached:    1 cached, 1 total
+    Time:\s*[\.0-9]+m?s >>> FULL TURBO (re)
+
diff --git a/cli/integration_tests/single_package/setup.sh b/cli/integration_tests/single_package/setup.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+SCRIPT_DIR=$(dirname ${BASH_SOURCE[0]})
+TARGET_DIR=$1
+cp -a ${SCRIPT_DIR}/my-pkg/. ${TARGET_DIR}/
+${SCRIPT_DIR}/../setup_git.sh ${TARGET_DIR}
diff --git a/cli/integration_tests/single_package_deps/dry-run.t b/cli/integration_tests/single_package_deps/dry-run.t
@@ -0,0 +1,58 @@
+Setup
+  $ . ${TESTDIR}/../setup.sh
+  $ . ${TESTDIR}/setup.sh $(pwd)
+
+Check
+  $ ${TURBO} run test --dry --single-package
+
+  Tasks to Run
+  build
+    Task            = build                  
+    Hash            = 6218abb18f5176f5       
+    Cached (Local)  = false                  
+    Cached (Remote) = false                  
+    Command         = echo 'building' > foo  
+    Outputs         = foo                    
+    Log File        = .turbo/turbo-build.log 
+    Dependencies    =                        
+    Dependendents   = test                   
+  test
+    Task            = test                                         
+    Hash            = de6f1fc6a43f96b9                             
+    Cached (Local)  = false                                        
+    Cached (Remote) = false                                        
+    Command         = [[ ( -f foo ) && $(cat foo) == 'building' ]] 
+    Outputs         =                                              
+    Log File        = .turbo/turbo-test.log                        
+    Dependencies    = build                                        
+    Dependendents   =                                              
+
+  $ ${TURBO} run test --dry=json --single-package
+  {
+    "tasks": [
+      {
+        "task": "build",
+        "hash": "6218abb18f5176f5",
+        "command": "echo 'building' \u003e foo",
+        "outputs": [
+          "foo"
+        ],
+        "logFile": ".turbo/turbo-build.log",
+        "dependencies": [],
+        "dependents": [
+          "test"
+        ]
+      },
+      {
+        "task": "test",
+        "hash": "de6f1fc6a43f96b9",
+        "command": "[[ ( -f foo ) \u0026\u0026 $(cat foo) == 'building' ]]",
+        "outputs": [],
+        "logFile": ".turbo/turbo-test.log",
+        "dependencies": [
+          "build"
+        ],
+        "dependents": []
+      }
+    ]
+  }
diff --git a/cli/integration_tests/single_package_deps/graph.t b/cli/integration_tests/single_package_deps/graph.t
@@ -0,0 +1,16 @@
+Setup
+  $ . ${TESTDIR}/../setup.sh
+  $ . ${TESTDIR}/setup.sh $(pwd)
+
+Graph
+  $ ${TURBO} run test --single-package --graph
+
+  digraph {
+  \tcompound = "true" (esc)
+  \tnewrank = "true" (esc)
+  \tsubgraph "root" { (esc)
+  \t\t"[root] build" -> "[root] ___ROOT___" (esc)
+  \t\t"[root] test" -> "[root] build" (esc)
+  \t} (esc)
+  }
+
diff --git a/cli/integration_tests/single_package_deps/my-pkg/.gitignore b/cli/integration_tests/single_package_deps/my-pkg/.gitignore
@@ -0,0 +1,4 @@
+node_modules/
+.turbo
+foo
+.npmrc
diff --git a/cli/integration_tests/single_package_deps/my-pkg/package.json b/cli/integration_tests/single_package_deps/my-pkg/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "my-pkg",
+  "scripts": {
+    "build": "echo 'building' > foo",
+    "test": "[[ ( -f foo ) && $(cat foo) == 'building' ]]"
+  }
+}
diff --git a/cli/integration_tests/single_package_deps/my-pkg/turbo.json b/cli/integration_tests/single_package_deps/my-pkg/turbo.json
@@ -0,0 +1,12 @@
+{
+  "$schema": "https://turborepo.org/schema.json",
+  "pipeline": {
+    "build": {
+      "outputs": ["foo"]
+    },
+    "test": {
+      "outputs": [],
+      "dependsOn": ["build"]
+    }
+  }
+}
diff --git a/cli/integration_tests/single_package_deps/run.t b/cli/integration_tests/single_package_deps/run.t
@@ -0,0 +1,40 @@
+Setup
+  $ . ${TESTDIR}/../setup.sh
+  $ . ${TESTDIR}/setup.sh $(pwd)
+
+Check
+  $ ${TURBO} run test --single-package
+  \xe2\x80\xa2 Running test (esc)
+  build: cache miss, executing 6218abb18f5176f5
+  build: 
+  build: > build
+  build: > echo 'building' > foo
+  build: 
+  test: cache miss, executing de6f1fc6a43f96b9
+  test: 
+  test: > test
+  test: > [[ ( -f foo ) && $(cat foo) == 'building' ]]
+  test: 
+
+   Tasks:    2 successful, 2 total
+  Cached:    0 cached, 2 total
+    Time:\s*[\.0-9]+m?s  (re)
+
+Run a second time, verify caching works because there is a config
+  $ ${TURBO} run test --single-package
+  \xe2\x80\xa2 Running test (esc)
+  build: cache hit, replaying output 6218abb18f5176f5
+  build: 
+  build: > build
+  build: > echo 'building' > foo
+  build: 
+  test: cache hit, replaying output de6f1fc6a43f96b9
+  test: 
+  test: > test
+  test: > [[ ( -f foo ) && $(cat foo) == 'building' ]]
+  test: 
+
+   Tasks:    2 successful, 2 total
+  Cached:    2 cached, 2 total
+    Time:\s*[\.0-9]+m?s >>> FULL TURBO (re)
+
diff --git a/cli/integration_tests/single_package_deps/setup.sh b/cli/integration_tests/single_package_deps/setup.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+SCRIPT_DIR=$(dirname ${BASH_SOURCE[0]})
+TARGET_DIR=$1
+cp -a ${SCRIPT_DIR}/my-pkg/. ${TARGET_DIR}/
+${SCRIPT_DIR}/../setup_git.sh ${TARGET_DIR}
diff --git a/cli/integration_tests/single_package_no_config/dry-run.t b/cli/integration_tests/single_package_no_config/dry-run.t
@@ -0,0 +1,33 @@
+Setup
+  $ . ${TESTDIR}/../setup.sh
+  $ . ${TESTDIR}/setup.sh $(pwd)
+
+Check
+  $ ${TURBO} run build --dry --single-package
+
+  Tasks to Run
+  build
+    Task            = build                  
+    Hash            = c207d64157b1635a       
+    Cached (Local)  = false                  
+    Cached (Remote) = false                  
+    Command         = echo 'building'        
+    Outputs         =                        
+    Log File        = .turbo/turbo-build.log 
+    Dependencies    =                        
+    Dependendents   =                        
+
+  $ ${TURBO} run build --dry=json --single-package
+  {
+    "tasks": [
+      {
+        "task": "build",
+        "hash": "c207d64157b1635a",
+        "command": "echo 'building'",
+        "outputs": null,
+        "logFile": ".turbo/turbo-build.log",
+        "dependencies": [],
+        "dependents": []
+      }
+    ]
+  }
diff --git a/cli/integration_tests/single_package_no_config/graph.t b/cli/integration_tests/single_package_no_config/graph.t
@@ -0,0 +1,15 @@
+Setup
+  $ . ${TESTDIR}/../setup.sh
+  $ . ${TESTDIR}/setup.sh $(pwd)
+
+Graph
+  $ ${TURBO} run build --single-package --graph
+
+  digraph {
+  \tcompound = "true" (esc)
+  \tnewrank = "true" (esc)
+  \tsubgraph "root" { (esc)
+  \t\t"[root] build" -> "[root] ___ROOT___" (esc)
+  \t} (esc)
+  }
+
diff --git a/cli/integration_tests/single_package_no_config/my-pkg/.gitignore b/cli/integration_tests/single_package_no_config/my-pkg/.gitignore
@@ -0,0 +1,2 @@
+node_modules/
+.npmrc
diff --git a/cli/integration_tests/single_package_no_config/my-pkg/package.json b/cli/integration_tests/single_package_no_config/my-pkg/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "my-pkg",
+  "scripts": {
+    "build": "echo 'building'"
+  }
+}