Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to tar v3 #1212

Closed
wants to merge 2 commits into from
+19 −26
Closed

Upgrade to tar v3 #1212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a866a0
Upgrade to tar v3
isaacs May 31, 2017
b3e10a3
for testing the CI
refack Jun 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 16 additions & 22 deletions lib/install.js
View file
Open in desktop
Expand Up @@ -15,10 +15,8 @@ var fs = require('graceful-fs')
, rm = require('rimraf')
, path = require('path')
, crypto = require('crypto')
, zlib = require('zlib')
, log = require('npmlog')
, semver = require('semver')
, fstream = require('fstream')
, request = require('request')
, minimatch = require('minimatch')
, mkdir = require('mkdirp')
Expand Down Expand Up @@ -144,41 +142,33 @@ function install (gyp, argv, callback) {
var tarPath = gyp.opts.tarball
var badDownload = false
, extractCount = 0
, gunzip = zlib.createGunzip()
, extracter = tar.Extract({ path: devDir, strip: 1, filter: isValid })

var contentShasums = {}
var expectShasums = {}

// checks if a file to be extracted from the tarball is valid.
// only .h header files and the gyp files get extracted
function isValid () {
var name = this.path.substring(devDir.length + 1)
var isValid = valid(name)
if (name === '' && this.type === 'Directory') {
// the first directory entry is ok
return true
}
function isValid (path, entry) {
var isValid = valid(path)
if (isValid) {
log.verbose('extracted file from tarball', name)
log.verbose('extracted file from tarball', path)
extractCount++
} else {
// invalid
log.silly('ignoring from tarball', name)
log.silly('ignoring from tarball', path)
}
return isValid
}

gunzip.on('error', cb)
extracter.on('error', cb)
extracter.on('end', afterTarball)

// download the tarball, gunzip and extract!
// download the tarball and extract!

if (tarPath) {
var input = fs.createReadStream(tarPath)
input.pipe(gunzip).pipe(extracter)
return
return tar.extract({
file: tarPath,
strip: 1,
filter: isValid,
cwd: devDir
}).then(afterTarball, cb)
}

try {
Expand Down Expand Up @@ -218,7 +208,11 @@ function install (gyp, argv, callback) {
})

// start unzipping and untaring
req.pipe(gunzip).pipe(extracter)
res.pipe(tar.extract({
strip: 1,
cwd: devDir,
filter: isValid
}).on('close', afterTarball).on('error', cb))
})

// invoked after the tarball has finished being extracted
Expand Down
7 changes: 3 additions & 4 deletions package.json
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
"bindings",
"gyp"
],
"version": "3.6.2",
"version": "4.0.0",
"installVersion": 9,
"author": "Nathan Rajlich <nathan@tootallnate.net> (http://tootallnate.net)",
"repository": {
Expand All @@ -22,7 +22,6 @@
"bin": "./bin/node-gyp.js",
"main": "./lib/node-gyp.js",
"dependencies": {
"fstream": "^1.0.0",
"glob": "^7.0.3",
"graceful-fs": "^4.1.2",
"minimatch": "^3.0.2",
Expand All @@ -33,11 +32,11 @@
"request": "2",
"rimraf": "2",
"semver": "~5.3.0",
"tar": "^2.0.0",
"tar": "^3.1.3",
"which": "1"
},
"engines": {
"node": ">= 0.8.0"
"node": ">= 4.0.0"
},
"devDependencies": {
"tape": "~4.2.0",
Expand Down