plansheet 0.23.0 → 0.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 209e9e64f6e8f0ceba2e1182e60106ead59d0943331c940a9a38ff788ab2cd4f
-  data.tar.gz: 559296847d7777c6d339fd941f43dc8b106b00b75efa354a95ff78adcfc715b3
+  metadata.gz: fae1a985802ab6da236f5f3d54224b4468ae5cc5e6beba86510293e7a92fe0a8
+  data.tar.gz: b2fe70fc1cb48dd794f561ff5037d2311366bb7e64c901cf4f32d33c0592e45b
 SHA512:
-  metadata.gz: d883a334412977859444a6db5c33885ced07fabcfa8665aa0331be6609fc94bb7c3d15f4e5fa6a8b4c01bf7e537b4c281b88c90ac30337fcc3c326ef828dfb29
-  data.tar.gz: 4033cae733fd661360022a705b9d3098d07431db2d2377406af95eeb52fc60ace9ba881803557e8146c8bd48524e3f07cd0ab5eff9859b83633c51fc41115306
+  metadata.gz: f68b48246ce4e8b10c66dd805f783fd822886b168aa57bb7db71012934bd2f21f8a76c8f26dab6c8bf4f8156529b897a5d33c02cba2e67d39224579626ee00a0
+  data.tar.gz: 751a5a7beffa1c35d7723521db61aa0ca26d1fafb6643017bfd2c3a3cb14e63dd5d4f775df34e2a9b644c24a8d582e0cd19d9cfd4a3b009673b9fb6d70faef55

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    plansheet (0.23.0)
+    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

@@ -25,6 +25,10 @@ parser.on(
   "--stats",
   "Various stats (WIP)"
 )
+parser.on(
+  "--time-roi",
+  "Show projects with a time return-on-investment"
+)
 parser.on(
   "--calendar",
   "List of projects ordered by due date"
@@ -54,6 +58,13 @@ elsif options[:stats]
 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.each do |proj|
+    puts proj
+    puts "time ROI payoff: #{proj.time_roi_payoff}"
+    puts "\n"
+  end
 elsif options[:calendar]
   # TODO: add a project filter method
   project_arr = pool.projects

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

@@ -121,6 +121,12 @@ module Plansheet
       # Add a created_on field if it doesn't exist
       instance_variable_set("@created_on", Date.today) unless @created_on
 
+      # Handle nil-value tasks
+      if @tasks
+        @tasks.compact!
+        remove_instance_variable("@tasks") if @tasks.empty?
+      end
+
       # Generate time estimate from tasks if specified
       # Stomps time_estimate field
       if @tasks
@@ -176,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
 
@@ -334,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.0"
+  VERSION = "0.24.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plansheet
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.1
 platform: ruby
 authors:
 - David Crosby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-05 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