fix changes to country filter on cli, changes to readme

Author: sagarkarira

bin/index.js

@@ -1,52 +1,57 @@
 #!/usr/bin/env node
-
+const yargonaut = require('yargonaut')
+  .style('green');
+const yargs = require('yargs');
+const chalk = require('chalk');
 const { getCompleteTable } = require('../lib/corona');
 const { getCountryTable } = require('../lib/byCountry');
 const { lookupCountry } = require('../lib/helpers');
 
-const {argv} = require('yargs')
-  .command('$0 [country]', 'show COVID-19 statistics for the world or the given country', yargs =>
+const { argv } = yargs
+  .command('$0 [country]','Tool to COVID-19 statistics for the world or the given country', yargs =>
     yargs.positional('country', {
       coerce(arg) {
-      console.log(arg);
-        if('ALL' === arg.toUpperCase()) {
+        if ('ALL' === arg.toUpperCase()) {
           return 'ALL';
         }
-
         const country = lookupCountry(arg);
-
-        if(!country) {
-          throw new Error(`Country '${arg}' not found.
-            Try full country name or country code.
-            Ex:
-            - UK: for United Kingdom
-            - US: for United States of America.
-          - India: for India.`);
+        if (!country) {
+          let error = `Country '${arg}' not found.\n`;
+          error += 'Try full country name or country code.\n';
+          error += 'Ex:\n';
+          error += '- UK: for United Kingdom \n';
+          error += '- US: for United States of America.\n';
+          error += '- Italy: for Italy.\n';
+          throw new Error(chalk.red.bold(error));
         }
-
         return country.iso2;
       },
-      describe: 'which country to show statistics for',
+      describe: 'Filter table by country',
       default: 'all',
       type: 'string'
     })
   )
   .options({
     e: {
       alias: 'emojis',
-      describe: 'enable the use of emojis in the table (may break alignment in some terminals)',
+      describe: 'Show emojis in table',
       default: false,
       type: 'boolean'
     },
     c: {
       alias: 'color',
-      describe: 'enable the use of color in the table.',
+      describe: 'Show colors formatted output',
       type: 'boolean'
     }
   })
   .strict()
   .help('help');
 
-(country === 'all' ? getCompleteTable(argv) : getCountryTable(country, argv))
+const { emojis, country } = argv;
+(
+  country === 'ALL'
+    ? getCompleteTable(emojis)
+    : getCountryTable(country, emojis)
+)
   .then(console.log)
   .catch(console.error);

lib/byCountry.js

@@ -79,7 +79,7 @@ exports.getJSONDataForCountry = async (countryCode) => {
   return countryData;
 }
 
-exports.getCountryTable = async (countryCode, {emojis=false}={}) => {
+exports.getCountryTable = async (countryCode, emojis = false) => {
   const head = [
     '',
     'State',

lib/corona.js

@@ -79,11 +79,11 @@ function extraStats(dataArr) {
   );
 }
 
-exports.getCompleteTable = async ({emojis=false}={}) => {
+exports.getCompleteTable = async (emojis = false) => {
   const head = [
     '',
     'Country',
-    'Confirmed',
+    `Confirmed ${emojis ? ' ✅': ''}`,
     `Recovered${emojis ? ' 😀' : ''}`,
     `Deaths${emojis ? ' 😞' : ''}`,
     `Active${emojis ? ' 😷' : ''}`,
@@ -117,7 +117,7 @@ exports.getCompleteTable = async ({emojis=false}={}) => {
       getOneDayChange(worldStats),
       getOneWeekChange(worldStats),
       // '',
-      ... ( emojis ? ['🌎'] : [] )
+      ...( emojis ? ['🌎'] : [] )
     ]
   })
   let rank = 1;
@@ -134,7 +134,7 @@ exports.getCompleteTable = async ({emojis=false}={}) => {
       getOneDayChange(cd),
       getOneWeekChange(cd),
       // getRateOfGrowth(cd),
-      ... (emojis ? [countryEmoji] : [])
+      ...(emojis ? [countryEmoji] : [])
     ]
     table.push({ [rank++]: values })
   });

lib/helpers.js

@@ -162,7 +162,7 @@ e.lookupCountry = country => {
   } catch (error) {
     return lookup.byFips(country) || lookup.byCountry(country);
   }
-}
+};
 
 e.footer = (lastUpdated) => `
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "coronavirus-tracker-cli",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "track conronavirus cases from cli",
   "main": "./lib/corona.js",
   "bin": {
@@ -29,6 +29,7 @@
     "moment": "^2.24.0",
     "morgan": "^1.9.1",
     "node-cache": "^5.1.0",
+    "yargonaut": "^1.1.4",
     "yargs": "15.3.1"
   },
   "devDependencies": {

package.json

@@ -51,31 +51,31 @@ npm install coronavirus-tracker-cli -g
 corona
 ````
 
-**Top 10**
-
-Note: This command will cause colored output to be discarded.
+**With emojis**
 
 ````sh
-# Grep the rank of 10 and the 23 lines preceding it
-corona | grep -B 23 ' 10  '
+corona -e
 ````
 
-**Your country**
+**Filter by country**
+
+````sh
+corona italy
+````
 
-Note: These commands will cause colored output to be discarded.
+**Disable colors**
 
-- Replace the `US` part of the command with your country code.
-- If you want to also see the `World` stats, replace the `3` with a `5`
 ````sh
-# sed the first 3 (or 5) lines; your country; bottom table border
-corona | sed -n '1,3p;/\(US\)/p;/╚═/p'
+corona --colors=false
 ````
 
-Or, get your country within context of your rank
+**Top 10** (Working on native command)
+
+Note: This command will cause colored output to be discarded.
+
 ````sh
-# grep with 2 lines of context for each result
-# output the 'World' stats and headers; the country stats; the bottom table border
-corona | grep --color=none -C 2 -e 'World' -e '\(US\)' -e 'Stay'
+# Grep the rank of 10 and the 23 lines preceding it
+corona | grep -B 23 ' 10  '
 ````
 
 ### ToDos
@@ -86,6 +86,22 @@ corona | grep --color=none -C 2 -e 'World' -e '\(US\)' -e 'Stay'
 * Add growth rate. (linear regression)
 * Add latest updates from reddit / twitter.
 
+### Contributors
+
+```
+ project  : curl-corona
+ lines    :     2821
+ authors  :
+ 2343 sagark                    83.1%
+  293 Alexandra Parker          10.4%
+  120 Not Committed Yet         4.3%
+   30 Lucas Fernandez Nicolau   1.1%
+   25 Shelton Koskie            0.9%
+    6 Mo'men Tawfik             0.2%
+    3 XhmikosR                  0.1%
+    1 CyberDracula              0.0%
+```
+
 ### Other Regional Trackers.
 
 * [Italy](http://opendatadpc.maps.arcgis.com/apps/opsdashboard/index.html#/b0c68bce2cce478eaac82fe38d4138b1)