kovid 0.6.1 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b34798e9212d718e441ff0185598d028662b4e13994ebe7a7354cd0a22a7aef5
-  data.tar.gz: 2e23bc917e77996ad1b848aed6340cdb25123ba5bfd976a8d5407c347f05ac25
+  metadata.gz: 6abc6282e6ec84a393eee2b5383d70f88643d7633f8bd7537c207dae341ead1b
+  data.tar.gz: a93e83c437e3b1f740fe7471cca72ad2e83c837d0a637c5fe8c71636bdd545dd
 SHA512:
-  metadata.gz: 0c2ce46118ef92380c1c5bd1b4faba1b1e8893225161c7e3c2fe684298db3d830eda22f13854f8a69e8aef6d0ad581cca9b1ee40db8f3ab79bc410db1fce29f7
-  data.tar.gz: 9099b7a5e109c567ab7a0b707d991ad53be609ff918b02b6d56bcc45516c1489a9785e931c2814036a415edab69c0f24826bdd9f18ec6ccc6a438dae85c89e86
+  metadata.gz: dbc95ba0e85745d9369e15b0e81b6f5d36a7199b1227aaaec56eb57b8aac067750e4e2c71f937a97b333fdf57693547d6f98a09e70d214a5300b5b09cd5eeb25
+  data.tar.gz: a2a458068aefa1f001ad85426ef5eba0317ba23a0320fab970eed818a9009186cc966f757c0a4f1b693a85cf668098ffa477acc3587849ed5864dcfc53a3b5fe

data/.rubocop.yml

@@ -0,0 +1,4 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  TargetRubyVersion: 2.6

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.lock

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

data/README.md

@@ -44,7 +44,7 @@ You can get continental information with the following commands:
 
 You can fetch US state-specific data:
 * `kovid state STATE` OR `kovid state "STATE NAME"`.
-* `kovid aus` for data on all US states.
+* `kovid states --all` or `kovid states -a` for data on all US states.
 
 Provinces
 

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/aggregators.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Kovid
+  # Sends info about continents to Tablelize
+  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

@@ -2,7 +2,10 @@
 
 require 'typhoeus'
 
+# rubocop:disable Style/Documentation
 module Kovid
+  # rubocop:enable Style/Documentation
+  # Caches HTTP requests
   class Cache
     def initialize
       @memory = {}

data/lib/kovid/cli.rb

@@ -4,38 +4,50 @@ require 'thor'
 require 'kovid'
 
 module Kovid
+  # Describes the commands that can be run by the user
+  # Descriptions are returned to STDOUT
   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,31 +56,20 @@ 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 'all_us_states', 'Returns full comparison table for all US states'
-    def all_us_states
-      puts Kovid.all_us_states
       data_source
     end
-    map aus: :all_us_states
 
     desc 'world', 'Returns total number of cases, deaths and recoveries.'
     def world
@@ -76,7 +77,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

data/lib/kovid/helpers.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'terminal-table'
+
 module Kovid
   module_function
 
@@ -14,4 +15,19 @@ module Kovid
     date_to_parse = Date.strptime(date, '%m/%d/%y').to_s
     Date.parse(date_to_parse).strftime('%d %b, %y')
   end
+
+  def comma_delimit(number)
+    number.to_s.chars.to_a.reverse.each_slice(3).map(&:join).join(',').reverse
+  end
+
+  # Insert + sign to format positive numbers
+  def add_plus_sign(num)
+    num.to_i.positive? ? "+#{comma_delimit(num)}" : comma_delimit(num).to_s
+  end
+
+  def format_country_history_numbers(load)
+    load['timeline'].values.map(&:values).transpose.each do |data|
+      data.map! { |number| Kovid.comma_delimit(number) }
+    end
+  end
 end

data/lib/kovid/historians.rb

@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+module Kovid
+  # Constructs history data for specified country
+  module Historians
+    include Constants
+
+    def history(country, last)
+      # Write checks for when country is spelt wrong.
+      headings = DATE_CASES_DEATHS_RECOVERED
+      rows = []
+
+      stats = if last
+                Kovid.format_country_history_numbers(country).last(last.to_i)
+              else
+                Kovid.format_country_history_numbers(country)
+              end
+
+      dates = if last
+                country['timeline']['cases'].keys.last(last.to_i)
+              else
+                country['timeline']['cases'].keys
+              end
+
+      unless last
+        stats = stats.reject { |stat| stat[0].to_i.zero? && stat[1].to_i.zero? }
+        dates = dates.last(stats.count)
+      end
+
+      stats.each_with_index do |val, index|
+        val.unshift(Kovid.dateman(dates[index]))
+      end.each do |row|
+        rows << row
+      end
+
+      if stats.size > 10
+        rows << FOOTER_LINE
+        rows << DATE_CASES_DEATHS_RECOVERED
+      end
+
+      Terminal::Table.new(
+        title: country['country'].upcase,
+        headings: headings,
+        rows: rows
+      )
+    end
+
+    def histogram(country, date_string)
+      @date = date_string.split('.')
+
+      if @date.last.to_i != 20
+        Kovid.info_table('Only 2020 histgrams are available.')
+        return
+      end
+
+      # From dates where number of !cases.zero?
+      country_cases = country['timeline']['cases']
+      positive_cases_figures = country_cases.values.reject(&:zero?)
+      dates = country_cases.reject { |_k, v| v.zero? }.keys
+      data = []
+
+      # TODO: Refactor
+      # Returns array of days.to_i from the date param
+      dates = dates.map do |date|
+        date.split('/')
+      end.select do |date|
+        date.last == @date.last
+      end.select do |date|
+        date.first == @date.first
+      end.map do |array|
+        array[1]
+      end.map(&:to_i).last(positive_cases_figures.count)
+
+      # Arranges dates and figures in [x,y] for histogram
+      # With x being day, y being number of cases
+      if dates.empty?
+        if @date.first.to_i > Time.now.month
+          msgs = [
+            'Seriously...??! 😏', 'Did you just check the future??',
+            'You just checked the future Morgan.',
+            'Knowing too much of your future is never a good thing.'
+          ]
+
+          Kovid.info_table(msgs.sample)
+        else
+          Kovid.info_table('Check your spelling/No infections for this month.')
+        end
+
+      else
+        dates.each_with_index do |val, index|
+          data << [val, positive_cases_figures[index]]
+        end
+        y_range = AsciiCharts::Cartesian.new(
+          data, bar: true, hide_zero: true
+        ).y_range
+
+        last_two_y = y_range.last 2
+        y_interval = last_two_y.last - last_two_y.first
+
+        scale("Scale on Y: #{y_interval}:#{(
+          y_interval / last_two_y.last.to_f * positive_cases_figures.last
+        ).round(2) / y_interval}")
+
+        puts 'Experimental feature, please report issues.'
+
+        AsciiCharts::Cartesian.new(data, bar: true, hide_zero: true).draw
+      end
+    end
+  end
+end