plansheet 0.23.2 → 0.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e479f020bfa87192523fd231ec0704d07a2e0e92805eaf76720bf3ee62469c4a
-  data.tar.gz: c197a3c2730522f7f70aa4793ff50670e91e04f57f15874bef174c0f94b44f83
+  metadata.gz: fae1a985802ab6da236f5f3d54224b4468ae5cc5e6beba86510293e7a92fe0a8
+  data.tar.gz: b2fe70fc1cb48dd794f561ff5037d2311366bb7e64c901cf4f32d33c0592e45b
 SHA512:
-  metadata.gz: 77d8895595f834e4bf6f844aabd20178b3f50172071a2713e81f50e9e0e21f4c9cc29df0550cfba085419f7508eeb188417610ce8364b18fdcdd8a6012290eed
-  data.tar.gz: 1da8aab0fe36a1775584afbdd140c3b0e0b6a6ed43202b2987311aa258bc3a2d59ce6109cb88c11c6a8a9335bd5770c9c2e66c1ff3f74c3f26cd4c0c07120733
+  metadata.gz: f68b48246ce4e8b10c66dd805f783fd822886b168aa57bb7db71012934bd2f21f8a76c8f26dab6c8bf4f8156529b897a5d33c02cba2e67d39224579626ee00a0
+  data.tar.gz: 751a5a7beffa1c35d7723521db61aa0ca26d1fafb6643017bfd2c3a3cb14e63dd5d4f775df34e2a9b644c24a8d582e0cd19d9cfd4a3b009673b9fb6d70faef55

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    plansheet (0.23.2)
+    plansheet (0.24.1)
       dc-kwalify (~> 1.0)
+      diffy (= 3.4.2)
       rgl (= 0.5.8)
 
 GEM
@@ -11,6 +12,7 @@ GEM
     ast (2.4.2)
     coderay (1.1.3)
     dc-kwalify (1.0.0)
+    diffy (3.4.2)
     ffi (1.15.5)
     formatador (1.1.0)
     generator (0.0.1)

data/exe/plansheet

@@ -59,7 +59,7 @@ elsif options[:sort]
   # Pool sorts projects, this now just matches old behaviour
   pool.write_projects
 elsif options[:"time-roi"]
-  project_arr = pool.projects.select {|x| x.time_roi_payoff != 0 && !x.dropped_or_done?}.sort
+  project_arr = pool.projects.select { |x| x.time_roi_payoff != 0 && !x.dropped_or_done? }.sort
   project_arr.each do |proj|
     puts proj
     puts "time ROI payoff: #{proj.time_roi_payoff}"

data/lib/plansheet/pool.rb

@@ -10,12 +10,14 @@ module Plansheet
 
     DEFAULT_COMPARISON_ORDER = %w[
       completeness
+      completed_on
       dependency
       priority
       defer
       due
       time_roi
       status
+      name
     ].freeze
 
     def initialize(config, debug: false)
@@ -89,8 +91,7 @@ module Plansheet
       # to keep a list of project files to delete
       project_namespaces.each do |ns|
         pyf = ProjectYAMLFile.new "#{@projects_dir}/#{ns}.yml"
-        pyf.projects = projects_in_namespace(ns)
-        pyf.write
+        pyf.compare_and_write projects_in_namespace(ns)
       end
     end
 

data/lib/plansheet/project/yaml.rb

@@ -189,12 +189,29 @@ module Plansheet
       @projects.sort!
     end
 
-    def write
-      File.write @path, yaml_dump
+    def compare_and_write(projects)
+      updated_projects_string = yaml_dump(projects)
+
+      # Compare the existing file to the newly generated one - we only want a
+      # write if something has changed
+      return if updated_projects_string == yaml_dump(load_file)
+
+      puts "#{@path} has changed, writing"
+      require "diffy"
+      puts Diffy::Diff.new(updated_projects_string, yaml_dump(load_file)).to_s(:color)
+      File.write @path, updated_projects_string
     end
 
-    def yaml_dump
-      YAML.dump(@projects.map { |x| x.to_h.delete_if { |k, _| k == "namespace" } })
+    def yaml_dump(projects)
+      # binding.irb if projects.nil?
+      YAML.dump(projects.map do |x|
+        x.to_h.delete_if do |k, v|
+          # Remove low-value default noise from projects
+          k == "namespace" ||
+           (k == "priority" && v == "low") ||
+           (k == "status" && v == "idea")
+        end
+      end)
     end
   end
 end

data/lib/plansheet/project.rb

@@ -182,6 +182,20 @@ module Plansheet
       PROJECT_STATUS_PRIORITY[status] <=> PROJECT_STATUS_PRIORITY[other.status]
     end
 
+    # This seems silly at first glance, but it's to keep projects from flipping
+    # around on each sort when they are equal in all other respects
+    def compare_name(other)
+      @name <=> other.name
+    end
+
+    def compare_completed_on(other)
+      retval = 0
+      retval += 1 if @completed_on
+      retval -= 1 if other.completed_on
+      retval = (other.completed_on <=> @completed_on) if retval.zero?
+      retval
+    end
+
     def compare_due(other)
       # -1 is receiving object being older
 
@@ -340,8 +354,6 @@ module Plansheet
       ALL_PROPERTIES.each do |prop|
         h[prop] = instance_variable_get("@#{prop}") if instance_variable_defined?("@#{prop}")
       end
-      h.delete "priority" if h.key?("priority") && h["priority"] == "low"
-      h.delete "status" if h.key?("status") && h["status"] == "idea"
       h
     end
   end

data/lib/plansheet/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plansheet
 version: !ruby/object:Gem::Version
-  version: 0.23.2
+  version: 0.24.1
 platform: ruby
 authors:
 - David Crosby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-08 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dc-kwalify
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: diffy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.4.2
 - !ruby/object:Gem::Dependency
   name: rgl
   requirement: !ruby/object:Gem::Requirement