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

-(defpackage :cloud-watcher.aws-result

+(defpackage :daydreamer.aws-result

   (:use :cl :fw.lu :alexandria :st)

   (:export

    #:stack

@@ -25,7 +25,7 @@

    #:extract-stack

    #:timeline

    #:tagged-kv-formatter))

-(in-package :cloud-watcher.aws-result)

+(in-package :daydreamer.aws-result)

 (defun find-all-indices (pred str &optional accum (start (or (car accum) 0)))

   (check-type pred function)

new file mode 100644

@@ -0,0 +1,33 @@

+(defpackage :fwoar.build

+  (:use :cl)

+  (:export make))

+(in-package :fwoar.build)

+

+(defmacro eval-always (&body body)

+  `(eval-when (:compile-toplevel :load-toplevel :execute)

+     ,@body))

+

+(defmacro stepwise (&body body)

+  `(progn

+     ,@(mapcar (lambda (x)

+                 `(eval-always

+                    ,@x))

+               body)))

+

+

+

+(define-symbol-macro *my-pathname* 

+    (or *compile-file-pathname*

+        *load-pathname*))

+

+(stepwise

+  ((defun load-compile (pn)

+     (load (compile-file pn))))

+

+  ((princ

+    (mapcar 'load-compile

+            (directory (merge-pathnames "*.asd"

+                                        *my-pathname*))))

+   (terpri))

+

+  ((ql:quickload :daydreamer)))

@@ -1,16 +1,17 @@

-(defpackage :cloud-watcher.cli

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

+(defpackage :daydreamer.cli

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

+  (:import-from :daydreamer.aws-result :start-date-time :end-date-time)

   (:import-from :serapeum :op)

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

   (:use :cl :st)

   (:export options

-           #:*cloud-watcher-synopsis*

+           #:*daydreamer-synopsis*

            #:dump))

-(in-package :cloud-watcher.cli)

+(in-package :daydreamer.cli)

-(defparameter *cloud-watcher-synopsis*

+

+(defparameter *daydreamer-synopsis*

   (defsynopsis (:postfix "ARGS...")

     (group (:header "actions")

            (flag :short-name "s" :long-name "stacks" :description "show stack information")

@@ -30,11 +31,11 @@

 (defun stacks-main ()

   (mapcar (lambda (s)

             (format t "~3&STACK ~a ~a~2%"

-                    (cloud-watcher.aws-result:stack-name s)

-                    (cloud-watcher.aws-result:stack-status s))

+                    (daydreamer.aws-result:stack-name s)

+                    (daydreamer.aws-result:stack-status s))

             (stack-info s))

-          (mapcar 'cloud-watcher.aws-result:extract-stack

-                  (cloud-watcher.aws-result:extract-list

+          (mapcar 'daydreamer.aws-result:extract-stack

+                  (daydreamer.aws-result:extract-list

                    (cdar

                     (aws/cloudformation:describe-stacks))))))

@@ -48,24 +49,25 @@

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

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

+  (st:test :package (find-package :daydreamer.aws-result))

+  (st:test :package (find-package :daydreamer.main))

+  (st:test :package (find-package :daydreamer.cli)))

-(defun dump ()

-  "Create an executable with the command-line interface defined above."

-  (handler-bind ((sb-ext:name-conflict (lambda (c)

-                                         (declare (ignore c))

-                                         (invoke-restart-interactively 'sb-ext:resolve-conflict))))

-    (let ((sb-ext:*on-package-variance* '(:warn (:cloud-watcher.aws-result

-                                                 :cloud-watcher.main

-                                                 :cloud-watcher.cli)

-                                          :error t)))

-      (asdf:load-system :cloud-watcher :force t)))

-  (clon:dump "cloud-watcher" main))

+(eval-when (:compile-toplevel :load-toplevel :execute)

+  (defun dump ()

+    "Create an executable with the command-line interface defined above."

+    (handler-bind ((sb-ext:name-conflict (lambda (c)

+                                           (declare (ignore c))

+                                           (invoke-restart-interactively 'sb-ext:resolve-conflict))))

+      (let ((sb-ext:*on-package-variance* '(:warn t #+nil(:daydreamer.aws-result

+                                                           :daydreamer.main

+                                                           :daydreamer.cli)

+                                                  #+nil(:error t))))

+        (asdf:load-system :daydreamer :force t)))

+    (clon:dump "daydreamer" main)))

 (defun main ()

-  (let* ((context (net.didierverna.clon:make-context :synopsis *cloud-watcher-synopsis*))

+  (let* ((context (net.didierverna.clon:make-context :synopsis *daydreamer-synopsis*))

          (files (clon:remainder :context context))

          (region (clon:getopt :long-name "aws-region"))

          (aws-sdk/api:*session* (aws-sdk/session:make-session :region region)))

@@ -74,9 +76,13 @@

     (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 "watch") (daydreamer.main:watch-stack (car files)))

           ((clon:getopt :long-name "stacks") (stacks-main))

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

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

           ((clon:getopt :long-name "self-test") (run-tests))

-          ((clon:getopt :long-name "rebuild") (dump)))))

+          ((clon:getopt :long-name "rebuild")

+           (load (compile-file (load-time-value

+                                 (asdf:system-relative-pathname :daydreamer "cli.lisp"))))

+           (dump)))))

+

similarity index 100%

rename from cloud-watcher.asd

rename to daydreamer.asd

@@ -3,8 +3,8 @@

 (eval-when (:execute :load-toplevel :compile-toplevel)

   (net.didierverna.clon:nickname-package))

-(defpackage :cloud-watcher.main

-  (:use :cl :fw.lu :alexandria :st :cloud-watcher.aws-result)

+(defpackage :daydreamer.main

+  (:use :cl :fw.lu :alexandria :st :daydreamer.aws-result)

   (:export main dump

            #:stack-parameters

            #:stack-outputs

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

            #:watch-stack

            #:stack-info))

-(in-package :cloud-watcher.main)

+(in-package :daydreamer.main)

 (define-condition invalid-result (error)

   ())

@@ -119,7 +119,7 @@

   (setf (old-status object) (stack-status object)))

 (defgeneric refresh (stack-formatter)

-  (:method ((stack cloud-watcher.aws-result:stack))

+  (:method ((stack daydreamer.aws-result:stack))

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

   (:method ((stack-formatter string))

     (make-instance 'stack-formatter :stack (stack-for-name stack-formatter)))

@@ -127,7 +127,7 @@

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

     stack-formatter))

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

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

   nil)

 (defun stack-info (the-stack)