fix(tar): chown directories on extract as well

lib/extract-stream.js

@@ -10,24 +10,14 @@ function extractStream (dest, opts, cb) {
     filter: (name, entry) => !entry.header.type.match(/^.*link$/i),
     strip: 1,
     onwarn: msg => opts.log && opts.log.warn('tar', msg),
-    onentry: makeOnEntry(opts),
-    preserveOwner: opts.uid != null || opts.gid != null
+    uid: opts.uid,
+    gid: opts.gid,
+    onentry (entry) {
+      if (entry.type.toLowerCase() === 'file') {
+        entry.mode = opts.fmode & ~(opts.umask || 0)
+      } else if (entry.type.toLowerCase() === 'directory') {
+        entry.mode = opts.dmode & ~(opts.umask || 0)
+      }
+    }
   })
 }
-
-function makeOnEntry (opts) {
-  const sawEntry = {}
-  return entry => _onentry(entry, sawEntry, opts)
-}
-
-function _onentry (entry, sawIgnores, opts) {
-  if (process.getuid) {
-    entry.uid = opts.uid == null ? entry.uid : opts.uid
-    entry.gid = opts.gid == null ? entry.gid : opts.gid
-  }
-  if (entry.type.toLowerCase() === 'file') {
-    entry.mode = opts.fmode & ~(opts.umask || 0)
-  } else if (entry.type.toLowerCase() === 'directory') {
-    entry.mode = opts.dmode & ~(opts.umask || 0)
-  }
-}

package.json

@@ -59,7 +59,7 @@
     "safe-buffer": "^5.1.1",
     "semver": "^5.4.1",
     "ssri": "^4.1.6",
-    "tar": "^3.1.13",
+    "tar": "^3.2.0",
     "unique-filename": "^1.1.0",
     "which": "^1.3.0"
   },

test/extract-stream.chown.js

@@ -55,6 +55,8 @@ test('accepts gid and uid opts', {skip: !process.getuid}, t => {
     }))
   }).then(() => {
     t.deepEqual(updatedPaths, [
+      'target',
+      'target/foo',
       'target/package.json',
       'target/foo/index.js'
     ], 'extracted files had correct uid/gid set')