time_cop 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d92283db162ec5be4691e842d3af922fadb985af
-  data.tar.gz: 3d7dc0135dae7784ab0dfbea08f0b88f4d918a5e
+  metadata.gz: acea5459ff2d87073e48ce8bf49624c3053d29d0
+  data.tar.gz: 19b808d20e27eed1a5ea49f00db0f7668e1acd4d
 SHA512:
-  metadata.gz: 707941008f8ea575c15242bf06d8fc5a965ee8baa0779364803828eae8b2b1aad1172f1007bfa9ba65f82055a4f644b210ea61f302ec0f20fdd22efef3f22383
-  data.tar.gz: 83e1af161c88299a0661f6b028487da1893946252d91d41ca2ffdbeed5907d5f7c8cf01f54ea7be098369d979b5047318d2550dfcdef3a407fd0d3e713d742b8
+  metadata.gz: 479b1ff4901d55092c744987364cb33cbc3c7f3f3ffed69d2777467f747f362a998713499d57d54f68d0d8e7e2fd887e99c6d62f3c63a92a8e41ca4733cd30fc
+  data.tar.gz: f9c45e804a9e90345a424b1866ee754ab17a030b3e0ccd15c11b4463f45e5a97d37e1e138c9effb65914ed9c57363e04b7f81f5763ca8d251079410d8a9802c0

data/lib/time_cop/accountability.rb

@@ -15,15 +15,15 @@ module TimeCop
       q4: [{month: 10, day: 1}, {month: 12, day: 31}]
     }
 
-    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)
+    def initialize(harvest_client:, date: Date.today, today: Date.today, report_builder: nil, email: nil, hours_per_week: 32)
+      @client = harvest_client
       @date = date
       @today = today
       @hours_per_week = hours_per_week
       @report_builder = report_builder ||
         ReportBuilder.new(
           client: client,
-          user: email ? fetch_user(email) : default_user,
+          user: (email ? fetch_user(email) : default_user),
           start_date: start_of_quarter_date,
           end_date: end_of_quarter_date
         )
@@ -167,8 +167,10 @@ module TimeCop
         hours: {
           charged: total_quarter_time_tracked,
           needed: expected_quarter_hours,
+          left: quarterly_hours_delta,
           average_charged: average_quarter_hours_per_day,
           average_needed: quarterly_hours_per_business_day_needed,
+          current_hours: current_hours_delta,
           total_projected: projected_quarter_hours
         }
       }

data/lib/time_cop/runner.rb

@@ -16,8 +16,11 @@ module TimeCop
         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),
+          harvest_client: Harvest.client(
+            username: (username.nil? ? options[:username] : username),
+            password: (password.nil? ? options[:password] : password),
+            subdomain: 'wildland'
+          ),
           email: options[:email]
         }
         q_dates = [
@@ -84,8 +87,7 @@ module TimeCop
         end
       else
         accountability_options = {
-          username: (options[:username]),
-          password: (options[:password]),
+          harvest_client: Harvest.client(username: options[:username], password: options[:password], subdomain: 'wildland'),
           email: options[:email]
         }
         accountability = Accountability.new(

data/lib/time_cop/version.rb

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

data/time_cop.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "harvested", "~> 3.1.1"
+  spec.add_runtime_dependency "harvested", "~> 4.0.0"
   spec.add_runtime_dependency "highline", "~> 1.7.8"
   spec.add_runtime_dependency 'activesupport', '~> 5.0'
   spec.add_runtime_dependency 'paint', '~> 2.0.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_cop
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Sam Clopton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-21 00:00:00.000000000 Z
+date: 2018-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: harvested
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement