Skip to content

Commit

Permalink
Merge pull request #354 from org-trello/0.8.0
Browse files Browse the repository at this point in the history
0.8.0
  • Loading branch information
ardumont committed Feb 25, 2017
2 parents dfb9815 + 52f52fb commit 32dd866
Show file tree
Hide file tree
Showing 32 changed files with 476 additions and 77 deletions.
20 changes: 11 additions & 9 deletions .travis.yml
@@ -1,21 +1,23 @@
language: emacs-lisp
sudo: false
env:
global:
- PATH=$HOME/.cask/bin:$HOME/.evm/bin:$PATH
matrix:
# - EVM_EMACS=emacs-24.1-bin
# - EVM_EMACS=emacs-24.2-bin
- EVM_EMACS=emacs-24.3-bin
- EVM_EMACS=emacs-24.4-bin
- EVM_EMACS=emacs-24.5-bin

before_install:
# evm install
- curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > x.sh && source ./x.sh
- evm install $EVM_EMACS --use --skip
# install the matrix's emacs version
- cask --version
- emacs --version
# install deps for cask
- cask
env:
global:
- PATH=$HOME/.cask/bin:$HOME/.evm/bin:$PATH
matrix:
- EVM_EMACS=emacs-24.4-travis
- EVM_EMACS=emacs-24.5-travis
- EVM_EMACS=emacs-25.1-travis

script:
- pwd
- make install test
3 changes: 1 addition & 2 deletions Cask
Expand Up @@ -30,5 +30,4 @@
(depends-on "undercover")
(depends-on "ert")
(depends-on "ert-expectations")
(depends-on "el-mock")
(depends-on "helm"))
(depends-on "el-mock"))
10 changes: 1 addition & 9 deletions Makefile
Expand Up @@ -47,11 +47,6 @@ install-package-from-melpa:
install-file-with-deps-from-melpa: package
./install-file-with-deps-from.sh melpa $(VERSION)

cleanup-data:
rm -rvf ~/.emacs.d/elnode/public_html/org-trello/{1,2,3}/.scanning/* \
~/.emacs.d/elnode/public_html/org-trello/{1,2,3}/* \
~/.emacs.d/elnode/public_html/org-trello/*.lock

release:
./release.sh $(VERSION) $(PACKAGE)

Expand All @@ -64,8 +59,5 @@ install-cask:
emacs-install-clean: package
~/bin/emacs/emacs-install-clean.sh ./$(ARCHIVE)

respect-convention:
./contrib/respect-elisp-conventions.sh

tests:
./run-tests.sh 24.3-bin 24.4-bin 24.5-bin
./run-tests.sh 24.4-travis 24.5-travis 25.1-travis
14 changes: 12 additions & 2 deletions TODO.org
Expand Up @@ -2,8 +2,7 @@
#+AUTHOR: ardumont
#+STYLE: <style> h1,h2,h3 {font-family: arial, helvetica, sans-serif} </style>

* TODO Backlog
** Bug
* TODO Backlog** Bug
- [ ] #240 - Preserve non-trello related tags/other meta data
- [ ] #278 - Too much checklist sync?

Expand Down Expand Up @@ -32,6 +31,17 @@
- [ ] #245 - Trying to sync a card: orgtrello-buffer/compute-marker: Wrong type argument: numberp, nil
- [ ] #248 - Installing from melpa (unstable) works, but then it errs on an undefined variable "error-messages"
- [ ] #263 - Colors broken in org trello
* DONE 0.8.0 [100%]
CLOSED: [2017-02-25 Sat 21:31]

- [X] Update travis ci configuration
- [X] Fix ci's multiple problems
- [X] Fix some emacs25 incompatibilities
- [X] Add copyright headers + update copyright range
- [X] Add 'kill-whole-line in bug report
- [X] Upgrade version
- [X] Release notes

* DONE 0.7.9 [100%]
CLOSED: [2016-06-04 Sat 14:42]
- [X] Fix problem with custom kill-whole-line properties - Close #270
Expand Down
19 changes: 19 additions & 0 deletions org-trello-action.el
@@ -1,4 +1,23 @@
;;; org-trello-action.el --- Reference some action functions

;; Copyright (C) 2015-2017 Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>

;; Author: Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>
;; Keywords:

;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.

;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.

;;; Commentary:
;;; Code:

Expand Down
19 changes: 19 additions & 0 deletions org-trello-api.el
@@ -1,4 +1,23 @@
;;; org-trello-api.el --- Interface functions to Trello API

;; Copyright (C) 2015-2017 Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>

;; Author: Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>
;; Keywords:

;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.

;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.

;;; Commentary:
;;; Code:

Expand Down
19 changes: 19 additions & 0 deletions org-trello-backend.el
@@ -1,4 +1,23 @@
;;; org-trello-backend.el --- Orchestration namespace to discuss with trello

;; Copyright (C) 2015-2017 Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>

;; Author: Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>
;; Keywords:

;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.

;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.

;;; Commentary:
;;; Code:

Expand Down
21 changes: 20 additions & 1 deletion org-trello-buffer.el
@@ -1,4 +1,23 @@
;;; org-trello-buffer.el --- Manipulation functions of org-trello buffer

;; Copyright (C) 2015-2017 Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>

;; Author: Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>
;; Keywords:

;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.

;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.

;;; Commentary:
;;; Code:

Expand Down Expand Up @@ -349,7 +368,7 @@ Remove text and overlays."

(defun orgtrello-buffer--private-compute-card-to-org-entry (name status due tags)
"Compute the org format of a card with NAME, STATUS, DUE date and TAGS."
(let ((prefix-string (format "* %s %s" (if status status org-trello--todo)
(let ((prefix-string (format "*%s %s" (if status (format " %s" status) "")
name)))
(format "%s%s\n%s" prefix-string
(orgtrello-buffer--serialize-tags prefix-string tags)
Expand Down
19 changes: 19 additions & 0 deletions org-trello-cbx.el
@@ -1,4 +1,23 @@
;;; org-trello-cbx.el --- Manipulation functions of checkbox to add some behavior to org's checkbox

;; Copyright (C) 2015-2017 Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>

;; Author: Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>
;; Keywords:

;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.

;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.

;;; Commentary:
;;; Code:

Expand Down
36 changes: 30 additions & 6 deletions org-trello-controller.el
@@ -1,4 +1,23 @@
;;; org-trello-controller.el --- Controller of org-trello mode

;; Copyright (C) 2015-2017 Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>

;; Author: Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>
;; Keywords:

;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.

;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.

;;; Commentary:
;;; Code:

Expand Down Expand Up @@ -375,7 +394,7 @@ DATA is a list of (user)."
(orgtrello-log-msg
orgtrello-log-info
(if user-me
(format "Account '%s' configured! Everything is ok!"
(format "Account %s configured! Everything is ok!"
(orgtrello-data-entity-username user-me))
"There is a problem with your credentials.\nMake sure you used M-x org-trello-install-key-and-token and this installed correctly the consumer-key and access-token.\nSee http://org-trello.github.io/trello-setup.html#credentials for more information."))))

Expand Down Expand Up @@ -517,7 +536,11 @@ BUFFER-NAME is the actual buffer to work on."
(defun orgtrello-controller-do-delete-entities ()
"Launch a batch deletion of every single entities present on the buffer.
SYNC flag permit to synchronize the http query."
(org-map-entries 'orgtrello-controller--do-delete-card t 'file))
(let ((do-it (if orgtrello-with-check-on-sensible-actions
(orgtrello-input-confirm "Do you want to delete all cards? ")
t)))
(when do-it
(org-map-entries 'orgtrello-controller--do-delete-card t 'file))))

(defun orgtrello-controller-checks-and-do-archive-card ()
"Check the functional requirements, then if everything is ok, archive the card."
Expand Down Expand Up @@ -620,7 +643,7 @@ Returns DATA."
(if (file-exists-p user-config-file)
(orgtrello-log-msg
orgtrello-log-info
"Configuration for user '%s' already existing (file '%s'), skipping."
"Configuration for user %s already existing (file %s), skipping."
user-login user-config-file)
(orgtrello-deferred-eval-computation
(list user-login)
Expand Down Expand Up @@ -1138,8 +1161,9 @@ Dict Id String -> [String]"
(let ((card-id (-> (orgtrello-buffer-entity-metadata)
orgtrello-data-entity-id)))
(if (or (null card-id) (string= "" card-id))
(orgtrello-log-msg orgtrello-log-info
"Card not sync'ed so cannot add comment - skip.")
(orgtrello-log-msg
orgtrello-log-info
"Card not synchronized so cannot add comment - skip.")
(orgtrello-controller-add-comment card-id)))))

(defun orgtrello-controller-do-delete-card-comment ()
Expand Down Expand Up @@ -1424,7 +1448,7 @@ Returns to BUFFER-NAME at POINT when done."
;; remove org-trello overlays
(orgtrello-buffer-remove-overlays)
;; deactivate org-trello--mode-activated-p
(setq org-trello--mode-activated-p))
(setq org-trello--mode-activated-p nil))

(orgtrello-log-msg orgtrello-log-debug "orgtrello-controller loaded!")

Expand Down
19 changes: 19 additions & 0 deletions org-trello-data.el
@@ -1,4 +1,23 @@
;;; org-trello-data.el --- org-trello data access functions

;; Copyright (C) 2015-2017 Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>

;; Author: Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>
;; Keywords:

;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.

;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.

;;; Commentary:
;;; Code:

Expand Down
9 changes: 2 additions & 7 deletions org-trello-date.el
@@ -1,10 +1,8 @@
;;; org-trello-date.el --- Date manipulation for org-trello-buffer
;;; Commentary:
;;; Code:

;; Copyright (C) 2015 Antoine Romain Dumont
;; Copyright (C) 2015-2017 Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>

;; Author: Antoine Romain Dumont <antoine.romain.dumont@gmail.com>
;; Author: Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>
;; Keywords:

;; This program is free software; you can redistribute it and/or modify
Expand All @@ -21,9 +19,6 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.

;;; Commentary:

;;

;;; Code:

(require 'dash)
Expand Down
19 changes: 19 additions & 0 deletions org-trello-deferred.el
@@ -1,4 +1,23 @@
;;; org-trello-deferred.el --- Deferred computations in org-trello

;; Copyright (C) 2015-2017 Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>

;; Author: Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>
;; Keywords:

;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.

;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.

;;; Commentary:
;;; Code:

Expand Down
19 changes: 19 additions & 0 deletions org-trello-entity.el
@@ -1,4 +1,23 @@
;;; org-trello-entity.el --- Predicates to determine if we are currently on a card/checklist/item + some default movments

;; Copyright (C) 2015-2017 Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>

;; Author: Antoine R. Dumont (@ardumont) <antoine.romain.dumont@gmail.com>
;; Keywords:

;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.

;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.

;;; Commentary:
;;; Code:

Expand Down

0 comments on commit 32dd866

Please sign in to comment.