time_cop 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5386380ae098f3a9daa1a1e7861a44fb346db8e8
-  data.tar.gz: 6aa3386caa796aca933336607980e764aced49f3
+  metadata.gz: 79389be668d32868c727b13d6ce34ac5ece7f70b
+  data.tar.gz: f15e624a821ff4ef3aa312313278c968dd876f9f
 SHA512:
-  metadata.gz: 9a4c4d9e71d174573580c90dc35f2f90f48de1059369d084d93411972a44b60c669af0cf9e59b807ccbc2128f3b015e48e01587d8e09a0f75570b4741010f6cd
-  data.tar.gz: 05f65255b494f94b81891a522a94e0635b17712cfbc60a3df8e49c8ed4ad18fdd4fa5e067c3df9715d31d3ed7c91c51eeeb5cbc663a1d1133299348387517f49
+  metadata.gz: 48ed8649132f365a3732e1b30ca10b49ea082bdb0a0df7c8d250d480ace3e0b11aa9590eb8255a719a9bcb8653f0d0bb5f6f922ee801e5c25b932cfc7ac2628f
+  data.tar.gz: 427c2a6458541ee41c8fc655d741492015d33277c7404fdaad2dc946123fc3fc49079397827d023f642a51cfe6dec457479be686dd4abf63f354d699b3c57249

data/README.md

@@ -15,9 +15,20 @@ And then execute:
     $ time_cop
 
 ## Usage
+### Simple Usage
 
     $ time_cop --username=user@wild.land --password=super_secret_password
 
+### Interactive Mode
+This is an interactive mode which prompt you for report options.
+
+    $ time_cop -i
+
+Interactive mode supports the following `ENV` variables which will autofill the prompts:
+- `HARVEST_USERNAME` your username. You can set it `$ export HARVEST_USERNAME="user@wild.land"`
+- `HARVEST_PASSWORD` your password. You can set it `$ export HARVEST_PASSWORD="secret_password"`
+- `HARVEST_HOURS_PER_WEEK` your hours per week. You can set it `$ export HARVEST_HOURS_PER_WEEK="34.0"`
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -29,4 +40,3 @@ To release a new version, update the version number in `version.rb`, and then ru
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/wildland/time_cop. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
-

data/lib/time_cop/accountability.rb

@@ -77,7 +77,7 @@ module TimeCop
     end
 
     def total_quarter_time_tracked
-      quarterly_tracked_time_by_user.map { |t| t.hours }.reduce(:+)
+      quarterly_tracked_time_by_user.map { |t| t.hours }.reduce(0, :+)
     end
 
     def total_quarter_days
@@ -118,8 +118,8 @@ module TimeCop
 
     def summary_hash
       {
-        quarter: { 
-          start: start_of_quarter_date, 
+        quarter: {
+          start: start_of_quarter_date,
           end: end_of_quarter_date,
           weekdays_in_quarter: weekdays_between(@report_builder.start_date, @report_builder.end_date)
         },
@@ -137,8 +137,10 @@ module TimeCop
       puts "Current Surplus(+)/Deficit(-): #{current_hours_delta.round(2)}"
       puts "Quarterly Hour Target: #{expected_quarter_hours.round(2)}"
       puts "Current Quarterly Charged Hours: #{total_quarter_time_tracked.round(2)}"
-      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)}"
+      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)}"
+      end
     end
   end
 end

data/lib/time_cop/runner.rb

@@ -11,63 +11,77 @@ module TimeCop
 
       if (options[:interactive])
         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? (Full Time 34)') { |q| q.default = 34 }.to_f
+        username = ENV['HARVEST_USERNAME'].nil? ? cli.ask('Harvest Username: ') : ENV['HARVEST_USERNAME']
+        password = ENV['HARVEST_PASSWORD'].nil? ? cli.ask('Harvest Password: ') { |q| q.echo = false } : ENV['HARVEST_PASSWORD']
+        interactive_hash[:hours_per_week] = ENV['HARVEST_HOURS_PER_WEEK'].nil? ? cli.ask('Hours per week? Defaults to Full Time (34)') { |q| q.default = 34 }.to_f : ENV['HARVEST_HOURS_PER_WEEK'].to_f
+        year = cli.ask("Year? Defaults to #{Date.today.year}") { |q| q.default = Date.today.year }.to_i
         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)
+          {
+            range: Date.new(year, 1, 1)...Date.new(year, 3, 31),
+            choice: :Q1
+          },
+          {
+            range: Date.new(year, 4, 1)...Date.new(year, 6, 30),
+            choice: :Q2
+          },
+          {
+            range: Date.new(year, 7, 1)...Date.new(year, 9, 30),
+            choice: :Q3
+          },
+          {
+            range: Date.new(year, 10, 1)...Date.new(year, 12, 31),
+            choice: :Q4
+          }
         ]
-
+        default_quarter = q_dates.find{|q_date| q_date[:range].include?(Date.today)}
+        default_choice = default_quarter.nil? ? '' : "Defaults to #{default_quarter[:choice]}"
         cli.choose do |menu|
-          menu.prompt = 'Which Quarter? '
-          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
+          menu.prompt = "Which Quarter? #{default_choice}"
+          unless default_quarter.nil?
+            menu.default = default_quarter[:choice]
           end
-          menu.choice(:Q4) do 
-            interactive_hash[:date] = q_dates[3]
-            Accountability.new(interactive_hash.merge(accountability_options)).print_report
+          q_dates.each do |q_date|
+            menu.choice(q_date[:choice]) do
+              interactive_hash[:date] = q_date[:range].begin
+              puts 'Fetching data...'
+              Accountability.new(interactive_hash.merge(accountability_options)).print_report
+            end
           end
           menu.choice(:Year) do
-            summary = q_dates.map do |d|
-              interactive_hash[:date] = d
+            summary = q_dates.map do |q_date|
+              interactive_hash[:date] = q_date[:range].begin
+              puts "Fetching data for #{q_date[:choice]}..."
               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
+            weekdays = (Date.today..Date.new(year, 12, 31)).select{|d| (1..5).include?(d.wday)}.size
+            weekdays_so_far = (Date.new(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}"
+            if (year == Date.today.year)
+              puts "Business Days Left In Year: #{weekdays}"
+              puts "Current Year End Surplus(+)/Deficit(-): #{diff}"
+              puts "Projected Year End Surplus(+)/Deficit(-): #{projected_diff}"
+              puts ""
+            else
+              puts "#{year} Surplus(+)/Deficit(-): #{diff}"
+            end
+            puts "Total Harvest Hours for #{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 
+            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}"
+            end
+          end
         end
       else
         accountability_options = {

data/lib/time_cop/version.rb

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

metadata

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