fix: Fixing issues with commands introduced in #403

package.json

@@ -48,13 +48,13 @@
   "homepage": "https://github.com/all-contributors/all-contributors-cli#readme",
   "dependencies": {
     "@babel/runtime": "^7.7.6",
-    "chalk": "^5.6.2",
     "inquirer": "^7.3.3",
     "json-fixer": "^1.6.8",
     "lodash": "^4.11.2",
     "node-fetch": "^2.6.0",
     "pify": "^5.0.0",
-    "yargs": "^18.0.0"
+    "yargs": "^18.0.0",
+    "yoctocolors": "^2.1.2"
   },
   "devDependencies": {
     "@babel/cli": "^7.26.0",

src/api.js

@@ -3,15 +3,15 @@
 // This is to support adding contributors using the AllContributors GitHub Bot (see github.com/all-contributors/all-contributors-bot
 // These Node API's are intended to be network and side effect free, everything should be in memory with no io to network/disk
 
-const chalk = require('chalk')
+const YoctoColors = require('yoctocolors')
 
 const addContributorWithDetails = require('./contributors/addWithDetails')
 const generate = require('./generate')
 const {addContributorsList, addBadge} = require('./init/init-content')
 
 process.stdout.write(
-  chalk.yellow(
-    `${chalk.bold(
+  YoctoColors.yellow(
+    `${YoctoColors.bold(
       'WARNING',
     )} :: Using the all-contributors node-api comes with zero guarantees of stability and may contain breaking changes without warning\n`,
   ),

src/cli.js

@@ -2,8 +2,8 @@
 
 const path = require('path')
 const yargs = require('yargs/yargs')
+const YoctoColors = require('yoctocolors')
 const {hideBin} = require('yargs/helpers')
-const chalk = require('chalk')
 const inquirer = require('inquirer')
 
 const init = require('./init')
@@ -70,14 +70,11 @@ function startGeneration(argv) {
 }
 
 async function addContribution(argv) {
-  // ensure the config file exists
-  await util.configFile.readConfig(argv.config)
-
   const username = argv._[1] === undefined ? undefined : String(argv._[1])
   const contributions = argv._[2]
 
   // Add or update contributor in the config file
-  const data = updateContributors(argv, username, contributions)
+  const data = await updateContributors(argv, username, contributions)
 
   argv.contributors = data.contributors
 
@@ -90,22 +87,20 @@ async function addContribution(argv) {
 }
 
 async function checkContributors(argv) {
-  const configData = await util.configFile.readConfig(argv.config)
-
   return repo
     .getContributors(
-      configData.projectOwner,
-      configData.projectName,
-      configData.repoType,
-      configData.repoHost,
+      argv.projectOwner,
+      argv.projectName,
+      argv.repoType,
+      argv.repoHost,
     )
     .then(repoContributors => {
-      const checkKey = repo.getCheckKey(configData.repoType)
-      const knownContributions = configData.contributors.reduce((obj, item) => {
+      const checkKey = repo.getCheckKey(argv.repoType)
+      const knownContributions = argv.contributors.reduce((obj, item) => {
         obj[item[checkKey]] = item.contributions
         return obj
       }, {})
-      const knownContributors = configData.contributors.map(
+      const knownContributors = argv.contributors.map(
         contributor => contributor[checkKey],
       )
 
@@ -122,14 +117,17 @@ async function checkContributors(argv) {
 
       if (missingInConfig.length) {
         process.stdout.write(
-          chalk.bold('Missing contributors in .all-contributorsrc:\n'),
+          YoctoColors.bold('Missing contributors in .all-contributorsrc:\n'),
         )
-        process.stdout.write(`    ${missingInConfig.join(', ')}\n`)
+        process.stdout.write(`${missingInConfig.join(', ')}\n`)
       }
 
       if (missingFromRepo.length) {
+        process.stdout.write('\n')
         process.stdout.write(
-          chalk.bold('Unknown contributors found in .all-contributorsrc:\n'),
+          YoctoColors.bold(
+            'Unknown contributors found in .all-contributorsrc:\n',
+          ),
         )
         process.stdout.write(`${missingFromRepo.join(', ')}\n`)
       }
@@ -169,6 +167,18 @@ function promptForCommand(argv) {
 async function run() {
   try {
     const argv = getArgs()
+
+    // Load and merge config file data into argv
+    try {
+      const configData = await util.configFile.readConfig(argv.config)
+      Object.assign(argv, configData)
+    } catch (error) {
+      if (error instanceof SyntaxError || argv.config !== defaultRCFile) {
+        throw error
+      }
+      // If default config file doesn't exist, that's okay
+    }
+
     const command = await promptForCommand(argv)
 
     switch (command) {

src/util/git.js

@@ -3,7 +3,6 @@ const spawn = require('child_process').spawn
 const _ = require('lodash/fp')
 const pify = require('pify')
 const conventions = require('../init/commit-conventions')
-const {readConfig} = require('./config-file')
 
 const commitTemplate =
   '<%= prefix %> <%= (newContributor ? "Add" : "Update") %> @<%= username %> as a contributor'
@@ -58,8 +57,7 @@ async function commit(options, data) {
   const absolutePathFiles = files.map(file => {
     return path.resolve(process.cwd(), file)
   })
-  const config = await readConfig(options.config)
-  const commitConvention = conventions[config.commitConvention]
+  const commitConvention = conventions[options.commitConvention]
 
   return spawnGitCommand(['add'].concat(absolutePathFiles)).then(() => {
     let commitMessage = _.template(options.commitTemplate || commitTemplate)({