kovid 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9550f7e2c21e089e88674eaa7be67f06afe3a10d3a3c06d4afa25c5bd694c5f
-  data.tar.gz: 910479f761ce923dbce855a4e466cf2d9b8d653bac427be77807357fccbb4a91
+  metadata.gz: fa7abbc0a4d9eca2bbc865fd6740fdf7ae611ec5290cf96e6ce28248982f2f00
+  data.tar.gz: 51ad886114e16c076fca34b96e4bd92c30022eb0a5fcff2e4a20eb067f688e8b
 SHA512:
-  metadata.gz: 0f5109a811d7f3986ced3b55ac1794a26e2e4abe8f13f7b9bf228f184bb9c6e66cac1be7d28426c40e58c3d231a220994eedb33061f1f013bae0fc39db27f5d7
-  data.tar.gz: cdaa6de69ccc6c13a56749c15bf0a5c19ac2b25e4cb5db73e1ed2257f51c0e2695a9885636575e491eabc3f38a7655725b3fba3412d46e4dbd34ca038e7a6d4a
+  metadata.gz: 93ac6304f8fcbf01b071e0be5dbf39d8a717d2fb9449f5851abe60f2ece6b17d541828817cbe42ede1cec787018c32f000a410287ee5ed3987d74a41ddcf43f3
+  data.tar.gz: 5cbe6f55009cb9a8af32a16a98739cf6df669218e903684232e86a58372c29fdd70c5d3ae2102228449c4e85157e58f02c31971a9f158375e17ee06cd389864f

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    kovid (0.2.2)
-      colorize
-      terminal-table
-      thor
-      typhoeus
+    kovid (0.3.0)
+      rainbow (~> 3.0)
+      terminal-table (~> 1.8)
+      thor (~> 1.0)
+      typhoeus (~> 1.3)
 
 GEM
   remote: https://rubygems.org/
@@ -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,30 +15,33 @@ Before installing:
 
 ✌️ Run `gem install kovid`
 
+UPDATE often with `gem update kovid`
+
 
 
 ## ⚒️ Usage
 
 You can run `kovid --help` to see the full list of available commands.
 
-**NOTE:** If you find it irritating to have to type `kovid state michigan`, `covid state michigan` works as well.
+**NOTE:** If you find it irritating to have to type `kovid state STATE`, `covid state STATE` works as well.
 
 #### Commands Overview
 😷 **Fetching**
-* `kovid check ghana`
-* `kovid check italy -f` OR `kovid check italy --full`
+* `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 🇺🇸
-* `kovid state colorado` OR `kovid state "north carolina"`
+* `kovid state STATE` OR `kovid state "STATE WITH SPACES"`
 
 😷 **Comparing**
-* `kovid compare ghana poland` (sorts by cases DESC)
-* `kovid compare germany poland -f` OR `kovid compare germany poland --full` (sorts by cases DESC)
+* `kovid compare COUNTRYA COUNTRYB` (sorts by cases DESC)
+* `kovid compare COUNTRYA COUNTRYB -f` OR `kovid compare COUNTRYA COUNTRYB --full` (sorts by cases DESC)
 
 You can compare as many countries as you want.
 
 😷 **History**
-* `kovid history italy`
+* `kovid history COUNTRY` (full history)
+* `kovid history COUNTRY N` (history in the last N days)
 
 😷 **Total figures**
 * `kovid cases`
@@ -73,15 +77,15 @@ To compare a countries stats with a full table:
 
 To fetch state-specific data run:
 
-`kovid state colorado`
+`kovid state colorado` OR `kovid state "north carolina"`
 
 ![kovid](https://i.gyazo.com/d00b1c5bbb6251cbd517f801c856ba66.png "Covid data.")
 
 You can check historical statistics by running
 
-`kovid history COUNTRY` eg:
+`kovid history italy 7` eg:
 
-![kovid](https://i.gyazo.com/45d306694cbf793f2e4f7646854cbac8.png "Covid data.")
+![kovid](https://i.gyazo.com/e4872b5047eeaebbd354847a943de268.png "Covid data.")
 
 To check for total figures:
 

data/kovid.gemspec

@@ -45,10 +45,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "thor"
-  spec.add_dependency "terminal-table"
-  spec.add_dependency "typhoeus"
-  spec.add_dependency "colorize"
+  spec.add_dependency "thor", "~> 1.0"
+  spec.add_dependency "terminal-table", "~> 1.8"
+  spec.add_dependency "typhoeus", "~> 1.3"
+  spec.add_dependency "rainbow", "~> 3.0"
 
   spec.add_development_dependency "pry"
   spec.add_development_dependency "cucumber"

data/lib/kovid.rb

@@ -36,7 +36,7 @@ module Kovid
     Kovid::Request.cases
   end
 
-  def history(country)
-    Kovid::Request.history(country)
+  def history(country, last)
+    Kovid::Request.history(country, last)
   end
 end

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,9 +51,13 @@ module Kovid
       puts Kovid.cases
     end
 
-    desc 'history COUNTRY', 'Return history of incidents of COUNTRY'
-    def history(country)
-      puts Kovid.history(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)
+      else
+        puts Kovid.history(params.first, nil)
+      end
     end
   end
 end

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)
@@ -48,17 +49,17 @@ module Kovid
         Kovid::Tablelize.cases(response)
       end
 
-      def history(country)
+      def history(country, last)
         history_path = UriBuilder.new('/historical').url
         response ||= JSON.parse(Typhoeus.get(history_path + "/#{country}", cache_ttl: 900).response_body)
 
-        Kovid::Tablelize.history(response)
+        Kovid::Tablelize.history(response, last)
       end
 
       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,20 +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'], 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'],
-                            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,18 +76,13 @@ 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'], headings: headings, rows: rows)
+        Terminal::Table.new(title: state['state'].upcase, headings: headings, rows: rows)
       end
 
       def compare_countries_table(data)
@@ -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,19 +134,36 @@ 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', headings: headings, rows: rows)
+        Terminal::Table.new(title: 'Total Number of Incidents Worldwide'.upcase, headings: headings, rows: rows)
       end
 
-      def history(country)
+      def history(country, last)
         headings = DATE_CASES_DEATHS_RECOVERED
         rows = []
-        stats = country['timeline'].values.map(&:values).transpose.each do |data|
-          data.map! { |number| comma_delimit(number) }
-        end
 
-        dates = country['timeline']['cases'].keys
+        stats = if last
+                  country['timeline'].values.map(&:values).transpose.each do |data|
+                    data.map! { |number| comma_delimit(number) }
+                  end.last(last.to_i)
+                else
+                  country['timeline'].values.map(&:values).transpose.each do |data|
+                    data.map! { |number| comma_delimit(number) }
+                  end
+                end
+
+        dates = if last
+                  country['timeline']['cases'].keys.last(last.to_i)
+                else
+                  country['timeline']['cases'].keys
+                end
 
         stats.each_with_index do |val, index|
           val.unshift(Date.parse(Date.strptime(dates[index], '%m/%d/%y').to_s).strftime('%d %b, %y'))
@@ -144,10 +171,12 @@ module Kovid
           rows << row
         end
 
-        rows << FOOTER_LINE
-        rows << DATE_CASES_DEATHS_RECOVERED
+        if stats.size > 10
+          rows << FOOTER_LINE
+          rows << DATE_CASES_DEATHS_RECOVERED
+        end
 
-        Terminal::Table.new(title: country['standardizedCountryName'].split.map(&:capitalize).join(' '), headings: headings, rows: rows)
+        Terminal::Table.new(title: country['standardizedCountryName'].upcase, headings: headings, rows: rows)
       end
 
       private
@@ -155,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.4'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 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
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement