plansheet 0.13.2 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76e5120430c540166b342a58cf0a0c07dfaf773d0a46b1dcd05614be677fe1a6
-  data.tar.gz: 83eb24c7811f8e1e49d8f7f79a059c1451673907460203d95a5c28e98fbc74c2
+  metadata.gz: 209e9e64f6e8f0ceba2e1182e60106ead59d0943331c940a9a38ff788ab2cd4f
+  data.tar.gz: 559296847d7777c6d339fd941f43dc8b106b00b75efa354a95ff78adcfc715b3
 SHA512:
-  metadata.gz: 71d3b9dad2c16601ef4472805c282cbfced288e0fc1cee42b0b2e6cb508c5aa255a688c3301fbdee38ae5188f36a2d65cbee2ebc9aa3290771a8f2a2f84854ac
-  data.tar.gz: bc7d994b5d320c0c9f7ed53ca625afb6f586f228a48f16e2e9f1b2f392cae4cb1e1cef45ddc305069fb06a59a8e1fa9cf2324c1dc4a322e411f801d5802c41fe
+  metadata.gz: d883a334412977859444a6db5c33885ced07fabcfa8665aa0331be6609fc94bb7c3d15f4e5fa6a8b4c01bf7e537b4c281b88c90ac30337fcc3c326ef828dfb29
+  data.tar.gz: 4033cae733fd661360022a705b9d3098d07431db2d2377406af95eeb52fc60ace9ba881803557e8146c8bd48524e3f07cd0ab5eff9859b83633c51fc41115306

data/Gemfile

@@ -7,9 +7,10 @@ gemspec
 
 group :development, optional: true do
   gem "guard", "~> 2.18"
-  gem "guard-minitest", "~> 2.4"
+  gem "guard-rake", "~> 1.0"
   gem "minitest", "~> 5.0"
   gem "rake", "~> 13.0"
+  gem "rdoc"
 
   gem "rubocop", "~> 1.21"
   gem "rubocop-minitest"

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    plansheet (0.13.2)
+    plansheet (0.23.0)
       dc-kwalify (~> 1.0)
+      rgl (= 0.5.8)
 
 GEM
   remote: https://rubygems.org/
@@ -12,6 +13,7 @@ GEM
     dc-kwalify (1.0.0)
     ffi (1.15.5)
     formatador (1.1.0)
+    generator (0.0.1)
     guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
@@ -21,10 +23,10 @@ GEM
       pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-compat (1.2.1)
-    guard-minitest (2.4.6)
-      guard-compat (~> 1.2)
-      minitest (>= 3.0)
+    guard-rake (1.0.0)
+      guard
+      rake
+    lazy_priority_queue (0.1.1)
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -41,13 +43,21 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    psych (4.0.4)
+      stringio
     rainbow (3.1.1)
     rake (13.0.6)
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
+    rdoc (6.4.0)
+      psych (>= 4.0.0)
     regexp_parser (2.4.0)
     rexml (3.2.5)
+    rgl (0.5.8)
+      lazy_priority_queue (~> 0.1.0)
+      rexml (~> 3.2, >= 3.2.4)
+      stream (~> 0.5.3)
     rubocop (1.29.1)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
@@ -65,6 +75,9 @@ GEM
       rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
     shellany (0.0.1)
+    stream (0.5.4)
+      generator
+    stringio (3.0.2)
     thor (1.2.1)
     unicode-display_width (2.1.0)
 
@@ -73,10 +86,11 @@ PLATFORMS
 
 DEPENDENCIES
   guard (~> 2.18)
-  guard-minitest (~> 2.4)
+  guard-rake (~> 1.0)
   minitest (~> 5.0)
   plansheet!
   rake (~> 13.0)
+  rdoc
   rubocop (~> 1.21)
   rubocop-minitest
   rubocop-rake

data/Guardfile

@@ -1,9 +1,16 @@
 # frozen_string_literal: true
 
-directories(%w[lib test].select { |d| Dir.exist?(d) ? d : UI.warning("Directory #{d} does not exist") })
+directories(%w[. exe bin lib test].select { |d| Dir.exist?(d) ? d : UI.warning("Directory #{d} does not exist") })
 
-guard :minitest do
-  watch(%r{^test/test_(.*)\.rb$}) { "test" }
-  watch(%r{^lib/plansheet/(.*)\.rb$}) { "test" }
-  watch(%r{^lib/plansheet\.rb$}) { "test" }
+guard :rake, task: "default" do
+  watch("Gemfile")
+  watch("Rakefile")
+  watch("Guardfile")
+  watch(%r{^test/test_(.*)\.rb$})
+  watch("exe/plansheet")
+  watch("bin/console")
+  watch(%r{^test/test_(.*)\.rb$})
+  watch(%r{^lib/plansheet/(.*)\.rb$})
+  watch(%r{^lib/plansheet/project/(.*)\.rb$})
+  watch(%r{^lib/plansheet\.rb$})
 end

data/exe/plansheet

@@ -13,10 +13,22 @@ parser.on(
   "--sort",
   "Sort project files"
 )
+parser.on(
+  "--irb",
+  "Open IRB console after loading projects"
+)
 parser.on(
   "--cli",
   "CLI dump of projects (WIP)"
 )
+parser.on(
+  "--stats",
+  "Various stats (WIP)"
+)
+parser.on(
+  "--calendar",
+  "List of projects ordered by due date"
+)
 parser.on(
   "--location_filter LOCATION",
   "location filter for CLI dump (WIP)"
@@ -25,18 +37,36 @@ options = {}
 parser.parse!(into: options)
 
 config = Plansheet.load_config
+pool = Plansheet::Pool.new({ projects_dir: config["projects_dir"],
+                             sort_order: config["sort_order"] })
 
 if options[:sheet] || options.empty?
-  project_arr = Plansheet.load_projects_dir config["projects_dir"]
-
+  require "plansheet/sheet"
   Dir.mkdir config["output_dir"] unless Dir.exist? config["output_dir"]
-
-  Plansheet::Sheet.new("#{config["output_dir"]}/projects.md", project_arr)
+  Plansheet::Sheet.new("#{config["output_dir"]}/projects.md", pool.projects)
+elsif options[:irb]
+  binding.irb # rubocop:disable Lint/Debugger
+elsif options[:stats]
+  puts "# of projects: #{pool.projects.count}"
+  puts "# of tasks: #{pool.projects.sum { |x| x&.tasks&.count || 0 }}"
+  puts "# of locations: #{pool.projects.collect(&:location).flatten.delete_if(&:nil?).uniq.count}"
+  puts "combined time estimate: #{pool.projects.sum { |x| x.time_estimate_minutes || 0 }} minutes"
 elsif options[:sort]
-  Plansheet.resort_projects_in_dir config["projects_dir"]
+  # Pool sorts projects, this now just matches old behaviour
+  pool.write_projects
+elsif options[:calendar]
+  # TODO: add a project filter method
+  project_arr = pool.projects
+  project_arr.delete_if { |x| x.status == "dropped" || x.status == "done" }
+  project_arr.delete_if { |x| x.due.nil? }
+  project_arr.sort_by!(&:due)
+  project_arr.each do |proj|
+    puts proj
+    puts "\n"
+  end
 elsif options[:cli]
-  project_arr = Plansheet.load_projects_dir config["projects_dir"]
-  project_arr.sort!
+  # TODO: add a project filter method
+  project_arr = pool.projects
   project_arr.delete_if { |x| x.status == "dropped" || x.status == "done" }
   project_arr.select! { |x| x.location == options[:location_filter] } if options[:location_filter]
   project_arr.each do |proj|

data/lib/plansheet/pool.rb

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+require "rgl/adjacency"
+require "rgl/topsort"
+
+module Plansheet
+  # The "pool" is the aggregated collection of projects, calendar events, etc.
+  class Pool
+    attr_accessor :projects
+
+    DEFAULT_COMPARISON_ORDER = %w[
+      completeness
+      dependency
+      priority
+      defer
+      due
+      time_roi
+      status
+    ].freeze
+
+    def initialize(config, debug: false)
+      @projects_dir = config[:projects_dir]
+      @sort_order = config[:sort_order]
+      # @completed_projects_dir = config(:completed_projects_dir)
+
+      # This bit of trickiness is because we don't know what the sort order is
+      # until runtime. I'm sure this design decision definitely won't bite me
+      # in the future ;-) Fortunately, it's also not a problem that can't be
+      # walked back from.
+      # rubocop:disable Lint/OrAssignmentToConstant
+      Plansheet::Pool::POOL_COMPARISON_ORDER ||= config[:sort_order] if config[:sort_order]
+      puts "using config sort order" if config[:sort_order]
+      Plansheet::Pool::POOL_COMPARISON_ORDER ||= Plansheet::Pool::DEFAULT_COMPARISON_ORDER
+      # rubocop:enable Lint/OrAssignmentToConstant
+      require_relative "project"
+
+      load_projects_dir(@projects_dir) unless debug
+      sort_projects if @projects
+    end
+
+    def sort_projects
+      @projects ||= []
+      @projects.sort!
+      # lookup_hash returns the index of a project
+      lookup_hash = Hash.new nil
+
+      # initialize the lookups
+      @projects.each_index do |i|
+        lookup_hash[@projects[i].name] = i
+      end
+
+      pg = RGL::DirectedAdjacencyGraph.new
+      pg.add_vertices @projects
+      @projects.each_index do |proj_index|
+        next if @projects[proj_index].dropped_or_done?
+
+        @projects[proj_index]&.dependencies&.each do |dep|
+          di = lookup_hash[dep]
+          if di
+            # Don't add edges for dropped/done projects, they'll be sorted out
+            # later
+            next if @projects[di].dropped_or_done?
+
+            pg.add_edge(@projects[di], @projects[proj_index])
+          end
+        end
+      end
+
+      # The topological sort of pg is the correct dependency order of the
+      # projects
+      @projects = pg.topsort_iterator.to_a.flatten.uniq
+
+      # TODO: second sort doesn't deal with problems where deferred task gets
+      # pushed below.
+      @projects.sort!
+    end
+
+    def project_namespaces
+      @projects.collect(&:namespace).uniq.sort
+    end
+
+    def projects_in_namespace(namespace)
+      @projects.select { |x| x.namespace == namespace }
+    end
+
+    def write_projects
+      # TODO: This leaves potential for duplicate projects where empty files
+      # are involved once completed project directories are a thing - will need
+      # 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
+      end
+    end
+
+    def load_projects_dir(dir)
+      project_arr = []
+      projects = Dir.glob("*yml", base: dir)
+      projects.each do |l|
+        project_arr << ProjectYAMLFile.new(File.join(dir, l)).load_file
+      end
+
+      @projects = project_arr.flatten!
+    end
+  end
+end

data/lib/plansheet/project/stringify.rb

@@ -4,7 +4,9 @@ module Plansheet
   class Project
     def to_s
       str = String.new
-      str << "# #{@name}\n"
+      str << "# "
+      str << "#{@namespace} - " if @namespace
+      str << "#{@name}\n"
       STRING_PROPERTIES.each do |o|
         str << stringify_string_property(o)
       end

data/lib/plansheet/project/yaml.rb

@@ -4,9 +4,13 @@ require "yaml"
 require "date"
 require "pathname"
 
+require "kwalify"
+
 module Plansheet
   # Once there's some stability in plansheet and dc-kwalify, will pre-load this
   # to save the later YAML.load
+  YAML_TIME_REGEX = "/\\d+[mh] ?\d*m?/" # TODO: regex is bad, adjust for better handling of pretty time
+  YAML_DATE_REGEX = "/\\d+[dw]/"
   PROJECT_YAML_SCHEMA = <<~YAML
     desc: dc-tasks project schema
     type: seq
@@ -16,11 +20,10 @@ module Plansheet
           "project":
             desc: Project name
             type: str
-            required: yes
+            unique: true
           "namespace":
-            desc: Namespace of a group of projects (for organizing)
+            desc: Project name
             type: str
-            required: yes
           "priority":
             desc: Project priority
             type: str
@@ -51,14 +54,42 @@ module Plansheet
           "time_estimate":
             desc: The estimated amount of time before a project is completed
             type: str
+            pattern: #{YAML_TIME_REGEX}
+          "daily_time_roi":
+            desc: The estimated amount of time saved daily by completing this project
+            type: str
+            pattern: #{YAML_TIME_REGEX}
+          "weekly_time_roi":
+            desc: The estimated amount of time saved daily by completing this project
+            type: str
+            pattern: #{YAML_TIME_REGEX}
+          "yearly_time_roi":
+            desc: The estimated amount of time saved daily by completing this project
+            type: str
+            pattern: #{YAML_TIME_REGEX}
+          "day_of_week":
+            desc: recurring day of week project
+            type: str
+            enum:
+              - Sunday
+              - Monday
+              - Tuesday
+              - Wednesday
+              - Thursday
+              - Friday
+              - Saturday
           "frequency":
-            desc: The amount of time before a recurring project moves to ready status again from when it was last done (WIP)
+            desc: The amount of time before a recurring project moves to ready status again from when it was last done, with a set due date (eg. a bill becomes due)
+            type: str
+            pattern: #{YAML_DATE_REGEX}
+          "last_for":
+            desc: "The amount of time before a recurring project moves to ready status again from when it was last done, with a set defer date (eg. inflating a bike tire). If your project 'can't wait' a day or two, you should use frequency."
             type: str
-            pattern: /\\d+[dwDW]/
+            pattern: #{YAML_DATE_REGEX}
           "lead_time":
             desc: The amount of time before a recurring project is "due" moved to ready where the project (sort of a deferral mechanism) (WIP)
             type: str
-            pattern: /\\d+[dwDW]/
+            pattern: #{YAML_DATE_REGEX}
           "due":
             desc: Due date of the task
             type: date
@@ -114,17 +145,19 @@ module Plansheet
   PROJECT_SCHEMA = YAML.safe_load(PROJECT_YAML_SCHEMA)
 
   class ProjectYAMLFile
-    attr_reader :projects
+    attr_accessor :projects
 
     def initialize(path)
       @path = path
       # TODO: this won't GC, inline validation instead?
+    end
 
+    def load_file
       # Handle pre-Ruby 3.1 psych versions (this is brittle)
       @raw = if Psych::VERSION.split(".")[0].to_i >= 4
-               YAML.load_file(path, permitted_classes: [Date])
+               YAML.load_file(@path, permitted_classes: [Date])
              else
-               YAML.load_file(path)
+               YAML.load_file(@path)
              end
 
       validate_schema
@@ -133,6 +166,7 @@ module Plansheet
         proj["namespace"] = namespace
         Project.new proj
       end
+      @projects
     end
 
     def namespace
@@ -155,8 +189,12 @@ module Plansheet
       @projects.sort!
     end
 
+    def write
+      File.write @path, yaml_dump
+    end
+
     def yaml_dump
-      YAML.dump(@projects.map(&:to_h))
+      YAML.dump(@projects.map { |x| x.to_h.delete_if { |k, _| k == "namespace" } })
     end
   end
 end

data/lib/plansheet/project.rb

@@ -5,6 +5,13 @@ require "date"
 require_relative "project/yaml"
 require_relative "project/stringify"
 
+# Needed for Project#time_estimate, would be much happier *not* patching Array
+class Array
+  def nil_if_empty
+    count.zero? ? nil : self
+  end
+end
+
 module Plansheet
   PROJECT_STATUS_PRIORITY = {
     "wip" => 1,
@@ -17,11 +24,11 @@ module Plansheet
     "done" => 8
   }.freeze
 
-  PROJECT_PRIORITY = {
-    "high" => 1,
-    "medium" => 2,
-    "low" => 3
-  }.freeze
+  # Pre-compute the next days-of-week
+  NEXT_DOW = 0.upto(6).to_h do |x|
+    d = Date.today + x
+    [d.strftime("%A"), d]
+  end.freeze
 
   def self.parse_date_duration(str)
     return Regexp.last_match(1).to_i if str.strip.match(/(\d+)[dD]/)
@@ -30,6 +37,29 @@ module Plansheet
     raise "Can't parse time duration string #{str}"
   end
 
+  def self.parse_time_duration(str)
+    if str.match(/(\d+h) (\d+m)/)
+      return (parse_time_duration(Regexp.last_match(1)) + parse_time_duration(Regexp.last_match(2)))
+    end
+
+    return Regexp.last_match(1).to_i if str.strip.match(/(\d+)m/)
+    return (Regexp.last_match(1).to_f * 60).to_i if str.strip.match(/(\d+\.?\d*)h/)
+
+    raise "Can't parse time duration string #{str}"
+  end
+
+  def self.build_time_duration(minutes)
+    if minutes > 59
+      if (minutes % 60).zero?
+        "#{minutes / 60}h"
+      else
+        "#{minutes / 60}h #{minutes % 60}m"
+      end
+    else
+      "#{minutes}m"
+    end
+  end
+
   # The use of instance_variable_set/get probably seems a bit weird, but the
   # intent is to avoid object allocation on non-existent project properties, as
   # well as avoiding a bunch of copy-paste boilerplate when adding a new
@@ -39,26 +69,31 @@ module Plansheet
   class Project
     include Comparable
 
-    DEFAULT_COMPARISON_ORDER = %w[
-      completeness
-      dependency
-      priority
-      defer
-      due
-      status
-    ].map { |x| "compare_#{x}".to_sym }.freeze
+    TIME_EST_REGEX = /\((\d+\.?\d*[mMhH])\)$/.freeze
+    TIME_EST_REGEX_NO_CAPTURE = /\(\d+\.?\d*[mMhH]\)$/.freeze
+
+    PROJECT_PRIORITY = {
+      "high" => 1,
+      "medium" => 2,
+      "low" => 3
+    }.freeze
+
+    COMPARISON_ORDER_SYMS = Plansheet::Pool::POOL_COMPARISON_ORDER.map { |x| "compare_#{x}".to_sym }.freeze
     # NOTE: The order of these affects presentation!
     # namespace is derived from file name
-    STRING_PROPERTIES = %w[namespace priority status location notes time_estimate frequency lead_time].freeze
+    STRING_PROPERTIES = %w[priority status location notes time_estimate daily_time_roi weekly_time_roi yearly_time_roi
+                           day_of_week frequency last_for lead_time].freeze
     DATE_PROPERTIES = %w[due defer completed_on created_on starts_on last_done last_reviewed].freeze
     ARRAY_PROPERTIES = %w[dependencies externals urls tasks done tags].freeze
 
     ALL_PROPERTIES = STRING_PROPERTIES + DATE_PROPERTIES + ARRAY_PROPERTIES
 
-    attr_reader :name, *ALL_PROPERTIES
+    attr_reader :name, :priority_val, :time_estimate_minutes, *ALL_PROPERTIES
+    attr_accessor :namespace
 
     def initialize(options)
       @name = options["project"]
+      @namespace = options["namespace"]
 
       ALL_PROPERTIES.each do |o|
         instance_variable_set("@#{o}", options[o]) if options[o]
@@ -74,12 +109,51 @@ module Plansheet
       # date/external commits/penalties for project failure, etc
       #
       # Assume all projects are low priority unless stated otherwise.
-      @priority ||= "low"
+      @priority_val = if @priority
+                        PROJECT_PRIORITY[@priority]
+                      else
+                        PROJECT_PRIORITY["low"]
+                      end
+
+      # Remove stale defer dates
+      remove_instance_variable("@defer") if @defer && (@defer < Date.today)
+
+      # Add a created_on field if it doesn't exist
+      instance_variable_set("@created_on", Date.today) unless @created_on
+
+      # Generate time estimate from tasks if specified
+      # Stomps time_estimate field
+      if @tasks
+        @time_estimate_minutes = @tasks&.select do |t|
+                                   t.match? TIME_EST_REGEX_NO_CAPTURE
+                                 end&.nil_if_empty&.map { |t| Plansheet::Project.task_time_estimate(t) }&.sum
+      elsif @time_estimate
+        # No tasks with estimates, but there's an explicit time_estimate
+        # Convert the field to minutes
+        @time_estimate_minutes = Plansheet.parse_time_duration(@time_estimate)
+      end
+      if @time_estimate_minutes # rubocop:disable Style/GuardClause
+        # 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
+    end
+
+    def yearly_minutes_saved
+      if @daily_time_roi
+        Plansheet.parse_time_duration(@daily_time_roi) * 365
+      elsif @weekly_time_roi
+        Plansheet.parse_time_duration(@weekly_time_roi) * 52
+      elsif @yearly_time_roi
+        Plansheet.parse_time_duration(@yearly_time_roi)
+      end
     end
 
     def <=>(other)
       ret_val = 0
-      DEFAULT_COMPARISON_ORDER.each do |method|
+      COMPARISON_ORDER_SYMS.each do |method|
         ret_val = send(method, other)
         break if ret_val != 0
       end
@@ -87,7 +161,15 @@ module Plansheet
     end
 
     def compare_priority(other)
-      PROJECT_PRIORITY[@priority] <=> PROJECT_PRIORITY[other.priority]
+      priority_val <=> other.priority_val
+    end
+
+    def time_roi_payoff
+      @time_roi_payoff || 0
+    end
+
+    def compare_time_roi(other)
+      other.time_roi_payoff <=> time_roi_payoff
     end
 
     def compare_status(other)
@@ -115,19 +197,25 @@ module Plansheet
       receiver <=> comparison
     end
 
-    def compare_dependency(other)
-      return 0 if @dependencies.nil? && other.dependencies.nil?
+    def dependency_of?(other)
+      other&.dependencies&.any? do |dep|
+        @name&.downcase == dep.downcase
+      end
+    end
 
-      if @dependencies.nil?
-        return -1 if other.dependencies.any? do |dep|
-          @name.downcase == dep.downcase
-        end
-      elsif @dependencies.any? do |dep|
-              other.name.downcase == dep.downcase
-            end
-        return 1
+    def dependent_on?(other)
+      @dependencies&.any? do |dep|
+        other&.name&.downcase == dep.downcase
       end
-      0
+    end
+
+    def compare_dependency(other)
+      # This approach might seem odd,
+      # but it's to handle circular dependencies
+      retval = 0
+      retval -= 1 if dependency_of?(other)
+      retval += 1 if dependent_on?(other)
+      retval
     end
 
     # Projects that are dropped or done are considered "complete", insofar as
@@ -173,7 +261,8 @@ module Plansheet
 
     def subsequent_recurring_status
       return "done" if @lead_time && defer > Date.today
-      return "done" if due > Date.today
+      return "done" if @last_for && defer > Date.today
+      return "done" if due && due > Date.today
 
       task_based_status
     end
@@ -186,41 +275,62 @@ module Plansheet
     # Due date either explicit or recurring
     def due
       return @due if @due
-      return recurring_due_date if recurring?
+      return recurring_due_date if recurring_due?
 
       nil
     end
 
     def recurring_due_date
       if @last_done
-        @last_done + Plansheet.parse_date_duration(@frequency)
-      else
-        Date.today
+        return @last_done + Plansheet.parse_date_duration(@frequency) if @frequency
+
+        if @day_of_week
+          return Date.today + 7 if @last_done == Date.today
+          return @last_done + 7 if @last_done < Date.today - 7
+
+          return NEXT_DOW[@day_of_week]
+        end
       end
+
+      # Going to assume this is the first time, so due today
+      Date.today
     end
 
     def defer
       return @defer if @defer
       return lead_time_deferral if @lead_time && due
+      return last_for_deferral if @last_for
 
       nil
     end
 
+    def last_for_deferral
+      return @last_done + Plansheet.parse_date_duration(@last_for) if @last_done
+    end
+
     def lead_time_deferral
       [(due - Plansheet.parse_date_duration(@lead_time)),
        Date.today].max
     end
 
+    def recurring_due?
+      !@frequency.nil? || !@day_of_week.nil?
+    end
+
     def recurring?
-      !@frequency.nil?
+      !@frequency.nil? || !@day_of_week.nil? || !@last_done.nil?
     end
 
     def dropped_or_done?
       status == "dropped" || status == "done"
     end
 
+    def self.task_time_estimate(str)
+      Plansheet.parse_time_duration(Regexp.last_match(1)) if str.match(TIME_EST_REGEX)
+    end
+
     def to_h
-      h = { "project" => @name }
+      h = { "project" => @name, "namespace" => @namespace }
       ALL_PROPERTIES.each do |prop|
         h[prop] = instance_variable_get("@#{prop}") if instance_variable_defined?("@#{prop}")
       end

data/lib/plansheet/sheet.rb

@@ -5,12 +5,10 @@ module Plansheet
   # The Sheet class constructs a Markdown/LaTeX file for use with pandoc
   class Sheet
     def initialize(output_file, project_arr)
-      sorted_arr = project_arr.sort!
-
       projects_str = String.new
       projects_str << sheet_header
 
-      sorted_arr.each do |p|
+      project_arr.each do |p|
         projects_str << project_minipage(p)
       end
       puts "Writing to #{output_file}"
@@ -30,19 +28,26 @@ module Plansheet
 
     def project_minipage(proj)
       str = String.new
-      str << "\\begin{minipage}{4.5cm}\n"
+      str << "\\begin{minipage}{6cm}\n"
       str << project_header(proj)
       proj&.tasks&.each do |t|
-        str << "$\\square$ #{t} \\\\\n"
+        str << "$\\square$ #{sanitize_string(t)} \\\\\n"
       end
       str << "\\end{minipage}\n"
       str
     end
 
+    def sanitize_string(str)
+      str.gsub("_", '\_')
+    end
+
     def project_header(proj)
       str = String.new
-      str << "#{proj.name} - #{proj.status}"
-      str << " - #{proj.location}" if proj.location
+      str << "#{sanitize_string(proj.namespace)}: #{sanitize_string(proj.name)}\\\\\n"
+      str << proj.status.to_s
+      str << " - #{sanitize_string(proj.location)}" if proj.location
+      str << " due: #{proj.due}" if proj.due
+      str << " time: #{proj.time_estimate}" if proj.time_estimate
       str << " \\\\\n"
       str
     end

data/lib/plansheet/version.rb

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

data/lib/plansheet.rb

@@ -1,36 +1,16 @@
 # frozen_string_literal: true
 
 require_relative "plansheet/version"
-require_relative "plansheet/project"
-require_relative "plansheet/sheet"
+require_relative "plansheet/pool"
 require "yaml"
-require "kwalify"
 
 module Plansheet
   class Error < StandardError; end
 
+  # TODO: config schema validation
   def self.load_config
     YAML.load_file "#{Dir.home}/.plansheet.yml"
   rescue StandardError
     abort "unable to load plansheet config file"
   end
-
-  def self.resort_projects_in_dir(dir)
-    project_files = Dir.glob("#{dir}/*yml")
-    project_files.each do |f|
-      pyf = ProjectYAMLFile.new(f)
-      pyf.sort!
-      File.write(f, pyf.yaml_dump)
-    end
-  end
-
-  def self.load_projects_dir(dir)
-    project_arr = []
-    projects = Dir.glob("*yml", base: dir)
-    projects.each do |l|
-      project_arr << ProjectYAMLFile.new(File.join(dir, l)).projects
-    end
-
-    project_arr.flatten!
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plansheet
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.23.0
 platform: ruby
 authors:
 - David Crosby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 2022-07-05 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: rgl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.5.8
 description: Convert YAML project files into a nice PDF
 email:
 - dave@dafyddcrosby.com
@@ -43,6 +57,7 @@ files:
 - examples/backpack.yml
 - exe/plansheet
 - lib/plansheet.rb
+- lib/plansheet/pool.rb
 - lib/plansheet/project.rb
 - lib/plansheet/project/stringify.rb
 - lib/plansheet/project/yaml.rb