3 files changed, 64 insertions, 16 deletions

diff --git a/README.md b/README.md
index 7dd5a31..468887b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
 # vim-bujo
 
-This plugin allows people to easily access and manage a minimalist todo list from vim.
+This plugin allows people to easily access and manage todo lists for their projects from vim.
 
+You can easily access and manage Todo lists of specific projects or a general Todo list.
 
 ## Installation
 
@@ -17,9 +18,13 @@ Plug 'vuciv/vim-bujo'
 
 ## Use / Mappings
 
-* Run:
+* Open Todo of current git repo:
   ```
-  :Todo
+  :Todo // from git repo
+  ```
+* Open general Todo:
+  ```
+  :Todo g
   ```
 * Insert a new task:
   ```
@@ -42,7 +47,7 @@ Plug 'vuciv/vim-bujo'
 
 ## Screenshots
 
-This gif shows how the TODO list opens up in vim.
+This gif shows how the Todo list opens up in vim.
 
 ![Gif of Bujo use](https://raw.githubusercontent.com/jfonseca8/vim-bujo/master/screenshots/bujo.gif)
 
diff --git a/doc/bujo.txt b/doc/bujo.txt
index 1bacef0..cea58be 100644
--- a/doc/bujo.txt
+++ b/doc/bujo.txt
@@ -4,7 +4,7 @@
 
 Author: Jersey Fonseca <jerseyfonseca@gmail.com>
 
-Version: 0.1
+Version: 0.2
 
 1. Overview
 2. Features
@@ -15,9 +15,13 @@ Version: 0.1
 1. Overview~
 
 This plugin allows people to easily access and
-manage a todo list.
+manage todo lists for their projects.
 
-You can stable versions of this plugin at: 
+You can access Todo lists of specific projects just
+by being inside of that git repo. In addition, you
+can access a general todo list from any folder.
+
+You can find stable versions of this plugin at: 
 
 https://github.com/jfonseca8/vim-bujo
 
diff --git a/plugin/bujo.vim b/plugin/bujo.vim
index f29d268..e8b7077 100644
--- a/plugin/bujo.vim
+++ b/plugin/bujo.vim
@@ -1,21 +1,60 @@
+" bujo.vim - A minimalist todo list manager
+" Maintainer:   Jersey Fonseca <http://www.jerseyfonseca.com/>
+" Version:      0.5
+
 "Make bujo directory if it doesn't exist"
 let g:bujo#todo_file_path = get(g:, "bujo#todo_file_path", $HOME . "/.cache/bujo")
 if empty(glob(g:bujo#todo_file_path))
   call mkdir(g:bujo#todo_file_path)
 endif
-autocmd bufnewfile todo.md call append(0, '#Todo') 
-autocmd bufnewfile todo.md call append(1, 'Date: ')
-autocmd bufnewfile,bufread,filewritepre todo.md exe "g/Date: */s/Date: *.*/Date: " .strftime("%a %d %b %Y")
-autocmd bufnewfile,Bufwritepre,filewritepre todo.md execute "normal Go"
+
+" InGitRepository() tells us if the directory we are currently working in
+" is a git repository. It makes use of the 'git rev-parse --is-inside-work-tree'
+" command. This command outputs true to the shell if so, and a STDERR message 
+" otherwise.
+"
+" We will use this function to know whether we should open a specific
+" project's todo list, or a global todo list.
+function s:InGitRepository()
+  :silent let bool = system("git rev-parse --is-inside-work-tree")
+
+  " The git function will return true with some leading characters
+  " if we are in a repository. So, we split off those characters
+  " and just check the first word.
+  if split(bool, '\v\n')[0] == 'true'
+    return 1
+  endif
+endfunction
 
 
+" GetToplevelFolder() gives us a clean name of the git repository that we are
+" currently working in
+function s:GetToplevelFolder()
+    let absolute_path = system("git rev-parse --show-toplevel")
+    let repo_name = split(absolute_path, "/")
+    let repo_name_clean = split(repo_name[-1], '\v\n')[0]
+    return repo_name_clean
+endfunction
 
-" Open the bujo todo list file
-function s:OpenTodo()
-  "30 makes it open at width 30
-  exe ":30vs" . g:bujo#todo_file_path . "/todo.md" 
+" OpenTodo() opens the respective todo.md file from $HOME/.cache/bujo
+" If we are in a git repository, we open the todo.md for that git repository.
+" Otherwise, we open the global todo file.
+function s:OpenTodo(...)
+  " If an argument was passed in, we open the general file
+  " a:0 will be false if no argument was passed in (a:0 == 0) 
+  if a:0 || !s:InGitRepository()
+    exe ":30vs" . g:bujo#todo_file_path . "/todo.md" 
+  else 
+    let repo_name_clean = s:GetToplevelFolder()
+    exe ":30vs" . g:bujo#todo_file_path . "/" . repo_name_clean . "/todo.md"
+  endif
 endfunction
 
 if !exists(":Todo")
-  command Todo :call s:OpenTodo()
+  command -nargs=? Todo :call s:OpenTodo(<f-args>)
 endif
+
+autocmd bufnewfile todo.md call append(0, '#' . split(expand('%:p:h:t'), '\v\n')[0] . " todo")  
+autocmd bufnewfile todo.md call append(1, 'Date: ')
+autocmd bufnewfile,bufread,filewritepre todo.md exe "g/Date: */s/Date: *.*/Date: " .strftime("%a %d %b %Y")
+autocmd bufnewfile,Bufwritepre,filewritepre todo.md execute "normal Go"