kovid 0.2.6 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdb8dfafa7894028f398f20f933b498c405d56bfc3ef4a5d7a339a83276a7d6d
-  data.tar.gz: 30eb0c8ce98ee989185cf81f8bba72f5c993bdc6a44a229b7ba2a9131e31b1ae
+  metadata.gz: d4205df6f2e487214f535dda994a132264a9966b6c7527dec22f908f7aad76ed
+  data.tar.gz: 24b98f27cddcff29ed2a75d02be4af8d81fb2078d138890d75c9fb3541207bdf
 SHA512:
-  metadata.gz: bdf67215185377506876eb06937b1e9592c4e29d984b1f8458296acc3d23f1ff6162f64864ebb430906a1e70e3005d80ff226fc51c7eb8ecb9a07164dd9019f1
-  data.tar.gz: d7d350545f13bd7ebee3987e0af9a3d23968f229ef7c87d70da5536bdcb5064525093988ab1f5ee16b7bf3b07d25c164368e742b5bcc075b71768d2a98b08b47
+  metadata.gz: 2c5e2f6b14c57dc707d81f5711ea6d2004300d253f8ba7afb0d453d14bd2f73210de62d73d2457caf7ed221ad8d27b192db2e511e749903bb25cd31bbfe3be02
+  data.tar.gz: 7fc35f3888744cbadcfe131e080ef56a3d9b0055f8437316f5286f364ab71391a6322df951c86c707ab43d3669b839aaed58fa3108913c36d6d252ce3759dca5

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    kovid (0.2.5)
-      colorize (~> 0.8)
+    kovid (0.3.1)
+      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

@@ -1,57 +1,55 @@
 # 🦠 Kovid
 
-[gem]: https://rubygems.org/gems/kovid
-
-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.
+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 so I thought I'd build this to provide info directly in the terminal. It's where some of us spend time more.
 
 Code contribution and ideas welcome.
 
 
 ## ⚙️ Installation
 
-Before installing:
-
-☝️ Wash your hands with soap and water for at least 20 seconds.
+To install:
 
-✌️ Run `gem install kovid`
+* ️ Wash your hands with soap and water for at least 20 seconds.
 
+*  Run `gem install kovid`.
 
+It's recommended you 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 STATE`, `covid state STATE` works as well.
-
 #### Commands Overview
 😷 **Fetching**
-* `kovid check COUNTRY` (`kovid country COUNTRY` works as well)
-* `kovid check COUNTRY -f` OR `kovid check COUNTRY --full`
+* `kovid check COUNTRY` OR `kovid country COUNTRY`.
+* `kovid check COUNTRY -f` OR `kovid check COUNTRY --full`.
+
+🇺🇸🇺🇸🇺🇸
 
-🇺🇸You can fetch US state-specific data 🇺🇸
-* `kovid state STATE` OR `kovid state "STATE WITH SPACES"`
+You can fetch US state-specific data:
+* `kovid state STATE` OR `kovid state "STATE NAME"`.
 
 😷 **Comparing**
-* `kovid compare COUNTRYA COUNTRYB` (sorts by cases DESC)
-* `kovid compare COUNTRYA COUNTRYB -f` OR `kovid compare COUNTRYA COUNTRYB --full` (sorts by cases DESC)
+* `kovid compare FOO BAR` (sorts by cases DESC).
+* `kovid compare FOO BAR -f` OR `kovid compare FOO BAR --full` (sorts by cases DESC).
 
-You can compare as many countries as you want.
+Where `FOO` and `BAR` are different countries.
+
+You can compare as many countries as you want; `kovid compare FOO BAR BAZ` OR `kovid compare FOO BAR BAZ -f`
 
 😷 **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`
-
+* `kovid cases` (summary of reported incidents globally).
 
+**NOTE:** If you find it irritating to have to type `kovid state STATE`, `covid state STATE` works as well.
 
 #### Commands Details
 To fetch basic data on a country run:
 
-`kovid check ghana`
-
-If the location contains spaces: `kovid check "Diamond Princess"`
+`kovid check ghana`. If the location contains spaces: `kovid check "Diamond Princess"`
 
 ![kovid](https://i.gyazo.com/ab779c3fc838ac279bae5b9d6d10d617.png "Covid data.")
 
@@ -104,7 +102,7 @@ To install this gem onto your local machine, run `bundle exec rake install`.
 
 ## 🤲 Contributing
 
-There are multiple areas in this repo that can be improved or use some refactoring(there's a lot to be refactorted in fact!). For that reason, bug reports and pull requests are welcome! This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/siaw23/kovid/blob/master/CODE_OF_CONDUCT.md).
+There are multiple areas in this repo that can be improved or use some refactoring(there's a lot to be refactored in fact!). For that reason, bug reports and pull requests are welcome! This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/siaw23/kovid/blob/master/CODE_OF_CONDUCT.md).
 
 
 ## 🔖 License

data/kovid.gemspec

@@ -14,6 +14,29 @@ Gem::Specification.new do |spec|
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org/"
 
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/siaw23/kovid"
+  spec.metadata["changelog_uri"] = "https://github.com/siaw23/kovid"
+
+  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"
+  spec.add_development_dependency "aruba"
+  spec.add_development_dependency "simplecov"
+
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
   spec.post_install_message = %q{
     ============================================================================
       COVID-19 has devasted the world. But while we're fighting
@@ -31,27 +54,4 @@ Gem::Specification.new do |spec|
       Emmanuel Hayford.
     ============================================================================
     }
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/siaw23/kovid"
-  spec.metadata["changelog_uri"] = "https://github.com/siaw23/kovid"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  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_development_dependency "pry"
-  spec.add_development_dependency "cucumber"
-  spec.add_development_dependency "aruba"
-  spec.add_development_dependency "simplecov"
 end

data/lib/kovid/cli.rb

@@ -15,14 +15,14 @@ module Kovid
     desc 'check COUNTRY or check "COUNTRY NAME"', 'Returns reported data on provided country. eg: "kovid check "hong kong".'
     method_option :full, aliases: '-f'
     def check(name)
-      if options[:full]
-        puts Kovid.country_full(name)
-      else
-        puts Kovid.country(name)
-      end
+      fetch_country_stats(name)
     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)
+      fetch_country_stats(name)
+    end
 
     desc 'state STATE', 'Return reported data on provided state.'
     def state(state)
@@ -51,5 +51,15 @@ module Kovid
         puts Kovid.history(params.first, nil)
       end
     end
+
+    private
+
+    def fetch_country_stats(country)
+      if options[:full]
+        puts Kovid.country_full(country)
+      else
+        puts Kovid.country(country)
+      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)
@@ -58,8 +59,8 @@ module Kovid
       private
 
       def no_case_in(country)
-        rows = [['No reported cases OR wrong spelling of country/state!']]
-        Terminal::Table.new headings: ["You checked: #{country.capitalize}"], rows: rows
+        rows = [["Wrong spelling of location/API has no info on #{country.upcase} at the moment."]]
+        Terminal::Table.new title: "You checked: #{country.upcase}", rows: rows
       end
 
       def fetch_countries(list)
@@ -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.to_s, 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']
         ]
+
+        # 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,12 +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']]
+        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
@@ -82,7 +96,7 @@ module Kovid
         rows = []
 
         data.each do |country|
-          rows << [country['country'].upcase, 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)
@@ -105,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
 
@@ -120,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
@@ -164,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.6'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.2
 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