cross-zip 3.0.0 → 3.1.0

package/.travis.yml

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

package/index.js

@@ -1,3 +1,4 @@
+/*! cross-zip. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
 module.exports = {
   zip: zip,
   zipSync: zipSync,
@@ -114,14 +115,18 @@ function getUnzipCommand () {
   }
 }
 
+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); }',
-      '-myInPath', inPath,
-      '-myOutPath', outPath
+      '-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)
@@ -134,9 +139,9 @@ function getUnzipArgs (inPath, outPath) {
     return [
       '-nologo',
       '-noprofile',
-      '-command', '& { param([String]$myInPath, [String]$myOutPath); Add-Type -A "System.IO.Compression.FileSystem"; [IO.Compression.ZipFile]::ExtractToDirectory($myInPath, $myOutPath); }',
-      '-myInPath', inPath,
-      '-myOutPath', outPath
+      '-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 ['-o', inPath, '-d', outPath]

package/package.json

@@ -1,19 +1,18 @@
 {
   "name": "cross-zip",
   "description": "Cross-platform .zip file creation",
-  "version": "3.0.0",
+  "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": "*",
-    "tape": "^4.0.0"
+    "tape": "^5.0.0"
   },
   "homepage": "https://github.com/feross/cross-zip",
   "keywords": [
@@ -37,5 +36,19 @@
   },
   "dependencies": {
     "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')