From 3da2d3718b130c26d56355c33bdead383549580a Mon Sep 17 00:00:00 2001
From: Tom Robinson <tom@280north.com>
Date: Wed, 3 Mar 2010 09:02:57 -0800
Subject: [PATCH 1/3] Bump required Narwhal version to 0.2.2

---
 common.jake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common.jake b/common.jake
index a18a645d1..6ef6d0eed 100644
--- a/common.jake
+++ b/common.jake
@@ -51,7 +51,7 @@ function ensurePackageUpToDate(packageName, requiredVersion, options)
 ensurePackageUpToDate("jake",           "0.1.4");
 ensurePackageUpToDate("browserjs",      "0.1.1");
 ensurePackageUpToDate("shrinksafe",     "0.2");
-ensurePackageUpToDate("narwhal",        "0.2.1", {
+ensurePackageUpToDate("narwhal",        "0.2.2", {
     noupdate : true,
     message : "Update Narwhal to 0.2.1 by running bootstrap.sh, or pulling the latest from git (see: http://github.com/280north/narwhal)."
 });

From b0d62a86085ae11b69bdd50403133ac94b1608c7 Mon Sep 17 00:00:00 2001
From: Tom Robinson <tom@280north.com>
Date: Wed, 3 Mar 2010 09:08:02 -0800
Subject: [PATCH 2/3] Add option to automatically upgrade packages for CI
 server, etc.

---
 Tools/Scripts/ci.sh | 1 +
 common.jake         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Tools/Scripts/ci.sh b/Tools/Scripts/ci.sh
index 4bc798a70..1500cc2fa 100755
--- a/Tools/Scripts/ci.sh
+++ b/Tools/Scripts/ci.sh
@@ -3,6 +3,7 @@
 project_home="$(dirname "$PWD")"
 
 export PATH="$HOME/narwhal/bin:$PATH"
+export CAPP_AUTO_UPGRADE="yes"
 
 export CAPP_BUILD=$project_home/build_incremental
 time jake test
diff --git a/common.jake b/common.jake
index 6ef6d0eed..c9416635c 100644
--- a/common.jake
+++ b/common.jake
@@ -32,7 +32,7 @@ function ensurePackageUpToDate(packageName, requiredVersion, options)
     if (!options.noupdate)
     {
         print("Update? yes or no:");
-        if (system.stdin.readLine() !== "yes\n")
+        if (!SYSTEM.env["CAPP_AUTO_UPGRADE"] && system.stdin.readLine() !== "yes\n")
         {
             print("Jake aborted.");
             OS.exit(1);

From b30f10ca46a6009539e1c8c85273b4d3be8a7415 Mon Sep 17 00:00:00 2001
From: Tom Robinson <tom@280north.com>
Date: Wed, 3 Mar 2010 10:40:31 -0800
Subject: [PATCH 3/3] Enquote NARWHALOPT package paths to fix building in
 directories with spaces.

Bump jake version to 0.1.5
---
 common.jake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common.jake b/common.jake
index c9416635c..613730d0f 100644
--- a/common.jake
+++ b/common.jake
@@ -48,7 +48,7 @@ function ensurePackageUpToDate(packageName, requiredVersion, options)
 }
 
 // UPDATE THESE TO PICK UP CORRESPONDING CHANGES IN DEPENDENCIES
-ensurePackageUpToDate("jake",           "0.1.4");
+ensurePackageUpToDate("jake",           "0.1.5");
 ensurePackageUpToDate("browserjs",      "0.1.1");
 ensurePackageUpToDate("shrinksafe",     "0.2");
 ensurePackageUpToDate("narwhal",        "0.2.2", {
@@ -162,7 +162,7 @@ serializedENV = function()
     // pseudo-HACK: add NARWHALOPT with packages we should ensure are loaded
     var packages = additionalPackages();
     if (packages.length) {
-        envNew["NARWHALOPT"] = packages.map(function(p) { return "-p " + p; }).join(" ");
+        envNew["NARWHALOPT"] = packages.map(function(p) { return "-p " + OS.enquote(p); }).join(" ");
         envNew["PATH"] = packages.map(function(p) { return FILE.join(p, "bin"); }).concat(SYSTEM.env["PATH"]).join(":");
     }