From db63ef388f1bb8a98dfb5085beac6f5487b67850 Mon Sep 17 00:00:00 2001 From: Andreas Gerler Date: Tue, 26 Dec 2023 14:55:58 +0100 Subject: [PATCH] update org-jira --- .../jiralib.el | 4 +- .../org-jira-autoloads.el | 138 +++++++----------- .../org-jira-pkg.el | 4 +- .../org-jira-sdk.el | 0 .../org-jira.el | 62 +++----- 5 files changed, 76 insertions(+), 132 deletions(-) rename elpa/{org-jira-20230413.441 => org-jira-20230915.57}/jiralib.el (99%) rename elpa/{org-jira-20230413.441 => org-jira-20230915.57}/org-jira-autoloads.el (73%) rename elpa/{org-jira-20230413.441 => org-jira-20230915.57}/org-jira-pkg.el (69%) rename elpa/{org-jira-20230413.441 => org-jira-20230915.57}/org-jira-sdk.el (100%) rename elpa/{org-jira-20230413.441 => org-jira-20230915.57}/org-jira.el (98%) diff --git a/elpa/org-jira-20230413.441/jiralib.el b/elpa/org-jira-20230915.57/jiralib.el similarity index 99% rename from elpa/org-jira-20230413.441/jiralib.el rename to elpa/org-jira-20230915.57/jiralib.el index 233dba09..4c1907b3 100644 --- a/elpa/org-jira-20230413.441/jiralib.el +++ b/elpa/org-jira-20230915.57/jiralib.el @@ -43,7 +43,7 @@ ;;; Commentary: -;; This file provides a programatic interface to JIRA. It provides access to +;; This file provides a programmatic interface to JIRA. It provides access to ;; JIRA from other programs, but no user level functionality. ;; Jira References: @@ -1236,7 +1236,7 @@ performed asynchronously and JIRALIB-COMPLETE-CALLBACK will be called when all data are retrieved. If JIRALIB-COMPLETE-CALLBACK is nil, then the call will be -performed syncronously and this function will return the +performed synchronously and this function will return the retrieved data. API - path to called API that must start with /rest/agile/1.0. diff --git a/elpa/org-jira-20230413.441/org-jira-autoloads.el b/elpa/org-jira-20230915.57/org-jira-autoloads.el similarity index 73% rename from elpa/org-jira-20230413.441/org-jira-autoloads.el rename to elpa/org-jira-20230915.57/org-jira-autoloads.el index d4573279..cf50172b 100644 --- a/elpa/org-jira-20230413.441/org-jira-autoloads.el +++ b/elpa/org-jira-20230915.57/org-jira-autoloads.el @@ -1,27 +1,33 @@ -;;; org-jira-autoloads.el --- automatically extracted autoloads -*- lexical-binding: t -*- -;; +;;; org-jira-autoloads.el --- automatically extracted autoloads (do not edit) -*- lexical-binding: t -*- +;; Generated by the `loaddefs-generate' function. + +;; This file is part of GNU Emacs. + ;;; Code: -(add-to-list 'load-path (directory-file-name - (or (file-name-directory #$) (car load-path)))) +(add-to-list 'load-path (or (and load-file-name (directory-file-name (file-name-directory load-file-name))) (car load-path))) + -;;;### (autoloads nil "jiralib" "jiralib.el" (0 0 0 0)) ;;; Generated autoloads from jiralib.el (register-definition-prefixes "jiralib" '("jiralib-")) -;;;*** -;;;### (autoloads nil "org-jira" "org-jira.el" (0 0 0 0)) ;;; Generated autoloads from org-jira.el (autoload 'org-jira-mode "org-jira" "\ Toggle org-jira mode. + With no argument, the mode is toggled on/off. Non-nil argument turns mode on. Nil argument turns mode off. +Commands: +\\{org-jira-entry-mode-map} + +Entry to this mode calls the value of `org-jira-mode-hook'. + This is a minor mode. If called interactively, toggle the `Org-jira mode' mode. If the prefix argument is positive, enable the mode, and if it is zero or negative, disable the mode. @@ -36,16 +42,9 @@ evaluate `org-jira-mode'. The mode's hook is called both when the mode is enabled and when it is disabled. -Commands: -\\{org-jira-entry-mode-map} - -Entry to this mode calls the value of `org-jira-mode-hook'. - -\(fn &optional ARG)" t nil) - +(fn &optional ARG)" t) (autoload 'org-jira-get-projects "org-jira" "\ -Get list of projects." t nil) - +Get list of projects." t) (autoload 'org-jira-get-issue-list "org-jira" "\ Get list of issues, using jql (jira query language), invoke CALLBACK after. @@ -53,14 +52,11 @@ Default is unresolved issues assigned to current login user; with a prefix argument you are given the chance to enter your own jql. -\(fn &optional CALLBACK)" nil nil) - +(fn &optional CALLBACK)") (autoload 'org-jira-get-summary "org-jira" "\ -Get issue summary from point and place next to issue id from jira" t nil) - +Get issue summary from point and place next to issue id from jira" t) (autoload 'org-jira-get-summary-url "org-jira" "\ -Get issue summary from point and place next to issue id from jira, and make issue id a link" t nil) - +Get issue summary from point and place next to issue id from jira, and make issue id a link" t) (autoload 'org-jira-get-issues-headonly "org-jira" "\ Get list of ISSUES, head only. @@ -69,23 +65,19 @@ The default behavior is to return issues assigned to you and unresolved. With a prefix argument, allow you to customize the jql. See `org-jira-get-issue-list'. -\(fn ISSUES)" t nil) - +(fn ISSUES)" t) (autoload 'org-jira-get-issue "org-jira" "\ Get a JIRA issue, allowing you to enter the issue-id first. -\(fn ID)" t nil) - +(fn ID)" t) (autoload 'org-jira-get-issues-by-fixversion "org-jira" "\ Get list of issues by FIXVERSION. -\(fn FIXVERSION)" t nil) - +(fn FIXVERSION)" t) (autoload 'org-jira-get-issue-project "org-jira" "\ -\(fn ISSUE)" nil nil) - +(fn ISSUE)") (autoload 'org-jira-get-issues "org-jira" "\ Get list of ISSUES into an org buffer. @@ -93,8 +85,7 @@ Default is get unfinished issues assigned to you, but you can customize jql with a prefix argument. See`org-jira-get-issue-list' -\(fn ISSUES)" t nil) - +(fn ISSUES)" t) (autoload 'org-jira-get-issues-from-custom-jql "org-jira" "\ Get JQL-LIST list of issues from a custom JQL and PROJ-KEY. @@ -106,105 +97,80 @@ proof. If you try to run multiple calls to this function, it will mangle things badly, as they rely on globals DEFAULT-JQL and ORG-JIRA-PROJ-KEY-OVERRIDE being set before and after running. -\(fn &optional JQL-LIST)" t nil) - +(fn &optional JQL-LIST)" t) (autoload 'org-jira-update-comment "org-jira" "\ -Update a comment for the current issue." t nil) - +Update a comment for the current issue." t) (autoload 'org-jira-update-worklogs-from-org-clocks "org-jira" "\ -Update or add a worklog based on the org clocks." t nil) - +Update or add a worklog based on the org clocks." t) (autoload 'org-jira-copy-current-issue-key "org-jira" "\ -Copy the current issue's key into clipboard." t nil) - +Copy the current issue's key into clipboard." t) (autoload 'org-jira-unassign-issue "org-jira" "\ -Update an issue to be unassigned." t nil) - +Update an issue to be unassigned." t) (autoload 'org-jira-set-issue-reporter "org-jira" "\ -Update an issue's reporter interactively." t nil) - +Update an issue's reporter interactively." t) (autoload 'org-jira-assign-issue "org-jira" "\ -Update an issue with interactive re-assignment." t nil) - +Update an issue with interactive re-assignment." t) (autoload 'org-jira-update-issue "org-jira" "\ -Update an issue." t nil) - +Update an issue." t) (autoload 'org-jira-todo-to-jira "org-jira" "\ -Convert an ordinary todo item to a jira ticket." t nil) - +Convert an ordinary todo item to a jira ticket." t) (autoload 'org-jira-get-subtasks "org-jira" "\ -Get subtasks for the current issue." t nil) - +Get subtasks for the current issue." t) (autoload 'org-jira-create-issue "org-jira" "\ Create an issue in PROJECT, of type TYPE, with given SUMMARY and DESCRIPTION. -\(fn PROJECT TYPE SUMMARY DESCRIPTION)" t nil) - +(fn PROJECT TYPE SUMMARY DESCRIPTION)" t) (autoload 'org-jira-create-subtask "org-jira" "\ Create a subtask issue for PROJECT, of TYPE, with SUMMARY and DESCRIPTION. -\(fn PROJECT TYPE SUMMARY DESCRIPTION)" t nil) - +(fn PROJECT TYPE SUMMARY DESCRIPTION)" t) (autoload 'org-jira-refresh-issue "org-jira" "\ -Refresh current issue from jira to org." t nil) - +Refresh current issue from jira to org." t) (autoload 'org-jira-progress-issue "org-jira" "\ -Progress issue workflow." t nil) - +Progress issue workflow." t) (autoload 'org-jira-progress-issue-next "org-jira" "\ -Progress issue workflow." t nil) - +Progress issue workflow." t) (autoload 'org-jira-browse-issue "org-jira" "\ -Open the current issue in external browser." t nil) - +Open the current issue in external browser." t) (autoload 'org-jira-download-attachment "org-jira" "\ -Download the attachment under cursor." t nil) - +Download the attachment under cursor." t) (autoload 'org-jira-get-issues-from-filter "org-jira" "\ Get issues from the server-side stored filter named FILTER. Provide this command in case some users are not able to use client side jql (maybe because of JIRA server version?). -\(fn FILTER)" t nil) - +(fn FILTER)" t) (autoload 'org-jira-get-issues-from-filter-headonly "org-jira" "\ Get issues *head only* from saved filter named FILTER. See `org-jira-get-issues-from-filter'. -\(fn FILTER)" t nil) - +(fn FILTER)" t) (autoload 'org-jira-get-issues-by-board "org-jira" "\ -Get list of ISSUES from agile board." t nil) - +Get list of ISSUES from agile board." t) (autoload 'org-jira-get-issues-by-sprint "org-jira" "\ -Get list of ISSUES from sprint." t nil) - +Get list of ISSUES from sprint." t) (autoload 'org-jira-get-issues-by-board-headonly "org-jira" "\ -Get list of ISSUES from agile board, head only." t nil) - +Get list of ISSUES from agile board, head only." t) (autoload 'org-jira-get-boards "org-jira" "\ -Get list of boards and their properies." t nil) - +Get list of boards and their properties." t) (register-definition-prefixes "org-jira" '("ensure-on-" "org-jira-")) -;;;*** -;;;### (autoloads nil "org-jira-sdk" "org-jira-sdk.el" (0 0 0 0)) ;;; Generated autoloads from org-jira-sdk.el (register-definition-prefixes "org-jira-sdk" '("org-jira-sdk-")) - -;;;*** -;;;### (autoloads nil nil ("org-jira-pkg.el") (0 0 0 0)) +;;; End of scraped data + +(provide 'org-jira-autoloads) -;;;*** - ;; Local Variables: ;; version-control: never ;; no-byte-compile: t ;; no-update-autoloads: t -;; coding: utf-8 +;; no-native-compile: t +;; coding: utf-8-emacs-unix ;; End: + ;;; org-jira-autoloads.el ends here diff --git a/elpa/org-jira-20230413.441/org-jira-pkg.el b/elpa/org-jira-20230915.57/org-jira-pkg.el similarity index 69% rename from elpa/org-jira-20230413.441/org-jira-pkg.el rename to elpa/org-jira-20230915.57/org-jira-pkg.el index b7a3a7cd..bbda076e 100644 --- a/elpa/org-jira-20230413.441/org-jira-pkg.el +++ b/elpa/org-jira-20230915.57/org-jira-pkg.el @@ -1,9 +1,9 @@ -(define-package "org-jira" "20230413.441" "Syncing between Jira and Org-mode." +(define-package "org-jira" "20230915.57" "Syncing between Jira and Org-mode." '((emacs "24.5") (cl-lib "0.5") (request "0.2.0") (dash "2.14.1")) - :commit "63a74d4458f512f0825e9f55491baad3ee4e9c4b" :maintainers + :commit "295b01ede42952c848bd8d76bc8c456a87876cbc" :maintainers '(("Matthew Carter" . "m@ahungry.com")) :maintainer '("Matthew Carter" . "m@ahungry.com") diff --git a/elpa/org-jira-20230413.441/org-jira-sdk.el b/elpa/org-jira-20230915.57/org-jira-sdk.el similarity index 100% rename from elpa/org-jira-20230413.441/org-jira-sdk.el rename to elpa/org-jira-20230915.57/org-jira-sdk.el diff --git a/elpa/org-jira-20230413.441/org-jira.el b/elpa/org-jira-20230915.57/org-jira.el similarity index 98% rename from elpa/org-jira-20230413.441/org-jira.el rename to elpa/org-jira-20230915.57/org-jira.el index 6cc47950..0f45c414 100644 --- a/elpa/org-jira-20230413.441/org-jira.el +++ b/elpa/org-jira-20230915.57/org-jira.el @@ -1086,8 +1086,8 @@ ORG-JIRA-PROJ-KEY-OVERRIDE being set before and after running." (let ((elem (org-element-at-point))) (and (eq 'headline (car elem)) (equal (format "%s-Tickets" proj-key) - (plist-get (cadr elem) :title)) - (= 1 (plist-get (cadr elem) :level))))) + (org-element-property :title elem)) + (= 1 (org-element-property :level elem))))) (defun org-jira--maybe-render-top-heading (proj-key) "Ensure that there is a headline for PROJ-KEY at the top of the file." @@ -1961,54 +1961,32 @@ Used in org-jira-read-resolution and org-jira-progress-issue calls.") (defun org-jira-refresh-issues-in-buffer-loose () "Iterates over all level 1-2 headings in current buffer, refreshing on issue :ID:. - It differs with org-jira-refresh-issues-in-buffer() in that: - a) It accepts current buffer and its corresponding filename, regardless of whether - it has been previously registered as an org-jira project file or not. - b) It doesn't expect a very specific structure in the org buffer, but simply goes - over every existing heading (level 1-2), and refreshes it IFF a valid jira ID - can be detected in it." +It differs with `org-jira-refresh-issues-in-buffer' in that it accepts the current buffer +and its corresponding filename, regardless of whether it has been previously registered +as an org-jira project file or not." (interactive) (save-excursion (save-restriction (widen) - (outline-show-all) - (outline-hide-sublevels 2) - (goto-char (point-min)) - - (while (not (eobp)) - (progn - (if (org-jira-id) - (progn - (org-jira--refresh-issue (org-jira-id) (file-name-sans-extension buffer-file-name)))) - (outline-next-visible-heading 1)))))) - -;; TODO: Refactor to just scoop all ids from buffer, run ensure-on-issue-id on -;; each using a map, and refresh them that way. That way we don't have to iterate -;; on the user headings etc. + (let* ((org-ids (org-map-entries 'org-id-get "LEVEL=1|LEVEL=2")) + (org-ids (delq nil org-ids)) + (file-name (file-name-sans-extension buffer-file-name))) + (mapcar (lambda (org-id) (org-jira--refresh-issue org-id file-name)) + org-ids))))) + (defun org-jira-refresh-issues-in-buffer () - "Iterate across all entries in current buffer, refreshing on issue :ID:. + "Iterate across all level 1-2 headings in current buffer, refreshing on issue :ID:. Where issue-id will be something such as \"EX-22\"." (interactive) (save-excursion (save-restriction (widen) - (outline-show-all) - (outline-hide-sublevels 2) - (goto-char (point-min)) - (while (and (or (looking-at "^ *$") - (looking-at "^#.*$") - (looking-at "^\\* .*")) - (not (eobp))) - (forward-line)) - (outline-next-visible-heading 1) - (while (and (not (org-next-line-empty-p)) - (not (eobp))) - (when (outline-on-heading-p t) - ;; It's possible we could be on a non-org-jira headline, but - ;; that should be an exceptional case and not necessitating a - ;; fix atm. - (org-jira-refresh-issue)) - (outline-next-visible-heading 1))))) + (let* ((org-ids (org-map-entries 'org-id-get "LEVEL=1|LEVEL=2")) + (org-ids (delq nil org-ids))) + ;; It's possible we could be on a non-org-jira headline, but + ;; that should be an exceptional case and not necessitating a + ;; fix atm. + (mapcar 'org-jira--refresh-issue-by-id org-ids))))) ;;;###autoload (defun org-jira-refresh-issue () @@ -2218,7 +2196,7 @@ otherwise it should return: ;; update, why not? This is better to fire first, because it ;; doesn't auto-refresh any areas, while the end of the main ;; update does a callback that reloads the worklog entries (so, - ;; we hope that wont occur until after this successfully syncs + ;; we hope that won't occur until after this successfully syncs ;; up). Only do this sync if the user defcustom defines it as such. (when org-jira-worklog-sync-p (org-jira-update-worklogs-from-org-clocks)) @@ -2541,7 +2519,7 @@ boards - list of `org-jira-sdk-board' records." ;;;###autoload (defun org-jira-get-boards () - "Get list of boards and their properies." + "Get list of boards and their properties." (interactive) (let* ((datalist (jiralib-get-boards)) (boards (org-jira-sdk-create-boards-from-data-list datalist))) -- 2.47.3