cacache 11.3.2 → 11.3.3

package/CHANGELOG.md

@@ -1,7 +1,20 @@
-# Change Log
+# Changelog
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [11.3.3](https://github.com/zkat/cacache/compare/v11.3.2...v11.3.3) (2019-06-17)
+
+
+### Bug Fixes
+
+* **audit:** npm audit fix ([200a6d5](https://github.com/zkat/cacache/commit/200a6d5))
+* **config:** Add ssri config 'error' option ([#146](https://github.com/zkat/cacache/issues/146)) ([47de8f5](https://github.com/zkat/cacache/commit/47de8f5))
+* **deps:** npm audit fix ([481a7dc](https://github.com/zkat/cacache/commit/481a7dc))
+* **standard:** standard --fix ([7799149](https://github.com/zkat/cacache/commit/7799149))
+* **write:** avoid another cb never called situation ([5156561](https://github.com/zkat/cacache/commit/5156561))
+
+
+
 <a name="11.3.2"></a>
 ## [11.3.2](https://github.com/zkat/cacache/compare/v11.3.1...v11.3.2) (2018-12-21)
 

package/README.es.md

@@ -287,7 +287,7 @@ entrada si existe.
 
 * `key` - Clave de la entrada. Igual al argumento `clave`.
 * `integrity` - [hacheo de Subresource Integrity](#integrity) del contenido al que se refiere esta entrada.
-* `path` - Dirección del fichero de datos almacenados, relativa al argumento `cache`.
+* `path` - Dirección del fichero de datos almacenados, unida al argumento `cache`.
 * `time` - Hora de creación de la entrada
 * `metadata` - Metadatos asignados a esta entrada por el usuario
 

package/README.md

@@ -290,7 +290,7 @@ one exists.
 
 * `key` - Key the entry was looked up under. Matches the `key` argument.
 * `integrity` - [Subresource Integrity hash](#integrity) for the content this entry refers to.
-* `path` - Filesystem path relative to `cache` argument where content is stored.
+* `path` - Filesystem path where content is stored, joined with `cache` argument.
 * `time` - Timestamp the entry was first added on.
 * `metadata` - User-assigned metadata associated with the entry/content.
 

package/lib/content/path.js

@@ -12,7 +12,7 @@ const ssri = require('ssri')
 //
 module.exports = contentPath
 function contentPath (cache, integrity) {
-  const sri = ssri.parse(integrity, {single: true})
+  const sri = ssri.parse(integrity, { single: true })
   // contentPath is the *strongest* algo given
   return path.join.apply(path, [
     contentDir(cache),

package/lib/content/read.js

@@ -54,8 +54,8 @@ function readStream (cache, integrity, opts) {
   opts = ReadOpts(opts)
   const stream = new PassThrough()
   withContentSri(cache, integrity, (cpath, sri) => {
-    return lstatAsync(cpath).then(stat => ({cpath, sri, stat}))
-  }).then(({cpath, sri, stat}) => {
+    return lstatAsync(cpath).then(stat => ({ cpath, sri, stat }))
+  }).then(({ cpath, sri, stat }) => {
     return pipe(
       fs.createReadStream(cpath),
       ssri.integrityStream({
@@ -95,7 +95,7 @@ module.exports.hasContent = hasContent
 function hasContent (cache, integrity) {
   if (!integrity) { return BB.resolve(false) }
   return withContentSri(cache, integrity, (cpath, sri) => {
-    return lstatAsync(cpath).then(stat => ({size: stat.size, sri, stat}))
+    return lstatAsync(cpath).then(stat => ({ size: stat.size, sri, stat }))
   }).catch(err => {
     if (err.code === 'ENOENT') { return false }
     if (err.code === 'EPERM') {
@@ -114,7 +114,7 @@ function hasContentSync (cache, integrity) {
   return withContentSriSync(cache, integrity, (cpath, sri) => {
     try {
       const stat = fs.lstatSync(cpath)
-      return {size: stat.size, sri, stat}
+      return { size: stat.size, sri, stat }
     } catch (err) {
       if (err.code === 'ENOENT') { return false }
       if (err.code === 'EPERM') {
@@ -141,12 +141,12 @@ function withContentSri (cache, integrity, fn) {
     } else {
       return BB.any(sri[sri.pickAlgorithm()].map(meta => {
         return withContentSri(cache, meta, fn)
-      }, {concurrency: 1}))
+      }, { concurrency: 1 }))
         .catch(err => {
           if ([].some.call(err, e => e.code === 'ENOENT')) {
             throw Object.assign(
               new Error('No matching content found for ' + sri.toString()),
-              {code: 'ENOENT'}
+              { code: 'ENOENT' }
             )
           } else {
             throw err[0]

package/lib/content/write.js

@@ -36,11 +36,11 @@ function write (cache, data, opts) {
   }
   return BB.using(makeTmp(cache, opts), tmp => (
     writeFileAsync(
-      tmp.target, data, {flag: 'wx'}
+      tmp.target, data, { flag: 'wx' }
     ).then(() => (
       moveToDestination(tmp, cache, sri, opts)
     ))
-  )).then(() => ({integrity: sri, size: data.length}))
+  )).then(() => ({ integrity: sri, size: data.length }))
 }
 
 module.exports.stream = writeStream
@@ -111,8 +111,8 @@ function pipeToTmp (inputStream, cache, tmpTarget, opts, errCheck) {
     })
     errCheck()
     return pipe(inputStream, hashStream, outStream).then(() => {
-      return {integrity, size}
-    }, err => {
+      return { integrity, size }
+    }).catch(err => {
       return rimraf(tmpTarget).then(() => { throw err })
     })
   })

package/lib/entry-index.js

@@ -64,7 +64,7 @@ function insert (cache, key, integrity, opts) {
     )
   }).then(
     () => fixOwner.chownr(bucket, opts.uid, opts.gid)
-  ).catch({code: 'ENOENT'}, () => {
+  ).catch({ code: 'ENOENT' }, () => {
     // There's a class of race conditions that happen when things get deleted
     // during fixOwner, or between the two mkdirfix/chownr calls.
     //
@@ -178,7 +178,7 @@ function lsStream (cache) {
             const formatted = formatEntry(cache, entry)
             formatted && stream.push(formatted)
           }
-        }).catch({code: 'ENOENT'}, nop)
+        }).catch({ code: 'ENOENT' }, nop)
       })
     })
   }).then(() => {
@@ -282,8 +282,8 @@ function formatEntry (cache, entry) {
 
 function readdirOrEmpty (dir) {
   return readdirAsync(dir)
-    .catch({code: 'ENOENT'}, () => [])
-    .catch({code: 'ENOTDIR'}, () => [])
+    .catch({ code: 'ENOENT' }, () => [])
+    .catch({ code: 'ENOTDIR' }, () => [])
 }
 
 function nop () {

package/lib/util/fix-owner.js

@@ -27,7 +27,7 @@ function fixOwner (filepath, uid, gid) {
       filepath,
       typeof uid === 'number' ? uid : process.getuid(),
       typeof gid === 'number' ? gid : process.getgid()
-    ).catch({code: 'ENOENT'}, () => null)
+    ).catch({ code: 'ENOENT' }, () => null)
   )
 }
 
@@ -65,7 +65,7 @@ function mkdirfix (p, uid, gid, cb) {
     if (made) {
       return fixOwner(made, uid, gid).then(() => made)
     }
-  }).catch({code: 'EEXIST'}, () => {
+  }).catch({ code: 'EEXIST' }, () => {
     // There's a race in mkdirp!
     return fixOwner(p, uid, gid).then(() => null)
   })

package/lib/verify.js

@@ -130,7 +130,7 @@ function garbageCollect (cache, opts) {
             })
           })
         }
-      }, {concurrency: opts.concurrency}))
+      }, { concurrency: opts.concurrency }))
     })
   })
 }
@@ -150,7 +150,7 @@ function verifyContent (filepath, sri) {
         contentInfo.valid = false
       })
     }).then(() => contentInfo)
-  }).catch({code: 'ENOENT'}, () => ({size: 0, valid: false}))
+  }).catch({ code: 'ENOENT' }, () => ({ size: 0, valid: false }))
 }
 
 function rebuildIndex (cache, opts) {
@@ -183,7 +183,7 @@ function rebuildIndex (cache, opts) {
     }
     return BB.map(Object.keys(buckets), key => {
       return rebuildBucket(cache, buckets[key], stats, opts)
-    }, {concurrency: opts.concurrency}).then(() => stats)
+    }, { concurrency: opts.concurrency }).then(() => stats)
   })
 }
 
@@ -200,7 +200,7 @@ function rebuildBucket (cache, bucket, stats, opts) {
           metadata: entry.metadata,
           size: entry.size
         }).then(() => { stats.totalEntries++ })
-      }).catch({code: 'ENOENT'}, () => {
+      }).catch({ code: 'ENOENT' }, () => {
         stats.rejectedEntries++
         stats.missingContent++
       })

package/locales/en.json

@@ -2,5 +2,6 @@
   "No cache entry for `%s` found in `%s`": "No cache entry for %s found in %s",
   "Integrity verification failed for %s (%s)": "Integrity verification failed for %s (%s)",
   "Bad data size: expected inserted data to be %s bytes, but got %s instead": "Bad data size: expected inserted data to be %s bytes, but got %s instead",
-  "Cache input stream was empty": "Cache input stream was empty"
-}
+  "Cache input stream was empty": "Cache input stream was empty",
+  "Integrity check failed:\n  Wanted: %s\n   Found: %s": "Integrity check failed:\n  Wanted: %s\n   Found: %s"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cacache",
-  "version": "11.3.2",
+  "version": "11.3.3",
   "cache-version": {
     "content": "2",
     "index": "5"
@@ -58,32 +58,32 @@
   ],
   "license": "ISC",
   "dependencies": {
-    "bluebird": "^3.5.3",
+    "bluebird": "^3.5.5",
     "chownr": "^1.1.1",
     "figgy-pudding": "^3.5.1",
-    "glob": "^7.1.3",
+    "glob": "^7.1.4",
     "graceful-fs": "^4.1.15",
     "lru-cache": "^5.1.1",
     "mississippi": "^3.0.0",
     "mkdirp": "^0.5.1",
     "move-concurrently": "^1.0.1",
     "promise-inflight": "^1.0.1",
-    "rimraf": "^2.6.2",
+    "rimraf": "^2.6.3",
     "ssri": "^6.0.1",
     "unique-filename": "^1.1.1",
     "y18n": "^4.0.0"
   },
   "devDependencies": {
     "benchmark": "^2.1.4",
-    "chalk": "^2.3.2",
+    "chalk": "^2.4.2",
     "cross-env": "^5.1.4",
-    "require-inject": "^1.4.2",
-    "standard": "^11.0.1",
-    "standard-version": "^4.4.0",
-    "tacks": "^1.2.7",
-    "tap": "^12.1.1",
+    "require-inject": "^1.4.4",
+    "standard": "^12.0.1",
+    "standard-version": "^6.0.1",
+    "tacks": "^1.3.0",
+    "tap": "^12.7.0",
     "weallbehave": "^1.2.0",
-    "weallcontribute": "^1.0.8"
+    "weallcontribute": "^1.0.9"
   },
   "config": {
     "nyc": {

package/put.js

@@ -20,6 +20,7 @@ const PutOpts = figgyPudding({
   gid: {},
   single: {},
   sep: {},
+  error: {},
   strict: {}
 })
 
@@ -28,7 +29,7 @@ function putData (cache, key, data, opts) {
   opts = PutOpts(opts)
   return write(cache, data, opts).then(res => {
     return index.insert(
-      cache, key, res.integrity, opts.concat({size: res.size})
+      cache, key, res.integrity, opts.concat({ size: res.size })
     ).then(entry => {
       if (opts.memoize) {
         memo.put(cache, entry, data, opts)
@@ -63,7 +64,7 @@ function putStream (cache, key, opts) {
     })
   }, cb => {
     contentStream.end(() => {
-      index.insert(cache, key, integrity, opts.concat({size})).then(entry => {
+      index.insert(cache, key, integrity, opts.concat({ size })).then(entry => {
         if (opts.memoize) {
           memo.put(cache, entry, Buffer.concat(memoData, memoTotal), opts)
         }