cross-zip 2.1.4 → 3.1.0

package/.travis.yml

@@ -1,3 +1,9 @@
 language: node_js
 node_js:
-  - 'node'
+  - lts/*
+os:
+  - linux
+  - osx
+  - windows
+git:
+  autocrlf: input

package/README.md

@@ -1,4 +1,4 @@
-# cross-zip [![travis][travis-image]][travis-url] [![npm][npm-image]][npm-url] [![downloads][downloads-image]][downloads-url]
+# cross-zip [![travis][travis-image]][travis-url] [![npm][npm-image]][npm-url] [![downloads][downloads-image]][downloads-url] [![javascript style guide][standard-image]][standard-url]
 
 [travis-image]: https://img.shields.io/travis/feross/cross-zip/master.svg
 [travis-url]: https://travis-ci.org/feross/cross-zip
@@ -6,6 +6,8 @@
 [npm-url]: https://npmjs.org/package/cross-zip
 [downloads-image]: https://img.shields.io/npm/dm/cross-zip.svg
 [downloads-url]: https://npmjs.org/package/cross-zip
+[standard-image]: https://img.shields.io/badge/code_style-standard-brightgreen.svg
+[standard-url]: https://standardjs.com
 
 ### Cross-platform .zip file creation
 
@@ -59,6 +61,10 @@ On Windows 7 or earlier, you will need to install these manually in order for
 
 - [Stack Overflow - zipping from command line in Windows](https://stackoverflow.com/questions/17546016/how-can-you-zip-or-unzip-from-the-command-prompt-using-only-windows-built-in-ca)
 
+## related
+
+- [cross-zip-cli](https://github.com/jprichardson/cross-zip-cli): CLI version of cross-zip.
+
 ## license
 
 MIT. Copyright (c) [Feross Aboukhadijeh](http://feross.org).

package/index.js

@@ -1,3 +1,4 @@
+/*! cross-zip. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
 module.exports = {
   zip: zip,
   zipSync: zipSync,
@@ -53,7 +54,11 @@ function zip (inPath, outPath, cb) {
   }
 
   function doZip2 () {
-    cp.exec(getZipCommand(inPath, outPath), function (err) {
+    var opts = {
+      cwd: path.dirname(inPath),
+      maxBuffer: Infinity
+    }
+    cp.execFile(getZipCommand(), getZipArgs(inPath, outPath), opts, function (err) {
       cb(err)
     })
   }
@@ -70,34 +75,75 @@ function zipSync (inPath, outPath) {
     }
     rimraf.sync(outPath)
   }
-  cp.execSync(getZipCommand(inPath, outPath))
-}
-
-function getZipCommand (inPath, outPath) {
-  if (process.platform === 'win32') {
-    return `powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::CreateFromDirectory('${inPath}', '${outPath}'); }"`
-  } else {
-    var dirPath = path.dirname(inPath)
-    var fileName = path.basename(inPath)
-    return `cd ${JSON.stringify(dirPath)} && zip -r -y ${JSON.stringify(outPath)} ${JSON.stringify(fileName)}`
+  var opts = {
+    cwd: path.dirname(inPath),
+    maxBuffer: Infinity
   }
+  cp.execFileSync(getZipCommand(), getZipArgs(inPath, outPath), opts)
 }
 
 function unzip (inPath, outPath, cb) {
   if (!cb) cb = function () {}
-  cp.exec(getUnzipCommand(inPath, outPath), function (err) {
+  var opts = {
+    maxBuffer: Infinity
+  }
+  cp.execFile(getUnzipCommand(), getUnzipArgs(inPath, outPath), opts, function (err) {
     cb(err)
   })
 }
 
 function unzipSync (inPath, outPath) {
-  cp.execSync(getUnzipCommand(inPath, outPath))
+  var opts = {
+    maxBuffer: Infinity
+  }
+  cp.execFileSync(getUnzipCommand(), getUnzipArgs(inPath, outPath), opts)
+}
+
+function getZipCommand () {
+  if (process.platform === 'win32') {
+    return 'powershell.exe'
+  } else {
+    return 'zip'
+  }
+}
+
+function getUnzipCommand () {
+  if (process.platform === 'win32') {
+    return 'powershell.exe'
+  } else {
+    return 'unzip'
+  }
+}
+
+function quotePath (pathToTransform) {
+  return '"' + pathToTransform + '"'
+}
+
+function getZipArgs (inPath, outPath) {
+  if (process.platform === 'win32') {
+    return [
+      '-nologo',
+      '-noprofile',
+      '-command', '& { param([String]$myInPath, [String]$myOutPath); Add-Type -A "System.IO.Compression.FileSystem"; [IO.Compression.ZipFile]::CreateFromDirectory($myInPath, $myOutPath); exit !$? }',
+      '-myInPath', quotePath(inPath),
+      '-myOutPath', quotePath(outPath)
+    ]
+  } else {
+    var fileName = path.basename(inPath)
+    return ['-r', '-y', outPath, fileName]
+  }
 }
 
-function getUnzipCommand (inPath, outPath) {
+function getUnzipArgs (inPath, outPath) {
   if (process.platform === 'win32') {
-    return `powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('${inPath}', '${outPath}'); }"`
+    return [
+      '-nologo',
+      '-noprofile',
+      '-command', '& { param([String]$myInPath, [String]$myOutPath); Add-Type -A "System.IO.Compression.FileSystem"; [IO.Compression.ZipFile]::ExtractToDirectory($myInPath, $myOutPath); exit !$? }',
+      '-myInPath', quotePath(inPath),
+      '-myOutPath', quotePath(outPath)
+    ]
   } else {
-    return `unzip -o ${JSON.stringify(inPath)} -d ${JSON.stringify(outPath)}`
+    return ['-o', inPath, '-d', outPath]
   }
 }

package/package.json

@@ -1,19 +1,18 @@
 {
   "name": "cross-zip",
   "description": "Cross-platform .zip file creation",
-  "version": "2.1.4",
+  "version": "3.1.0",
   "author": {
     "name": "Feross Aboukhadijeh",
     "email": "feross@feross.org",
-    "url": "http://feross.org/"
+    "url": "https://feross.org"
   },
   "bugs": {
     "url": "https://github.com/feross/cross-zip/issues"
   },
   "devDependencies": {
-    "mkdirp": "^0.5.1",
-    "standard": "^7.0.0",
-    "tape": "^4.0.0"
+    "standard": "*",
+    "tape": "^5.0.0"
   },
   "homepage": "https://github.com/feross/cross-zip",
   "keywords": [
@@ -36,6 +35,20 @@
     "test": "standard && tape test/*.js"
   },
   "dependencies": {
-    "rimraf": "^2.5.2"
-  }
+    "rimraf": "^3.0.0"
+  },
+  "funding": [
+    {
+      "type": "github",
+      "url": "https://github.com/sponsors/feross"
+    },
+    {
+      "type": "patreon",
+      "url": "https://www.patreon.com/feross"
+    },
+    {
+      "type": "consulting",
+      "url": "https://feross.org/support"
+    }
+  ]
 }

package/test/unzip.js

@@ -1,5 +1,4 @@
 var fs = require('fs')
-var mkdirp = require('mkdirp')
 var path = require('path')
 var rimraf = require('rimraf')
 var test = require('tape')
@@ -9,7 +8,7 @@ var filePath = path.join(__dirname, 'content', 'file.txt')
 var fileZipPath = path.join(__dirname, 'content', 'file.txt.zip')
 var tmpPath = path.join(__dirname, 'tmp')
 
-mkdirp.sync(tmpPath)
+fs.mkdirSync(tmpPath, { recursive: true })
 
 test('unzipSync', function (t) {
   var tmpFilePath = path.join(tmpPath, 'file.txt')
@@ -40,3 +39,26 @@ test('unzip', function (t) {
     })
   })
 })
+
+test('unzip from a folder with a space in it', function (t) {
+  t.plan(4)
+
+  var zipSpacePath = path.join(tmpPath, 'folder space', path.basename(fileZipPath))
+  fs.mkdirSync(path.dirname(zipSpacePath), { recursive: true })
+  fs.copyFileSync(fileZipPath, zipSpacePath)
+
+  var tmpFilePath = path.join(tmpPath, 'file.txt')
+  rimraf(tmpFilePath, function (err) {
+    t.error(err)
+
+    zip.unzip(zipSpacePath, tmpPath, function (err) {
+      t.error(err)
+
+      t.ok(fs.existsSync(tmpFilePath), 'extracted file should exist')
+      var tmpFile = fs.readFileSync(tmpFilePath)
+      var file = fs.readFileSync(filePath)
+
+      t.deepEqual(tmpFile, file)
+    })
+  })
+})

package/test/zip.js

@@ -1,5 +1,4 @@
 var fs = require('fs')
-var mkdirp = require('mkdirp')
 var path = require('path')
 var rimraf = require('rimraf')
 var test = require('tape')
@@ -8,7 +7,7 @@ var zip = require('../')
 var filePath = path.join(__dirname, 'content', 'file.txt')
 var tmpPath = path.join(__dirname, 'tmp')
 
-mkdirp.sync(tmpPath)
+fs.mkdirSync(tmpPath, { recursive: true })
 
 test('zipSync', function (t) {
   var tmpFileZipPath = path.join(tmpPath, 'file.zip')

package/.npmignore

@@ -1,2 +0,0 @@
-node_modules/
-test/tmp