kovid 0.2.7 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c76d29e21beeda2615b7b70e435dbe253674a539fc8be8a30f6cd68eb7d3cf8
-  data.tar.gz: 5a94f5237aaaf71800fbaf186bfc0d3a7ffdeb86d4448f2c8b15fb37126f0d2d
+  metadata.gz: 9f04b3f270cae0450368cdffa483d4968dfe6e260a19f4ff244dda25765fba32
+  data.tar.gz: f9381a8141630f18888ec65ced2c352eee1ddd7cd79c131e839fc77e1d4c9255
 SHA512:
-  metadata.gz: ab21f119d7485688ecf81346c0efb070a0fd12c4caf4a7a90881a2266296e7135e131c72f1978eac7d79ba487760ee7c1ffb4a8d1ce94e485f4baa87c21b87b1
-  data.tar.gz: 427582de7610751e7eb0eea746ec01fd33d4a6d3386711c515203d5d653279babf156cc259f4217fe6939db321de25c8cc155312c3902c9ebb4d26a8cbf169ab
+  metadata.gz: b09ebeaa677af45d87d3c37f347caaa9668d95e4c4d67c4462c68143b0dbe1c820faf1e50607acf0460d9acc88abc59958aa8390b1f88396c2ed127dac830fb9
+  data.tar.gz: 7c8a93f91fa8cc64e55cbb2ea055f2d5edc902dd7a5b1d984e0f5a76e967eaa3c239f63fc7f25d13cce4e22cb4e9e288c53ba8752a5bb5ebf41d39f5cdaca5fe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kovid (0.2.6)
+    kovid (0.3.2)
       rainbow (~> 3.0)
       terminal-table (~> 1.8)
       thor (~> 1.0)

data/README.md

@@ -1,59 +1,60 @@
 # 🦠 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`
-
-UPDATE often with `gem update 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 aggregated EU (all 27 countries combined) data:
+* `kovid eu`.
+
+🇺🇸🇺🇸🇺🇸
 
-🇺🇸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.")
 
@@ -81,6 +82,12 @@ To fetch state-specific data run:
 
 ![kovid](https://i.gyazo.com/d00b1c5bbb6251cbd517f801c856ba66.png "Covid data.")
 
+To fetch EU data run:
+
+`kovid eu`
+
+![kovid](https://i.gyazo.com/51d2adcb8e9feb0a0fbe38ff9cf4c550.png "Covid data.")
+
 You can check historical statistics by running
 
 `kovid history italy 7` eg:
@@ -106,7 +113,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 "rainbow", "~> 3.0"
-
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "cucumber"
-  spec.add_development_dependency "aruba"
-  spec.add_development_dependency "simplecov"
 end

data/lib/kovid.rb

@@ -8,8 +8,8 @@ module Kovid
 
   module_function
 
-  def whatis
-    'Coronavirus disease 2019 (COVID-19) is an infectious disease caused by severe acute respiratory syndrome coronavirus 2 (SARS-CoV-2).'
+  def eu_aggregate
+    Kovid::Request.eu_aggregate
   end
 
   def country(name)

data/lib/kovid/cli.rb

@@ -3,26 +3,29 @@
 require 'thor'
 require 'kovid'
 
+# ["AT", "BE", "BG", "CY", "CZ", "DE", "DK", "EE", "ES", "FI", "FR", "GR", "HR", "HU", "IE", "IT", "LT", "LU", "LV", "MT", "NL", "PL", "PT", "RO", "SE", "SI", "SK"]
+
+# Czechia has no code
 module Kovid
   class CLI < Thor
     FULL_FLAG = %w[-f --full].freeze
 
-    desc 'define', 'Defines COVID-19'
-    def define
-      puts Kovid.whatis
+    desc 'check EU', 'Returns aggregated data on the EU.'
+    def eu
+      puts Kovid.eu_aggregate
     end
 
     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 +54,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/request.rb

@@ -9,8 +9,25 @@ module Kovid
   class Request
     COUNTRIES_PATH = UriBuilder.new('/countries').url
     STATES_URL = UriBuilder.new('/states').url
+    EU_ISOS = %w[AT BE BG CY CZ DE DK EE ES FI FR GR HR HU IE IT LT LU LV MT NL PL PT RO SE SI SK].freeze
 
     class << self
+      def eu_aggregate
+        countries_array = JSON.parse(Typhoeus.get(UriBuilder.new('/countries').url, cache_ttl: 900).response_body)
+
+        eu_array = countries_array.select do |hash|
+          EU_ISOS.include?(hash['countryInfo']['iso2']) || hash['country'] == 'Czechia'
+          # Check API later to see if ISO-Alpha-2 code has been added for Czechia
+        end
+
+        first, *rest = eu_array
+        eu_data = first.merge(*rest) do |key, left, right|
+          left + right unless %w[country countryInfo].include?(key)
+        end .compact
+
+        Kovid::Tablelize.eu_aggregate(eu_data)
+      end
+
       def by_country(country_name)
         response = fetch_country(country_name)
 
@@ -59,8 +76,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)

data/lib/kovid/tablelize.rb

@@ -28,11 +28,12 @@ module Kovid
         rows = [[data['cases'], data['deaths'], data['recovered']]]
 
         if iso = data['countryInfo']['iso2']
-          Terminal::Table.new(title: "#{data['country'].upcase} #{country_emoji(iso)}", headings: headings, rows: rows)
+          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)
@@ -57,15 +58,15 @@ module Kovid
           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
+        # 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
 
@@ -95,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)
@@ -118,13 +119,13 @@ module Kovid
         data.each do |country|
           rows << [
             country['country'],
-            country['cases'],
-            country['deaths'],
-            country['recovered'],
+            comma_delimit(country['cases']),
+            comma_delimit(country['deaths']),
+            comma_delimit(country['recovered']),
             check_if_positve(country['todayCases']),
             check_if_positve(country['todayDeaths']),
-            country['critical'],
-            country['casesPerOneMillion']
+            comma_delimit(country['critical']),
+            comma_delimit(country['casesPerOneMillion'])
           ]
         end
 
@@ -133,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
@@ -172,6 +179,16 @@ module Kovid
         Terminal::Table.new(title: country['standardizedCountryName'].upcase, headings: headings, rows: rows)
       end
 
+      def eu_aggregate(eu_data)
+        headings = ['Cases'.paint_white, 'Cases Today'.paint_white, 'Deaths'.paint_red, 'Deaths Today'.paint_red, 'Recovered'.paint_green, 'Active'.paint_yellow, 'Critical'.paint_green]
+
+        rows = []
+
+        rows << [comma_delimit(eu_data['cases']), check_if_positve(eu_data['todayCases']), comma_delimit(eu_data['deaths']), check_if_positve(eu_data['todayDeaths']), comma_delimit(eu_data['recovered']), comma_delimit(eu_data['active']), comma_delimit(eu_data['critical'])]
+
+        Terminal::Table.new(title: 'EU Aggragation'.upcase, headings: headings, rows: rows)
+      end
+
       private
 
       def comma_delimit(number)
@@ -179,7 +196,7 @@ module Kovid
       end
 
       def check_if_positve(num)
-        num.to_i.positive? ? "+#{num}" : num.to_s
+        num.to_i.positive? ? "+#{comma_delimit(num)}" : comma_delimit(num).to_s
       end
 
       def country_emoji(iso)

data/lib/kovid/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.3
 platform: ruby
 authors:
 - Emmanuel Hayford