Tidy up readJson util

Author: cookpete

src/run.js

@@ -100,8 +100,8 @@ async function getReleases (commits, remote, latestVersion, options) {
 }
 
 export default async function run (argv) {
- const pkg = await fileExists(PACKAGE_FILE) && await readJson(PACKAGE_FILE)
- const dotOptions = await fileExists(OPTIONS_DOTFILE) && await readJson(OPTIONS_DOTFILE)
+ const pkg = await readJson(PACKAGE_FILE)
+ const dotOptions = await readJson(OPTIONS_DOTFILE)
  const options = getOptions(argv, pkg, dotOptions)
  const log = string => options.stdout ? null : updateLog(string)
  log('Fetching remote…')

src/utils.js

@@ -89,6 +89,8 @@ export function fileExists (path) {
 }
 
 export async function readJson (path) {
- const json = await readFile(path)
- return JSON.parse(json)
+ if (await fileExists(path) === false) {
+ return null
+ }
+ return JSON.parse(await readFile(path))
 }

test/utils.js

@@ -95,7 +95,10 @@ describe('fileExists', () => {
 
 describe('readJson', () => {
  it('reads file', async () => {
- mock('fs', { readFile: (path, type, cb) => cb(null, '{"abc":123}') })
+ mock('fs', {
+ readFile: (path, type, cb) => cb(null, '{"abc":123}'),
+ access: (path, cb) => cb(null)
+ })
  expect(await readJson()).to.deep.equal({ abc: 123 })
  unmock('cmd')
  })