kovid 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 818eebe2a40fddcf9a85bf971b8ef3a4f96daeb1cf4c9e8600ea4e3cf01e8490
-  data.tar.gz: c78d7baf120b4e345a7450be3b23dbcf5dc371b3810d8e5a60c6ae9b2caf4065
+  metadata.gz: bbc5646b9be503c0b26d29ed1c546a18f5bad793a792ec7b2f59cc2ad0ac7622
+  data.tar.gz: a4a15e16634862590e3f62194b6f49cf1652f84fec6aec2b3f80c5649558aa1d
 SHA512:
-  metadata.gz: 2b32a18ae14c18b930d6e745e4d1a02e92aa7f18ff6ef2f64974747936413adaa07079a2d105d5b9e9ed5ee7e14744551fc08d9f8391042faa2b7238af7a434c
-  data.tar.gz: 9ca2edf9042a2f3bd49a367cc9671f5a80c757a685228c13b6780503b64a9e3a78cca8a36e3e1efa871a6010360daedb24c349e6c1cc2982ea63045eacf58b9e
+  metadata.gz: 73a7a4c5a633f79e898f48e1fcbc5e4a7dde8145e0a94d704e43c5918ca46e01b880629bd527bbcc77c66a786cd67d6139de9f83fef166f6c836a5e70626d922
+  data.tar.gz: f00ba753893b56d053b10972ea6091fcaf69f707f6425750bfee6ef00be27f1588a5f2aa5b473a958abeedf6b29a532689fdc86ca0a8c0923cce51da1e0c45d0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kovid (0.5.2)
+    kovid (0.5.4)
       ascii_charts (~> 0.9.1)
       rainbow (~> 3.0)
       terminal-table (~> 1.8)

data/README.md

@@ -2,6 +2,8 @@
 [![Open Source Helpers](https://www.codetriage.com/siaw23/kovid/badges/users.svg)](https://www.codetriage.com/siaw23/kovid)
 
 
+If you're looking to consume this in your Ruby-based application, you might want to check [Sarskov](https://github.com/siaw23/sarskov) out. Sarskov returns statistics in a JSON format.
+
 # 🦠 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 so I thought I'd build this to provide info directly in the terminal. It's where some of us spend time more.
@@ -61,7 +63,7 @@ You can compare as many countries as you want; `kovid compare FOO BAR BAZ` OR `k
 🇺🇸🇺🇸🇺🇸
 
 You can compare US states with:
-* `kovid compare STATE STATE` Example: `kovid states illinois "new york" california`
+* `kovid states STATE STATE` Example: `kovid states illinois "new york" california`
 
 You can compare provicnes with:
 * `kovid provinces PROVINCE PROVINCE` Example: `kovid provinces ontario manitoba`

data/lib/kovid/request.rb

@@ -13,11 +13,18 @@ module Kovid
 
     SERVER_DOWN = 'Server overwhelmed. Please try again in a moment.'
 
-    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
-    EUROPE_ISOS = EU_ISOS + %w[GB IS NO CH MC AD SM VA BA RS ME MK AL BY UA RU MD]
-    AFRICA_ISOS = %w[DZ AO BJ BW BF BI CM CV CF TD KM CD CG CI DJ EG GQ ER SZ ET GA GM GH GN GW KE LS LR LY MG MW ML MR MU MA MZ NA NE NG RW ST SN SC SL SO ZA SS SD TZ TG TN UG ZM ZW EH].freeze
-    SOUTH_AMERICA_ISOS = ['AR' 'BO', 'BV', 'BR', 'CL', 'CO', 'EC', 'FK', 'GF', 'GY', 'PY', 'PE', 'GS', 'SR', 'UY', 'VE'].freeze
-    ASIA_ISOS = %w[AE AF AM AZ BD BH BN BT CC CN CX GE HK ID IL IN IQ IR JO JP KG KH KP KR KW KZ LA LB LK MM MN MO MY NP OM PH PK PS QA SA SG SY TH TJ TL TM TR TW UZ VN YE].freeze
+    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
+    EUROPE_ISOS = EU_ISOS + %w[GB IS NO CH MC AD SM VA BA RS ME MK AL\
+                               BY UA RU MD]
+    AFRICA_ISOS = %w[DZ AO BJ BW BF BI CM CV CF TD KM CD CG CI DJ EG \
+                     GQ ER SZ ET GA GM GH GN GW KE LS LR LY MG MW ML MR MU MA MZ NA NE \
+                     NG RW ST SN SC SL SO ZA SS SD TZ TG TN UG ZM ZW EH].freeze
+    SOUTH_AMERICA_ISOS = ['AR' 'BO', 'BV', 'BR', 'CL', 'CO', 'EC', \
+                          'FK', 'GF', 'GY', 'PY', 'PE', 'GS', 'SR', 'UY', 'VE'].freeze
+    ASIA_ISOS = %w[AE AF AM AZ BD BH BN BT CC CN CX GE HK ID IL IN \
+                   IQ IR JO JP KG KH KP KR KW KZ LA LB LK MM MN MO MY NP OM PH PK \
+                   PS QA SA SG SY TH TJ TL TM TR TW UZ VN YE].freeze
 
     class << self
       def eu_aggregate

data/lib/kovid/tablelize.rb

@@ -88,6 +88,13 @@ module Kovid
       FOOTER_LINE = ['------------', '------------', '------------', '------------'].freeze
       COUNTRY_LETTERS = 'A'.upto('Z').with_index(127_462).to_h.freeze
 
+      RIGHT_ALIGN_COLUMNS = {
+        compare_country_table_full: [1, 2, 3, 4, 5, 6, 7],
+        compare_country_table: [1, 2, 3, 4, 5],
+        compare_us_states: [1, 2, 3, 4, 5],
+        compare_provinces: [1, 2, 3]
+      }.freeze
+
       def country_table(data)
         rows = [
           [
@@ -179,7 +186,9 @@ module Kovid
                   end
         end
 
-        Terminal::Table.new(headings: COMPARE_COUNTRIES_TABLE_HEADINGS, rows: rows)
+        align_columns(:compare_country_table,
+                      Terminal::Table.new(headings: COMPARE_COUNTRIES_TABLE_HEADINGS,
+                                          rows: rows))
       end
 
       def compare_countries_table_full(data)
@@ -196,7 +205,9 @@ module Kovid
           ]
         end
 
-        Terminal::Table.new(headings: COMPARE_COUNTRY_TABLE_FULL, rows: rows)
+        align_columns(:compare_country_table_full,
+                      Terminal::Table.new(headings: COMPARE_COUNTRY_TABLE_FULL,
+                                          rows: rows))
       end
 
       def compare_us_states(data)
@@ -211,7 +222,9 @@ module Kovid
           ]
         end
 
-        Terminal::Table.new(headings: COMPARE_STATES_HEADINGS, rows: rows)
+        align_columns(:compare_us_states,
+                      Terminal::Table.new(headings: COMPARE_STATES_HEADINGS,
+                                          rows: rows))
       end
 
       def compare_provinces(data)
@@ -224,7 +237,9 @@ module Kovid
           ]
         end
 
-        Terminal::Table.new(headings: COMPARE_PROVINCES_HEADINGS, rows: rows)
+        align_columns(:compare_provinces,
+                      Terminal::Table.new(headings: COMPARE_PROVINCES_HEADINGS,
+                                          rows: rows))
       end
 
       def cases(cases)
@@ -416,6 +431,15 @@ module Kovid
           rows: rows
         )
       end
+
+      def align_columns(table_type, table)
+        return table unless RIGHT_ALIGN_COLUMNS[table_type]
+
+        RIGHT_ALIGN_COLUMNS[table_type].each do |col_no|
+          table.align_column(col_no, :right)
+        end
+        table
+      end
     end
   end
 end

data/lib/kovid/version.rb

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

data/lib/kovid.rb

@@ -41,7 +41,7 @@ module Kovid
   def province(name)
     Kovid::Request.province(name)
   end
-  
+
   def provinces(names)
     Kovid::Request.provinces(names)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Emmanuel Hayford
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-01 00:00:00.000000000 Z
+date: 2020-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor