From b04444a299b0514c748de52d029ec4cec3e59f3c Mon Sep 17 00:00:00 2001 From: Kerem Sevencan Date: Wed, 14 Apr 2021 16:29:51 +0200 Subject: [PATCH] implement cliDir --- package.json | 2 +- src/commands/create.ts | 8 +++----- src/commands/init.ts | 5 ++--- src/commands/toc.ts | 10 ++++++---- src/config.ts | 4 ++++ 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 28bcff8..8a54c62 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "adr-tool", "description": "easy CLI for ADR docs", - "version": "0.0.0", + "version": "0.0.1", "author": "Kerem Sevencan @keremciu", "bin": { "adr-tool": "./bin/run" diff --git a/src/commands/create.ts b/src/commands/create.ts index c8339b3..129a3c1 100644 --- a/src/commands/create.ts +++ b/src/commands/create.ts @@ -6,7 +6,7 @@ import {error} from '@oclif/errors' import {adrDir} from '../config' const templateFile = adrDir + '/template.md' -const tocFile = adrDir + '/README.md' +const tocFilePath = adrDir + 'README.md' const extension = 'md' const slicePos = -extension.length @@ -80,7 +80,7 @@ a decision created on ./docs/adr/0001-use-adr-tool.md const filePath = adrDir + filename + '.md' fs.writeFileSync(filePath, fileData) - const tocFileRaw = fs.readFileSync(tocFile, 'utf8') + const tocFileRaw = fs.readFileSync(tocFilePath, 'utf8') const tocFileArray = tocFileRaw.split('\n') const tocString = `* [ADR-${fileIndex}](${filename}.md) - ${args.title}` @@ -88,9 +88,7 @@ a decision created on ./docs/adr/0001-use-adr-tool.md const tocStopIndex = tocFileArray.indexOf('') tocFileArray.splice(tocStopIndex - 1, 0, tocString) - const tocPath = adrDir + 'README.md' - - fs.writeFileSync(tocPath, tocFileArray.join('\n')) + fs.writeFileSync(tocFilePath, tocFileArray.join('\n')) this.log('a decision created on ' + filePath) } diff --git a/src/commands/init.ts b/src/commands/init.ts index 9e5156d..8f5a457 100644 --- a/src/commands/init.ts +++ b/src/commands/init.ts @@ -4,10 +4,9 @@ const path = require('path') import {Command, flags} from '@oclif/command' import {error} from '@oclif/errors' -import {adrDir} from '../config' +import {adrDir, cliDir} from '../config' -const dirname = __dirname -const cliTemplates = path.join(dirname + '/../templates/') +const cliTemplates = path.join(cliDir + '/../templates/') const cliTemplateFile = cliTemplates + 'template.md' const cliTOCFile = cliTemplates + 'toc.md' diff --git a/src/commands/toc.ts b/src/commands/toc.ts index cc30b2b..be1cffe 100644 --- a/src/commands/toc.ts +++ b/src/commands/toc.ts @@ -4,10 +4,10 @@ const path = require('path') import {Command, flags} from '@oclif/command' import {error} from '@oclif/errors' -import {adrDir} from '../config' +import {adrDir, cliDir} from '../config' + +const cliTemplates = path.join(cliDir + '/../templates/') -const dirname = __dirname -const cliTemplates = path.join(dirname + '/../templates/') const cliTOCFile = cliTemplates + 'toc.md' export default class Toc extends Command { @@ -28,7 +28,9 @@ export default class Toc extends Command { error('docs/adr/README.md file is already exist.') } - fs.copyFile(cliTOCFile, adrDir + 'README.md', () => null) + fs.copyFile(cliTOCFile, adrDir + 'README.md', (err: Error) => { + if (err) throw err + }) this.log('./docs/adr/README.md file is created!') } diff --git a/src/config.ts b/src/config.ts index 3fd552b..76f93ee 100644 --- a/src/config.ts +++ b/src/config.ts @@ -1,2 +1,6 @@ +const path = require('path') +const fs = require('fs') + export const workDir = process.cwd() export const adrDir = workDir + '/docs/adr/' +export const cliDir = path.dirname(fs.realpathSync(__filename))