plansheet 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3546f42fdd342ea128be90bff2e19b7bcb5c0910990e2132b89b87cbf6a1f776
-  data.tar.gz: 2ea5d505262832e19e77a63e7aa7c59c9fff0b98ddc3ee8218c68b010f4768eb
+  metadata.gz: 0df6d0d15bff6b0d639ea6561ad722308c02e00b1bd313649b952a48c7826ad4
+  data.tar.gz: 51faedcd44ccaeec7ee88a3e345bb8d5ae1597a5689324953a188e1725a465e2
 SHA512:
-  metadata.gz: 335cb1a3e74ab82a1441ec034099427dc0caabaad8a87c1f2620c7143d1fd4772023fe089a7305063fb12a96d169e44dd0b01f8f20437f45bdfa945b03aa2422
-  data.tar.gz: 5d618d61c6a07d8e32e46cfb4dba5df0264370f01d8b4ecef4c68f9fdcf6fcf600ca33bda0a8918e63992434e2a009e4d836f1f838851e0ee94de53128fe1ab2
+  metadata.gz: 0eb27167a0d754f27df229da3e2e12a07734a1e90f8d1a19374a6d408fd822d67286b31efbaa223eae61ec97931727ed4d3ea70e4211035cb8f2ea68f728f207
+  data.tar.gz: 646ed78dd6f00b145ad61778fc7462b1ee1a3f9c52df3b3e27347c5d30ac199b2b4ef914239dd1a586d2e575e9fe8d44f664d5e152075a8ca5211150b4034838

data/Gemfile.lock

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

data/exe/plansheet

@@ -32,7 +32,7 @@ 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.each do |proj|
+  project_arr.sort.each do |proj|
     puts proj
     puts "\n"
   end

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,13 +50,13 @@ 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 (not currently implemented)
+            desc: Location
             type: str
           "tasks":
             desc: List of tasks to do
@@ -63,7 +74,8 @@ module Plansheet
   YAML
   PROJECT_SCHEMA = YAML.safe_load(PROJECT_YAML_SCHEMA)
   class Project
-    attr_reader :name, :tasks, :done, :notes, :location
+    include Comparable
+    attr_reader :name, :tasks, :done, :notes, :location, :priority
 
     def initialize(options)
       @name = options["project"]
@@ -72,10 +84,25 @@ module Plansheet
       @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
 
@@ -92,7 +119,8 @@ module Plansheet
 
     def to_s
       str = String.new
-      str <<  "# #{@name}\n"
+      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?
@@ -106,8 +134,10 @@ module Plansheet
       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?
@@ -132,17 +162,15 @@ module Plansheet
       validator = Kwalify::Validator.new(Plansheet::PROJECT_SCHEMA)
       errors = validator.validate(@raw)
       # Check YAML validity
-      if errors && !errors.empty?
-        $stderr.write "Schema errors in #{l}\n"
-        errors.each { |err| puts "- [#{err.path}] #{err.message}" }
-        abort
-      end
+      return unless errors && !errors.empty?
+
+      $stderr.write "Schema errors in #{l}\n"
+      errors.each { |err| puts "- [#{err.path}] #{err.message}" }
+      abort
     end
 
     def sort!
-      @projects.sort_by! do |project|
-        Plansheet::PROJECT_STATUS_PRIORITY[project.status]
-      end
+      @projects.sort!
     end
 
     def yaml_dump

data/lib/plansheet/sheet.rb

@@ -5,9 +5,7 @@ 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_by do |p|
-        Plansheet::PROJECT_STATUS_PRIORITY[p.status]
-      end
+      sorted_arr = project_arr.sort!
 
       projects_str = String.new
       projects_str << sheet_header

data/lib/plansheet/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plansheet
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - David Crosby