no rimraf

Author: claudiahdz

index.js

@@ -6,11 +6,10 @@ const path = require('path')
 const util = require('util')
 const pacote = require('pacote')
 const npa = require('npm-package-arg')
-
+const rimraf = util.promisify(require('rimraf'))
 const runScript = require('@npmcli/run-script')
 
 const mkdtemp = util.promisify(fs.mkdtemp)
-const rimraf = util.promisify(require('rimraf'))
 
 const mv = require('./utils/mv')
 const { getContents, logTar } = require('./utils/tar')
@@ -49,6 +48,7 @@ async function pack (spec = 'file:.', opts = {}) {
 
   // moves tarball to dest
   await mv(tmpTarget, dest)
+  // removes tmpDir
   await rimraf(tmpDir)
 
   if (spec.type === 'directory') {

package-lock.json

@@ -23,6 +23,7 @@
     "check-coverage": true
   },
   "devDependencies": {
+    "mkdirp": "^1.0.3",
     "nock": "^12.0.2",
     "standard": "^14.3.1",
     "tap": "^14.10.6"

package.json

@@ -6,8 +6,6 @@ const ssri = require('ssri')
 const pacote = require('pacote')
 const pack = require('../index.js')
 const tnock = require('./fixtures/tnock.js')
-const { promisify } = require('util')
-const rimraf = promisify(require('rimraf'))
 
 const OPTS = {
   registry: 'https://mock.reg/'
@@ -23,7 +21,7 @@ t.test('packs from local directory', async t => {
     }, null, 2),
     'index.js': 'hello'
   })
-  const target = `${__dirname}/my-cool-pkg-1.0.0.tgz`
+  const target = `${testDir}/my-cool-pkg-1.0.0.tgz`
 
   const cwd = process.cwd()
   process.chdir(testDir)
@@ -57,14 +55,12 @@ t.test('packs from local directory', async t => {
   t.deepEqual(tarContents, contents,
     'packed directory matches expectations'
   )
-
-  await rimraf(target)
 })
 
 t.test('packs from local directory on target', async t => {
   const testDir = t.testdir({
     'package.json': JSON.stringify({
-      name: 'my-cool-pkg',
+      name: 'my-local-pkg',
       version: '1.0.0',
       bundledDependencies: ['a']
     }, null, 2),
@@ -79,26 +75,26 @@ t.test('packs from local directory on target', async t => {
     }
   })
 
-  const target = `${__dirname}/my-cool-pkg-1.0.0.tgz`
+  const target = `${testDir}/my-local-pkg-1.0.0.tgz`
 
   const tarContents = await pack(testDir, { target })
   const integrity = await ssri.fromStream(fs.createReadStream(target), {
     algorithms: ['sha512']
   })
 
   const contents = {
-    id: 'my-cool[email protected]',
-    name: 'my-cool-pkg',
+    id: 'my-local[email protected]',
+    name: 'my-local-pkg',
     version: '1.0.0',
-    size: 260,
-    unpackedSize: 133,
-    shasum: '535bdcc05fd4a1b7f2603c5527a7c63ba5b88cff',
+    size: 261,
+    unpackedSize: 134,
+    shasum: 'dbbd93ed67b3c2941dc8096c5ec66b10f5606690',
     integrity: ssri.parse(integrity.sha512[0]),
-    filename: 'my-cool-pkg-1.0.0.tgz',
+    filename: 'my-local-pkg-1.0.0.tgz',
     files: [
       { path: 'index.js', size: 5, mode: 420 },
       { path: 'node_modules/a/package.json', size: 39, mode: 420 },
-      { path: 'package.json', size: 89, mode: 420 }
+      { path: 'package.json', size: 90, mode: 420 }
     ],
     entryCount: 3,
     bundled: ['a']
@@ -107,37 +103,33 @@ t.test('packs from local directory on target', async t => {
   t.deepEqual(tarContents, contents,
     'packed directory matches expectations'
   )
-
-  await rimraf(target)
 })
 
 t.test('packs from registry spec', async t => {
   const testDir = t.testdir({
     'package.json': JSON.stringify({
-      name: 'my-cool-pkg',
+      name: 'my-pkg',
       version: '1.0.0'
     }, null, 2),
     'index.js': 'hello'
   })
-  // weird windows thing.  when we write the file into the testdir
-  // on this test, it breaks all kinds of stuff when it tries to
-  // clean it up.
-  const target = `${__dirname}/my-cool-pkg-1.0.0.tgz`
-  const spec = 'my-cool-pkg'
+
+  const spec = 'my-pkg'
+  const target = `${testDir}/my-pkg-1.0.0.tgz`
 
   const tarData = await pacote.tarball(`file:${testDir}`)
   const integrity = ssri.fromData(tarData, { algorithms: ['sha512'] })
   const packument = {
-    _id: 'my-cool-pkg',
-    name: 'my-cool-pkg',
+    _id: 'my-pkg',
+    name: 'my-pkg',
     description: 'some stuff',
     'dist-tags': {
       latest: '1.0.0'
     },
     versions: {
       '1.0.0': {
         _nodeVersion: process.versions.node,
-        name: 'my-cool-pkg',
+        name: 'my-pkg',
         version: '1.0.0',
         description: 'some stuff',
         dist: {
@@ -159,21 +151,21 @@ t.test('packs from registry spec', async t => {
   }
 
   const srv = tnock(t, REG)
-  srv.get('/my-cool-pkg').reply(200, packument)
+  srv.get('/my-pkg').reply(200, packument)
 
   const tarContents = await pack(spec, { ...OPTS, target })
   const contents = {
-    id: 'my-cool-[email protected]',
-    name: 'my-cool-pkg',
+    id: '[email protected]',
+    name: 'my-pkg',
     version: '1.0.0',
-    size: 187,
-    unpackedSize: 54,
-    shasum: 'e4db5fa79b694e5f94cb7a48250eb5a728f9669f',
+    size: 183,
+    unpackedSize: 49,
+    shasum: 'fb8fce241a824279f95f16648dade6f760b85087',
     integrity,
-    filename: 'my-cool-pkg-1.0.0.tgz',
+    filename: 'my-pkg-1.0.0.tgz',
     files: [
       { path: 'index.js', size: 5, mode: 420 },
-      { path: 'package.json', size: 49, mode: 420 }
+      { path: 'package.json', size: 44, mode: 420 }
     ],
     entryCount: 2,
     bundled: []
@@ -182,6 +174,4 @@ t.test('packs from registry spec', async t => {
   t.deepEqual(tarContents, contents,
     'packed directory matches expectations'
   )
-
-  await rimraf(target)
 })

test/.DS_Store

@@ -15,14 +15,14 @@ const pack = require('../index')
 t.test('other errors', async t => {
   const testDir = t.testdir({
     'package.json': JSON.stringify({
-      name: 'my-cool-pkg',
+      name: 'my-other-pkg',
       version: '1.0.0'
     }, null, 2),
     'index.js': 'hello'
   })
 
   err.code = 'EPERM'
 
-  const target = `${testDir}/my-cool-pkg-1.0.0.tgz`
+  const target = `${__dirname}/my-other-pkg-1.0.0.tgz`
   await t.rejects(pack(testDir, { target }))
 })

test/index.js

@@ -20,13 +20,13 @@ function copy (oldPath, newPath) {
   return new Promise((resolve, reject) => {
     const readStream = fs.createReadStream(oldPath)
     const writeStream = fs.createWriteStream(newPath)
+    const stream = readStream.pipe(writeStream)
 
     readStream.on('error', reject)
     writeStream.on('error', reject)
-    writeStream.on('close', () => {
+    stream.on('error', reject)
+    stream.on('close', () => {
       resolve(rimraf(oldPath))
     })
-
-    readStream.pipe(writeStream)
   })
 }