plansheet 0.24.1 → 0.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fae1a985802ab6da236f5f3d54224b4468ae5cc5e6beba86510293e7a92fe0a8
-  data.tar.gz: b2fe70fc1cb48dd794f561ff5037d2311366bb7e64c901cf4f32d33c0592e45b
+  metadata.gz: 1d6783f3c90e7d781de642be7c98e2a8469e48d8576405a5554cf92282632f2e
+  data.tar.gz: 39de90d2ad1d6c371c1626b56ffba32d79e293b9adaa0c01bb3d8113cc16225d
 SHA512:
-  metadata.gz: f68b48246ce4e8b10c66dd805f783fd822886b168aa57bb7db71012934bd2f21f8a76c8f26dab6c8bf4f8156529b897a5d33c02cba2e67d39224579626ee00a0
-  data.tar.gz: 751a5a7beffa1c35d7723521db61aa0ca26d1fafb6643017bfd2c3a3cb14e63dd5d4f775df34e2a9b644c24a8d582e0cd19d9cfd4a3b009673b9fb6d70faef55
+  metadata.gz: d30350f829b3db7e0b6d1163d55b835c55bef408c1c34ffc16a209837b9f4f1573b2d51d46fe294c4e48eeb1018a11a04701b100edce353c68c39becff5c9cca
+  data.tar.gz: fac00b40c31909b7d785e8938f49f877f02872875d72246bc8413dd84d34b857a0a3840605d0e22ac60a288091a6d28629eb915bb3ece4b2930c5e1ea8fbf841

data/.rubocop.yml

@@ -11,6 +11,9 @@ Style/StringLiteralsInInterpolation:
   Enabled: true
   EnforcedStyle: double_quotes
 
+Style/GuardClause:
+  Enabled: false
+
 Layout/LineLength:
   Max: 120
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    plansheet (0.24.1)
+    plansheet (0.25.1)
       dc-kwalify (~> 1.0)
       diffy (= 3.4.2)
       rgl (= 0.5.8)

data/lib/plansheet/project/yaml.rb

@@ -198,7 +198,7 @@ module Plansheet
 
       puts "#{@path} has changed, writing"
       require "diffy"
-      puts Diffy::Diff.new(updated_projects_string, yaml_dump(load_file)).to_s(:color)
+      puts Diffy::Diff.new(yaml_dump(load_file), updated_projects_string).to_s(:color)
       File.write @path, updated_projects_string
     end
 

data/lib/plansheet/project.rb

@@ -138,13 +138,21 @@ module Plansheet
         # Convert the field to minutes
         @time_estimate_minutes = Plansheet.parse_time_duration(@time_estimate)
       end
-      if @time_estimate_minutes # rubocop:disable Style/GuardClause
+      if @time_estimate_minutes
         # Rewrite time_estimate field
         @time_estimate = Plansheet.build_time_duration(@time_estimate_minutes)
 
         yms = yearly_minutes_saved
         @time_roi_payoff = yms.to_f / @time_estimate_minutes if yms
       end
+
+      if done?
+        @completed_on ||= Date.today unless recurring?
+        remove_instance_variable("@status") if @status
+        remove_instance_variable("@time_estimate") if @time_estimate
+        remove_instance_variable("@time_estimate_minutes") if @time_estimate
+        remove_instance_variable("@time_roi_payoff") if @time_roi_payoff
+      end
     end
 
     def yearly_minutes_saved
@@ -287,11 +295,6 @@ module Plansheet
       task_based_status
     end
 
-    def process_recurring
-      # TODO: Tasks will be moved from done->tasks if recurring project is
-      # starting again
-    end
-
     # Due date either explicit or recurring
     def due
       return @due if @due
@@ -345,6 +348,10 @@ module Plansheet
       status == "dropped" || status == "done"
     end
 
+    def done?
+      status == "done"
+    end
+
     def self.task_time_estimate(str)
       Plansheet.parse_time_duration(Regexp.last_match(1)) if str.match(TIME_EST_REGEX)
     end

data/lib/plansheet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Plansheet
-  VERSION = "0.24.1"
+  VERSION = "0.25.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plansheet
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 0.25.1
 platform: ruby
 authors:
 - David Crosby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-11 00:00:00.000000000 Z
+date: 2022-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dc-kwalify