down to 6 failing tests

Eldev

@@ -7,3 +7,4 @@
 (setq eldev-test-framework 'buttercup)
 
 (eldev-add-extra-dependencies 'test 'with-simulated-input)
+(eldev-add-extra-dependencies 'test 'dash)

changes-for-3.0.org

@@ -0,0 +1,4 @@
+* org-gtd-process-mode is now org-gtd-clarify-mode
+* org-gtd-process-map is now org-gtd-clarify-map
+* org-gtd-choose is now org-gtd-organize
+* you can now clarify single items with org-gtd-clarify-item

dev/.emacs

@@ -44,6 +44,7 @@
 (assq-delete-all 'org package--builtin-versions)
 
 (straight-use-package '(org-gtd :type git :host github :repo "trevoke/org-gtd.el"))
+(setq org-gtd-update-ack "2.1.0")
 (require 'org-gtd)
 
 ;; (use-package org

doc/org-gtd.org

@@ -325,7 +325,7 @@ Make sure you also read about sub-package configuration: [[*Required configurati
 There's an important keymap you'll want to make the flow of processing the inbox smoother. To limit impact on your emacs configuration, there is a specific keymap you can use. The function you'll want to bind is ~org-gtd-choose~. I suggest ~C-c c~, as in the following example.
 
 #+begin_src elisp
-(define-key org-gtd-process-map (kbd "C-c c") #'org-gtd-choose)
+(define-key org-gtd-clarify-map (kbd "C-c c") #'org-gtd-organize)
 #+end_src
 
 For other keybindings, do what you need. My bindings use ~C-c d~ as a prefix, i.e.:

org-gtd-archive.el

@@ -78,7 +78,13 @@ Done here is any done `org-todo-keyword'.  For org-gtd this means DONE or CNCL."
 
        (org-archive-subtree-default)))
    "+LEVEL=2&+ORG_GTD=\"Projects\""
-   'agenda))
+   'agenda)
+
+  (message ".................................................")
+  (mapc (lambda (x) (message "---------\n %s \n-----------" x)) kill-ring)
+  (message ".................................................")
+
+  )
 
 (defun org-gtd--all-subheadings-in-done-type-p ()
   "Private function. Returns t if every sub-heading is in a DONE or CNCL state."

org-gtd-clarify.el

@@ -24,22 +24,100 @@
 ;;
 ;;; Code:
 
+(require 'org-gtd-id)
+
+(defconst org-gtd-clarify--prefix "Org-GTD WIP")
+
+(defvar-local org-gtd-clarify--window-config nil
+  "Store window configuration prior to clarifying task")
+
+(defvar-local org-gtd-clarify--stuff-marker nil
+  "Store marker to item that is being clarified")
+
+(defvar-local org-gtd-clarify--clarify-id nil
+  "Reference to the org id of the heading currently in the WIP buffer")
+
+(defvar-local org-gtd-clarify--inbox-p nil
+  "Used to separate a one-off clarify from the inbox clarification.")
+
+;;;###autoload
+(defvar org-gtd-clarify-map (make-sparse-keymap)
+  "Keymap for command `org-gtd-clarify-mode', a minor mode.")
+
+;;;###autoload
+(define-minor-mode org-gtd-clarify-mode
+  "Minor mode for org-gtd."
+  :lighter " GPM"
+  :keymap org-gtd-clarify-map
+  (if org-gtd-clarify-mode
+      (setq-local
+       header-line-format
+       (substitute-command-keys
+        "\\<org-gtd-clarify-map>Clarify item.  Use `\\[org-gtd-organize]' to file it appropriately when finished."))
+    (setq-local header-line-format nil)))
+
 ;;;###autoload
 (defun org-gtd-clarify-item ()
   "Process item at point through org-gtd."
   (interactive)
-  (let ((processing-buffer (org-gtd-wip--get-buffer))
+  (let ((processing-buffer (org-gtd-clarify--get-buffer))
         (window-config (current-window-configuration))
         (stuff-marker (point-marker)))
+    (message "Entering org-gtd-clarify-item")
     (when (= (buffer-size processing-buffer) 0)
       (org-copy-subtree)
       (with-current-buffer processing-buffer
-        (org-yank)))
+        (message ".................................................")
+        (mapc (lambda (x) (message "---------\n %s \n-----------" x)) kill-ring)
+        (message ".................................................")
+
+        (org-paste-subtree)))
+    (message "stuffmarker is: %s" stuff-marker)
+    (with-current-buffer processing-buffer
+      (setq-local org-gtd-clarify--window-config window-config
+                org-gtd-clarify--stuff-marker stuff-marker
+                org-gtd-clarify--clarify-id (org-id-get)))
+    (set-buffer processing-buffer)
     (display-buffer processing-buffer)
-    (delete-other-windows (get-buffer-window processing-buffer))
-    (setq-local org-gtd--window-config window-config
-                org-gtd--stuff-marker stuff-marker
-                org-gtd--wip-id (org-id-get)))
+    (delete-other-windows (get-buffer-window processing-buffer))))
+
+;;;###autoload
+(defun org-gtd-clarify-inbox-item ()
+  "Process item at point through org-gtd. This function is called through the
+inbox clarification process."
+  (interactive)
+  (org-gtd-clarify-item)
+  (setq-local org-gtd-clarify--inbox-p t))
+
+;;;###autoload
+(defun org-gtd-clarify-select ()
+  "Prompt the user to choose one of the existing WIP buffers."
+  (interactive)
+  (let ((buf-names (mapcar #'buffer-name (org-gtd-clarify--get-buffers))))
+    (if buf-names
+        (let ((chosen-buf-name (completing-read "Choose a buffer: " buf-names)))
+          (get-buffer chosen-buf-name))
+      (message "There are no Org-GTD WIP buffers."))))
+
+(defun org-gtd-clarify--buffer-name (id)
+  "Retrieve the name of the WIP buffer for this particular ID."
+  (format "*%s: %s*" org-gtd-clarify--prefix id))
+
+(defun org-gtd-clarify--get-buffers ()
+  "Retrieve a list of Org GTD WIP buffers."
+  (seq-filter (lambda (buf)
+                (string-match-p org-gtd-clarify--prefix (buffer-name buf)))
+              (buffer-list)))
+
+(defun org-gtd-clarify--get-buffer ()
+  "Get or create a WIP buffer for heading at point."
+  (org-gtd-id-get-create)
+  (let ((buffer (get-buffer-create (org-gtd-clarify--buffer-name (org-id-get)))))
+    (with-current-buffer buffer
+      (let ((org-todo-keywords '((sequence "NEXT" "TODO" "WAIT" "|" "DONE" "CNCL" "TRASH"))))
+        (org-mode)
+        (org-gtd-clarify-mode 1))
+      buffer)))
 
 (provide 'org-gtd-clarify)
 ;;; org-gtd-clarify.el ends here