fixing output from customConfig (#76)

gagoar · Oct 2, 2020 · 970240c · 970240c
1 parent bc90e05
commit 970240c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/__tests__/generate.spec.ts b/__tests__/generate.spec.ts
@@ -182,7 +182,7 @@ describe('Generate', () => {
         isEmpty: false,
         filepath: '/some/package.json',
         config: {
-          output: 'CODEOWNERS',
+          output: '.github/CODEOWNERS',
           useMaintainers: true,
           includes: ['dir1/*', 'dir2/*', 'dir5/*', 'dir6/*', 'dir7/*'],
         },

diff --git a/src/commands/generate.ts b/src/commands/generate.ts
@@ -72,7 +72,9 @@ interface CommandGenerate extends Command {
 export const command = async (command: CommandGenerate): Promise<void> => {
   const globalOptions = await getGlobalOptions(command);
 
-  const { output, verifyPaths, useMaintainers } = command;
+  const { verifyPaths, useMaintainers } = command;
+
+  const { output = globalOptions.output || path.join(__dirname, OUTPUT) } = command;
 
   const loader = ora('generating codeowners...').start();
 
@@ -81,12 +83,10 @@ export const command = async (command: CommandGenerate): Promise<void> => {
   try {
     const ownerRules = await generate({ rootDir: __dirname, verifyPaths, useMaintainers, ...globalOptions });
 
-    const outputFile = output || path.join(__dirname, OUTPUT);
-
     if (ownerRules.length) {
-      await createOwnersFile(outputFile, ownerRules);
+      await createOwnersFile(output, ownerRules);
 
-      loader.stopAndPersist({ text: `CODEOWNERS file was created! location: ${outputFile}`, symbol: SUCCESS_SYMBOL });
+      loader.stopAndPersist({ text: `CODEOWNERS file was created! location: ${output}`, symbol: SUCCESS_SYMBOL });
     } else {
       const includes = globalOptions.includes?.length ? globalOptions.includes : INCLUDES;
       loader.stopAndPersist({

diff --git a/src/utils/getGlobalOptions.ts b/src/utils/getGlobalOptions.ts
@@ -1,6 +1,7 @@
 import { getCustomConfiguration } from './getCustomConfiguration';
 interface GlobalOptions {
   includes?: string[];
+  output?: string;
 }
 export interface Command {
   parent: Partial<GlobalOptions>;