taskmeister 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 591ce55195a674c8070990555d81b0adb170bbfb
-  data.tar.gz: ba6c0b5b60a931b6b88ed9b1fbd4972593ddd6cc
+  metadata.gz: c3ed72f2ffd7c5abeff6d683b75dc8e0d8cb8fa1
+  data.tar.gz: 868ad94b5ddd220439631d2997897ca5f8aafcac
 SHA512:
-  metadata.gz: e6b26c40298e84d9849c7938ffe0b9e0eeb7c75d8eece34a3d3f056383d6e1f5d6b740a0a420c53a7c2e5840f9813865754a5f5ce7656ab64e30bde23c3b2b11
-  data.tar.gz: aa049e066b54e142feee77aea27e427e71c61557bfca4891f859ba7f499c680695dac19cd96f5d340b0533c65f8e8c58ed2257884b98932d960105ae6ade0664
+  metadata.gz: e9a06654fba462da119efeb967e71c96ef0791f3faa05108013edc9fdac5f39875aab18bb27ebd2bd51af2aec077e84fd51324bb9acd7e143fd60da451b3faa6
+  data.tar.gz: 89d3baf2c913ba4c40639cb183bc2895ed3ff5f82282e724bbcd9cf573c0d8db14708f73d2975afe5e6113edc32dfa30bd8807558ac8cf1b6f6a67c95a9c47fd

data/README.md

@@ -4,9 +4,10 @@ Simple command line task management modelled after [t](http://stevelosh.com/proj
 
 I like the simplicity of t but there are a couple of changes I wanted.
 
-First: I like to have separate task lists per project. So I infer the task list
-name from the current project directory. It finds a project directory by walking
-up from the current directory until it finds a `.git` or `.hg` directory in it.
+First: I like to have separate task lists per project but I want a single shell
+alias for all of them. So I infer the task list name from the current project
+directory. It finds a project directory by walking up from the current directory
+until it finds a `.git` or `.hg` directory in it.
 
 Second: I like to have a short list of notes accompanying my tasks. You can add
 notes beneath your task. They can be edited via Vim with `taskmeister -e` or
@@ -16,14 +17,19 @@ Third: I format my task files in Markdown so that when I open them on my phone
 via a Markdown-enabled editor they look nice. The format is still simple:
 
 ```markdown
-Add authorisation - [id](aaf83a9b-02f7-4cc0-8ee1-4d98b98903b8)
+# Update gems [∞](#aaf83a9b-02f7-4cc0-8ee1-4d98b98903b8)
 
-> Some notes to go with the task above.
->
-> Maybe paste in some links or other interesting information for later.
+# Refactor the widget model [∞](#ae0cce15-456d-48c0-a2e2-69d5f567e092)
+
+# Update the README [∞](#a5d4d3a9-2b9a-427a-9047-b47c6aec8f93)
+
+Some notes to go with the task above.
+
+- item 1
+- item 2
+
+> Or a quote
 
-Refactor the task model - [id](ae0cce15-456d-48c0-a2e2-69d5f567e092)
-Update the README - [id](a5d4d3a9-2b9a-427a-9047-b47c6aec8f93)
 ```
 
 ## Installation

data/features/add.feature

@@ -3,13 +3,14 @@ Feature: taskmeister adds a task to the list
   Scenario: Add a task to the list
     Given a file named "mylist.md" with:
       """
-Task one - [id](aaf83a9b-02f7-4cc0-8ee1-4d98b98903b8)
+# Task one [∞](#e8fd82de-c379-496d-a77b-2873192e8ea8)
 
-> Notes line one
-> Notes line two
+Notes line one
+Notes line two
 
-Task two - [id](ae0cce15-456d-48c0-a2e2-69d5f567e092)
-Task three - [id](a5d4d3a9-2b9a-427a-9047-b47c6aec8f93)
+# Task two [∞](#ae0cce15-456d-48c0-a2e2-69d5f567e092)
+
+# Task three [∞](#a5d4d3a9-2b9a-427a-9047-b47c6aec8f93)
       """
     When I successfully run `taskmeister --list mylist.md A new task`
     And I successfully run `taskmeister --list mylist.md`

data/features/done.feature

@@ -3,13 +3,14 @@ Feature: taskmeister removes finished tasks from the list
   Scenario: Complete a task in the list
     Given a file named "mylist.md" with:
       """
-Task one - [id](aaf83a9b-02f7-4cc0-8ee1-4d98b98903b8)
+# Task one [∞](#a8fd82de-c379-496d-a77b-2873192e8ea8)
 
-> Notes line one
-> Notes line two
+Notes line one
+Notes line two
 
-Task two - [id](ae0cce15-456d-48c0-a2e2-69d5f567e092)
-Task three - [id](a5d4d3a9-2b9a-427a-9047-b47c6aec8f93)
+# Task two [∞](#ae0cce15-456d-48c0-a2e2-69d5f567e092)
+
+# Task three [∞](#a5d4d3a9-2b9a-427a-9047-b47c6aec8f93)
       """
     When I successfully run `taskmeister --list mylist.md --done a`
     And I successfully run `taskmeister --list mylist.md`
@@ -18,10 +19,10 @@ Task three - [id](a5d4d3a9-2b9a-427a-9047-b47c6aec8f93)
   Scenario: Delete the task list when you remove the last task
     Given a file named "mylist.md" with:
       """
-Task one - [id](aaf83a9b-02f7-4cc0-8ee1-4d98b98903b8)
+# Task one [∞](#a8fd82de-c379-496d-a77b-2873192e8ea8)
 
-> Notes line one
-> Notes line two
+Notes line one
+Notes line two
       """
     When I successfully run `taskmeister --list mylist.md --done a`
     Then the file "mylist.md" should not exist

data/features/edit.feature

@@ -3,13 +3,14 @@ Feature: taskmeister opens vim to edit your task list
   Scenario: Edit entire task list
     Given a file named "mylist.md" with:
       """
-Task one - [id](aaf83a9b-02f7-4cc0-8ee1-4d98b98903b8)
+# Task one [∞](#a8fd82de-c379-496d-a77b-2873192e8ea8)
 
-> Notes line one
-> Notes line two
+Notes line one
+Notes line two
 
-Task two - [id](ae0cce15-456d-48c0-a2e2-69d5f567e092)
-Task three - [id](a5d4d3a9-2b9a-427a-9047-b47c6aec8f93)
+# Task two [∞](#ae0cce15-456d-48c0-a2e2-69d5f567e092)
+
+# Task three [∞](#a5d4d3a9-2b9a-427a-9047-b47c6aec8f93)
       """
     And I double `vim`
     When I run `taskmeister --list mylist.md --edit`
@@ -19,16 +20,17 @@ Task three - [id](a5d4d3a9-2b9a-427a-9047-b47c6aec8f93)
   Scenario: Edit specific task in the list
     Given a file named "mylist.md" with:
       """
-Task one - [id](aaf83a9b-02f7-4cc0-8ee1-4d98b98903b8)
+# Task one [∞](#a8fd82de-c379-496d-a77b-2873192e8ea8)
+
+Notes line one
+Notes line two
 
-> Notes line one
-> Notes line two
+# Task two [∞](#ae0cce15-456d-48c0-a2e2-69d5f567e092)
 
-Task two - [id](ae0cce15-456d-48c0-a2e2-69d5f567e092)
-Task three - [id](a5d4d3a9-2b9a-427a-9047-b47c6aec8f93)
+# Task three [∞](#a5d4d3a9-2b9a-427a-9047-b47c6aec8f93)
       """
     And I double `vim`
     When I run `taskmeister --list mylist.md --edit a`
-    Then the double `vim` should have been run with "+/aaf83a9b-02f7-4cc0-8ee1-4d98b98903b8" and file "mylist.md"
+    Then the double `vim` should have been run with "+/a8fd82de-c379-496d-a77b-2873192e8ea8" and file "mylist.md"
     And the exit status should be 0
 

data/features/list.feature

@@ -3,13 +3,14 @@ Feature: taskmeister lists the contents of a task list
   Scenario: List tasks in list
     Given a file named "mylist.md" with:
       """
-Task one - [id](aaf83a9b-02f7-4cc0-8ee1-4d98b98903b8)
+# Task one [∞](#a8fd82de-c379-496d-a77b-2873192e8ea8)
 
-> Notes line one
-> Notes line two
+Notes line one
+Notes line two
 
-Task two - [id](ae0cce15-456d-48c0-a2e2-69d5f567e092)
-Task three - [id](a5d4d3a9-2b9a-427a-9047-b47c6aec8f93)
+# Task two [∞](#ae0cce15-456d-48c0-a2e2-69d5f567e092)
+
+# Task three [∞](#a5d4d3a9-2b9a-427a-9047-b47c6aec8f93)
       """
     When I successfully run `taskmeister --list mylist.md`
     Then the output should contain "a  - Task one »"

data/features/project_dir.feature

@@ -6,13 +6,14 @@ Feature: taskmeister infers the name of your task list from your current project
     And a directory named "project/child"
     And a file named "project.md" with:
       """
-Task one - [id](aaf83a9b-02f7-4cc0-8ee1-4d98b98903b8)
+# Task one [∞](#a8fd82de-c379-496d-a77b-2873192e8ea8)
 
-> Notes line one
-> Notes line two
+Notes line one
+Notes line two
 
-Task two - [id](ae0cce15-456d-48c0-a2e2-69d5f567e092)
-Task three - [id](a5d4d3a9-2b9a-427a-9047-b47c6aec8f93)
+# Task two [∞](#ae0cce15-456d-48c0-a2e2-69d5f567e092)
+
+# Task three [∞](#a5d4d3a9-2b9a-427a-9047-b47c6aec8f93)
       """
     And I cd to "project/child"
     When I successfully run `taskmeister --task-dir ../../`

data/features/replace.feature

@@ -3,13 +3,14 @@ Feature: taskmeister replaces a task in the list
   Scenario: Replace text of task in list
     Given a file named "mylist.md" with:
       """
-Task one - [id](aaf83a9b-02f7-4cc0-8ee1-4d98b98903b8)
+# Task one [∞](#e8fd82de-c379-496d-a77b-2873192e8ea8)
 
-> Notes line one
-> Notes line two
+Notes line one
+Notes line two
 
-Task two - [id](ae0cce15-456d-48c0-a2e2-69d5f567e092)
-Task three - [id](a5d4d3a9-2b9a-427a-9047-b47c6aec8f93)
+# Task two [∞](#ae0cce15-456d-48c0-a2e2-69d5f567e092)
+
+# Task three [∞](#a5d4d3a9-2b9a-427a-9047-b47c6aec8f93)
       """
     When I successfully run `taskmeister --list mylist.md -r a A new task`
     And I successfully run `taskmeister --list mylist.md`

data/features/show.feature

@@ -3,16 +3,17 @@ Feature: taskmeister shows the details of a task in the list
   Scenario: Show task in list
     Given a file named "mylist.md" with:
       """
-Task one - [id](aaf83a9b-02f7-4cc0-8ee1-4d98b98903b8)
+# Task one [∞](#a8fd82de-c379-496d-a77b-2873192e8ea8)
 
-> Notes line one
-> Notes line two
+Notes line one
+Notes line two
 
-Task two - [id](ae0cce15-456d-48c0-a2e2-69d5f567e092)
-Task three - [id](a5d4d3a9-2b9a-427a-9047-b47c6aec8f93)
+# Task two [∞](#ae0cce15-456d-48c0-a2e2-69d5f567e092)
+
+# Task three [∞](#a5d4d3a9-2b9a-427a-9047-b47c6aec8f93)
       """
     When I successfully run `taskmeister --list mylist.md --show a`
-    Then the output should contain "Task one - [id](aaf83a9b-02f7-4cc0-8ee1-4d98b98903b8)"
-    And the output should contain "> Notes line one"
-    And the output should contain "> Notes line two"
+    Then the output should contain "# Task one [∞](#a8fd82de-c379-496d-a77b-2873192e8ea8)"
+    And the output should contain "Notes line one"
+    And the output should contain "Notes line two"
 

data/lib/taskmeister.rb

@@ -6,3 +6,4 @@ require "taskmeister/task_list_writer"
 require "taskmeister/cli/task_list_name"
 require "taskmeister/cli/main"
 require "taskmeister/cli/options"
+require "taskmeister/cli/commands"

data/lib/taskmeister/cli/commands.rb

@@ -0,0 +1,70 @@
+require "ostruct"
+
+module Taskmeister
+  module Cli
+    module Commands
+
+      class Command
+        def initialize(task_list, options=OpenStruct.new, stdout=STDOUT, kernel=Kernel)
+          @task_list = task_list
+          @options = options
+          @stdout = stdout
+          @kernel = kernel
+        end
+
+        def execute!
+          # Override this in derived class
+        end
+
+        protected
+
+        def write
+          Taskmeister::TaskListWriter.to_markdown_file(@task_list)
+        end
+      end
+
+      class List < Command
+        def execute!
+          @stdout.puts @task_list.to_short_list
+        end
+      end
+
+      class Show < Command
+        def execute!
+          @stdout.puts @task_list.markdown_for(@options.task_id)
+        end
+      end
+
+      class Add < Command
+        def execute!
+          @task_list.add(Taskmeister::Task.create(@options.task_text))
+          write
+        end
+      end
+
+      class Replace < Command
+        def execute!
+          @task_list.replace(@options.task_id, @options.task_text)
+          write
+        end
+      end
+
+      class Done < Command
+        def execute!
+          @task_list.complete(@options.task_id)
+          write
+        end
+      end
+
+      class Edit < Command
+        def execute!
+          task = @task_list[@options.task_id]
+
+          search_path = task ? "+/#{task.id} " : ""
+
+          system "vim #{search_path}#{@task_list.file_path}"
+        end
+      end
+    end
+  end
+end

data/lib/taskmeister/cli/main.rb

@@ -10,49 +10,18 @@ module Taskmeister
       def execute!
         options = Options.new(@stdout, @kernel).parse(@argv)
 
-        task_list = Taskmeister::TaskListReader.from_markdown_file(task_list_path(options))
+        file_path = task_list_path(options)
+        task_list = Taskmeister::TaskListReader.from_markdown_file(file_path)
 
-        run_command(options, task_list)
-      end
-
-      private
-
-      def run_command(options, task_list)
-        case options.command
-        when Commands::LIST
-          @stdout.puts task_list.to_short_list
-
-        when Commands::SHOW
-
-          @stdout.puts task_list.markdown_for(options.task_id)
-
-        when Commands::EDIT
-
-          task = task_list[options.task_id]
-
-          search_path = task ? "+/#{task.id} " : ""
-          system "vim #{search_path}#{task_list.file_path}"
-
-        when Commands::ADD
+        command = options.command.new(task_list, options, @stdout, @kernel)
 
-          task_list.add(Taskmeister::Task.create(options.task_text))
-          update task_list
-
-        when Commands::DONE
-
-          task_list.complete(options.task_id)
-          update task_list
-
-        when Commands::REPLACE
-
-          task_list.replace(options.task_id, options.task_text)
-          update task_list
-
-        end
+        command.execute!
 
         @kernel.exit 0
       end
 
+      private
+
       def task_list_path(options)
         Pathname.new(options.task_dir) + task_list_name(options)
       end
@@ -61,16 +30,12 @@ module Taskmeister
         task_list_name = options.list || TaskListName.from_project_dir(Pathname.getwd)
 
         unless task_list_name
-          @stderr.puts "Could not find a project directory. Please specify a task list."
+          @stderr.puts "Could not find a project directory. Please specify a task list instead."
           @kernel.exit 1
         end
 
         task_list_name
       end
-
-      def update(task_list)
-        Taskmeister::TaskListWriter.to_markdown_file(task_list)
-      end
     end
   end
 end

data/lib/taskmeister/cli/options.rb

@@ -4,17 +4,8 @@ require "pathname"
 
 module Taskmeister
   module Cli
-    module Commands
-      ADD     = "add"
-      LIST    = "list"
-      REPLACE = "replace"
-      EDIT    = "edit"
-      SHOW    = "show"
-      DONE    = "done"
-    end
-
     class Options
-      def initialize(stdout = STDOUT, kernel = Kernel)
+      def initialize(stdout=STDOUT, kernel=Kernel)
         @stdout = stdout
         @kernel = kernel
       end
@@ -45,26 +36,26 @@ module Taskmeister
 
           opts.on("-d", "--done TASK_ID",
                   "Finish a task") do |task_id|
-            options.command = Commands::DONE
+            options.command = Commands::Done
             options.task_id = task_id
           end
 
           opts.on("-s", "--show TASK_ID",
                   "Show a task list item and its notes") do |task_id|
-            options.command = Commands::SHOW
+            options.command = Commands::Show
             options.task_id = task_id
           end
 
           opts.on("-e", "--edit [TASK_ID]",
                   "Edit task list in Vim",
                   "  Will search for a specific task if TASK_ID is provided") do |task_id|
-            options.command = Commands::EDIT
+            options.command = Commands::Edit
             options.task_id = task_id
           end
 
           opts.on("-r", "--replace TASK_ID",
                   "Replace a task description") do |task_id|
-            options.command = Commands::REPLACE
+            options.command = Commands::Replace
             options.task_id = task_id
           end
 
@@ -88,8 +79,8 @@ module Taskmeister
 
         # If there is TASK TEXT and the default command hasn't been overwritten
         # by the user, set the command to ADD
-        if !task_text.empty? and options.command == Commands::LIST
-          options.command = Commands::ADD
+        if !task_text.empty? and options.command == Commands::List
+          options.command = Commands::Add
         end
 
         options
@@ -99,7 +90,7 @@ module Taskmeister
 
       def default_options
         OpenStruct.new.tap do |o|
-          o.command  = Commands::LIST
+          o.command  = Commands::List
           o.task_dir = Pathname.getwd
         end
       end

data/lib/taskmeister/task.rb

@@ -5,26 +5,21 @@ module Taskmeister
     attr_reader :text, :notes, :id
 
     def initialize(text, id, notes)
-      @text, @id, @notes = text, id, notes
+      @text, @id, @notes = text, id, Array(notes)
     end
 
     def notes?
-      notes && !notes.empty?
+      notes.any? { |ns| !ns.empty? }
     end
 
     def to_markdown
-      [ "#{text} - [id](#{id})" ].tap do |a|
-        return a unless notes.match(/\S/)
-        a << ""
-        a.concat notes.split("\n").map { |n|
-          n.size > 0 ? "> #{n}" : ">"
-        }
-        a << ""
+      [ "# #{text} [∞](##{id})" ].tap do |a|
+        a.concat notes
       end
     end
 
     def self.create(text)
-      self.new(text, SecureRandom.uuid, "")
+      self.new(text, SecureRandom.uuid, [""])
     end
 
     def self.from_markdown(lines)
@@ -32,13 +27,11 @@ module Taskmeister
 
       text, id = task_attributes(task)
 
-      notes = notes.map { |l| l.gsub(/\A> ?/, "") }.join("\n")
-
       self.new(text, id, notes)
     end
 
     def self.task_attributes(line)
-      matches = line.match(/\A(.+) - \[id\]\(([\w-]+)\)\z/)
+      matches = line.match(/#\s(.+)\s\[∞\]\(#([\w-]+)\)/)
 
       fail "Invalid task: #{line}" unless matches
 

data/lib/taskmeister/task_list.rb

@@ -3,9 +3,9 @@ module Taskmeister
     attr_reader :file_path
 
     def initialize(tasks, file_path)
-      @file_path = file_path
+      @file_path = Pathname.new file_path
 
-      @hash = {}
+      @shortIdToTask = {}
 
       tasks.each do |t|
         add(t)
@@ -15,23 +15,23 @@ module Taskmeister
     end
 
     def to_short_list
-      longest_id = @hash.keys.max_by(&:length)
-      @hash.map { |id, task|
+      longest_id = @shortIdToTask.keys.max_by(&:length)
+      @shortIdToTask.map { |id, task|
         marker = task.notes? ? " »" : ""
         "%-#{longest_id.length}s - %s%s" % [id, task.text, marker]
       }
     end
 
     def tasks
-      @hash.values
+      @shortIdToTask.values
     end
 
     def [](key)
-      @hash[key]
+      @shortIdToTask[key]
     end
 
     def empty?
-      @hash.empty?
+      @shortIdToTask.empty?
     end
 
     def dirty?
@@ -40,12 +40,12 @@ module Taskmeister
 
     def add(task)
       prefix = assign_short_code_to_task(task)
-      @hash[prefix] = task
+      @shortIdToTask[prefix] = task
       @dirty = true
     end
 
     def complete(short_id)
-      removed_val = @hash.delete(short_id)
+      removed_val = @shortIdToTask.delete(short_id)
       @dirty = true if removed_val
     end
 
@@ -53,12 +53,12 @@ module Taskmeister
       task = self[short_id]
       return unless task
 
-      @hash[short_id] = Task.new(new_text, task.id, task.notes)
+      @shortIdToTask[short_id] = Task.new(new_text, task.id, task.notes)
       @dirty = true
     end
 
     def markdown_for(short_id)
-      return [] unless @hash.has_key?(short_id)
+      return [] unless @shortIdToTask.has_key?(short_id)
 
       self[short_id].to_markdown
     end
@@ -68,7 +68,7 @@ module Taskmeister
     def assign_short_code_to_task(task)
       task.id.length.times do |i|
         prefix = task.id.slice(0, i + 1)
-        return prefix unless @hash.has_key?(prefix)
+        return prefix unless @shortIdToTask.has_key?(prefix)
       end
     end
   end

data/lib/taskmeister/task_list_reader.rb

@@ -1,16 +1,19 @@
 module Taskmeister
   class TaskListReader
     def self.from_markdown(file_lines, file_path)
-      grouped_lines = \
+      lines_grouped_by_task = \
         file_lines.map(&:chomp)
-                  .reject(&:empty?)
                   .reduce([]) do |acc, l|
-                    acc << [l]    if l.match(/\A[^\s>]/) # A new task
-                    acc.last << l if l.match(/\A>/)      # A line of note for the latest task
-                    acc
+                    acc.tap do |a|
+                      if l.match(/#\s.+\s\[∞\]\(#[\w-]+\)/)
+                        acc << [l]    # A new task
+                      else
+                        acc.last << l # A line of note for the latest task
+                      end
+                    end
                   end
 
-      tasks = grouped_lines.map do |ls|
+      tasks = lines_grouped_by_task.map do |ls|
         Task.from_markdown ls
       end
 

data/lib/taskmeister/version.rb

@@ -1,3 +1,3 @@
 module Taskmeister
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/lib/taskmeister/task_list_reader_spec.rb

@@ -25,48 +25,59 @@ module Taskmeister
 
       describe "passed a list of simple tasks" do
         let(:lines) { [
-          "Task number 1\n",
-          "Task number 2\n"
+          "# Task number 1 [∞](#e8fd82de-c379-496d-a77b-2873192e8ea8)\n",
+          "\n",
+          "# Task number 2 [∞](#e9fd82de-c379-496d-a77b-2873192e8ea8)\n",
+          "\n"
           ]
         }
 
         it "creates a task for each line, stripping new lines" do
-          expect(Task).to receive(:from_markdown).with([ "Task number 1" ])
-          expect(Task).to receive(:from_markdown).with([ "Task number 2" ])
+          expect(Task).to receive(:from_markdown).with([ "# Task number 1 [∞](#e8fd82de-c379-496d-a77b-2873192e8ea8)", ""])
+          expect(Task).to receive(:from_markdown).with([ "# Task number 2 [∞](#e9fd82de-c379-496d-a77b-2873192e8ea8)", ""])
           it
         end
       end
 
       describe "passed a list of tasks with notes" do
         let(:lines) { [
-          "Task number 1\n",
+          "# Task number 1 [∞](#e8fd82de-c379-496d-a77b-2873192e8ea8)\n",
+          "\n",
+          "note line 1\n",
+          "\n",
+          "\n",
+          "note line 2\n",
           "\n",
-          "> note line 1\n",
-          "> note line 2\n",
+          "# Task number 2 [∞](#18fd82de-c379-496d-a77b-2873192e8ea8)\n",
           "\n",
-          "Task number 2\n",
-          "Task number 3\n",
+          "# Task number 3 [∞](#e9fd82de-c379-496d-a77b-2873192e8ea8)\n",
           "\n",
-          "> note line 3\n",
-          "> note line 4\n",
-          "",
-          "",
+          "note line 3\n",
+          "note line 4\n",
+          "\n"
           ]
         }
 
         it "creates a task for each line with their associated notes, stripping newlines" do
           expect(Task).to receive(:from_markdown).with([
-            "Task number 1",
-            "> note line 1",
-            "> note line 2",
+            "# Task number 1 [∞](#e8fd82de-c379-496d-a77b-2873192e8ea8)",
+            "",
+            "note line 1",
+            "",
+            "",
+            "note line 2",
+            "",
           ])
           expect(Task).to receive(:from_markdown).with([
-            "Task number 2"
+            "# Task number 2 [∞](#18fd82de-c379-496d-a77b-2873192e8ea8)",
+            "",
           ])
           expect(Task).to receive(:from_markdown).with([
-            "Task number 3",
-            "> note line 3",
-            "> note line 4",
+            "# Task number 3 [∞](#e9fd82de-c379-496d-a77b-2873192e8ea8)",
+            "",
+            "note line 3",
+            "note line 4",
+            ""
           ])
 
           it

data/spec/lib/taskmeister/task_list_spec.rb

@@ -4,13 +4,13 @@ require "taskmeister/task"
 module Taskmeister
   RSpec.describe TaskList do
 
-    let(:task1) { Task.new("task 1", "78dc2561-8c9a-4780-a560-56e1e14f2ed3", nil) }
-    let(:task2) { Task.new("task 2", "b2110029-ffa0-4e54-985a-2aa6d1bed53b", nil) }
+    let(:task1) { Task.new("task 1", "78dc2561-8c9a-4780-a560-56e1e14f2ed3", []) }
+    let(:task2) { Task.new("task 2", "b2110029-ffa0-4e54-985a-2aa6d1bed53b", []) }
     let(:task3) { Task.new("task 3", "1c890df0-97a5-4310-9b01-374983416af7", "a note") }
-    let(:task4) { Task.new("task 4", "1c891df0-97a5-4310-9b01-374983416af7", nil) }
-    let(:task5) { Task.new("task 5", "ef0915ee-3d11-4358-b12c-15a4ab0d1d26", nil) }
-    let(:task6) { Task.new("task 6", "f2a0d281-f323-4909-8547-d4af5315a295", nil) }
-    let(:task7) { Task.new("task 7", "f2a0d281-4323-4909-8547-d4af5315a295", nil) }
+    let(:task4) { Task.new("task 4", "1c891df0-97a5-4310-9b01-374983416af7", []) }
+    let(:task5) { Task.new("task 5", "ef0915ee-3d11-4358-b12c-15a4ab0d1d26", []) }
+    let(:task6) { Task.new("task 6", "f2a0d281-f323-4909-8547-d4af5315a295", []) }
+    let(:task7) { Task.new("task 7", "f2a0d281-4323-4909-8547-d4af5315a295", []) }
 
     let(:tasks) { [
       task1, task2, task3, task4, task5, task6, task7
@@ -18,8 +18,8 @@ module Taskmeister
 
     let(:list) { described_class.new(tasks, "fake file") }
 
-    it "saves its file path" do
-      expect(list.file_path).to eq "fake file"
+    it "initially saves its file path" do
+      expect(list.file_path).to eq Pathname.new("fake file")
     end
 
     it "is initially clean" do

data/spec/lib/taskmeister/task_spec.rb

@@ -5,24 +5,28 @@ module Taskmeister
     describe ".from_markdown" do
       subject { described_class.from_markdown(lines) }
 
-      describe "passed a single valid line" do
+      describe "passed a task with an empty note" do
         let(:lines) { [
-          "A task name - [id](78dc2561-8c9a-4780-a560-56e1e14f2ed3)"
+          "# A task name [∞](#78dc2561-8c9a-4780-a560-56e1e14f2ed3)",
+          "",
         ]}
 
         it "sets the name and id of the task" do
           expect(subject.id).to eq "78dc2561-8c9a-4780-a560-56e1e14f2ed3"
           expect(subject.text).to eq "A task name"
-          expect(subject.notes).to eq ""
+          expect(subject.notes).to eq [""]
         end
       end
 
       describe "passed a single valid line and notes" do
         let(:lines) { [
-          "A task name - [id](78dc2561-8c9a-4780-a560-56e1e14f2ed3)",
-          "> line one of a note",
-          ">",
-          "> line two of a note"
+          "# A task name [∞](#78dc2561-8c9a-4780-a560-56e1e14f2ed3)",
+          "",
+          "note line 1",
+          "",
+          "",
+          "note line 2",
+          ""
         ]}
 
         it "sets the name and id of the task" do
@@ -30,8 +34,15 @@ module Taskmeister
           expect(subject.text).to eq "A task name"
         end
 
-        it "concatenates together the notes of the task" do
-          expect(subject.notes).to eq "line one of a note\n\nline two of a note"
+        it "sets the notes of the task" do
+          expect(subject.notes).to eq [
+            "",
+            "note line 1",
+            "",
+            "",
+            "note line 2",
+            ""
+          ]
         end
       end
 
@@ -47,33 +58,45 @@ module Taskmeister
     end
 
     describe ".create" do
-      it "returns a task with the specified text and a new id" do
+      it "returns a task with the specified text, a new id, and empty notes" do
         task = described_class.create("My task text")
         expect(task.text).to eq "My task text"
         expect(task.id).to match(/[\w-]+/)
-        expect(task.notes).to eq ""
+        expect(task.notes).to eq [""]
+      end
+    end
+
+    describe "#notes?" do
+      it "returns true if there is a non-empty string in the notes list" do
+        task = Task.new("My task text", "f23891df0-97a5-4310-9b01-374983416af7", ["", "a note", ""])
+        expect(task.notes?).to be_truthy
+      end
+
+      it "returns false if there is are only empty strings in the notes list" do
+        task = Task.new("My task text", "f23891df0-97a5-4310-9b01-374983416af7", ["", ""])
+        expect(task.notes?).to be_falsy
       end
     end
 
     describe "#to_markdown" do
       it "returns a list of markdown-formatted lines" do
-        task = described_class.new("task 8", "f23891df0-97a5-4310-9b01-374983416af7", " ")
+        task = described_class.new("task 8", "f23891df0-97a5-4310-9b01-374983416af7", [""])
         expect(task.to_markdown).to eq [
-          "task 8 - [id](f23891df0-97a5-4310-9b01-374983416af7)"
+          "# task 8 [∞](#f23891df0-97a5-4310-9b01-374983416af7)",
+          ""
         ]
       end
 
       it "returns a list of markdown-formatted lines including notes" do
         task = described_class.new("task 8", "f23891df0-97a5-4310-9b01-374983416af7",
-                        "First line of a note\nsecond line\n\nthird line")
+                        ["", "First line of a note", "second line", "", "third line"])
         expect(task.to_markdown).to eq [
-          "task 8 - [id](f23891df0-97a5-4310-9b01-374983416af7)",
+          "# task 8 [∞](#f23891df0-97a5-4310-9b01-374983416af7)",
           "",
-          "> First line of a note",
-          "> second line",
-          ">",
-          "> third line",
-          ""
+          "First line of a note",
+          "second line",
+          "",
+          "third line"
         ]
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taskmeister
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ray Grasso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,6 +120,7 @@ files:
 - features/step_definitions/command_double_steps.rb
 - features/support/env.rb
 - lib/taskmeister.rb
+- lib/taskmeister/cli/commands.rb
 - lib/taskmeister/cli/main.rb
 - lib/taskmeister/cli/options.rb
 - lib/taskmeister/cli/task_list_name.rb
@@ -154,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Another command line task manager.