@@ -1,7 +1,12 @@

 (in-package #:jira-api) 

 ; curl -u user:password https://atomampd.atlassian.net/rest/api/2/issue/ATOMOS-212 | jq .

-(defparameter *endpoint* "https://atomampd.atlassian.net/rest/api/2/")

+(defparameter *hostname* "https://atomampd.atlassian.net")

+(defparameter *endpoint* (princ-to-string (puri:merge-uris *hostname* "/rest/api/2/")))

+

+(defun update-hostname (new-subdomain)

+  (setf *hostname* (format nil "https://~a.atlassian.net" new-subdomain))

+  (setf *endpoint* (princ-to-string (puri:merge-uris "/rest/api/2/" *hostname*))))

 (defun api-get-call (auth method &rest parameters)

   "Connect to a GET REST endpoint specified by method and return a stream from

@@ -1,6 +1,4 @@

 ;;;; jira-api.lisp

-(declaim (optimize (debug 3)))

-

 (in-package #:jira-api)

 (defun get-issues (auth)

@@ -62,38 +60,11 @@

 (defun show-labels (labels)

   (format t "~&~4tLabels: ~{~a~}~%" (coerce labels 'list)))

-(defun show-description (description)

-  (pprint-logical-block (*standard-output* (mapcar (compose 'tokens 'trim-whitespace)

-                                                 (lines description)))

-    (pprint-indent :block 4 *standard-output*)

-    (pprint-newline :mandatory *standard-output*)

-    (loop

-      (pprint-exit-if-list-exhausted)

-      (let ((line (pprint-pop)))

-        (pprint-logical-block (*standard-output* line)

-          (loop

-            (princ (pprint-pop) *standard-output*)

-            (pprint-exit-if-list-exhausted)

-            (princ #\space *standard-output*)

-            (pprint-indent :block 3)

-            (pprint-newline :fill *standard-output*)))

-        (pprint-newline :mandatory *standard-output*)))))

-

-(defun show-summary (summary)

-  (pprint-logical-block (*standard-output* (funcall (compose 'tokens 'trim-whitespace) summary))

-    (pprint-indent :block 8 *standard-output*)

-    (pprint-exit-if-list-exhausted)

-    (format *standard-output* "~4tSummary: ")

-    (loop

-      (princ (pprint-pop))

-      (pprint-exit-if-list-exhausted)

-      (pprint-newline :fill *standard-output*)

-      (princ #\space))))

-

 (defun classify-issues (sheeple-issues &optional (classify-by '(status name)))

   (sheeple:with-properties (issues) sheeple-issues

     (loop with classes = (make-hash-table :test 'equalp)

           for issue across issues

+          do (ensure-parent issue =issue=)

           do (loop for classification in classify-by

                    for thing = (sheeple:property-value (fields issue) classification)

                        then (sheeple:property-value thing classification)

@@ -105,7 +76,13 @@

     (let* ((fields (fields issue))

            (status (name (status fields)))

            (summary (summary fields)))

-      (format t "~&~a ~a (~a)~%" self key status)

+

+      (format t "~&~a (~a) <~a>~%"

+              key

+              status 

+              (puri:merge-uris (format nil "/browse/~a" (key issue))

+                               *hostname*))

+

       (show-summary summary)

       (fresh-line))))

@@ -19,6 +19,12 @@

   (sheeple:with-properties (labels) fields

     labels))

+(sheeple:defproto =comment= () (self id author body))

+

+(sheeple:defreply sheeple:shared-init :after ((comment =comment=) &key)

+  (with-accessors ((author author)) issue

+      (ensure-parent author =person= :err-if-nil nil)))

+

 (sheeple:defreply sheeple:shared-init :after ((issue =issue=) &key)

   (with-accessors ((fields fields)) issue

     (when fields

@@ -26,7 +32,12 @@

       (ensure-parent (status fields) =status=)

       (ensure-parent (reporter fields) =person=)

       (ensure-parent (creator fields) =person=)

-      (ensure-parent (assignee fields) =person= :err-if-nil nil))))

+      (ensure-parent (assignee fields) =person= :err-if-nil nil)

+      (when (sheeple:direct-property-p issue 'comment) 

+        (sheeple:with-properties (comment) issue

+          (sheeple:with-properties (comments) comment

+            (map 'nil (lambda (comment) (ensure-parent comment =comment=))

+                 comments)))))))

 (sheeple:defreply show ((person =person=) &rest args)

   (declare (ignore args))

@@ -75,7 +86,8 @@

         (format t "~a (~a) <~a>~%"

                 (key issue)

                 (show status)

-                (self issue))

+                (princ-to-string (puri:merge-uris (format nil "/browse/~a" (key issue))

+                                                  *hostname*)))

         (show-summary summary)

@@ -63,40 +63,40 @@

   (setf *auth* (ubiquitous:value :jira :creds))

   (make-context)

-  (let ((jira-api::*endpoint* (format nil *endpoint-template* (getopt :long-name "jira-account"))))

-    (cond

-      ((getopt :long-name "help") (help))

-      ((getopt :long-name "version") (format t "~&~a~%" *version*))

-      ((getopt :long-name "dump-configuration") (dump-configuration))

-      ((getopt :long-name "configure") (let ((creds (prompt :creds))

-                                             (account (prompt :jira-account)))

-                                         (setf (ubiquitous:value :jira :creds) creds)

-                                         (setf (ubiquitous:value :jira :account) account)

-                                         (dump-configuration)))

-      ((getopt :long-name "get-issue") (let ((options (remainder)))

-                                         (format t "~&~a~&"

-                                                 (jira-api::show

-                                                   (jira-api::json2sheeple

-                                                     (jira-api::get-issue *auth*

-                                                                          (format nil "~a-~a"

-                                                                                  (car options)

-                                                                                  (cadr options)))

-                                                     jira-api::=issue=)))))

-      ((getopt :long-name "get-issues")

-       (let ((options (remainder)))

-         (let ((issues (jira-api::json2sheeple (jira-api::get-issues *auth*))))

-           (alexandria:if-let ((status (getopt :long-name "status")))

-             (setf issues

-                   (sheeple:defobject ()

-                                      ((jira-api::issues

-                                         (apply 'vector

-                                                (gethash status

-                                                         (jira-api::classify-issues issues))))))))

-           (jira-api::show-issues issues))))

-      ((getopt :long-name "list-projects") (jira-api::show-projects

-                                             (jira-api::json2sheeple

-                                               (jira-api::get-projects *auth*))))

-      ((getopt :long-name "post-issue") (yason:encode (jira-api::read-issue)))

-      (t  (help) (exit)))))

+  (jira-api::update-hostname (getopt :long-name "jira-account"))

+  (cond

+    ((getopt :long-name "help") (help))

+    ((getopt :long-name "version") (format t "~&~a~%" *version*))

+    ((getopt :long-name "dump-configuration") (dump-configuration))

+    ((getopt :long-name "configure") (let ((creds (prompt :creds))

+                                           (account (prompt :jira-account)))

+                                       (setf (ubiquitous:value :jira :creds) creds)

+                                       (setf (ubiquitous:value :jira :account) account)

+                                       (dump-configuration)))

+    ((getopt :long-name "get-issue") (let ((options (remainder)))

+                                       (format t "~&~a~&"

+                                               (jira-api::show

+                                                 (jira-api::json2sheeple

+                                                   (jira-api::get-issue *auth*

+                                                                        (format nil "~a-~a"

+                                                                                (car options)

+                                                                                (cadr options)))

+                                                   jira-api::=issue=)))))

+    ((getopt :long-name "get-issues")

+     (let ((options (remainder)))

+       (let ((issues (jira-api::json2sheeple (jira-api::get-issues *auth*))))

+         (alexandria:if-let ((status (getopt :long-name "status")))

+           (setf issues

+                 (sheeple:defobject ()

+                                    ((jira-api::issues

+                                       (apply 'vector

+                                              (gethash status

+                                                       (jira-api::classify-issues issues))))))))

+         (jira-api::show-issues issues))))

+    ((getopt :long-name "list-projects") (jira-api::show-projects

+                                           (jira-api::json2sheeple

+                                             (jira-api::get-projects *auth*))))

+    ((getopt :long-name "post-issue") (yason:encode (jira-api::read-issue)))

+    (t  (help) (exit))))

 (dump "jira-client" main)