doing 1.0.18 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a196efa7539ea75803e860bb9f2085433f4810eedf380da90ecf3f73a0981049
-  data.tar.gz: 620c726d10967fb0b7f8ad1256ae6709ec7eb475d1cca75f55941f3436686321
+  metadata.gz: d675f8d0e03a45a55e9be965c7e1dd5da2e1f6329bd313327c92234ec54f4b57
+  data.tar.gz: 591e84462f5a8a7d38b94f3daf6482c65d262306f246ffcb9d5125a794eb25bd
 SHA512:
-  metadata.gz: 4ea8b06c7a10b05978785ad5cbc6cf61f898c221d433b863b8749a5c179620c2319196a171108081c24a8863b7cf9358f703e914c902d460fda2c4f86b56f753
-  data.tar.gz: 8139559b029d38a8802e6b4bb8a9ab8b2e309dd940dac7bf08ad5761771f808d047737fe87e666e630f7d579de73f19cc989bc6e9e1d502366b4173ac3b9a1b8
+  metadata.gz: cd522f9ba33483143c8f792d1c4e20c4952a91b968859f8b8c1350fe4b80c063f4158f4301c670164a4fa8404f4c9a94b522f025716a1a0effcab85485e83b91
+  data.tar.gz: 79170973a2dd8b49d31ef3f6b576ab9bc9c34f135585b8f0aac074cb527f5a3da08310d1f6d7192ced81c3747f2289b9ce1065de6bbc2b31627093f209473e5a

data/README.md

@@ -336,7 +336,9 @@ Any time you use one of the foreground colors it will reset the bold and backgro
     done     - Add a completed item with @done(date). No argument finishes last entry.
     meanwhile - Finish any @meanwhile tasks and optionally create a new one
 
-The `doing now` command can accept `-s section_name` to send the new entry straight to a non-default section. It also accepts `--back AMOUNT` to let you specify a start date in the past using "natural language." For example, `doing now --back 25m ENTRY` or `doing now --back "yesterday 3:30pm" ENTRY`.
+The `doing now` command can accept `-s section_name` to send the new entry straight to a non-default section. It also accepts `--back=AMOUNT` to let you specify a start date in the past using "natural language." For example, `doing now --back=25m ENTRY` or `doing now --back="yesterday 3:30pm" ENTRY`.
+
+If you want to use `--back` with `doing done` but want the end time to be different than the start time, you can either use `--took` in addition, or just use `--took` on its own as it will backdate the start time such that the end time is now and the duration is equal to the value of the `--took` argument.
 
 You can finish the last unfinished task when starting a new one using `doing now` with the `-f` switch. It will look for the last task not marked `@done` and add the `@done` tag with the start time of the new task (either the current time or what you specified with `--back`).
 
@@ -488,7 +490,13 @@ __Fish:__ See the file [`doing.fish`](https://github.com/ttscoff/doing/blob/mast
 
 The LaunchBar action requires that `doing` be available in `/usr/local/bin/doing`. If it's not (because you're using RVM or similar), you'll need to symlink it there. Running the action with Return will show the latest 9 items from Currently, along with any time intervals recorded, and includes a submenu of Timers for each tag.
 
-{% download 117 %}
+Pressing Spacebar and typing allows you to add a new entry to currently. You an also trigger a custom show command by typing "show [section/tag]" and hitting return.
+
+Point of interest, the LaunchBar Action makes use of the `-o json` flag for outputting JSON to the action's script for parsing.
+
+<!--{% download 117 %}-->
+
+Download the Action at [brettterpstra.com](https://brettterpstra.com/projects/doing/)
 
 Evan Lovely has [created an Alfred workflow as well](http://www.evanlovely.com/blog/technology/alfred-for-terpstras-doing/).
 
@@ -528,10 +536,17 @@ Please try not to email me directly about GitHub projects.
 
 ### Developer notes
 
-I'll try to document some of the code structure as I flesh it out. I'm currently working on adding a CLI reporting structure and logging methods, as well as santizing and standardizing all the flags and switches for consistency. Feel free to [poke around](http://github.com/ttscoff/doing/), I'll try to add more comments in the future (and retroactively).
+Feel free to [poke around](http://github.com/ttscoff/doing/), I'll try to add more comments in the future (and retroactively).
 
 ## Changelog
 
+#### 1.0.19
+
+- For `doing note -e` include the entry title so you know what you're adding a note to
+- For any other command that allows `-e` include a comment noting that anything after the first line creates a note
+- Ignore # comments when parsing editor results
+
+
 #### 1.0.18
 
 - Fix `undefined method [] for nil class` error in `doing view`

data/bin/doing

@@ -145,8 +145,11 @@ command :note do |c|
       input = wwid.fork_editor(input)
       if input
         title, note = wwid.format_input(input)
-        note.insert(0, title)
-        wwid.note_last(section, note, true)
+        if note
+          wwid.note_last(section, note, true)
+        else
+          raise "No note content"
+        end
       else
         raise "No content, cancelled"
       end

data/lib/doing/version.rb

@@ -1,3 +1,3 @@
 module Doing
-  VERSION = '1.0.18'
+  VERSION = '1.0.19'
 end

data/lib/doing/wwid.rb

@@ -223,10 +223,11 @@ class WWID
   end
 
   def fork_editor(input="")
-    tmpfile = Tempfile.new('doing')
+    tmpfile = Tempfile.new(['doing','.md'])
 
     File.open(tmpfile.path,'w+') do |f|
       f.puts input
+      f.puts "\n# The first line is the entry title, any lines after that are added as a note"
     end
 
     pid = Process.fork { system("$EDITOR #{tmpfile.path}") }
@@ -267,7 +268,7 @@ class WWID
     note.map! { |line|
       line.strip
     }.delete_if { |line|
-      line =~ /^\s*$/
+      line =~ /^\s*$/ || line =~ /^#/
     }
 
     [title, note]
@@ -433,8 +434,8 @@ class WWID
     section = guess_section(section)
     if @content.has_key?(section)
       last_item = @content[section]['items'].dup.sort_by{|item| item['date'] }.reverse[0]
-      p last_item
-      return last_item['note']
+      $stderr.puts "Editing note for #{last_item['title']}"
+      return "#{last_item['title']}\n# EDIT BELOW THIS LINE ------------\n#{last_item['note'].map{|line| line.strip }.join("\n")}"
     else
       raise "Section #{section} not found"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doing
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.19
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
+date: 2020-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake