kovid 0.6.2 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba5ca0fe0f0b4f13d4ae3fa0796df0fdda1bd0029c8e1f908a4ac7b79766f928
-  data.tar.gz: 11328de6b6c9e1a4f4bad7bb42d65ed3575e0efc7677dc4aa916bfe1ba4b5000
+  metadata.gz: a77d1ad2686877dfe810f0df3cbc817b46c287f2a6025ce999108213ad0e54c8
+  data.tar.gz: 888dab7db56dc55241512e24bef98fb9f9117abd9e09790a19894630d691e0c2
 SHA512:
-  metadata.gz: d3ad984c1cef60884ec75512763f759eca655c09d69d7db0a237a015fc78b05e2a2059fd84441d60aa090a08452df388c51cd10de51cf2ce52c2cce8c71da1b6
-  data.tar.gz: 9277e293560db60a004a4f388789a790d5da74a3a650e39b21a6eca0f01e1431c54ad09a66cf467cf22a3f57c2dce94cba121185ab6e87096410d29a3e1586bf
+  metadata.gz: 6394d6904a073fef5c4fa1d6429c3789a84dfc329a519346dd90e53b082b22284405a044a13c984cf231f7cdd02fb790c49450c47c1d6c0fecb124fbc67783e5
+  data.tar.gz: 7c45571d9683f723068c6d17a97427348c5d3f8ed64db76e2bd71db72af322f3611bd0d66af8dc3732d4a251f1253d2ea0d49c0db34f8c905739f7cc7dd885cc

data/.rubocop.yml

@@ -0,0 +1,7 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  TargetRubyVersion: 2.6
+
+Style/Documentation:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,59 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2020-04-07 20:38:28 -0300 using RuboCop version 0.67.2.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+Metrics/AbcSize:
+  Max: 54
+  Exclude:
+    - 'lib/kovid/historians.rb'
+
+# Offense count: 2
+Metrics/BlockLength:
+  Exclude:
+    - 'kovid.gemspec'
+    - 'spec/kovid_spec.rb'
+
+# Offense count: 3
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 220
+  Exclude:
+    - 'lib/kovid/cli.rb'
+    - 'lib/kovid/request.rb'
+    - 'lib/kovid/tablelize.rb'
+
+# Offense count: 2
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/MethodLength:
+  Max: 44
+  Exclude:
+    - 'lib/kovid/historians.rb'
+
+# Offense count: 1
+Metrics/PerceivedComplexity:
+  Max: 8
+  Exclude:
+    - 'lib/kovid/historians.rb'
+
+# Offense count: 1
+Style/CaseEquality:
+  Exclude:
+    - 'lib/kovid/request.rb'
+
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/kovid.rb'
+    - 'lib/kovid/helpers.rb'
+
+# Offense count: 5
+Style/MultilineBlockChain:
+  Exclude:
+    - 'lib/kovid/historians.rb'
+    - 'lib/kovid/request.rb'

data/Gemfile

@@ -7,3 +7,6 @@ gemspec
 
 gem 'rake', '~> 12.0'
 gem 'rspec', '~> 3.0'
+
+# Repo of geogrpahic locations
+gem 'carmen', '~> 1.1.3'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kovid (0.6.1)
+    kovid (0.6.6)
       ascii_charts (~> 0.9.1)
       rainbow (~> 3.0)
       terminal-table (~> 1.8)
@@ -11,12 +11,24 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    activesupport (6.0.2.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
     ascii_charts (0.9.1)
+    carmen (1.1.3)
+      activesupport (>= 3.0.0)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
     docile (1.3.2)
     ethon (0.12.0)
       ffi (>= 1.3.0)
     ffi (1.12.2)
+    i18n (1.8.2)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.0)
     rainbow (3.0.0)
     rake (12.3.3)
     rspec (3.9.0)
@@ -39,14 +51,19 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (1.0.1)
+    thread_safe (0.3.6)
     typhoeus (1.3.1)
       ethon (>= 0.9.0)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  carmen (~> 1.1.3)
   kovid!
   rake (~> 12.0)
   rspec (~> 3.0)

data/README.md

@@ -46,6 +46,8 @@ You can fetch US state-specific data:
 * `kovid state STATE` OR `kovid state "STATE NAME"`.
 * `kovid states --all` or `kovid states -a` for data on all US states.
 
+You can also use USPS abbreviations.  Example: `kovid state me`
+
 Provinces
 
 You can fetch province specific data:
@@ -64,7 +66,7 @@ You can compare as many countries as you want; `kovid compare FOO BAR BAZ` OR `k
 🇺🇸🇺🇸🇺🇸
 
 You can compare US states with:
-* `kovid states STATE STATE` Example: `kovid states illinois "new york" california`
+* `kovid states STATE STATE` Example: `kovid states illinois "new york" california` OR `kovid states il ny ca`
 
 You can compare provicnes with:
 * `kovid provinces PROVINCE PROVINCE` Example: `kovid provinces ontario manitoba`

data/Rakefile

@@ -7,3 +7,4 @@ RSpec::Core::RakeTask.new(:spec)
 
 # rubocop:disable Style/HashSyntax
 task :default => :spec
+# rubocop:enable Style/HashSyntax

data/kovid.gemspec

@@ -8,8 +8,10 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Emmanuel Hayford']
   spec.email         = ['siawmensah@gmail.com']
 
-  spec.summary       = 'A CLI to fetch and compare the 2019 coronavirus pandemic statistics.'
-  spec.description   = 'A CLI to fetch and compare the 2019 coronavirus pandemic statistics.'
+  summary = 'A CLI to fetch and compare the 2019 ' \
+            'coronavirus pandemic statistics.'
+  spec.summary       = summary
+  spec.description   = summary
   spec.homepage      = 'https://github.com/siaw23/kovid'
   spec.license       = 'MIT'
   spec.required_ruby_version = Gem::Requirement.new('>= 2.4.0')
@@ -29,9 +31,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '~>  0.18'
 
   # 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.
+  # The `git ls-files -z` loads the files in the RubyGem
+  #   that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject do |f|
+      f.match(%r{^(test|spec|features)/})
+    end
   end
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }

data/lib/kovid.rb

@@ -6,8 +6,6 @@ require 'kovid/request'
 module Kovid
   require 'kovid/helpers'
 
-  class Error < StandardError; end
-
   module_function
 
   def eu_aggregate

data/lib/kovid/aggregators.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Kovid
+  module Aggregators
+    def eu_aggregate(eu_data)
+      aggregated_table(eu_data, 'The EU', Kovid::Request::EU_ISOS, '🇪🇺')
+    end
+
+    def europe_aggregate(europe_data)
+      aggregated_table(europe_data, 'Europe', Kovid::Request::EUROPE_ISOS, '🏰')
+    end
+
+    def africa_aggregate(africa_data)
+      aggregated_table(africa_data, 'Africa',
+                       Kovid::Request::AFRICA_ISOS, '🌍')
+    end
+
+    def south_america_aggregate(south_america_data)
+      aggregated_table(south_america_data,
+                       'South America',
+                       Kovid::Request::SOUTH_AMERICA_ISOS, '🌎')
+    end
+
+    def asia_aggregate(asia_data)
+      aggregated_table(asia_data, 'Asia', Kovid::Request::ASIA_ISOS, '🌏')
+    end
+  end
+end

data/lib/kovid/cache.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'typhoeus'
-
 module Kovid
   class Cache
     def initialize

data/lib/kovid/cli.rb

@@ -5,37 +5,47 @@ require 'kovid'
 
 module Kovid
   class CLI < Thor
-    FULL_FLAG = %w[-f --full].freeze
-
     def self.exit_on_failure?
       true
     end
 
-    desc 'province PROVINCE or province "PROVINCE NAME"', 'Returns reported data on provided province. eg "kovid check "new brunswick".'
+    desc 'province PROVINCE or province "PROVINCE NAME"',
+         'Returns reported data on provided province. ' \
+         'eg "kovid check "new brunswick".'
     method_option :full, aliases: '-p'
     def province(name)
       puts Kovid.province(name)
       data_source
     end
 
-    desc 'provinces PROVINCE PROVINCE', 'Returns full comparison table for the given provinces. Accepts multiple provinces.'
+    desc 'provinces PROVINCE PROVINCE',
+         'Returns full comparison table for the given provinces. ' \
+         'Accepts multiple provinces.'
     def provinces(*names)
       puts Kovid.provinces(names)
       data_source
     end
 
-    desc 'check COUNTRY or check "COUNTRY NAME"', 'Returns reported data on provided country. eg: "kovid check "hong kong".'
+    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)
-      fetch_country_stats(name)
+    def check(*name)
+      if name.size == 1
+        fetch_country_stats(name.pop)
+      elsif options[:full]
+        puts Kovid.country_comparison_full(name)
+      else
+        puts Kovid.country_comparison(name)
+      end
       data_source
     end
+    map country: :check
 
-    desc 'country COUNTRY or country "COUNTRY NAME"', 'Returns reported data on provided country. eg: "kovid country "hong kong".'
-    method_option :full, aliases: '-f'
-    def country(name)
-      fetch_country_stats(name)
-      data_source
+    desc 'compare COUNTRY COUNTRY', 'Deprecated. Will be removed in v7.0.0'
+    def compare(*_name)
+      Kovid.info_table("#compare is deprecated and will be removed in v7.0.0. \
+         \nPlease do `kovid check COUNTRY COUNTRY ...` instead.")
     end
 
     desc 'state STATE', 'Return reported data on provided state.'
@@ -44,29 +54,18 @@ module Kovid
       data_source
     end
 
-    desc 'compare COUNTRY COUNTRY', 'Returns full comparison table for given countries. Accepts multiple countries.'
-    def compare(*name)
-      if FULL_FLAG.include?(name.fetch(-1))
-        puts Kovid.country_comparison_full(name[0..-2])
+    desc 'states STATE STATE or states --all',
+         'Returns full comparison table for the given states. ' \
+         'Accepts multiple states.'
+    method_option :all, aliases: '-a'
+    def states(*states)
+      if options[:all]
+        puts Kovid.all_us_states
       else
-        puts Kovid.country_comparison(name)
+        downcased_states = states.map(&:downcase)
+        puts Kovid.states(downcased_states)
       end
-      data_source
-    end
-
-    desc 'states STATE STATE', 'Returns full comparison table for the given states. Accepts multiple states.'
-    def states(*states)
-      # This ensures this command is case insensitive.
-      downcased_states = states.map(&:downcase)
 
-      puts Kovid.states(downcased_states)
-      data_source
-    end
-
-    desc 'states -a', 'Returns full comparison table for all US states'
-    method_option :all, aliases: '-a'
-    def states
-      puts Kovid.all_us_states
       data_source
     end
 
@@ -76,7 +75,8 @@ module Kovid
       data_source
     end
 
-    desc 'history COUNTRY or history COUNTRY N', 'Return history of incidents of COUNTRY (in the last N days)'
+    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/constants.rb

@@ -0,0 +1,112 @@
+# frozen_string_literal: true
+
+module Kovid
+  module Constants
+    CASES_DEATHS_RECOVERED = [
+      'Cases'.paint_white,
+      'Deaths'.paint_red,
+      'Recovered'.paint_green
+    ].freeze
+
+    CASES_DEATHS_RECOVERED_CTODAY_DTODAY = [
+      'Cases'.paint_white,
+      'Cases Today'.paint_white,
+      'Deaths'.paint_red,
+      'Deaths Today'.paint_red,
+      'Recovered'.paint_green
+    ].freeze
+
+    DATE_CASES_DEATHS_RECOVERED = [
+      'Date'.paint_white,
+      'Cases'.paint_white,
+      'Deaths'.paint_red,
+      'Recovered'.paint_green
+    ].freeze
+
+    CONTINENTAL_AGGREGATE_HEADINGS = [
+      'Cases'.paint_white,
+      'Cases Today'.paint_white,
+      'Deaths'.paint_red,
+      'Deaths Today'.paint_red,
+      'Recovered'.paint_green,
+      'Active'.paint_yellow,
+      'Critical'.paint_red
+    ].freeze
+
+    COMPARE_COUNTRY_TABLE_FULL = [
+      'Country'.paint_white,
+      'Cases'.paint_white,
+      'Deaths'.paint_red,
+      'Recovered'.paint_green,
+      'Cases Today'.paint_white,
+      'Deaths Today'.paint_red,
+      'Critical'.paint_yellow,
+      'Cases/Million'.paint_white
+    ].freeze
+
+    COMPARE_COUNTRIES_TABLE_HEADINGS = [
+      'Country'.paint_white,
+      'Cases'.paint_white,
+      'Cases Today'.paint_white,
+      'Deaths'.paint_red,
+      'Deaths Today'.paint_red,
+      'Recovered'.paint_green
+    ].freeze
+
+    FULL_COUNTRY_TABLE_HEADINGS = [
+      'Cases'.paint_white,
+      'Deaths'.paint_red,
+      'Recovered'.paint_green,
+      'Cases Today'.paint_white,
+      'Deaths Today'.paint_red,
+      'Critical'.paint_yellow,
+      'Cases/Million'.paint_white
+    ].freeze
+
+    FULL_PROVINCE_TABLE_HEADINGS = [
+      'Confirmed'.paint_white,
+      'Deaths'.paint_red,
+      'Recovered'.paint_green
+    ].freeze
+
+    FULL_STATE_TABLE_HEADINGS = [
+      'Cases'.paint_white,
+      'Cases Today'.paint_white,
+      'Deaths'.paint_red,
+      'Deaths Today'.paint_red,
+      'Active'.paint_yellow
+    ].freeze
+
+    COMPARE_STATES_HEADINGS = [
+      'State'.paint_white,
+      'Cases'.paint_white,
+      'Cases Today'.paint_white,
+      'Deaths'.paint_red,
+      'Deaths Today'.paint_red,
+      'Active'.paint_yellow
+    ].freeze
+
+    COMPARE_PROVINCES_HEADINGS = [
+      'Province'.paint_white,
+      'Confirmed'.paint_white,
+      'Deaths'.paint_red,
+      'Recovered'.paint_green
+    ].freeze
+
+    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
+  end
+end