From 72001195cd96edf6bdd8a39f8fcb3d6f48e869b7 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Tue, 21 Oct 2014 17:04:46 +0200 Subject: [PATCH 1/9] Backlog + update regarding current state of master --- TODO.org | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/TODO.org b/TODO.org index 64947c31..fab98698 100644 --- a/TODO.org +++ b/TODO.org @@ -10,6 +10,12 @@ - [ ] Retrieve etags from GET result and store it inside the card's property drawer - [ ] Improve sync-from-trello to avoid destroying the full content of the buffer before writing inside - [ ] Does everything work? +* IN-PROGRESS 0.6.4 [20%] +- [X] Minor change to allow abbreviated file path - https://github.com/org-trello/org-trello/pull/213 +- [ ] Update version +- [ ] Move file list functionality to org-trello.el - https://github.com/org-trello/org-trello/issues/214 +- [ ] Add a file to the org-trello list - https://github.com/org-trello/org-trello/issues/211 +- [ ] Release notes * DONE 0.6.3 [100%] CLOSED: [2014-10-19 Sun 19:26] - [X] Update version From dd378be20e2275bc965312771b402d24ce0b5117 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Tue, 21 Oct 2014 17:11:53 +0200 Subject: [PATCH 2/9] - [X] Update version --- TODO.org | 4 ++-- org-trello-pkg.el | 2 +- org-trello.el | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/TODO.org b/TODO.org index fab98698..a8a9ead1 100644 --- a/TODO.org +++ b/TODO.org @@ -10,9 +10,9 @@ - [ ] Retrieve etags from GET result and store it inside the card's property drawer - [ ] Improve sync-from-trello to avoid destroying the full content of the buffer before writing inside - [ ] Does everything work? -* IN-PROGRESS 0.6.4 [20%] +* IN-PROGRESS 0.6.4 [40%] - [X] Minor change to allow abbreviated file path - https://github.com/org-trello/org-trello/pull/213 -- [ ] Update version +- [X] Update version - [ ] Move file list functionality to org-trello.el - https://github.com/org-trello/org-trello/issues/214 - [ ] Add a file to the org-trello list - https://github.com/org-trello/org-trello/issues/211 - [ ] Release notes diff --git a/org-trello-pkg.el b/org-trello-pkg.el index 4cc6e4be..8a4c9e0a 100644 --- a/org-trello-pkg.el +++ b/org-trello-pkg.el @@ -1,4 +1,4 @@ -(define-package "org-trello" "0.6.3" "Minor mode to synchronize org-mode buffer and trello board" +(define-package "org-trello" "0.6.4" "Minor mode to synchronize org-mode buffer and trello board" '((request-deferred "0.1.0") (deferred "0.3.2") (s "1.9.0") diff --git a/org-trello.el b/org-trello.el index feb64033..e1ccdd18 100644 --- a/org-trello.el +++ b/org-trello.el @@ -4,7 +4,7 @@ ;; Author: Antoine R. Dumont ;; Maintainer: Antoine R. Dumont -;; Version: 0.6.3 +;; Version: 0.6.4 ;; Package-Requires: ((emacs "24") (dash "2.8.0") (s "1.9.0") (deferred "0.3.2") (request-deferred "0.1.0")) ;; Keywords: org-mode trello sync org-trello ;; URL: https://github.com/org-trello/org-trello @@ -105,7 +105,7 @@ Please consider upgrading Emacs." emacs-version) "Error message when installing (require 'timer) (require 'align) -(defconst *ORGTRELLO/VERSION* "0.6.3" "Current org-trello version installed.") +(defconst *ORGTRELLO/VERSION* "0.6.4" "Current org-trello version installed.") From a926ec8a6234ca8e177fe1b538e7ab73d17c1c60 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Tue, 21 Oct 2014 17:23:30 +0200 Subject: [PATCH 3/9] - [X] Move file list functionality to org-trello.el - https://github.com/org-trello/org-trello/issues/214 --- TODO.org | 4 ++-- org-trello-setup.el | 10 ---------- org-trello.el | 10 ++++++++++ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/TODO.org b/TODO.org index a8a9ead1..6392e9ec 100644 --- a/TODO.org +++ b/TODO.org @@ -10,10 +10,10 @@ - [ ] Retrieve etags from GET result and store it inside the card's property drawer - [ ] Improve sync-from-trello to avoid destroying the full content of the buffer before writing inside - [ ] Does everything work? -* IN-PROGRESS 0.6.4 [40%] +* IN-PROGRESS 0.6.4 [60%] - [X] Minor change to allow abbreviated file path - https://github.com/org-trello/org-trello/pull/213 - [X] Update version -- [ ] Move file list functionality to org-trello.el - https://github.com/org-trello/org-trello/issues/214 +- [X] Move file list functionality to org-trello.el - https://github.com/org-trello/org-trello/issues/214 - [ ] Add a file to the org-trello list - https://github.com/org-trello/org-trello/issues/211 - [ ] Release notes * DONE 0.6.3 [100%] diff --git a/org-trello-setup.el b/org-trello-setup.el index 4a7d5804..222d0968 100644 --- a/org-trello-setup.el +++ b/org-trello-setup.el @@ -234,15 +234,5 @@ This is intended as a buffer local variable.") (set variable prefix-keybinding)) :group 'org-trello) -(defcustom org-trello-files nil - "Org-trello files that needs org-trello activated when opened." - :type 'list - :require 'org-trello - :group 'org-trello) - -(add-hook 'org-mode-hook (lambda () - (when (-any? (lambda (name) (string= (expand-file-name name) buffer-file-name)) org-trello-files) - (org-trello-mode)))) - (provide 'org-trello-setup) ;;; org-trello-setup.el ends here diff --git a/org-trello.el b/org-trello.el index e1ccdd18..91d39e62 100644 --- a/org-trello.el +++ b/org-trello.el @@ -343,6 +343,16 @@ If MODIFIER is not nil, unassign oneself from the card." (orgtrello-log/msg *OT/NOLOG* "org-trello/ot is off!")) 'do-append) +(defcustom org-trello-files nil + "Org-trello files that needs org-trello activated when opened." + :type 'list + :require 'org-trello + :group 'org-trello) + +(add-hook 'org-mode-hook (lambda () + (when (-any? (lambda (name) (string= (expand-file-name name) buffer-file-name)) org-trello-files) + (org-trello-mode)))) + (orgtrello-log/msg *OT/DEBUG* "org-trello loaded!") (provide 'org-trello) From 52757e88718d3df2dfc863683688f2e50045ea0b Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Fri, 24 Oct 2014 15:44:45 +0200 Subject: [PATCH 4/9] Add melpa badges --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 24d2164e..d89e4f2f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -org-trello [![Build Status](https://travis-ci.org/org-trello/org-trello.png?branch=master)](https://travis-ci.org/org-trello/org-trello) +org-trello [![Build Status](https://travis-ci.org/org-trello/org-trello.png?branch=master)](https://travis-ci.org/org-trello/org-trello) [![MELPA Stable](http://stable.melpa.org/packages/org-trello-badge.svg)](http://stable.melpa.org/#/org-trello) [![MELPA](http://melpa.org/packages/org-trello-badge.svg)](http://melpa.org/#/org-trello) ========== The [full documentation](http://org-trello.github.io/) is maintained! From 18348ac0cd5e71e551adc6aa4aacc14a948031b9 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Thu, 30 Oct 2014 18:25:13 +0100 Subject: [PATCH 5/9] Update backlog --- TODO.org | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/TODO.org b/TODO.org index 6392e9ec..7c9b9629 100644 --- a/TODO.org +++ b/TODO.org @@ -10,11 +10,12 @@ - [ ] Retrieve etags from GET result and store it inside the card's property drawer - [ ] Improve sync-from-trello to avoid destroying the full content of the buffer before writing inside - [ ] Does everything work? +- [ ] Add a file to the org-trello list - https://github.com/org-trello/org-trello/issues/211 * IN-PROGRESS 0.6.4 [60%] - [X] Minor change to allow abbreviated file path - https://github.com/org-trello/org-trello/pull/213 - [X] Update version -- [X] Move file list functionality to org-trello.el - https://github.com/org-trello/org-trello/issues/214 -- [ ] Add a file to the org-trello list - https://github.com/org-trello/org-trello/issues/211 +- [X] Move file list functionality to org-trello.el - CLOSE https://github.com/org-trello/org-trello/issues/214 +- [ ] Add ;;;### autoload for the org-trello's default commands - [ ] Release notes * DONE 0.6.3 [100%] CLOSED: [2014-10-19 Sun 19:26] From 08912051014077825fe8cbd2c249aefdab6755ea Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Thu, 30 Oct 2014 18:27:23 +0100 Subject: [PATCH 6/9] - [X] Add ;;;### autoload for the org-trello's default commands --- TODO.org | 4 ++-- org-trello.el | 24 ++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/TODO.org b/TODO.org index 7c9b9629..f2c3451d 100644 --- a/TODO.org +++ b/TODO.org @@ -11,11 +11,11 @@ - [ ] Improve sync-from-trello to avoid destroying the full content of the buffer before writing inside - [ ] Does everything work? - [ ] Add a file to the org-trello list - https://github.com/org-trello/org-trello/issues/211 -* IN-PROGRESS 0.6.4 [60%] +* IN-PROGRESS 0.6.4 [80%] - [X] Minor change to allow abbreviated file path - https://github.com/org-trello/org-trello/pull/213 - [X] Update version - [X] Move file list functionality to org-trello.el - CLOSE https://github.com/org-trello/org-trello/issues/214 -- [ ] Add ;;;### autoload for the org-trello's default commands +- [X] Add ;;;### autoload for the org-trello's default commands - [ ] Release notes * DONE 0.6.3 [100%] CLOSED: [2014-10-19 Sun 19:26] diff --git a/org-trello.el b/org-trello.el index 91d39e62..19724069 100644 --- a/org-trello.el +++ b/org-trello.el @@ -121,6 +121,7 @@ Please consider upgrading Emacs." emacs-version) "Error message when installing +;;;###autoload (defun org-trello/version () "Org-trello version." (interactive) @@ -146,8 +147,8 @@ when NOLOG-P is specified, no output log." (nolog-flag nolog-p)) (deferred:$ (deferred:next (lambda () (save-excursion - (with-local-quit - (apply (car computation) (cdr computation)))))) + (with-local-quit + (apply (car computation) (cdr computation)))))) (deferred:nextc it (lambda () (when buffer-to-save (orgtrello-buffer/save-buffer buffer-to-save)) (when reload-setup (orgtrello-action/reload-setup!)) @@ -173,12 +174,14 @@ If NO-CHECK-FLAG is set, no controls are done." (if no-check-flag nil '(orgtrello-controller/load-keys! orgtrello-controller/control-keys! orgtrello-controller/setup-properties!)) action-fn)) +;;;###autoload (defun org-trello/abort-sync () "Control first, then if ok, add a comment to the current card." (interactive) (deferred:clear-queue) (orgtrello-log/msg *OT/INFO* "Cancel actions done!")) +;;;###autoload (defun org-trello/add-card-comments (&optional modifier) "Control first, then if ok, add a comment to the current card. When MODIFIER is set, this will show the current card's comments." @@ -188,6 +191,7 @@ When MODIFIER is set, this will show the current card's comments." '("Display current card's last comments" orgtrello-controller/do-show-card-comments!) '("Add card comment" orgtrello-controller/do-add-card-comment!))))) +;;;###autoload (defun org-trello/show-card-comments () "Control first, then if ok, show a simple buffer with the current card's last comments." (interactive) @@ -198,6 +202,7 @@ When MODIFIER is set, this will show the current card's comments." (interactive) (org-trello/apply '(org-trello/log-strict-checks-and-do "Display current board's labels" orgtrello-controller/do-show-board-labels!))) +;;;###autoload (defun org-trello/sync-card (&optional modifier) "Execute the sync of an entity and its structure to trello. If MODIFIER is non nil, execute the sync entity and its structure from trello." @@ -208,6 +213,7 @@ If MODIFIER is non nil, execute the sync entity and its structure from trello." '("Request 'sync entity with structure from trello" orgtrello-controller/checks-then-sync-card-from-trello!) '("Request 'sync entity with structure to trello" orgtrello-controller/checks-then-sync-card-to-trello!))))) +;;;###autoload (defun org-trello/sync-buffer (&optional modifier) "Execute the sync of the entire buffer to trello. If MODIFIER is non nil, execute the sync of the entire buffer from trello." @@ -218,6 +224,7 @@ If MODIFIER is non nil, execute the sync of the entire buffer from trello." '("Request 'sync org buffer from trello board'" orgtrello-controller/do-sync-buffer-from-trello!) '("Request 'sync org buffer to trello board'" orgtrello-controller/do-sync-buffer-to-trello!))))) +;;;###autoload (defun org-trello/kill-entity (&optional modifier) "Execute the entity removal from trello and the buffer. If MODIFIER is non nil, execute all entities removal from trello and buffer." @@ -228,36 +235,43 @@ If MODIFIER is non nil, execute all entities removal from trello and buffer." '("Delete all cards" orgtrello-controller/do-delete-entities) '("Delete entity at point (card/checklist/item)" orgtrello-controller/checks-then-delete-simple))))) +;;;###autoload (defun org-trello/kill-cards () "Execute all entities removal from trello and buffer." (interactive) (org-trello/apply-deferred '(org-trello/log-strict-checks-and-do "Delete Cards" orgtrello-controller/do-delete-entities))) +;;;###autoload (defun org-trello/archive-card () "Execute archive card at point." (interactive) (org-trello/apply-deferred '(org-trello/log-strict-checks-and-do "Archive Card at point" orgtrello-controller/checks-and-do-archive-card))) +;;;###autoload (defun org-trello/archive-cards () "Execute archive all the DONE cards from buffer." (interactive) (org-map-entries 'org-trello/archive-card "/DONE" 'file)) +;;;###autoload (defun org-trello/install-key-and-token () "No control, trigger the setup installation of the key and the read/write token." (interactive) (org-trello/apply-deferred '(org-trello/log-light-checks-and-do "Setup key and token" orgtrello-controller/do-install-key-and-token 'do-no-checks))) +;;;###autoload (defun org-trello/install-board-metadata () "Control first, then if ok, trigger the setup installation of the trello board to sync with." (interactive) (org-trello/apply-deferred '(org-trello/log-light-checks-and-do "Install boards and lists" orgtrello-controller/do-install-board-and-lists))) +;;;###autoload (defun org-trello/update-board-metadata () "Control first, then if ok, trigger the update of the informations about the board." (interactive) (org-trello/apply-deferred '(org-trello/log-light-checks-and-do "Update board information" orgtrello-controller/do-update-board-metadata!))) +;;;###autoload (defun org-trello/jump-to-trello-card (&optional modifier) "Jump from current card to trello card in browser. If MODIFIER is not nil, jump from current card to board." @@ -267,16 +281,19 @@ If MODIFIER is not nil, jump from current card to board." '("Jump to board" orgtrello-controller/jump-to-board!) '("Jump to card" orgtrello-controller/jump-to-card!))))) +;;;###autoload (defun org-trello/jump-to-trello-board () "Jump to current trello board." (interactive) (org-trello/apply '(org-trello/log-strict-checks-and-do "Jump to board" orgtrello-controller/jump-to-board!))) +;;;###autoload (defun org-trello/create-board-and-install-metadata () "Control first, then if ok, trigger the board creation." (interactive) (org-trello/apply-deferred '(org-trello/log-light-checks-and-do "Create board and lists" orgtrello-controller/do-create-board-and-install-metadata))) +;;;###autoload (defun org-trello/assign-me (&optional modifier) "Assign oneself to the card. If MODIFIER is not nil, unassign oneself from the card." @@ -287,16 +304,19 @@ If MODIFIER is not nil, unassign oneself from the card." '("Assign myself to card" orgtrello-controller/do-assign-me))) (current-buffer))) +;;;###autoload (defun org-trello/check-setup () "Check the current setup." (interactive) (org-trello/apply '(org-trello/log-strict-checks-and-do "Checking setup." orgtrello-controller/check-trello-connection!) nil nil 'no-log)) +;;;###autoload (defun org-trello/delete-setup () "Delete the current setup." (interactive) (org-trello/apply '(org-trello/log-strict-checks-and-do "Delete current org-trello setup" orgtrello-controller/delete-setup!) (current-buffer))) +;;;###autoload (defun org-trello/help-describing-bindings () "A simple message to describe the standard bindings used." (interactive) From dca25251ee5c923ad759ecdf0a5dc7169f056f6e Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Thu, 30 Oct 2014 18:28:13 +0100 Subject: [PATCH 7/9] - [X] Release notes --- TODO.org | 4 ++-- release-notes.md | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/TODO.org b/TODO.org index f2c3451d..3ee39bde 100644 --- a/TODO.org +++ b/TODO.org @@ -11,12 +11,12 @@ - [ ] Improve sync-from-trello to avoid destroying the full content of the buffer before writing inside - [ ] Does everything work? - [ ] Add a file to the org-trello list - https://github.com/org-trello/org-trello/issues/211 -* IN-PROGRESS 0.6.4 [80%] +* IN-PROGRESS 0.6.4 [100%] - [X] Minor change to allow abbreviated file path - https://github.com/org-trello/org-trello/pull/213 - [X] Update version - [X] Move file list functionality to org-trello.el - CLOSE https://github.com/org-trello/org-trello/issues/214 - [X] Add ;;;### autoload for the org-trello's default commands -- [ ] Release notes +- [X] Release notes * DONE 0.6.3 [100%] CLOSED: [2014-10-19 Sun 19:26] - [X] Update version diff --git a/release-notes.md b/release-notes.md index dc17368b..291ce15e 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,5 +1,13 @@ # 0.6.3 +- [X] Minor change to allow abbreviated file path - https://github.com/org-trello/org-trello/pull/213 +- [X] Update version +- [X] Move file list functionality to org-trello.el - CLOSE https://github.com/org-trello/org-trello/issues/214 +- [X] Add ;;;### autoload for the org-trello's default commands +- [X] Release notes + +# 0.6.3 + - [X] Update version - [X] Enable org-trello mode automatically for certain files - https://github.com/org-trello/org-trello/issues/210 - [X] Release notes From 8bd407ef29f99ea82bab7d232ad2007096f56e24 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Thu, 30 Oct 2014 18:28:21 +0100 Subject: [PATCH 8/9] * DONE 0.6.4 [100%] --- TODO.org | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TODO.org b/TODO.org index 3ee39bde..1d1b3dc7 100644 --- a/TODO.org +++ b/TODO.org @@ -11,7 +11,8 @@ - [ ] Improve sync-from-trello to avoid destroying the full content of the buffer before writing inside - [ ] Does everything work? - [ ] Add a file to the org-trello list - https://github.com/org-trello/org-trello/issues/211 -* IN-PROGRESS 0.6.4 [100%] +* DONE 0.6.4 [100%] +CLOSED: [2014-10-30 Thu 18:28] - [X] Minor change to allow abbreviated file path - https://github.com/org-trello/org-trello/pull/213 - [X] Update version - [X] Move file list functionality to org-trello.el - CLOSE https://github.com/org-trello/org-trello/issues/214 From cce9c0aa34be001e194a24cc8728fb43970c65d7 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Thu, 30 Oct 2014 18:32:53 +0100 Subject: [PATCH 9/9] Fix typo --- release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-notes.md b/release-notes.md index 291ce15e..b79e7002 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,4 +1,4 @@ -# 0.6.3 +# 0.6.4 - [X] Minor change to allow abbreviated file path - https://github.com/org-trello/org-trello/pull/213 - [X] Update version