From 5c2eb0761b1dcc38f47d8fa0785e94183e442f36 Mon Sep 17 00:00:00 2001
From: Sashko Stubailo <sashko@mit.edu>
Date: Fri, 16 Jan 2015 15:59:32 -0800
Subject: [PATCH] Fix test by including JS image

---
 tools/files.js                            |   4 +--
 tools/tests/built-packages/has-colons.tgz | Bin 2406 -> 2405 bytes
 tools/tests/colon-converter-tests.js      |  20 +++++++++++++++
 tools/tropohouse.js                       |  30 +++++++++++++++++++---
 4 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/tools/files.js b/tools/files.js
index 840fd955c7..2760384767 100644
--- a/tools/files.js
+++ b/tools/files.js
@@ -573,7 +573,7 @@ if (! process.env.METEOR_SAVE_TMPDIRS) {
 // the archive should contain a single top-level directory, which will
 // be renamed atomically to destPath. The entire tree will be made
 // readonly.
-files.extractTarGz = function (buffer, destPath) {
+files.extractTarGz = function (buffer, destPath, options) {
   var parentDir = files.pathDirname(destPath);
   var tempDir = files.pathJoin(parentDir, '.tmp' + utils.randomToken());
   files.mkdir_p(tempDir);
@@ -589,7 +589,7 @@ files.extractTarGz = function (buffer, destPath) {
 
   var extractor = new tar.Extract({ path: convertToOSPath(tempDir) })
     .on('entry', function (e) {
-      if (process.platform === "win32") {
+      if (process.platform === "win32" || options.forceConvert) {
         // On Windows, try to convert old packages that have colons in paths
         // by blindly replacing all of the paths. Otherwise, we can't exen
         // extract the tarball
diff --git a/tools/tests/built-packages/has-colons.tgz b/tools/tests/built-packages/has-colons.tgz
index a15458ef43210ff1529beeb1930626626ae1e87e..02278cafda897130f3d6ef36233dc9cfb7db9009 100644
GIT binary patch
literal 2405
zcmZ`(dpOhkA9tzTO)B?$M6Qu=7*lesP%0_Taytl(gP&&dbtyzB$<c{6sT5^$s}v)b
zLt;8hn6yl5q_tsl+xGpOb)Mf}zvubA|9U^~+w*$A-_Pr%TPQ6?z5n94m?SGC1T)p9
z@uL;mTwAzLMmdP)6S956Kd#Gii#+ptvTFQM6O~A_o9=F9lt_1&Uu}50je)q*a^TrA
zpU@h1-C(yfedrGa3aKzRTw!Q<zekn4xo1!MxI5!reQ_@1xTj*o>EeaS2TVsDo5NE)
zmg>O8HsvRw`<L~?-K)i`GIsH2pGF@|*3-_=<t;jOC-*^z2a#&f2lj4n+;EOFf}FUr
zg!!|Ly#CCb)}#(}oK_{&JIcclBb9(CdC7J}Q1qzCKQX(iz{^hV_mz+{_Y$|N9p(%p
zd&>V4;_j8BZkf$iooBxLW^sB8r7un;qQqU^_SFGWzjyX;YJKyFxpVpDPjwPJ!b?@2
z9-ba8Vqmo*ysyT<<!`_4*P$7$P2Z`o7T)L!udUImuE19s7ka;aV{?E#v@M@D=Fy#V
z&7&qWcdK8WynNGQi?m^~(A>-o+vXEUB)*r?9@%R%m>m=pYnw3`fE5fJN_v)mBf&3J
zk?A@2Thlmy+gdi8`|@gfwZqiSzfU*%mxh;K{-Qtehauuq%5n~!SQ|k4l&SJ~5+u9e
zbaY)`2~*?9msil6Kdc#(84|J_49@o*>{LD@2}~QiA<%%nVh2jDPk*NEQ;-v&c9;lB
zRU<n5W^S-7k!-FlRwUIS*W_^4C1{>f_G@t);R0jE{Nj~Jfx(RWi1nbUZZ$`#Zs?dY
z-EXh5WnFK}T^XuFVE>yvMul;&%<=?@zy6X`Mt`+(ti{APf#IrvRiA5|d8jya$b(Uv
zfx<tw^i6Qw9im04BVRW$wNcZrap?<wBqfka%{6Qa+BiBaowJV=x8S0#>Rp+k(jIWK
zKJ{Z|>Vg)Os_7kQDAaj7HB>`B^?2;1SO$Htapl49oodd`%y(fRNb<8Cixk^_7MwWi
za1inhFOYT0p0M`)YtW!qKP+BCWBEsFW$*gV4P|CPnV<DWM+;+M)OmWp;K_dd_0nC2
z(m_&53Eyr@B=@HYY1QYsrFqW*d#XVkCdoctBrOTken_>fgWNGLa2~hsg6q3707(Uh
z@aYJ-^l91#6L>u}ueaWUzso6YlhgLG>9li{K9_s<+U6eSm7X(wXt6P0hk3vK>B9R}
zxd|yu=j{s$@ESIB7$$a131zeBEK<}d0x<195A##Rs8ooO`lo=ea#a+G;i0gRnCVkh
zS9-@8<$ia0DduYV88khO6};2E+VdcUmbZv9nivLyQxI877%0=pT!CU9k31A&UNUa9
z0&UqXEMTAS%z}=D>tem;K!cnRGK!uh#VkZDDSf3iAtl!WCHBMjcZv3c%BMKMd@8vM
z1Y{RRUoT#+xHm^HT{p-HMV*}|%pSepJg#z+R*1lNl(Xi!$M0m^@k87X`ZSIXsto52
zAe+)``YSG}9ZAfE<|-6z_@-N%(r_L*wTCWh84kL;6wNbYD^4!SD?J03HLc1$3x)RP
zGz=A@N$`oA(1AJ2EBn~z+PLDa?PR#~7o)Qj!&qJ7Q1>^3UHlsz_R9`cjTmZdF<!mF
z7!w%NX%tgTdF9nU+;q{awPf@%QspiTxxJYy^E@N8fBOLZ)eh}}Yd7^BzLx1>E4?!s
zO;*Bvg(^>jMfp>JxG7$M_W@6{AS0zO=v(ltn+O2`<d@gtnH0AeS0JvXkjN)`fGilV
zkqIY#QsRLf^Qb$a2ZVv*qtJ+^#R7zTm({)sEGX9LC&3X)HcV1(StPZ&`a71`@i9{?
z1<;V`+NuHvlo71Ks>=oGIfp{#`Vr)8edhWXT0iyJlZo%4IO>o7-cf4Wd-nT$QbfAl
z+)Dc2K&h07ZV%U9$T}FB_Q<523bYX~lXT*FH13};zDLm?oFF^`3R`;2xI?t0QpWZW
z1*ybKmIb%w4G%yZ%Zc0en9(734Z4YM;@Z;hJ2E?6I&?S~Hu?kc?NA9anv;wbcO0?5
zyz?6rrT?%Mo;o8${gq6B>s<@s=K7)#)l5Ybq=s!5P26r3Vx>%wJXT@aIic})P`?GY
z#txq#<?aFHF%?}T<>XoL+*$vO2;eMuz<Mn}8)Ys+@0PgB>1iekSAk@)M-<=6<vY6O
z33%oVqiw}R+!X5vWKC@$bSo5S#PcAWfVSd13f=rSTttIJ?<x9pP%jHc0iiK1!F&$X
zcj?2tCCybt@j%TqjG0F@%;yLLv!vYY6@;>J;1=CqNVXov5>gI_>s144r;JGW9GB6G
z5-PfMYzq}w!0{Au(Rb;BfB;*B46MB-jM{f?23@AA4u=YBH3m3V=fv)<<*lQ9^m<4}
z6?xkM0hndUgSN9e#{{@8lI#G7E&Wx$548q<Rz#D6v!U@!8VHb3hn>5TqE;U1XTs`d
zs|trGVI!c){;cPMo36PaFdOT&h!9ck+GlhN->Mc!{5wWjs4AkJ4D8O(eX)Vqz$<%k
ztW3ec;(uMFg<AnM3d&rwp`+`b1&|yU^>e^+`1-8w|8<pSQDOM+Xxaj)Z7p?ThX{K9
zBHDc0HoT<yzi0@1L3+%?x4r}m!R_K$dlregUvwA-jPEmGg~bl1yskguvd}l<wKv6$
z8RZtt+WN+=V2GZaU1wHr(yZ6e<8d3MM?9e#pb{LfdD_F&V0N*LfS_6hc{FYHkujA}
zs+vvI>T?hfs&%1*YitM4-=0#K0j*Z^2Kds)&nwx7G)fYEhWP6&5~e;0PjAFRs3+58
z<2QBPVJ8p1*!$yS7cO!#^nzw?Zlrqm6V>%+sl@LCJWLM9j?>6|A$V=FvpHvXvk&jQ
zP~EXT<)!R~Zr|iLYx5YwI^8mV+v`=Au|2p7Z*~998q{z?vG;?LpbxwNlRK#+aPzA+
z`^f1V39)~tn~fDLKmU@idSWSSN3hgn$h9)8?{d0}hT>jiXiQXzBTjGixbb8JW$9yF
zddF^j!yP|3XgXaj>O$oW^M1ym6IFt;P@hsMEz9P+o(vwB9c(Z@31d!1R3i<kkX%1B
r=9&u~;%ts)K(Rt%I98<T;xsTri}@(_zxMg+BGmiij|XA{Vq*UQN)rUf

literal 2406
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

diff --git a/tools/tests/colon-converter-tests.js b/tools/tests/colon-converter-tests.js
index 9e951bf0b7..58df80b119 100644
--- a/tools/tests/colon-converter-tests.js
+++ b/tools/tests/colon-converter-tests.js
@@ -93,3 +93,23 @@ if (process.platform !== "win32") {
 // Tests step 3: check if old packages are converted properly to have no weird
 // paths for Windows
 
+selftest.define("package with colons is converted on Windows", function () {
+  // We have a built package tarball in the git repo
+  var tarballPath = files.pathJoin(files.convertToStandardPath(__dirname),
+    "built-packages", "has-colons.tgz");
+
+  // Unpack it using our tropohouse code
+  var tarball = files.readFile(tarballPath);
+
+  // Force conversion of file paths with second argument
+  var targetDirectory = tropohouse._extractAndConvert(tarball, true);
+
+  // Uncomment below to check results
+  // console.log(utils.execFileSync("find", [targetDirectory], {
+  //   cwd: targetDirectory
+  // }).stdout);
+  
+  // Saved tree hash of the correct result
+  selftest.expectEqual(files.treeHash(targetDirectory),
+    "AQX/7h0fXwHT9rNQvlBTvIZAE2g8krlnkEQMc9lTuMI=");
+});
diff --git a/tools/tropohouse.js b/tools/tropohouse.js
index b4666d60bd..714a210aa3 100644
--- a/tools/tropohouse.js
+++ b/tools/tropohouse.js
@@ -38,13 +38,16 @@ exports.default = new exports.Tropohouse(defaultWarehouseDir());
 /**
  * Extract a package tarball, and on Windows convert file paths and metadata
  * @param  {String} packageTarball path to tarball
+ * @param {Boolean} forceConvert Convert paths even on unix, for testing
  * @return {String}                Temporary directory with contents of package
  */
-exports._extractAndConvert = function (packageTarball) {
+exports._extractAndConvert = function (packageTarball, forceConvert) {
   var targetDirectory = files.mkdtemp();
-  files.extractTarGz(packageTarball, targetDirectory);
+  files.extractTarGz(packageTarball, targetDirectory, {
+    forceConvert: forceConvert
+  });
 
-  if (process.platform === "win32") {
+  if (process.platform === "win32" || forceConvert) {
     // Packages published before the Windows release might have colons or
     // other unsavory characters in path names. In hopes of making most of
     // these packages work on Windows, we will try to automatically convert
@@ -59,7 +62,6 @@ exports._extractAndConvert = function (packageTarball) {
     // file paths. We have already converted the colons in the actual files
     // while untarring.
     var metadata = Isopack.readMetadataFromDirectory(targetDirectory);
-    console.log(files.readdir(targetDirectory));
     var convertedMetadata = colonConverter.convertIsopack(metadata);
 
     // Step 2. Write the isopack.json file
@@ -97,6 +99,26 @@ exports._extractAndConvert = function (packageTarball) {
       // Result: Now we are in a state where the unibuild file paths are
       // consistent with the paths in the downloaded tarball.
     });
+
+    // Lastly, convert the build plugins, which are in the JSImage format
+    _.each(metadata.plugins, function (pluginMeta) {
+      var programJsonPath = files.pathJoin(targetDirectory, pluginMeta.path);
+      var programJson = JSON.parse(files.readFile(programJsonPath));
+
+      if (programJson.format !== "javascript-image-pre1") {
+        throw new Error("Unsupported plugin format: " +
+          JSON.stringify(programJson.format));
+      }
+
+      var convertedPlugin = colonConverter.convertJSImage(programJson);
+
+      files.chmod(programJsonPath, 0777);
+      files.writeFile(programJsonPath,
+        new Buffer(JSON.stringify(convertedPlugin, null, 2), 'utf8'),
+        {mode: 0444});
+      // Result: Now we are in a state where the build plugin file paths are
+      // consistent with the paths in the downloaded tarball.
+    });
   }
 
   return targetDirectory;