@@ -1,5 +1,5 @@

 (defpackage :cloud-watcher.cli

-  (:import-from :cloud-watcher.main :stack-parameters :stack-outputs :stack-for-name)

+  (:import-from :cloud-watcher.main :stack-parameters :stack-outputs :stack-for-name :stack-info)

   (:import-from :cloud-watcher.aws-result :start-date-time :end-date-time)

   (:import-from :serapeum :op)

   (:import-from :clon :defsynopsis :group :flag :stropt)

@@ -16,6 +16,8 @@

            (flag :short-name "p" :long-name "parameters" :description "show stack parameters")

            (flag :short-name "o" :long-name "outputs" :description "show stack outputs")

            (flag :short-name "w" :long-name "watch" :description "watch a cloudformation stack until it's done processing")

+           (flag :short-name "i" :long-name "info" :description "get parameters, status and output of a stack")

+           #+null

            (flag :short-name "s" :long-name "start")

            (stropt :long-name "aws-region" :default-value "us-west-2")

            (flag :short-name "u" :long-name "update"))

@@ -30,6 +32,9 @@

 (defun stack-outputs-main (name)

   (stack-outputs (stack-for-name name)))

+(defun stack-info-main (name)

+  (stack-info (stack-for-name name)))

+

 (defun run-tests ()

   (st:test :package (find-package :cloud-watcher.aws-result))

   (st:test :package (find-package :cloud-watcher.main))

@@ -56,6 +61,7 @@

     (format *error-output* "~&IN REGION: ~a~%" region)

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

+          ((clon:getopt :long-name "info") (stack-info-main (car files)))

           ((clon:getopt :long-name "watch") (cloud-watcher.main:watch-stack (car files)))

           ((clon:getopt :long-name "outputs") (stack-outputs-main (car files)))

           ((clon:getopt :long-name "parameters") (stack-parameters-main (car files)))

@@ -9,7 +9,8 @@

            #:stack-parameters

            #:stack-outputs

            #:stack-for-name

-           #:watch-stack))

+           #:watch-stack

+           #:stack-info))

 (in-package :cloud-watcher.main)

@@ -121,6 +122,9 @@

     (setf (stack stack-formatter) (refresh-stack (stack stack-formatter)))

     stack-formatter))

+(defmethod old-status ((stack cloud-watcher.aws-result:stack))

+  nil)

+

 (defun stack-info (the-stack)

   (with-accessors ((old-status old-status)) the-stack

     (let* ((current-status (stack-status the-stack)))

@@ -134,12 +138,15 @@

           (output-block the-stack)

           t))))

+(defun refreshing (refresh-function cb)

+  (lambda (thing)

+    (let ((refreshed-thing (funcall refresh-function thing)))

+      (values (funcall cb refreshed-thing)

+              refreshed-thing))))

+

 (defun watch-stack (name)

   (format t "~&Watching ~s~2%" name)

-  (every-five-seconds (lambda (stale-stack)

-                        (let ((the-stack (refresh-stack stale-stack)))

-                          (values (stack-info the-stack)

-                                  the-stack)))

+  (every-five-seconds (refreshing 'refresh-stack 'stack-info)

                       (list name))

   (fresh-line))