time_cop 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c21ee81a8b7fc0e59cc8a8e5f157c5d17cfd3214
-  data.tar.gz: 8360109023c4c93f1f34808281b121f2a13eab73
+  metadata.gz: 5386380ae098f3a9daa1a1e7861a44fb346db8e8
+  data.tar.gz: 6aa3386caa796aca933336607980e764aced49f3
 SHA512:
-  metadata.gz: 0dd03ba3806685a59503b8ab5d6c9cb1e1915d9f112986da4ad1b0e64754319149375aa376b47c1dbd8be78d13108e1847932ed23b51b1a950ab3a224fd7c573
-  data.tar.gz: c4266afc1f13cdaeb481dc7e8fac50997fc79a3ac50df396ec4f9948282005de53bccf089e73c8f65499cb7c79937097d8d879fa0e234bb2e1666bf14b913dbc
+  metadata.gz: 9a4c4d9e71d174573580c90dc35f2f90f48de1059369d084d93411972a44b60c669af0cf9e59b807ccbc2128f3b015e48e01587d8e09a0f75570b4741010f6cd
+  data.tar.gz: 05f65255b494f94b81891a522a94e0635b17712cfbc60a3df8e49c8ed4ad18fdd4fa5e067c3df9715d31d3ed7c91c51eeeb5cbc663a1d1133299348387517f49

data/lib/time_cop/accountability.rb

@@ -3,7 +3,7 @@ require 'date'
 
 module TimeCop
   class Accountability
-    attr_reader :report_builder, :client, :date, :hours_per_week
+    attr_reader :report_builder, :client, :date, :today, :hours_per_week
 
     DAYS_PER_WEEK = 5.0
 
@@ -14,9 +14,10 @@ module TimeCop
       q4: [{month: 10, day: 1}, {month: 12, day: 31}]
     }
 
-    def initialize(username:, password:, subdomain: 'wildland', date: Date.today, report_builder: nil, email: nil, hours_per_week: 32)
+    def initialize(username:, password:, subdomain: 'wildland', date: Date.today, today: Date.today, report_builder: nil, email: nil, hours_per_week: 32)
       @client = Harvest.client(username: username, password: password, subdomain: subdomain)
       @date = date
+      @today = today
       @hours_per_week = hours_per_week
       @report_builder = report_builder ||
         ReportBuilder.new(
@@ -83,49 +84,12 @@ module TimeCop
       (end_of_quarter_date - start_of_quarter_date).to_i
     end
 
-    def business_days_between(start_date, end_date)
-      days_between = (end_date - start_date).to_i
-      return 0 unless days_between > 0
-
-      # Assuming we need to calculate days from 9th to 25th, 10-23 are covered
-      # by whole weeks, and 24-25 are extra days.
-      #
-      # Su Mo Tu We Th Fr Sa    # Su Mo Tu We Th Fr Sa
-      #        1  2  3  4  5    #        1  2  3  4  5
-      #  6  7  8  9 10 11 12    #  6  7  8  9 ww ww ww
-      # 13 14 15 16 17 18 19    # ww ww ww ww ww ww ww
-      # 20 21 22 23 24 25 26    # ww ww ww ww ed ed 26
-      # 27 28 29 30 31          # 27 28 29 30 31
-      whole_weeks, extra_days = days_between.divmod(7)
-
-      unless extra_days.zero?
-        # Extra days start from the week day next to start_day,
-        # and end on end_date's week date. The position of the
-        # start date in a week can be either before (the left calendar)
-        # or after (the right one) the end date.
-        #
-        # Su Mo Tu We Th Fr Sa    # Su Mo Tu We Th Fr Sa
-        #        1  2  3  4  5    #        1  2  3  4  5
-        #  6  7  8  9 10 11 12    #  6  7  8  9 10 11 12
-        # ## ## ## ## 17 18 19    # 13 14 15 16 ## ## ##
-        # 20 21 22 23 24 25 26    # ## 21 22 23 24 25 26
-        # 27 28 29 30 31          # 27 28 29 30 31
-        #
-        # If some of the extra_days fall on a weekend, they need to be subtracted.
-        # In the first case only corner days can be days off,
-        # and in the second case there are indeed two such days.
-        extra_days -= if start_date.next_day.wday <= end_date.wday
-                        [start_date.next_day.sunday?, end_date.saturday?].count(true)
-                      else
-                        2
-                      end
-      end
-
-      (whole_weeks * 5) + extra_days
+    def weekdays_between(start_date, end_date)
+      (start_date..end_date).select{|d| (1..5).include?(d.wday)}.size
     end
 
     def total_week_days
-      business_days_between(start_of_quarter_date, end_of_quarter_date)
+      weekdays_between(start_of_quarter_date, end_of_quarter_date)
     end
 
     def expected_quarter_hours
@@ -133,7 +97,7 @@ module TimeCop
     end
 
     def expected_quarter_hours_to_today
-      business_days_between(start_of_quarter_date, date) * hours_per_day
+      weekdays_between(start_of_quarter_date, today < end_of_quarter_date ? Date.today : end_of_quarter_date) * hours_per_day
     end
 
     def current_hours_delta
@@ -145,13 +109,28 @@ module TimeCop
     end
 
     def quarterly_hours_per_business_day_needed
-      if business_days_between(date, end_of_quarter_date) == 0
+      if weekdays_between(today, end_of_quarter_date) == 0
         quarterly_hours_delta
       else
-        quarterly_hours_delta / business_days_between(date, end_of_quarter_date).to_f
+        quarterly_hours_delta / weekdays_between(today, end_of_quarter_date).to_f
       end
     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)
+        },
+        hours_per_week: @hours_per_week,
+        hours: {
+          charged: total_quarter_time_tracked,
+          needed: expected_quarter_hours,
+        }
+      }
+    end
+
     def print_report
       puts "Quarter Period: #{start_of_quarter_date} #{end_of_quarter_date}"
       puts "Hours Per Week: #{@hours_per_week}"

data/lib/time_cop/runner.rb

@@ -13,28 +13,73 @@ module TimeCop
         cli = HighLine.new
         username = cli.ask('Harvest Username: ')
         password = cli.ask('Harvest Password: ') { |q| q.echo = false }
-        interactive_hash[:hours_per_week] = cli.ask('Hours per week? ') { |q| q.default = 32 }.to_i
+        interactive_hash[:hours_per_week] = cli.ask('Hours per week? (Full Time 34)') { |q| q.default = 34 }.to_f
+        accountability_options = {
+          username: (username.nil? ? options[:username] : username),
+          password: (password.nil? ? options[:password] : password),
+          email: options[:email]
+        }
+        q_dates = [
+          Date.new(Date.today.year, 1, 1),
+          Date.new(Date.today.year, 4, 1),
+          Date.new(Date.today.year, 7, 1),
+          Date.new(Date.today.year, 10, 1)
+        ]
+
         cli.choose do |menu|
           menu.prompt = 'Which Quarter? '
-          menu.choice(:Q1) { interactive_hash[:date] = Date.new(Date.today.year, 1, 1)}
-          menu.choice(:Q2) { interactive_hash[:date] =  Date.new(Date.today.year, 4, 1)}
-          menu.choice(:Q3) { interactive_hash[:date] =   Date.new(Date.today.year, 7, 1)}
-          menu.choice(:Q4) { interactive_hash[:date] =   Date.new(Date.today.year, 10, 1)}
+          menu.choice(:Q1) do
+           interactive_hash[:date] = q_dates[0]
+           Accountability.new(interactive_hash.merge(accountability_options)).print_report
+         end
+          menu.choice(:Q2) do 
+            interactive_hash[:date] = q_dates[1]
+            Accountability.new(interactive_hash.merge(accountability_options)).print_report
+          end
+          menu.choice(:Q3) do 
+            interactive_hash[:date] = q_dates[2]
+            Accountability.new(interactive_hash.merge(accountability_options)).print_report
+          end
+          menu.choice(:Q4) do 
+            interactive_hash[:date] = q_dates[3]
+            Accountability.new(interactive_hash.merge(accountability_options)).print_report
+          end
+          menu.choice(:Year) do
+            summary = q_dates.map do |d|
+              interactive_hash[:date] = d
+              Accountability.new(interactive_hash.merge(accountability_options)).summary_hash
+            end
+            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)
+            weekdays = (Date.today..Date.new(Date.today.year, 12, 31)).select{|d| (1..5).include?(d.wday)}.size
+            weekdays_so_far = (Date.new(Date.today.year, 1, 1)..Date.today).select{|d| (1..5).include?(d.wday)}.size
+            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 "Business Days Left In Year: #{weekdays}"
+            puts "Current Year End Surplus(+)/Deficit(-): #{diff}"
+            puts "Projected Year End Surplus(+)/Deficit(-): #{projected_diff}"
+            puts ""
+            puts "Total Harvest Hours This Year: #{logged}"
+            puts "Average Harvest Hours Per Business Day: #{average_clocked}"
+            puts ""
+            puts "Total Hours Needed By End Of Year: #{needed}"
+            puts "Average Hours Per Business Day Needed To Reach Goal: #{average_needed}"
+          end 
         end
+      else
+        accountability_options = {
+          username: (options[:username]),
+          password: (options[:password]),
+          email: options[:email]
+        }
+        accountability = Accountability.new(
+          accountability_options
+        )
+        accountability.print_report
       end
-
-      accountability_options = {
-        username: (username.nil? ? options[:username] : username),
-        password: (password.nil? ? options[:password] : password),
-        email: options[:email]
-      }
-
-      accountability_options = interactive_hash.merge(accountability_options)
-
-      accountability = Accountability.new(
-        accountability_options
-      )
-      accountability.print_report
     rescue Harvest::AuthenticationFailed
       puts 'Unable to authenticate to Harvest. Check username/password.'
     rescue Harvest::HTTPError => e

data/lib/time_cop/version.rb

@@ -1,3 +1,3 @@
 module TimeCop
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_cop
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Sam Clopton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-17 00:00:00.000000000 Z
+date: 2017-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: harvested