covid19 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6733fa65744f743fda7c448e801dd984fc0a1737ab90e71b8ad748f1477cd59b
-  data.tar.gz: 6ab5afaa596136070a056a1edc4833126b9a61440512a7c9dc1f4e7303b956f7
+  metadata.gz: '07796add8d36511f373a1ed6268fa95cc164577d9fb19726e592f6f4b33ecb2c'
+  data.tar.gz: eee233d00944280fd37ae88c06f78f7be419225e102d135107ad9ecae4aee355
 SHA512:
-  metadata.gz: d03cc9515829db8b90f90dd975a95826e1271a3d5951512c4f637c7174adb3a009bb933484cae985c108a0e9e5a1f11c74d4ad1c099f179499bafd480e1f01d2
-  data.tar.gz: 8c84f7ca6fec08e92f6965e92bb12a1d0b7480fb968376211b7bdadacf4626ec8f8f17f0bedab815fa376af67f93ff622a53c54d5da56c25a4bfcf85cf8aba3d
+  metadata.gz: 0e9f6750488e1a05e7c9ff620497c7c7e4376412c6da31acf6d6afce8d559b0b0de032eeae6d1f1b72e156a7de57581186e42fa1b769c0b0acd4e0eba78e5802
+  data.tar.gz: 5c0408ad61b9c7bf48c664aa301be11c7bd998be2ea82ba303371cb8ef09325e672b73b866144ef1d00147d4e1ea167c168a169dc1a87335785884b74cede305

data/CHANGELOG.md

@@ -5,9 +5,13 @@ All notable changes to this project will be documented in this file.
 
 This changelog was automatically generated using [Caretaker](https://github.com/WolfAtheneum/covid19) by [Wolf Software](https://github.com/WolfSoftware)
 
-### [Unreleased](https://github.com/WolfAtheneum/covid19/compare/v0.1.0...HEAD)
+### [v0.1.2](https://github.com/WolfAtheneum/covid19/compare/v0.1.0...v0.1.2)
 
-- Add a death rate as a percentage of confirmed cases [`[660e2b6]`](https://github.com/WolfAtheneum/covid19/commit/660e2b6e17b2ababed7e0c820a8d687b867cdf7f) [`[TGWolf]`](https://github.com/TGWolf)
+> Released on March, 23rd 2020
+
+- Add the new code to the binary as it was only added to the testing binary [`[e99c9ec]`](https://github.com/WolfAtheneum/covid19/commit/e99c9ec9a37d38b05ec1b632f0cb07e68788a19a) [`[TGWolf]`](https://github.com/TGWolf)
+
+- Add a death rate as a percentage of confirmed cases [`[348efbf]`](https://github.com/WolfAtheneum/covid19/commit/348efbf2c1ca5bdffbd369595c670acc7cadeaf8) [`[TGWolf]`](https://github.com/TGWolf)
 
 ### [v0.1.0](https://github.com/WolfAtheneum/covid19/releases/v0.1.0)
 

data/VERSION.txt

@@ -1 +1 @@
-0.1.1
+0.1.2

data/exe/covid19

@@ -17,6 +17,14 @@ def format_latest_stats(results)
     results['latest'].each do |key, value|
         formatted << [key, value]
     end
+
+    confirmed = results['latest']['confirmed']
+    deaths = results['latest']['deaths']
+
+    percentage = ((deaths.to_f / confirmed) * 100).round(2).to_s + ' %'
+
+    formatted << ['death rate', percentage]
+
     puts Terminal::Table.new :title => 'Latest Global Statistics', :rows => formatted, :style => { :width => 80 }
 end
 
@@ -40,7 +48,11 @@ def format_latest_country_stats(results, options = {})
             deaths = item['latest']['deaths']
             recovered = item['latest']['recovered']
         end
-        processed[country_code] = { 'country' => item['country'], 'country_code' => country_code, 'id' => item['id'], 'confirmed' => confirmed, 'deaths' => deaths, 'recovered' => recovered }
+        percentage = ((deaths.to_f / confirmed) * 100).round(2)
+
+        percentage = 0 if percentage.nil?
+
+        processed[country_code] = { 'country' => item['country'], 'country_code' => country_code, 'id' => item['id'], 'confirmed' => confirmed, 'deaths' => deaths, 'recovered' => recovered, 'death_rate' => percentage }
     end
 
     sorted = []
@@ -52,13 +64,14 @@ def format_latest_country_stats(results, options = {})
     sorted = sorted.sort_by { |k| k['confirmed'] }.reverse if options[:confirmed]
     sorted = sorted.sort_by { |k| k['deaths'] }.reverse if options[:deaths]
     sorted = sorted.sort_by { |k| k['recovered'] }.reverse if options[:recovered]
+    sorted = sorted.sort_by { |k| k['death_rate'] }.reverse if options[:percentage]
 
     formatted = []
     sorted.each do |item|
-        formatted << [item['country'], item['country_code'], item['id'], item['confirmed'], item['deaths'], item['recovered']]
+        formatted << [item['country'], item['country_code'], item['id'], item['confirmed'], item['deaths'], item['recovered'], item['death_rate'].to_s + ' %']
     end
 
-    table = Terminal::Table.new :title => 'Latest Statistics by Country', :headings => ['Country', 'Code', 'ID', 'Confirmed', 'Deaths', 'Recovered'], :rows => formatted, :style => { :padding_left => 2, :padding_right => 2 }
+    table = Terminal::Table.new :title => 'Latest Statistics by Country', :headings => ['Country', 'Code', 'ID', 'Confirmed', 'Deaths', 'Recovered', 'Death Rate'], :rows => formatted, :style => { :padding_left => 2, :padding_right => 2 }
     table.align_column(1, :center)
     table.align_column(2, :right)
     table.align_column(3, :right)
@@ -114,18 +127,28 @@ def process_arguments
         opts.on('-c', '--confirmed', 'Order results by confirmed cases') do
             options[:confirmed] = true
             options[:deaths] = false
+            options[:percentage] = false
             options[:recovered] = false
         end
 
         opts.on('-d', '--deaths', 'Order results by deaths') do
             options[:confirmed] = false
             options[:deaths] = true
+            options[:percentage] = false
+            options[:recovered] = false
+        end
+
+        opts.on('-p', '--death-rate', 'Order results by percentage of deaths (death rate)') do
+            options[:confirmed] = false
+            options[:deaths] = false
+            options[:percentage] = true
             options[:recovered] = false
         end
 
         opts.on('-r', '--recovered', 'Order results by recovered numbers') do
             options[:confirmed] = false
             options[:deaths] = false
+            options[:percentage] = false
             options[:recovered] = true
         end
     end

data/lib/covid19/version.rb

@@ -1,3 +1,3 @@
 class Covid19
-    VERSION = '0.1.1'.freeze
+    VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: covid19
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tim Gurney aka Wolf