kovid 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6704e68fddf1650cddcc75fcaafebc00116ff3f77fa65d3564a276a3bbd0f464
-  data.tar.gz: 276f9690e3066acb36c9a8dda80e8cd018b64f311028293083fd9735e0d422a2
+  metadata.gz: 62b08f268f6500bd01a16f58e6f723f6cb38c993a462a1c5df7ac3d81bb92124
+  data.tar.gz: 7ce4bf26fc74ef311e456ec9d5e75e0fc8b2f149643153d2afa95a018383a319
 SHA512:
-  metadata.gz: 1046f127ecd5edabc409f59a0df757ddb267405b3909306d811680de6dad7c7a4551b165bbeb88c9bce4bc0b2e8ffccdbea5cc96cb602611073d8ff5144ab7c8
-  data.tar.gz: 0e9e3b798436cc005aa55dafbc4fa219d7144fc7d293c1449ac1519c920a4b3ec09624476ff4b68f2099014ed75bb46aa752e13f88fbace1581fa65031d6b011
+  metadata.gz: 23e2acc82bc376fc649469c901b155b81672000ac07debb5c4ad04f51271871528fe320e24b71710165f76d2dd3adde89417011a3e361643a67a9991fc19afb5
+  data.tar.gz: 5b16bbf5ea2cbba4cf2c6eb2944a8dccef026872479c5a14e086e0b6fbe0ca7e0c45d2188b406fa357c7927adc7b69bc7619292e77ca33b590ad37e1fff1f013

data/README.md

@@ -12,7 +12,7 @@ Before installing:
 
 ☝️ Wash your hands with soap and water for at least 20 seconds.
 
-✌️ Run `$ gem install kovid`
+✌️ Run `gem install kovid`
 
 
 After installing:
@@ -25,14 +25,18 @@ After installing:
 
 ## ⚒️ Usage
 
+You can run `kovid --help` to see full list of available commands.
+
 #### Commands Overview
  **Fetching**
-* `kovid check ghana`.
+* `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`
+* `kovid compare ghana poland` (sorts by cases DESC)
+* `kovid compare ghana poland -f` OR `kovid compare ghana poland --full` (sorts by cases DESC)
+
+You can compare as many countries as you want.
 
 **Total figures**
 * `kovid cases`
@@ -62,9 +66,9 @@ 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/d0b72207765090b118a5b76d72ddde19.png "Covid data.")
+![kovid](https://i.gyazo.com/7ce86c5e93d549e1412fb6104a1d7877.png "Covid data.")
 
 To check for total figures:
 
@@ -80,7 +84,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## 🤲 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 and for thats why 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 +93,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/lib/kovid/cli.rb

@@ -5,12 +5,12 @@ require 'kovid'
 
 module Kovid
   class CLI < Thor
-    desc 'whatis', 'Defines COVID-19'
-    def definition
+    desc 'define', 'Defines COVID-19'
+    def define
       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]
@@ -20,7 +20,7 @@ module Kovid
       end
     end
 
-    desc 'compare', 'Returns full comparison table for given countries'
+    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

data/lib/kovid/nineteen.rb

@@ -6,7 +6,13 @@ module Kovid
   class Nineteen
     class << self
       def whatis
-        puts 'Coronavirus disease (COVID-19) is an infectious disease caused by a new virus.'
+        definition = <<-TEXT
+        Coronavirus disease 2019 (COVID-19) is an infectious disease caused by severe acute
+        respiratory syndrome coronavirus 2 (SARS-CoV-2).
+        The disease was first identified in 2019 in Wuhan, China, and has since spread globally,
+        resulting in the 2019–20 coronavirus pandemic.
+        TEXT
+        puts definition
       end
 
       def country(name)

data/lib/kovid/request.rb

@@ -10,29 +10,24 @@ module Kovid
 
     class << self
       require 'pry'
-      def by_country(name)
-        begin
-          path = "/countries/#{name}"
-          fetch_url = BASE_URL + path
-
-          response ||= JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 3600).response_body)
-          Kovid::Tablelize.country_table(response)
+      def by_country(country_name)
+        path = "/countries/#{country_name}"
+        fetch_url = BASE_URL + path
 
-        rescue JSON::ParserError
-          no_case_in(name)
-        end
+        response ||= JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 3600).response_body)
+        Kovid::Tablelize.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 by_country_full(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.full_country_table(response)
-        rescue JSON::ParserError
-          no_case_in(name)
-        end
+        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(country_name)
       end
 
       def by_country_comparison(list)
@@ -45,6 +40,8 @@ module Kovid
           array << JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 3600).response_body)
         end
 
+        array = array.sort_by { |json| -json['cases'] }
+
         Kovid::Tablelize.compare_countries_table(array)
       end
 
@@ -57,6 +54,7 @@ module Kovid
 
           array << JSON.parse(Typhoeus.get(fetch_url.to_s, cache_ttl: 3600).response_body)
         end
+        array = array.sort_by { |json| -json['cases'] }
 
         Kovid::Tablelize.compare_countries_table_full(array)
       end
@@ -73,8 +71,8 @@ module Kovid
 
       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
+        rows << ["Thankfully, there are no reported cases in #{country.capitalize}!"]
+        table = Terminal::Table.new headings: [country.capitalize.to_s], rows: rows
         puts table
       end
     end

data/lib/kovid/tablelize.rb

@@ -66,7 +66,7 @@ module Kovid
         rows = []
 
         rows << [cases['cases'], cases['deaths'], cases['recovered']]
-        puts Terminal::Table.new(title: "Total # of incidents", headings: headings, rows: rows)
+        puts 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.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kovid
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Emmanuel Hayford
 autorequire: 
 bindir: bin
 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