time_cop 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79389be668d32868c727b13d6ce34ac5ece7f70b
-  data.tar.gz: f15e624a821ff4ef3aa312313278c968dd876f9f
+  metadata.gz: d92283db162ec5be4691e842d3af922fadb985af
+  data.tar.gz: 3d7dc0135dae7784ab0dfbea08f0b88f4d918a5e
 SHA512:
-  metadata.gz: 48ed8649132f365a3732e1b30ca10b49ea082bdb0a0df7c8d250d480ace3e0b11aa9590eb8255a719a9bcb8653f0d0bb5f6f922ee801e5c25b932cfc7ac2628f
-  data.tar.gz: 427c2a6458541ee41c8fc655d741492015d33277c7404fdaad2dc946123fc3fc49079397827d023f642a51cfe6dec457479be686dd4abf63f354d699b3c57249
+  metadata.gz: 707941008f8ea575c15242bf06d8fc5a965ee8baa0779364803828eae8b2b1aad1172f1007bfa9ba65f82055a4f644b210ea61f302ec0f20fdd22efef3f22383
+  data.tar.gz: 83e1af161c88299a0661f6b028487da1893946252d91d41ca2ffdbeed5907d5f7c8cf01f54ea7be098369d979b5047318d2550dfcdef3a407fd0d3e713d742b8

data/lib/time_cop/accountability.rb

@@ -1,5 +1,6 @@
 require 'harvested'
 require 'date'
+require 'paint'
 
 module TimeCop
   class Accountability
@@ -60,6 +61,11 @@ module TimeCop
       end
     end
 
+    def active_quarter?
+      quarter_range = (date_from_period(get_quarter[0])...date_from_period(get_quarter[1]))
+      quarter_range.include?(Date.today)
+    end
+
     def get_quarter
       select_quarter.first[1]
     end
@@ -84,6 +90,22 @@ module TimeCop
       (end_of_quarter_date - start_of_quarter_date).to_i
     end
 
+    def weekdays_left(include_today = false)
+      if include_today
+        weekdays_between(Date.today, end_of_quarter_date)
+      else
+        weekdays_between(Date.today + 1, end_of_quarter_date)
+      end
+    end
+
+    def weekdays_so_far(include_today = true)
+      if include_today
+        weekdays_between(start_of_quarter_date, Date.today)
+      else
+        weekdays_between(start_of_quarter_date, Date.today - 1)
+      end
+    end
+
     def weekdays_between(start_date, end_date)
       (start_date..end_date).select{|d| (1..5).include?(d.wday)}.size
     end
@@ -100,6 +122,18 @@ module TimeCop
       weekdays_between(start_of_quarter_date, today < end_of_quarter_date ? Date.today : end_of_quarter_date) * hours_per_day
     end
 
+    def average_quarter_hours_per_day
+      if weekdays_so_far(false) > 0
+        total_quarter_time_tracked / weekdays_so_far(false)
+      else
+        0
+      end
+    end
+
+    def projected_quarter_hours
+      ((total_quarter_time_tracked + (weekdays_left(false) * average_quarter_hours_per_day)) - expected_quarter_hours)
+    end
+
     def current_hours_delta
       total_quarter_time_tracked - expected_quarter_hours_to_today
     end
@@ -116,31 +150,47 @@ module TimeCop
       end
     end
 
+    def self.paint_number(number)
+      Paint[number, (number >= 0 ? :green : :red)]
+    end
+
     def summary_hash
       {
         quarter: {
           start: start_of_quarter_date,
           end: end_of_quarter_date,
-          weekdays_in_quarter: weekdays_between(@report_builder.start_date, @report_builder.end_date)
+          weekdays_in_quarter: weekdays_between(@report_builder.start_date, @report_builder.end_date),
+          weekdays_so_far: weekdays_so_far,
+          weekdays_left: weekdays_left
         },
         hours_per_week: @hours_per_week,
         hours: {
           charged: total_quarter_time_tracked,
           needed: expected_quarter_hours,
+          average_charged: average_quarter_hours_per_day,
+          average_needed: quarterly_hours_per_business_day_needed,
+          total_projected: projected_quarter_hours
         }
       }
     end
 
     def print_report
-      puts "Quarter Period: #{start_of_quarter_date} #{end_of_quarter_date}"
+      puts "Quarter Period: #{start_of_quarter_date} - #{end_of_quarter_date}"
       puts "Hours Per Week: #{@hours_per_week}"
-      puts "Current Surplus(+)/Deficit(-): #{current_hours_delta.round(2)}"
+      puts ""
       puts "Quarterly Hour Target: #{expected_quarter_hours.round(2)}"
-      puts "Current Quarterly Charged Hours: #{total_quarter_time_tracked.round(2)}"
-      if (@date.year == Date.today.year)
-        puts "Total Hours Needed By End Of Quarter: #{quarterly_hours_delta.round(2)}"
-        puts "Hours Per Business Day Average Needed To Reach Goal: #{quarterly_hours_per_business_day_needed.round(2)}"
+      puts "Quarterly Hours Charged: #{total_quarter_time_tracked.round(2)}"
+      if active_quarter?
+        puts ""
+        puts "Business Days Left In The Quarter (Excluding Today): #{weekdays_left(false)}"
+        puts ""
+        puts "Additional Hours Needed By End Of Quarter: #{quarterly_hours_delta.round(2)}"
+        puts "Average Hours Per Business Day Worked: #{average_quarter_hours_per_day.round(2)}"
+        puts "Hours Per Business Day Average Needed: #{quarterly_hours_per_business_day_needed.round(2)}"
       end
+      puts""
+      puts "Quarter Surplus(+)/Deficit(-): #{Accountability.paint_number(current_hours_delta.round(2))}"
+      puts "Projected Surplus(+)/Deficit(-): #{Accountability.paint_number(projected_quarter_hours.round(2))}" if active_quarter?
     end
   end
 end

data/lib/time_cop/runner.rb

@@ -58,6 +58,7 @@ module TimeCop
               puts "Fetching data for #{q_date[:choice]}..."
               Accountability.new(interactive_hash.merge(accountability_options)).summary_hash
             end
+            puts ""
             logged = summary.inject(0){|sum, s| sum + s[:hours][:charged]}
             needed = summary.inject(0){|sum, s| sum + s[:hours][:needed]}.round(2 )
             diff = (logged - needed).round(2)
@@ -66,20 +67,18 @@ module TimeCop
             average_needed = (-1 * diff / weekdays).round(2)
             average_clocked = (logged / weekdays_so_far).round(2)
             projected_diff = ((logged + (weekdays * average_clocked)) - needed).round(2)
+            puts "Total Hours for #{year}: #{logged}"
+            puts "Average Hours Per Business Day: #{average_clocked}"
             if (year == Date.today.year)
+              puts "Total Hours Needed By End Of Year: #{needed}"
+              puts ""
               puts "Business Days Left In Year: #{weekdays}"
-              puts "Current Year End Surplus(+)/Deficit(-): #{diff}"
-              puts "Projected Year End Surplus(+)/Deficit(-): #{projected_diff}"
+              puts "Average Hours Per Business Day Needed To Reach Goal: #{average_needed}"
               puts ""
+              puts "Current Year End Surplus(+)/Deficit(-): #{Accountability.paint_number(diff)}"
+              puts "Projected Year End Surplus(+)/Deficit(-): #{Accountability.paint_number(projected_diff)}"
             else
-              puts "#{year} Surplus(+)/Deficit(-): #{diff}"
-            end
-            puts "Total Harvest Hours for #{year}: #{logged}"
-            puts "Average Harvest Hours Per Business Day: #{average_clocked}"
-            if (year == Date.today.year)
-              puts ""
-              puts "Total Hours Needed By End Of Year: #{needed}"
-              puts "Average Hours Per Business Day Needed To Reach Goal: #{average_needed}"
+              puts "#{year} Surplus(+)/Deficit(-): #{Accountability.paint_number(diff)}"
             end
           end
         end

data/lib/time_cop/version.rb

@@ -1,3 +1,3 @@
 module TimeCop
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/time_cop.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "harvested", "~> 3.1.1"
   spec.add_runtime_dependency "highline", "~> 1.7.8"
   spec.add_runtime_dependency 'activesupport', '~> 5.0'
+  spec.add_runtime_dependency 'paint', '~> 2.0.1'
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_cop
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Sam Clopton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: harvested
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: paint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement