Merge pull request #80 from Escyll/master

Add move (note mv) command

Author: pimterry

README.md

@@ -124,6 +124,10 @@ Opens your notes folder in your default configured file explorer. Shorthand alia
 
 Opens a given note in your `$EDITOR`. Name can be an absolute path, or a relative path in your notes (.md suffix optional). Shorthand alias also available with `notes o`.
 
+### `notes mv <note-name> <destination>|<directory>`
+
+Renames a given note to destination or moves the note to directory. Name can be an absolute path, or a relative path in your notes (.md suffix optional). Destination and directory have to be a relative path in your notes.
+
 ### `notes rm [-r | --recursive] <note-name>`
 
 Removes the given note if it exists. If `-r` or `--recursive` is given, deletes the folders/notes recursively.

notes

@@ -201,6 +201,31 @@ open_note() {
     $EDITOR "$note_path" < /dev/tty
 }
 
+move_note() {
+    local source_note_path=$( get_full_note_path "$1" )
+    local dest_or_dir_path=$2
+    
+    if [[ ! -e "$source_note_path" ]]; then
+        printf "mv requires a source note that exists\n"
+        exit 1
+    fi
+
+    if [[ -z "$dest_or_dir_path" ]]; then
+        printf "mv requires a destination name or folder\n"
+        exit 1
+    fi
+    
+    dir_path="$notes_dir/$dest_or_dir_path"
+    if [[ -d "$dir_path" ]]; then
+        mv $source_note_path $dir_path
+        return
+    fi
+
+    local dest_path=$( get_full_note_path "$dest_or_dir_path" )
+    mkdir -p "$( dirname $dest_path)"
+    mv $source_note_path $dest_path
+}
+
 cat_note() {
     local note_path=$1
 
@@ -227,6 +252,7 @@ Usage:
     $name search|s [pattern]              # Search notes by filename or content
     $name open|o                          # Open your notes directory
     $name open|o <name>                   # Open a note for editing by full name
+    $name mv <source> <dest>|<directory>  # Rename a note, or move a note when a directory is given
     $name rm [-r | --recursive] <name>    # Remove note, or folder if -r or --recursive is given
     $name cat <name>                      # Display note
     echo <name> | $name open|o            # Open all note filenames piped in
@@ -276,6 +302,9 @@ main() {
         "open"|"o" )
             cmd="handle_multiple_notes open"
             ;;
+        "mv" )
+            cmd="move_note"
+            ;;
         "rm" )
             cmd="remove_note"
             ;;

test/test-mv.bats

@@ -0,0 +1,64 @@
+#!./test/libs/bats/bin/bats
+
+load 'helpers'
+
+setup() {
+  setupNotesEnv
+}
+
+teardown() {
+  teardownNotesEnv
+}
+
+export EDITOR=touch
+notes="./notes"
+
+@test "Should rename a note" {
+  run $notes new note
+  run $notes mv note note2
+
+  assert_success
+  assert_exists "$NOTES_DIRECTORY/note2.md"
+}
+
+@test "Should rename a note in a subdir" {
+  run $notes new subdir/note
+  run $notes mv subdir/note subdir/note2
+
+  assert_success
+  assert_exists "$NOTES_DIRECTORY/subdir/note2.md"
+}
+
+@test "Should rename a note with extension" {
+  run $notes new note
+  run $notes mv note.md note2.md
+
+  assert_success
+  assert_exists "$NOTES_DIRECTORY/note2.md"
+}
+
+@test "Should move a note to an existing subdir" {
+  run $notes new subdir/note
+  run $notes new note2
+  run $notes mv note2 subdir
+
+  assert_success
+  assert_exists "$NOTES_DIRECTORY/subdir/note.md"
+  assert_exists "$NOTES_DIRECTORY/subdir/note2.md"
+}
+
+@test "Should move a note to a new subdir" {
+  run $notes new note
+  run $notes mv note.md subdir/note.md
+
+  assert_success
+  assert_exists "$NOTES_DIRECTORY/subdir/note.md"
+}
+
+@test "Should move a note to notes_directory" {
+  run $notes new subdir/note
+  run $notes mv subdir/note /
+
+  assert_success
+  assert_exists "$NOTES_DIRECTORY/note.md"
+}