plansheet 0.3.3 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e78fa7422ef53cce690b2d8500c406ac6bb2136d195725b3d839d67cc234c780
-  data.tar.gz: 65093bd8b89bf39b2a144de85867bcb4635e41f5a8c379b8486c0a8a0135cebb
+  metadata.gz: 36b1a62d85f75f6fe04c0ad37b6d344dc9d9192a02d093283979986f09532935
+  data.tar.gz: 13a281430dfc803f940d05efa83c68758db7a4452912cfcfd6b5fe9a7247d69c
 SHA512:
-  metadata.gz: a70d01f6617f79041d95e4a1b596f68c36de68a9be8abd7be684f3d394dd15a5d49bc0a7560435670fab7d5fc59dd505c1f4adee0aba68d7feaed46cc2f61bcb
-  data.tar.gz: f63764aaaca3a1a7efa75c07f2776d279171dc297cee0d34306416690fb2b08f5c85697f7d1ebc1a40a03671727f3162f0293d552231405c0084438a61dfb9b6
+  metadata.gz: fc3b217bf90a0333dc9f09b011c1f09caba8977a0f19bdd0a3695b76c519da54a5f2144897af49ee6e4f726a8abddc35532c51895c1c37a30422ddd39118676b
+  data.tar.gz: a553efe99e604078e55ae0ea9cfdfa625a026a242ac92025e6600ebc5e04935c528a4d1807ecbe3a2a469ec6c37d3923cf22bad9c6f292d3ab79d1eca868c58b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    plansheet (0.3.3)
+    plansheet (0.6.1)
       dc-kwalify (~> 1.0)
 
 GEM

data/exe/plansheet

@@ -1,81 +1,39 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "kwalify"
-require "yaml"
 require "plansheet"
-
-begin
-  config = YAML.load_file "#{Dir.home}/.plansheet.yml"
-rescue StandardError
-  abort "unable to load plansheet config file"
-end
-
-project_hash = {}
-projects = Dir.glob("*yml", base: config["projects_dir"])
-projects.each do |l|
-  contents = YAML.load_file(File.join(config["projects_dir"], l))
-  validator = Kwalify::Validator.new(Plansheet::PROJECT_SCHEMA)
-  errors = validator.validate(contents)
-  # Check YAML validity
-  if errors && !errors.empty?
-    $stderr.write "Schema errors in #{l}\n"
-    errors.each { |err| puts "- [#{err.path}] #{err.message}" }
-    abort
-  end
-
-  key = l.gsub(".yml", "")
-  contents.each do |project|
-    key = project["project"]
-    project_hash[key] = {
-      name: project["project"]
-    }
-    %w[tasks desc done].each do |k|
-      project_hash[key][k.to_sym] = project[k] if project[k]
-    end
-    project_hash[key][:status] = if project["status"]
-                                   project["status"]
-                                 elsif project_hash[key][:tasks]
-                                   "planning"
-                                 else
-                                   "idea"
-                                 end
+require "optparse"
+
+parser = OptionParser.new
+parser.on(
+  "--sheet",
+  "Generates MD/LaTeX project PDF"
+)
+parser.on(
+  "--sort",
+  "Sort project files"
+)
+parser.on(
+  "--cli",
+  "CLI dump of projects (WIP)"
+)
+options = {}
+parser.parse!(into: options)
+
+config = Plansheet.load_config
+
+if options[:sheet] || options.empty?
+  project_arr = Plansheet.load_projects_dir config["projects_dir"]
+
+  Dir.mkdir config["output_dir"] unless Dir.exist? config["output_dir"]
+
+  Plansheet::Sheet.new("#{config["output_dir"]}/projects.md", project_arr)
+elsif options[:sort]
+  Plansheet.resort_projects_in_dir config["projects_dir"]
+elsif options[:cli]
+  project_arr = Plansheet.load_projects_dir config["projects_dir"]
+  project_arr.sort.each do |proj|
+    puts proj
+    puts "\n"
   end
 end
-
-sorted_hash = project_hash.sort_by do |_, v|
-  Plansheet::PROJECT_STATUS_PRIORITY[v[:status]]
-end
-
-def project_minipage(proj)
-  str = String.new
-  str << "\\begin{minipage}{5cm}\n"
-  str << "#{proj[:name]} - #{proj[:status]} \\\\\n"
-  proj[:tasks]&.each do |t|
-    str << "$\\square$ #{t} \\\\\n"
-  end
-  str << "\\end{minipage}\n"
-  str
-end
-
-require "date"
-projects_str = String.new
-projects_str << <<~FRONTMATTER
-  ---
-  geometry: margin=3cm
-  ---
-  \\thispagestyle{empty}
-
-  # Date: #{Date.today}
-FRONTMATTER
-
-sorted_hash.first(60).each do |_, p|
-  projects_str << project_minipage(p)
-end
-
-output_file = "#{config["output_dir"]}/projects.md"
-puts "Writing to #{output_file}"
-Dir.mkdir config["output_dir"] unless Dir.exist? config["output_dir"]
-f = File.open(output_file, "w")
-f.write(projects_str)
-f.close

data/lib/plansheet/project.rb

@@ -13,6 +13,17 @@ module Plansheet
     "done" => 7
   }.freeze
 
+  PROJECT_PRIORITY = {
+    "high" => 1,
+    "medium" => 2,
+    "low" => 3
+  }.freeze
+  PROJECT_PRIORITY_REV = {
+    1 => "high",
+    2 => "medium",
+    3 => "low"
+  }.freeze
+
   # Once there's some stability in plansheet and dc-kwalify, will pre-load this
   # to save the later YAML.load
   PROJECT_YAML_SCHEMA = <<~YAML
@@ -39,11 +50,14 @@ module Plansheet
               - done # project is finished, but want to keep around
                      # for reference, etc.
           "priority":
-            desc: Project priority (not currently implemented)
+            desc: Project priority
             type: str
             enum:
               - high
               - low
+          "location":
+            desc: Location
+            type: str
           "tasks":
             desc: List of tasks to do
             type: seq
@@ -59,4 +73,108 @@ module Plansheet
             type: str
   YAML
   PROJECT_SCHEMA = YAML.safe_load(PROJECT_YAML_SCHEMA)
+  class Project
+    include Comparable
+    attr_reader :name, :tasks, :done, :notes, :location, :priority
+
+    def initialize(options)
+      @name = options["project"]
+
+      @tasks = options["tasks"] || []
+      @done = options["done"] || []
+
+      @notes = options["notes"] if options["notes"]
+      @priority = PROJECT_PRIORITY[options["priority"] || "medium"]
+      @location = options["location"] if options["location"]
+      @status = options["status"] if options["status"]
+    end
+
+    def <=>(other)
+      if @priority == other.priority
+        # TODO: if planning status, then sort based on tasks? category? alphabetically?
+        PROJECT_STATUS_PRIORITY[status] <=> PROJECT_STATUS_PRIORITY[other.status]
+      else
+        @priority <=> other.priority
+      end
+    end
+
+    # TODO: clean up priority handling
+    def priority_string
+      PROJECT_PRIORITY_REV[@priority]
+    end
+
+    def status
+      return @status if @status
+
+      if @tasks.count.positive?
+        if @done.count.positive?
+          "wip"
+        else
+          "planning"
+        end
+      else
+        "idea"
+      end
+    end
+
+    def to_s
+      str = String.new
+      str << "# #{@name}\n"
+      str << "priority: #{priority_string}\n"
+      str << "status: #{status}\n"
+      str << "notes: #{notes}\n" unless @notes.nil?
+      str << "location: #{location}\n" unless @location.nil?
+      str << "tasks:\n" unless @tasks.empty?
+      @tasks.each do |t|
+        str << "- #{t}\n"
+      end
+      str << "done:\n" unless @done.empty?
+      @done.each do |d|
+        str << "- #{d}\n"
+      end
+      str
+    end
+
+    def to_h
+      h = { "project" => @name }
+      h["priority"] = priority_string unless priority_string == "medium"
+      h["status"] = status unless status == "idea"
+      h["notes"] = @notes unless @notes.nil?
+      h["location"] = @location unless @location.nil?
+      h["tasks"] = @tasks unless @tasks.empty?
+      h["done"] = @done unless @done.empty?
+      h
+    end
+  end
+
+  class ProjectYAMLFile
+    attr_reader :projects
+
+    def initialize(path)
+      @path = path
+      # TODO: this won't GC, inline validation instead?
+      @raw = YAML.load_file(path)
+      validate_schema
+      @projects = @raw.map { |proj| Project.new proj }
+    end
+
+    def validate_schema
+      validator = Kwalify::Validator.new(Plansheet::PROJECT_SCHEMA)
+      errors = validator.validate(@raw)
+      # Check YAML validity
+      return unless errors && !errors.empty?
+
+      $stderr.write "Schema errors in #{@path}:\n"
+      errors.each { |err| puts "- [#{err.path}] #{err.message}" }
+      abort
+    end
+
+    def sort!
+      @projects.sort!
+    end
+
+    def yaml_dump
+      YAML.dump(@projects.map(&:to_h))
+    end
+  end
 end

data/lib/plansheet/sheet.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require "date"
+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.first(60).each do |p|
+        projects_str << project_minipage(p)
+      end
+      puts "Writing to #{output_file}"
+      File.write(output_file, projects_str)
+    end
+
+    def sheet_header
+      <<~FRONTMATTER
+        ---
+        geometry: margin=1.5cm
+        ---
+        \\thispagestyle{empty}
+
+        # Date: #{Date.today}
+      FRONTMATTER
+    end
+
+    def project_minipage(proj)
+      str = String.new
+      str << "\\begin{minipage}{4.5cm}\n"
+      str << project_header(proj)
+      proj.tasks.each do |t|
+        str << "$\\square$ #{t} \\\\\n"
+      end
+      str << "\\end{minipage}\n"
+      str
+    end
+
+    def project_header(proj)
+      str = String.new
+      str << "#{proj.name} - #{proj.status}"
+      str << " - #{proj.location}" if proj.location
+      str << " \\\\\n"
+      str
+    end
+  end
+end

data/lib/plansheet/version.rb

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

data/lib/plansheet.rb

@@ -2,8 +2,35 @@
 
 require_relative "plansheet/version"
 require_relative "plansheet/project"
+require_relative "plansheet/sheet"
+require "yaml"
+require "kwalify"
 
 module Plansheet
   class Error < StandardError; end
-  # Your code goes here...
+
+  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.3.3
+  version: 0.6.1
 platform: ruby
 authors:
 - David Crosby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-24 00:00:00.000000000 Z
+date: 2022-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dc-kwalify
@@ -29,7 +29,6 @@ email:
 - dave@dafyddcrosby.com
 executables:
 - plansheet
-- plansheet-sorter
 extensions: []
 extra_rdoc_files: []
 files:
@@ -42,9 +41,9 @@ files:
 - Rakefile
 - examples/backpack.yml
 - exe/plansheet
-- exe/plansheet-sorter
 - lib/plansheet.rb
 - lib/plansheet/project.rb
+- lib/plansheet/sheet.rb
 - lib/plansheet/version.rb
 homepage: https://dafyddcrosby.com
 licenses:

data/exe/plansheet-sorter

@@ -1,25 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-# An ugly script to sort projects by status (and eventually priority)
-
-require "yaml"
-require "plansheet"
-
-def project_priority(project)
-  if project["status"]
-    project["status"]
-  elsif project["tasks"]
-    "planning"
-  else
-    "idea"
-  end
-end
-
-filename = ARGV.first
-contents = YAML.load_file(filename)
-sorted_hash = contents.sort_by do |project|
-  Plansheet::PROJECT_STATUS_PRIORITY[project_priority project]
-end
-
-File.write(filename, YAML.dump(sorted_hash))