@@ -6,7 +6,7 @@

   (apply #'format stream prompt args)

   (force-output stream)

   (read-line stream nil :done))

-(trace prompt-for-line)

+;(trace prompt-for-line)

 (defun prompt-for-lines (stream initial-prompt continuation-prompt &rest args)

   "Not finished ... see :description below"

@@ -47,3 +47,10 @@

         do (vector-push-extend trim-line lines)

         finally (return (string-join lines #\newline))))

+(defmethod prompt ((field-name (eql :jira-account)) &optional (stream *prompt-stream*))

+  (prompt-for-line stream "JIRA Subdomain? "))

+

+(defmethod prompt ((field-name (eql :creds)) &optional (stream *prompt-stream*))

+  (let ((username (prompt-for-line stream "Username? "))

+        (password (prompt-for-line stream "Password (visible)? ")))

+    (list username password)))

@@ -36,6 +36,34 @@

   (declare (ignore args))

   (format nil "~a" (name status)))

+(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))))

+

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

   (declare (ignorable args))

   (with-output-to-string (*standard-output*)

@@ -68,7 +96,6 @@

 (sheeple:defproto =issuetype= () (description name))

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

-                  (declare (optimize (debug 3)))

   (with-accessors ((issuetypes issuetypes)) project

     (when issuetypes

       (map nil

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

   (:use #:cl #:serapeum #:alexandria #:fw.lu #:jira-api.cli #:jira-api #:net.didierverna.clon))

 (in-package #:jira-api.client)

-(defparameter *version* (format nil "0.1-init")) 

+(defparameter *version* (format nil "0.1-init"))

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

@@ -30,8 +30,9 @@

          (flag :short-name "i"

                :long-name "get-issue"

                :description "show an issue")

-         (flag :short-name "pi" :long-name "post-issue"

-               :description "post and issue"))

+         ;(flag :short-name "pi" :long-name "post-issue"

+         ;      :description "post and issue")

+         )

   (group (:header "JIRA options")

          (stropt :long-name "jira-account"

                  :description "The jira account to use."

@@ -41,22 +42,37 @@

          (stropt :short-name "s" :long-name "status"

                  :description "Only show issues with a certain status"))

   (group (:header "Other options")

+         (flag :short-name "dc" :long-name "dump-configuration"

+               :description "Dump the current configuration")

+         (flag :short-name "g" :long-name "configure"

+               :description "Configure the default values")

          (flag :short-name "h" :long-name "help"

-               :description "Show this help") 

+               :description "Show this help")

          (flag :short-name "v" :long-name "version"

                :description "Show the program version")))

 (defvar *auth*)

+(defun dump-configuration ()

+  (format t "~&~s~&"

+          (hash-table-alist

+            (ubiquitous:value :jira))))

+

 (defun main ()

-  (ubiquitous:restore :jira-api) 

+  (ubiquitous:restore :jira-api)

   (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

@@ -70,7 +86,7 @@

        (let ((options (remainder)))

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

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

-             (setf issues 

+             (setf issues

                    (sheeple:defobject ()

                                       ((jira-api::issues

                                          (apply 'vector

@@ -81,9 +97,6 @@

                                              (jira-api::json2sheeple

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

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

-      (t   (do-cmdline-options (option name value source)

-                               (print (list option name value source)))

-           (terpri)

-           (exit)))))

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

 (dump "jira-client" main)