diff --git a/steps/steps.lisp b/core/core.lisp similarity index 81% rename from steps/steps.lisp rename to core/core.lisp index 98dc226..6589129 100644 --- a/steps/steps.lisp +++ b/core/core.lisp @@ -1,13 +1,13 @@ -;;;; cl-scopes/steps - here comes the real action +;;;; cl-scopes/core - here comes the real action -(defpackage :scopes/steps +(defpackage :scopes/core (:use :common-lisp) (:local-nicknames (:config :scopes/config)) (:export #:config #:message #:service #:name #:send)) -(in-package :scopes/steps) +(in-package :scopes/core) (defclass config (config:base) (services)) diff --git a/scopes-core.asd b/scopes-core.asd index 2aeaae0..991af0d 100644 --- a/scopes-core.asd +++ b/scopes-core.asd @@ -8,22 +8,22 @@ :description "Core packages of the scopes project." :depends-on (:alexandria :cl-dotenv :com.inuoe.jzon :local-time :log4cl :str) :components ((:file "config" :depends-on ("util")) + (:file "core/core" :depends-on ("config" "forge/forge" "util")) (:file "forge/forge") - (:file "steps/steps" :depends-on ("config" "forge/forge" "util")) (:file "util") (:file "testing" :depends-on ("util")) (:file "test/test-config" :depends-on ("testing" "config")) (:file "test/test-forge" :depends-on ("testing" "forge/forge")) - (:file "test/test-steps" :depends-on ("testing" "steps/steps"))) + (:file "test/test-core" :depends-on ("testing" "core/core"))) :long-description "scopes/core: The core packages of the scopes project." :in-order-to ((test-op (test-op "scopes-core/test")))) (defsystem :scopes-core/test :depends-on (:scopes-core) :components ((:file "test/test-config") - (:file "test/test-forge") - (:file "test/test-steps")) + (:file "test/test-core") + (:file "test/test-forge")) :perform (test-op (o c) (symbol-call :scopes/test-config :run) - (symbol-call :scopes/test-forge :run) - (symbol-call :scopes/test-steps :run))) + (symbol-call :scopes/test-core :run) + (symbol-call :scopes/test-forge :run))) diff --git a/scopes.asd b/scopes.asd index cba900c..ef5b889 100644 --- a/scopes.asd +++ b/scopes.asd @@ -9,15 +9,15 @@ :depends-on (:alexandria :chanl :cl-dotenv :com.inuoe.jzon :dbi :local-time :log4cl :str :sxql) :components ((:file "config" :depends-on ("util")) + (:file "core/core" :depends-on ("config" "forge/forge" "util")) (:file "forge/forge") (:file "storage/storage") (:file "storage/tracking" :depends-on ("storage/storage")) - (:file "steps/steps" :depends-on ("config" "forge/forge" "util")) (:file "util") (:file "testing" :depends-on ("util")) (:file "test/test-config" :depends-on ("testing" "config")) + (:file "test/test-core" :depends-on ("testing" "core/core")) (:file "test/test-forge" :depends-on ("testing" "forge/forge")) - (:file "test/test-steps" :depends-on ("testing" "steps/steps")) (:file "test/test-storage" :depends-on ("testing" "storage/storage" "storage/tracking"))) :long-description "scopes: generic data processing facilities." @@ -28,11 +28,11 @@ (defsystem :scopes/test :depends-on (:scopes) :components ((:file "test/test-config") - (:file "test/test-steps") - (:file "test/test-storage") - (:file "test/test-forge")) + (:file "test/test-core") + (:file "test/test-forge") + (:file "test/test-storage")) :perform (test-op (o c) (symbol-call :scopes/test-config :run) + (symbol-call :scopes/test-core :run) (symbol-call :scopes/test-forge :run) - (symbol-call :scopes/test-steps :run) (symbol-call :scopes/test-storage :run-all))) diff --git a/test/etc/config-core.lisp b/test/etc/config-core.lisp new file mode 100644 index 0000000..ec3cf8c --- /dev/null +++ b/test/etc/config-core.lisp @@ -0,0 +1,6 @@ +;;;; cl-scopes/test/etc/config-core - configuration for `scopes-core` tests + +(in-package :scopes/test-core) + +(setf *config* + (make-instance 'core:config)) diff --git a/test/etc/config-steps.lisp b/test/etc/config-steps.lisp deleted file mode 100644 index 23cb5b8..0000000 --- a/test/etc/config-steps.lisp +++ /dev/null @@ -1,6 +0,0 @@ -;;;; cl-scopes/test/etc/config-steps - configuration for `scopes-steps` tests - -(in-package :scopes/test-steps) - -(setf *config* - (make-instance 'steps:config)) diff --git a/test/test-steps.lisp b/test/test-core.lisp similarity index 54% rename from test/test-steps.lisp rename to test/test-core.lisp index 52f3ee7..7724d2a 100644 --- a/test/test-steps.lisp +++ b/test/test-core.lisp @@ -1,32 +1,32 @@ -;;;; cl-scopes/test-steps - testing for the scopes-steps system. +;;;; cl-scopes/test-core - testing for the scopes-core system. -(defpackage :scopes/test-steps +(defpackage :scopes/test-core (:use :common-lisp) (:local-nicknames (:config :scopes/config) - (:steps :scopes/steps) + (:core :scopes/core) (:util :scopes/util) (:t :scopes/testing)) (:export #:run #:user #:password) (:import-from :scopes/testing #:deftest #:==)) -(in-package :scopes/test-steps) +(in-package :scopes/test-core) (defvar *config* nil) (defclass test-suite (t:test-suite) - ((receiver :initform (make-instance 'steps:service :name :test-rcvr) + ((receiver :initform (make-instance 'core:service :name :test-rcvr) :reader receiver))) (defun run () (let ((*config* nil) - (t:*test-suite* (make-instance 'test-suite :name "steps"))) - (load (t:test-path "config-steps" "etc")) + (t:*test-suite* (make-instance 'test-suite :name "core"))) + (load (t:test-path "config-core" "etc")) (test-send) (t:show-result))) (t:deftest test-send () (let ((rcvr (receiver t:*test-suite*)) (msg nil)) - (== (steps:name rcvr) :test-rcvr) - (steps:send rcvr msg) + (== (core:name rcvr) :test-rcvr) + (core:send rcvr msg) ))