kovid 0.1.7 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6704e68fddf1650cddcc75fcaafebc00116ff3f77fa65d3564a276a3bbd0f464
-  data.tar.gz: 276f9690e3066acb36c9a8dda80e8cd018b64f311028293083fd9735e0d422a2
+  metadata.gz: 7caa822059f633a6c539b81680b1687316c7c426df826db701fb3c4f8f6e6d2c
+  data.tar.gz: 52aced813f2ae8b7c15a9db83e660dec7dc25e8ce6da56a196b11b24718bf93d
 SHA512:
-  metadata.gz: 1046f127ecd5edabc409f59a0df757ddb267405b3909306d811680de6dad7c7a4551b165bbeb88c9bce4bc0b2e8ffccdbea5cc96cb602611073d8ff5144ab7c8
-  data.tar.gz: 0e9e3b798436cc005aa55dafbc4fa219d7144fc7d293c1449ac1519c920a4b3ec09624476ff4b68f2099014ed75bb46aa752e13f88fbace1581fa65031d6b011
+  metadata.gz: 495ce23620686e3945b5d60b71fd7967969f4eb45fe4010f79296d720c87566d968989175c2163016d7b228c3ab0fa37887c7fae46e10538c51006637626775c
+  data.tar.gz: 64f22c450cecd6fa413c95a09676b8a3b052c018d611903b898a63c2675a9623e960fe08e6dfa3212e2dc5def2663c8db23a113fa6059b33cf9caa949fb5bcef

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kovid (0.1.4)
+    kovid (0.1.11)
       terminal-table
       thor
       typhoeus
@@ -38,6 +38,7 @@ GEM
     cucumber-tag_expressions (1.1.1)
     cucumber-wire (0.0.1)
     diff-lcs (1.3)
+    docile (1.3.2)
     ethon (0.12.0)
       ffi (>= 1.3.0)
     ffi (1.12.2)
@@ -62,6 +63,10 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
+    simplecov (0.18.5)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (1.0.1)
@@ -79,6 +84,7 @@ DEPENDENCIES
   pry
   rake (~> 12.0)
   rspec (~> 3.0)
+  simplecov
 
 BUNDLED WITH
    2.1.2

data/README.md

@@ -12,29 +12,38 @@ Before installing:
 
 ☝️ Wash your hands with soap and water for at least 20 seconds.
 
-✌️ Run `$ gem install kovid`
+✌️ Run `gem install kovid`
 
 
 After installing:
 
 ☝️ Avoid touching your eyes, nose and mouth with unwashed hands later.
 
-✌️ Disinfect your phones, keys, doorknobs and anything you touch often than you should.
+✌️ Disinfect your phones, keys, doorknobs and anything you touch more often than you should.
 
 
 
 ## ⚒️ 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 michigan`, `covid state michigan` works as well.
+
 #### Commands Overview
- **Fetching**
-* `kovid check ghana`.
+😷 **Fetching**
+* `kovid check ghana`
 * `kovid check ghana -f` OR `kovid check ghana --full`
 
-**Comparing**
-* `kovid compare ghana poland`
-* `kovid compare ghana poland -f` OR `kovid compare ghana poland --full`
+🇺🇸You can fetch US state-specific data 🇺🇸
+* `kovid state colorado` OR `kovid state "north carolina"`
+
+😷 **Comparing**
+* `kovid compare ghana poland` (sorts by cases DESC)
+* `kovid compare ghana poland -f` OR `kovid compare ghana poland --full` (sorts by cases DESC)
 
-**Total figures**
+You can compare as many countries as you want.
+
+😷 **Total figures**
 * `kovid cases`
 
 
@@ -62,9 +71,15 @@ To compare country stats:
 
 To compare a countries stats with a full table:
 
-`kovid compare ghana poland -f` OR `kovid compare ghana poland --full`
+`kovid compare poland italy usa china -f` OR `kovid compare poland italy usa china --full`
+
+![kovid](https://i.gyazo.com/7ce86c5e93d549e1412fb6104a1d7877.png "Covid data.")
 
-![kovid](https://i.gyazo.com/d0b72207765090b118a5b76d72ddde19.png "Covid data.")
+To fetch state-specific data run:
+
+`kovid state colorado`
+
+![kovid](https://i.gyazo.com/133046d9d31c20a8bad1a05b46ba4d3e.png "Covid data.")
 
 To check for total figures:
 
@@ -72,15 +87,20 @@ To check for total figures:
 
 ![kovid](https://i.gyazo.com/f8a21ae54152cd945fbb124b72d12ff7.png "Covid data.")
 
+## Source
+> https://www.worldometers.info/coronavirus/ via [NovelCOVID/API](https://github.com/novelcovid/api)
+
+
 ## 👨‍💻 Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`.
+
 
 ## 🤲 Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/siaw23/kovid. 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. For that reason, bug reports and pull requests are welcome here on GitHub. 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
@@ -89,4 +109,4 @@ The gem is available as open-source under the terms of the [MIT License](https:/
 
 ## ❤️ Code of Conduct
 
-Everyone interacting in the Kovid project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/siaw23/kovid/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Kovid project's codebases and issue trackers is expected to follow the [code of conduct](https://github.com/siaw23/kovid/blob/master/CODE_OF_CONDUCT.md).

data/exe/kovid

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require 'kovid/cli'
+
+Kovid::CLI.start

data/kovid.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
   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        = "bin"
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_dependency "thor"
@@ -34,4 +34,5 @@ Gem::Specification.new do |spec|
   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

@@ -4,5 +4,6 @@ require 'kovid/version'
 require 'kovid/nineteen'
 
 module Kovid
+  require 'pry'
   class Error < StandardError; end
 end

data/lib/kovid/cli.rb

@@ -5,34 +5,39 @@ require 'kovid'
 
 module Kovid
   class CLI < Thor
-    desc 'whatis', 'Defines COVID-19'
-    def definition
-      Kovid::Nineteen.whatis
+    desc 'define', 'Defines COVID-19'
+    def define
+      puts Kovid::Nineteen.whatis
     end
 
-    desc 'check', 'Returns data on country'
+    desc 'check COUNTRY', 'Returns reported data on provided country'
     method_option :full, aliases: '-f'
     def check(name)
       if options[:full]
-        Kovid::Nineteen.country_full(name)
+        puts Kovid::Nineteen.country_full(name)
       else
-        Kovid::Nineteen.country(name)
+        puts Kovid::Nineteen.country(name)
       end
     end
 
-    desc 'compare', 'Returns full comparison table for given countries'
+    desc 'state STATE', 'Return reported data on provided state'
+    def state(state)
+      puts Kovid::Nineteen.state(state)
+    end
+
+    desc 'compare COUNTRY COUNTRY', 'Returns full comparison table for given countries. Accepts multiple countries'
     def compare(*name)
       if name[-1] == '-f' || name[-1] == '--full'
         name = name.reverse.drop(1).reverse
-        Kovid::Nineteen.country_comparison_full(name)
+        puts Kovid::Nineteen.country_comparison_full(name)
       else
-        Kovid::Nineteen.country_comparison(name)
+        puts Kovid::Nineteen.country_comparison(name)
       end
     end
 
     desc 'cases', 'Returns total number of cases, deaths and recoveries'
     def cases
-      Kovid::Nineteen.cases
+      puts Kovid::Nineteen.cases
     end
   end
 end

data/lib/kovid/nineteen.rb

@@ -6,27 +6,31 @@ module Kovid
   class Nineteen
     class << self
       def whatis
-        puts 'Coronavirus disease (COVID-19) is an infectious disease caused by a new virus.'
+        'Coronavirus disease 2019 (COVID-19) is an infectious disease caused by severe acute respiratory syndrome coronavirus 2 (SARS-CoV-2).'
       end
 
       def country(name)
-        puts Kovid::Request.by_country(name)
+        Kovid::Request.by_country(name)
       end
 
       def country_full(name)
-        puts Kovid::Request.by_country_full(name)
+        Kovid::Request.by_country_full(name)
       end
 
-      def country_comparison(name)
-        puts Kovid::Request.by_country_comparison(name)
+      def state(state)
+        Kovid::Request.state(state)
       end
 
-      def country_comparison_full(name)
-        puts Kovid::Request.by_country_comparison_full(name)
+      def country_comparison(names_array)
+        Kovid::Request.by_country_comparison(names_array)
+      end
+
+      def country_comparison_full(names_array)
+        Kovid::Request.by_country_comparison_full(names_array)
       end
 
       def cases
-        puts Kovid::Request.cases
+        Kovid::Request.cases
       end
     end
   end

data/lib/kovid/request.rb

@@ -9,46 +9,56 @@ module Kovid
     BASE_URL = 'https://corona.lmao.ninja'
 
     class << self
-      require 'pry'
-      def by_country(name)
-        begin
-          path = "/countries/#{name}"
-          fetch_url = BASE_URL + path
+      def by_country(country_name)
+        response = fetch_country(country_name)
 
-          response ||= JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 3600).response_body)
-          Kovid::Tablelize.country_table(response)
+        Kovid::Tablelize.country_table(response)
+      rescue JSON::ParserError
+        no_case_in(country_name)
+      end
 
-        rescue JSON::ParserError
-          no_case_in(name)
-        end
+      def by_country_full(country_name)
+        response = fetch_country(country_name)
+
+        Kovid::Tablelize.full_country_table(response)
+      rescue JSON::ParserError
+        no_case_in(country_name)
       end
 
-      def by_country_full(name)
-        begin
-          path = "/countries/#{name}"
-          fetch_url = BASE_URL + path
+      def state(state)
+        response = fetch_state(state)
 
-          response ||= JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 3600).response_body)
-          Kovid::Tablelize.full_country_table(response)
-        rescue JSON::ParserError
-          no_case_in(name)
-        end
+        Kovid::Tablelize.full_state_table(response)
       end
 
       def by_country_comparison(list)
-        array = []
+        array = fetch_countries(list)
+        Kovid::Tablelize.compare_countries_table(array)
+      end
 
-        list.each do |country|
-          path = "/countries/#{country}"
-          fetch_url = BASE_URL + path
+      def by_country_comparison_full(list)
+        array = fetch_countries(list)
+        Kovid::Tablelize.compare_countries_table_full(array)
+      end
 
-          array << JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 3600).response_body)
-        end
+      def cases
+        path = '/all'
+        fetch_url = BASE_URL + path
 
-        Kovid::Tablelize.compare_countries_table(array)
+        response ||= JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 3600).response_body)
+        Kovid::Tablelize.cases(response)
       end
 
-      def by_country_comparison_full(list)
+      private
+
+      def no_case_in(country)
+        rows = []
+        rows << ["Thankfully, there are no reported cases in #{country.capitalize}!"]
+        table = Terminal::Table.new headings: [country.capitalize.to_s], rows: rows
+        table
+      end
+
+      def fetch_countries(list)
         array = []
 
         list.each do |country|
@@ -58,24 +68,23 @@ module Kovid
           array << JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 3600).response_body)
         end
 
-        Kovid::Tablelize.compare_countries_table_full(array)
+        array = array.sort_by { |json| -json['cases'] }
       end
 
-      def cases
-        path = '/all'
+      def fetch_country(country_name)
+        path = "/countries/#{country_name}"
         fetch_url = BASE_URL + path
 
-        response ||= JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 3600).response_body)
-        Kovid::Tablelize.cases(response)
+        JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 3600).response_body)
       end
 
-      private
+      def fetch_state(state)
+        path = '/states'
+        fetch_url = BASE_URL + path
 
-      def no_case_in(country)
-        rows = []
-        rows << ["Thankfully there are no reported cases in #{country.capitalize}!"]
-        table = Terminal::Table.new :headings => ["#{country.capitalize}",], :rows => rows
-        puts table
+        states_array = JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 3600).response_body)
+
+        states_array.select { |state_name| state_name['state'] == state.split.map(&:capitalize).join(' ') }.first
       end
     end
   end

data/lib/kovid/tablelize.rb

@@ -9,7 +9,7 @@ module Kovid
         headings = %w[Cases Deaths Recovered]
         rows = []
         rows << [data['cases'], data['deaths'], data['recovered']]
-        puts Terminal::Table.new(title: data['country'], headings: headings, rows: rows)
+        Terminal::Table.new(title: data['country'], headings: headings, rows: rows)
       end
 
       def full_country_table(data)
@@ -33,9 +33,16 @@ module Kovid
           data['critical'],
           data['casesPerOneMillion']
         ]
-        puts Terminal::Table.new(title: data['country'],
-                                 headings: headings,
-                                 rows: rows)
+        Terminal::Table.new(title: data['country'],
+                            headings: headings,
+                            rows: rows)
+      end
+
+      def full_state_table(state)
+        headings = ['Cases', 'Cases Today', 'Deaths', 'Deaths Today', 'Reovered', 'Active']
+        rows = []
+        rows << [state['cases'], state['todayCases'], state['deaths'], state['todayDeaths'], state['recovered'], state['active']]
+        Terminal::Table.new(title: state['state'], headings: headings, rows: rows)
       end
 
       def compare_countries_table(data)
@@ -46,18 +53,36 @@ module Kovid
           rows << [country['country'], country['cases'], country['deaths'], country['recovered']]
         end
 
-        puts Terminal::Table.new(headings: headings, rows: rows)
+        Terminal::Table.new(headings: headings, rows: rows)
       end
 
       def compare_countries_table_full(data)
-        headings = ['Country', 'Cases', 'Deaths', 'Recovered', 'Cases Today', 'Deaths Today', 'Critical', 'Cases/Million']
+        headings = [
+          'Country',
+          'Cases',
+          'Deaths',
+          'Recovered',
+          'Cases Today',
+          'Deaths Today',
+          'Critical',
+          'Cases/Million'
+        ]
         rows = []
 
         data.each do |country|
-          rows << [country['country'], country['cases'], country['deaths'], country['recovered'], country['todayCases'], country['todayDeaths'], country['critical'], country['casesPerOneMillion']]
+          rows << [
+            country['country'],
+            country['cases'],
+            country['deaths'],
+            country['recovered'],
+            country['todayCases'],
+            country['todayDeaths'],
+            country['critical'],
+            country['casesPerOneMillion']
+          ]
         end
 
-        puts Terminal::Table.new(headings: headings, rows: rows)
+        Terminal::Table.new(headings: headings, rows: rows)
       end
 
       def cases(cases)
@@ -66,7 +91,7 @@ module Kovid
         rows = []
 
         rows << [cases['cases'], cases['deaths'], cases['recovered']]
-        puts Terminal::Table.new(title: "Total # of incidents", headings: headings, rows: rows)
+        Terminal::Table.new(title: 'Total # of incidents', headings: headings, rows: rows)
       end
     end
   end

data/lib/kovid/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.12
 platform: ruby
 authors:
 - Emmanuel Hayford
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2020-03-21 00:00:00.000000000 Z
+date: 2020-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -94,13 +94,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A CLI tool to fetch and compare the 2019 coronavirus pandemic numbers.
 email:
 - siawmensah@gmail.com
 executables:
-- console
+- covid
 - kovid
-- setup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -114,8 +127,9 @@ files:
 - README.md
 - Rakefile
 - bin/console
-- bin/kovid
 - bin/setup
+- exe/covid
+- exe/kovid
 - kovid.gemspec
 - lib/kovid.rb
 - lib/kovid/cli.rb