kovid 0.2.5 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b453d783796a94766fee3d796a41070ae4a1708c8a306a8b77ae60a912293a78
-  data.tar.gz: 85ff2d518cd223ab521f6c1221151745a75269605288fcd5882f569871bbc0eb
+  metadata.gz: ced083e926d055a20281a468cc923214709badda8fa4a489bcbaa2a0a30aecfa
+  data.tar.gz: 88f862b715a3ba136683511700f68edfa2c25716e373152b4151ebaaf717e184
 SHA512:
-  metadata.gz: 9d4d98b52a3eea164950abbb4639c97aacd95f3a3cce00f8d211c558ec5fc3f97bbb26bf2b97aab69ad95bbc897c77c9a65bd66a97e5f3021bb48adc23e007af
-  data.tar.gz: 19f9ce8011ecf1383c71787fd9bc853d4fef3d3df2bbb6d63010e0a4bffa6708d895ed05547c4db6629f9fe84028dc614e0b9de5951b603f8fd2e162b7de6473
+  metadata.gz: a265dcf1170bed905c522ae4aa038b2368561f9aed9c56c1f3e8dd8db89464a4c8ed576b215f94c1a2a4f9687e4e754f3c12ad1dd24a1a30c316c700e04eb93f
+  data.tar.gz: 58780c213b132e4b5047386d8c03f3127a09ab51512d09892eaa1ea4ddeb08d507daaa335658746fd6579b85758a1d2eba2cc28906217ecbac6d4c41c37e3282

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    kovid (0.2.4)
-      colorize (~> 0.8)
+    kovid (0.3.0)
+      rainbow (~> 3.0)
       terminal-table (~> 1.8)
       thor (~> 1.0)
       typhoeus (~> 1.3)
@@ -21,7 +21,6 @@ GEM
     builder (3.2.4)
     childprocess (3.0.0)
     coderay (1.1.2)
-    colorize (0.8.1)
     contracts (0.16.0)
     cucumber (3.1.2)
       builder (>= 2.1.2)
@@ -51,6 +50,7 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
+    rainbow (3.0.0)
     rake (12.3.3)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -89,4 +89,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.1.2
+   2.1.4

data/README.md

@@ -4,7 +4,8 @@
 
 Kovid is a small CLI app to fetch data surrounding the coronavirus pandemic of 2019. I found myself checking [Wikipedia](https://en.wikipedia.org/wiki/2019%E2%80%9320_coronavirus_pandemic) constantly for information and since I work mostly in the terminal, like some of you, I thought I'd build this to put the data right at our fingertips.
 
-Please feel free to contribute or suggest ideas!
+Code contribution and ideas welcome.
+
 
 ## ⚙️ Installation
 
@@ -14,6 +15,8 @@ Before installing:
 
 ✌️ Run `gem install kovid`
 
+UPDATE often with `gem update kovid`
+
 
 
 ## ⚒️ Usage
@@ -24,7 +27,7 @@ You can run `kovid --help` to see the full list of available commands.
 
 #### Commands Overview
 😷 **Fetching**
-* `kovid check COUNTRY`
+* `kovid check COUNTRY` (`kovid country COUNTRY` works as well)
 * `kovid check COUNTRY -f` OR `kovid check COUNTRY --full`
 
 🇺🇸You can fetch US state-specific data 🇺🇸
@@ -37,8 +40,8 @@ You can run `kovid --help` to see the full list of available commands.
 You can compare as many countries as you want.
 
 😷 **History**
-* `kovid history COUNTRY` (Full history)
-* `kovid history COUNTRY N` (History in the last N days)
+* `kovid history COUNTRY` (full history)
+* `kovid history COUNTRY N` (history in the last N days)
 
 😷 **Total figures**
 * `kovid cases`

data/kovid.gemspec

@@ -48,7 +48,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor", "~> 1.0"
   spec.add_dependency "terminal-table", "~> 1.8"
   spec.add_dependency "typhoeus", "~> 1.3"
-  spec.add_dependency "colorize", "~> 0.8"
+  spec.add_dependency "rainbow", "~> 3.0"
 
   spec.add_development_dependency "pry"
   spec.add_development_dependency "cucumber"

data/lib/kovid/cli.rb

@@ -21,8 +21,16 @@ module Kovid
         puts Kovid.country(name)
       end
     end
+
     desc 'country COUNTRY or country "COUNTRY NAME"', 'Returns reported data on provided country. eg: "kovid country "hong kong".'
-    alias country check
+    method_option :full, aliases: '-f'
+    def country(name)
+      if options[:full]
+        puts Kovid.country_full(name)
+      else
+        puts Kovid.country(name)
+      end
+    end
 
     desc 'state STATE', 'Return reported data on provided state.'
     def state(state)
@@ -43,7 +51,7 @@ module Kovid
       puts Kovid.cases
     end
 
-    desc 'history COUNTRY', 'Return history of incidents of COUNTRY'
+    desc 'history COUNTRY or history COUNTRY N', 'Return history of incidents of COUNTRY (in the last N days)'
     def history(*params)
       if params.size == 2
         puts Kovid.history(params.first, params.last)

data/lib/kovid/painter.rb

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
-require 'colorize'
+require 'rainbow'
 
 class String
   def paint_white
-    colorize(:white).colorize(background: :black).colorize(mode: :bold)
+    Rainbow(self).white.bg(:black).bold
   end
 
   def paint_red
-    colorize(:red).colorize(background: :black).colorize(mode: :bold)
+    Rainbow(self).red.bg(:black).bold
   end
 
   def paint_green
-    colorize(:green).colorize(background: :black).colorize(mode: :bold)
+    Rainbow(self).green.bg(:black).bold
   end
 
   def paint_yellow
-    colorize(:yellow).colorize(background: :black).colorize(mode: :bold)
+    Rainbow(self).yellow.bg(:black).bold
   end
 end

data/lib/kovid/request.rb

@@ -8,6 +8,7 @@ require_relative 'uri_builder'
 module Kovid
   class Request
     COUNTRIES_PATH = UriBuilder.new('/countries').url
+    STATES_URL = UriBuilder.new('/states').url
 
     class << self
       def by_country(country_name)
@@ -58,7 +59,7 @@ module Kovid
       private
 
       def no_case_in(country)
-        rows = [['No reported cases OR check your spelling!']]
+        rows = [['No reported cases OR wrong spelling of country/state!']]
         Terminal::Table.new headings: ["You checked: #{country.capitalize}"], rows: rows
       end
 
@@ -73,21 +74,17 @@ module Kovid
       end
 
       def fetch_country(country_name)
-        url = COUNTRIES_PATH + "/#{country_name}"
+        country_url = COUNTRIES_PATH + "/#{country_name}"
 
-        JSON.parse(Typhoeus.get(url, cache_ttl: 900).response_body)
+        JSON.parse(Typhoeus.get(country_url, cache_ttl: 900).response_body)
       end
 
       def fetch_state(state)
-        url = UriBuilder.new('/states').url
-
-        states_array = JSON.parse(Typhoeus.get(url, cache_ttl: 900).response_body)
+        states_array = JSON.parse(Typhoeus.get(STATES_URL, cache_ttl: 900).response_body)
 
         states_array.select { |state_name| state_name['state'] == capitalize_words(state) }.first
       end
 
-      private
-
       def capitalize_words(string)
         string.split.map(&:capitalize).join(' ')
       end

data/lib/kovid/tablelize.rb

@@ -21,12 +21,19 @@ module Kovid
       ].freeze
 
       FOOTER_LINE = ['------------', '------------', '------------', '------------'].freeze
+      COUNTRY_LETTERS = 'A'.upto('Z').with_index(127_462).to_h.freeze
 
       def country_table(data)
         headings = CASES_DEATHS_RECOVERED
         rows = [[data['cases'], data['deaths'], data['recovered']]]
 
-        Terminal::Table.new(title: data['country'].upcase, headings: headings, rows: rows)
+        if iso = data['countryInfo']['iso2']
+          Terminal::Table.new(title: "#{data['country'].upcase}", headings: headings, rows: rows)
+        else
+          Terminal::Table.new(title: data['country'].upcase, headings: headings, rows: rows)
+        end
+        # TODO: Rafactor this
+        # TODO: Fix emoji
       end
 
       def full_country_table(data)
@@ -45,14 +52,22 @@ module Kovid
           data['cases'],
           data['deaths'],
           data['recovered'],
-          data['todayCases'],
-          data['todayDeaths'],
+          check_if_positve(data['todayCases']),
+          check_if_positve(data['todayDeaths']),
           data['critical'],
           data['casesPerOneMillion']
         ]
-        Terminal::Table.new(title: data['country'].upcase,
-                            headings: headings,
-                            rows: rows)
+
+        # if iso = data['countryInfo']['iso2']
+        #   Terminal::Table.new(title: "#{data['country'].upcase} #{country_emoji(iso)}",
+        #                       headings: headings,
+        #                       rows: rows)
+        # else
+          Terminal::Table.new(title: data['country'].upcase,
+                              headings: headings,
+                              rows: rows)
+        # end
+        # TODO: Rafactor this
       end
 
       def full_state_table(state)
@@ -61,16 +76,11 @@ module Kovid
           'Cases Today'.paint_white,
           'Deaths'.paint_red,
           'Deaths Today'.paint_red,
-          'Recovered'.paint_green,
           'Active'.paint_yellow
         ]
 
         rows = []
-        rows << [state['cases'], state['todayCases'], state['deaths'], state['todayDeaths'], state['recovered'], state['active']]
-
-        puts
-        puts "‼️  Swap value of 'Recovered' for 'Active'. API scraper broke."
-        puts "‼️  So 'Active' is #{state['recovered']} and not #{state['active']}."
+        rows << [state['cases'], check_if_positve(state['todayCases']), state['deaths'], check_if_positve(state['todayDeaths']), state['active']]
 
         Terminal::Table.new(title: state['state'].upcase, headings: headings, rows: rows)
       end
@@ -86,7 +96,7 @@ module Kovid
         rows = []
 
         data.each do |country|
-          rows << [country['country'], country['cases'], country['deaths'], country['recovered']]
+          rows << [country['country'].upcase, comma_delimit(country['cases']), comma_delimit(country['deaths']), comma_delimit(country['recovered'])]
         end
 
         Terminal::Table.new(headings: headings, rows: rows)
@@ -109,13 +119,13 @@ module Kovid
         data.each do |country|
           rows << [
             country['country'],
-            country['cases'],
-            country['deaths'],
-            country['recovered'],
-            country['todayCases'],
-            country['todayDeaths'],
-            country['critical'],
-            country['casesPerOneMillion']
+            comma_delimit(country['cases']),
+            comma_delimit(country['deaths']),
+            comma_delimit(country['recovered']),
+            check_if_positve(country['todayCases']),
+            check_if_positve(country['todayDeaths']),
+            comma_delimit(country['critical']),
+            comma_delimit(country['casesPerOneMillion'])
           ]
         end
 
@@ -124,7 +134,13 @@ module Kovid
 
       def cases(cases)
         headings = CASES_DEATHS_RECOVERED
-        rows = [[cases['cases'], cases['deaths'], cases['recovered']]]
+        rows = [
+          [
+            comma_delimit(cases['cases']),
+            comma_delimit(cases['deaths']),
+            comma_delimit(cases['recovered'])
+          ]
+        ]
 
         Terminal::Table.new(title: 'Total Number of Incidents Worldwide'.upcase, headings: headings, rows: rows)
       end
@@ -168,6 +184,14 @@ module Kovid
       def comma_delimit(number)
         number.to_s.chars.to_a.reverse.each_slice(3).map(&:join).join(',').reverse
       end
+
+      def check_if_positve(num)
+        num.to_i.positive? ? "+#{comma_delimit(num)}" : comma_delimit(num).to_s
+      end
+
+      def country_emoji(iso)
+        COUNTRY_LETTERS.values_at(*iso.chars).pack('U*')
+      end
     end
   end
 end

data/lib/kovid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kovid
-  VERSION = '0.2.5'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.1
 platform: ruby
 authors:
 - Emmanuel Hayford
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement