Merge pull request pimterry#62 from apatil/master

Add ability to create quicknote in a subfolder

README.md

@@ -93,7 +93,7 @@ There are also more complex options available. You can set any configuration pro
 
 ### `notes new <note-name>`
 
-Opens your `$EDITOR` of choice for a new note, with the given name. The name can include slashes, if you want to put your note in a subfolder. Leave out the name if you want one to be generated for you (e.g. `quicknote-2016-12-21.md` - format configurable with `$QUICKNOTE_FORMAT`). Shorthand alias also available with `notes n`.
+Opens your `$EDITOR` of choice for a new note, with the given name. The name can include slashes, if you want to put your note in a subfolder. Leave out the name if you want one to be generated for you (e.g. `quicknote-2016-12-21.md` - format configurable with `$QUICKNOTE_FORMAT`). If you want to place a quicknote in a subfolder, use a trailing slash: `notes new subfolder/`. Shorthand alias also available with `notes n`.
 
 ### `notes find <part-of-a-note-name>`
 

notes

@@ -118,6 +118,11 @@ new_note() {
     if [[ $note_name == "" ]]; then
          note_name="$(generate_name)"
     fi
+
+    if echo "$note_name" | grep "/$" &> /dev/null; then
+        note_name="${note_name}/$(generate_name)"
+    fi
+
     mkdir -p "$(dirname "$notes_dir/$note_name")"
 
     open_note "$note_name"

test/test-new.bats

@@ -73,3 +73,11 @@ notes="./notes"
   assert_success
   assert_exists "$NOTES_DIRECTORY/notes with spaces/note.md"
 }
+
+@test "Should create quicknote in a subfolder" {
+  today=`date "+%Y-%m-%d"`
+  run $notes new subfolder/
+
+  assert_success
+  assert_exists "$NOTES_DIRECTORY/subfolder/quicknote-$today.md"
+}