Skip to content

Commit

Permalink
Merge pull request #215 from ardumont/0.6.4
Browse files Browse the repository at this point in the history
0.6.4
  • Loading branch information
ardumont committed Nov 4, 2014
2 parents 27992ae + cce9c0a commit d374c95
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 16 deletions.
2 changes: 1 addition & 1 deletion 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!
Expand Down
8 changes: 8 additions & 0 deletions TODO.org
Expand Up @@ -10,6 +10,14 @@
- [ ] 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
* 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
- [X] Add ;;;### autoload for the org-trello's default commands
- [X] Release notes
* DONE 0.6.3 [100%]
CLOSED: [2014-10-19 Sun 19:26]
- [X] Update version
Expand Down
2 changes: 1 addition & 1 deletion 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")
Expand Down
10 changes: 0 additions & 10 deletions org-trello-setup.el
Expand Up @@ -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
38 changes: 34 additions & 4 deletions org-trello.el
Expand Up @@ -4,7 +4,7 @@

;; Author: Antoine R. Dumont <eniotna.t AT gmail.com>
;; Maintainer: Antoine R. Dumont <eniotna.t AT gmail.com>
;; 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
Expand Down Expand Up @@ -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.")



Expand All @@ -121,6 +121,7 @@ Please consider upgrading Emacs." emacs-version) "Error message when installing



;;;###autoload
(defun org-trello/version ()
"Org-trello version."
(interactive)
Expand All @@ -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!))
Expand All @@ -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."
Expand All @@ -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)
Expand All @@ -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."
Expand All @@ -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."
Expand All @@ -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."
Expand All @@ -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."
Expand All @@ -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."
Expand All @@ -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)
Expand Down Expand Up @@ -343,6 +363,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)
Expand Down
8 changes: 8 additions & 0 deletions release-notes.md
@@ -1,3 +1,11 @@
# 0.6.4

- [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
Expand Down

0 comments on commit d374c95

Please sign in to comment.