From 39b941e01362c0b6593354a35f3ed97b531015b9 Mon Sep 17 00:00:00 2001 From: Jaidyn Ann <10477760+JadedCtrl@users.noreply.github.com> Date: Sun, 23 Jun 2024 12:49:58 -0500 Subject: [PATCH] Rename project to activity-servist Slightly less wrong, feels slightly less redundant! --- ...itypub-servist.asd => activity-servist.asd | 42 +++++++++---------- src/activity-vocabulary.lisp | 6 +-- src/activitypub-servist.lisp | 12 +++--- src/signatures.lisp | 8 ++-- t/activity-vocabulary.lisp | 14 +++---- t/signatures.lisp | 12 +++--- 6 files changed, 47 insertions(+), 47 deletions(-) rename activitypub-servist.asd => activity-servist.asd (60%) diff --git a/activitypub-servist.asd b/activity-servist.asd similarity index 60% rename from activitypub-servist.asd rename to activity-servist.asd index c036032..febe331 100644 --- a/activitypub-servist.asd +++ b/activity-servist.asd @@ -1,38 +1,38 @@ (require "asdf") -(asdf:defsystem "activitypub-servist" +(asdf:defsystem "activity-servist" :version "0.0" :license "AGPLv3" :description "ActitivyPub federated server framework." :author "Jaidyn Ann " - :homepage "https://hak.xwx.moe/jadedctrl/activitypub-servist" + :homepage "https://hak.xwx.moe/jadedctrl/activity-servist" :in-order-to ((test-op (test-op "activitypub/tests"))) - :depends-on ("activitypub-servist/signatures" + :depends-on ("activity-servist/signatures" "alexandria" "clack" "dexador" "local-time" "purl" "str" "webtentacle" "yason") - :components ((:file "src/activitypub-servist"))) + :components ((:file "src/activity-servist"))) -(asdf:defsystem "activitypub-servist/activity-vocabulary" +(asdf:defsystem "activity-servist/activity-vocabulary" :version "0.0" :license "AGPLv3" :description "AP-S subpackage for handling ActivityVocabulary parsing/encoding." :author "Jaidyn Ann " - :homepage "https://hak.xwx.moe/jadedctrl/activitypub-servist" + :homepage "https://hak.xwx.moe/jadedctrl/activity-servist" :in-order-to ((test-op (test-op "activitypub/tests/activity-vocabulary"))) :depends-on ("alexandria" "closer-mop" "str" "yason") :components ((:file "src/activity-vocabulary"))) -(asdf:defsystem "activitypub-servist/signatures" +(asdf:defsystem "activity-servist/signatures" :version "0.0" :license "AGPLv3" :description "AP-S subpackage for handling HTTP signatures." :author "Jaidyn Ann " - :homepage "https://hak.xwx.moe/jadedctrl/activitypub-servist" + :homepage "https://hak.xwx.moe/jadedctrl/activity-servist" :in-order-to ((test-op (test-op "activitypub/tests/signatures"))) :depends-on ("cl-base64" "flexi-streams" "inferior-shell" "ironclad" "str") @@ -42,34 +42,34 @@ ;;; Tests ;;; ————————————————————————————————————— -(asdf:defsystem "activitypub-servist/tests/activity-vocabulary" +(asdf:defsystem "activity-servist/tests/activity-vocabulary" :version "0.0" :license "AGPLv3" :author "Jaidyn Ann " - :description "Tests for the the activitypub-servist/signatures package." + :description "Tests for the the activity-servist/signatures package." - :depends-on (:activitypub-servist/activity-vocabulary :alexandria :lisp-unit2) + :depends-on (:activity-servist/activity-vocabulary :alexandria :lisp-unit2) :components ((:file "t/activity-vocabulary"))) -(asdf:defsystem "activitypub-servist/tests/signatures" +(asdf:defsystem "activity-servist/tests/signatures" :version "0.0" :license "AGPLv3" :author "Jaidyn Ann " - :description "Tests for the the activitypub-servist/signatures package." + :description "Tests for the the activity-servist/signatures package." - :depends-on (:activitypub-servist/signatures :lisp-unit2) + :depends-on (:activity-servist/signatures :lisp-unit2) :components ((:file "t/signatures"))) -(asdf:defsystem "activitypub-servist/tests" +(asdf:defsystem "activity-servist/tests" :version "0.0" :license "AGPLv3" :author "Jaidyn Ann " - :description "Tests for all activitypub-servist subpacakges." + :description "Tests for all activity-servist subpacakges." - :depends-on (:activitypub-servist/tests/activity-vocabulary - :activitypub-servist/tests/signatures + :depends-on (:activity-servist/tests/activity-vocabulary + :activity-servist/tests/signatures :alexandria :lisp-unit2) :components ((:file "t/t"))) @@ -79,6 +79,6 @@ `(defmethod asdf:perform ((o asdf:test-op) (c (eql (asdf:find-system ',package)))) (eval (read-from-string (format nil "(~A:run-with-summary)" ',package))))) -(define-asdf-testing activitypub-servist/tests/activity-vocabulary) -(define-asdf-testing activitypub-servist/tests/signatures) -(define-asdf-testing activitypub-servist/tests) +(define-asdf-testing activity-servist/tests/activity-vocabulary) +(define-asdf-testing activity-servist/tests/signatures) +(define-asdf-testing activity-servist/tests) diff --git a/src/activity-vocabulary.lisp b/src/activity-vocabulary.lisp index 71fa8bc..e0fc031 100644 --- a/src/activity-vocabulary.lisp +++ b/src/activity-vocabulary.lisp @@ -15,9 +15,9 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program. If not, see . -(defpackage #:activitypub-servist/activity-vocabulary +(defpackage #:activity-servist/activity-vocabulary (:use #:cl) - (:nicknames "AP-S/AV" "AV") + (:nicknames "AS/AV" "ACTIVITY-VOCABULARY") (:shadow #:delete #:ignore #:listen #:read #:remove) ;; One should never USE this package, since some class-names shadow ;; core Common Lisp symbols! Beware! :P @@ -58,7 +58,7 @@ :relationship-object :relationship-relationship :relationship-subject :tombstone-former-type :tombstone-deleted)) -(in-package #:activitypub-servist/activity-vocabulary) +(in-package #:activity-servist/activity-vocabulary) diff --git a/src/activitypub-servist.lisp b/src/activitypub-servist.lisp index 7531c13..f20685a 100644 --- a/src/activitypub-servist.lisp +++ b/src/activitypub-servist.lisp @@ -1,4 +1,4 @@ -;;;; activitypub-servist: An ActivityPub server framework. +;;;; activity-servist: An ActivityPub server framework. ;; Copyright © 2023-2024 Jaidyn Levesque ;; @@ -15,12 +15,12 @@ ;; You should have received a copy of the GNU Affero General Public License ;; along with this program. If not, see . -(defpackage #:activitypub-servist - (:use #:cl #:activitypub-servist/signatures) - (:nicknames "AP-S") +(defpackage #:activity-servist + (:use #:cl #:activity-servist/signatures) + (:nicknames "AS") (:export :server :start-server)) -(in-package #:activitypub-servist) +(in-package #:activity-servist) (defun users () @@ -146,7 +146,7 @@ the plist in the docstring for its WEBTENTACLE:SERVER function." ("inbox" . ,(str:concat user-root "/inbox")) ("outbox" . ,(str:concat user-root "/outbox")) ("discoverable" . t) - ("summary" . "Mi estas simpla roboto, kiu montras ke iomete ekfunkcias activitypub-servist. + ("summary" . "Mi estas simpla roboto, kiu montras ke iomete ekfunkcias activity-servist. … ĉu mi rajtas demeti la servistinan kostumon, nun? Mi ne estas knabino!!") ("icon" diff --git a/src/signatures.lisp b/src/signatures.lisp index 49e9996..e8bbab8 100644 --- a/src/signatures.lisp +++ b/src/signatures.lisp @@ -1,4 +1,4 @@ -;;;; activitypub-servist/signatures: Handle AP-compatible HTTP signatures. +;;;; activity-servist/signatures: Handle AP-compatible HTTP signatures. ;; Copyright © 2023-2024 Jaidyn Levesque ;; @@ -15,14 +15,14 @@ ;; You should have received a copy of the GNU Affero General Public License ;; along with this program. If not, see . -(defpackage #:activitypub-servist/signatures +(defpackage #:activity-servist/signatures (:use #:cl) - (:nicknames "AP-S/S") + (:nicknames "AS/S") (:export :generate-key-pair :sign-string :import-pem-key-pair :digest-string :string-sha256sum)) -(in-package #:activitypub-servist/signatures) +(in-package #:activity-servist/signatures) ;;; Key creation/parsing diff --git a/t/activity-vocabulary.lisp b/t/activity-vocabulary.lisp index 48126f3..6542e70 100644 --- a/t/activity-vocabulary.lisp +++ b/t/activity-vocabulary.lisp @@ -1,4 +1,4 @@ -;;;; activitypub-servist/tests/activity-vocabulary: Testing activity-vocabulary. +;;;; activity-servist/tests/activity-vocabulary: Testing activity-vocabulary. ;; Copyright © 2024 Jaidyn Levesque ;; @@ -15,16 +15,16 @@ ;; You should have received a copy of the GNU Affero General Public License ;; along with this program. If not, see . -(defpackage :activitypub-servist/tests/activity-vocabulary +(defpackage :activity-servist/tests/activity-vocabulary (:use :cl :lisp-unit2) - (:nicknames "AP-S/T/AV") + (:nicknames "AS/T/AV") (:export :run :run-with-summary)) -(in-package :activitypub-servist/tests/activity-vocabulary) +(in-package :activity-servist/tests/activity-vocabulary) (defun run () "Run all ACTIVITY-VOCABULARY tests." - (lisp-unit2:run-tests :package :activitypub-servist/tests/activity-vocabulary)) + (lisp-unit2:run-tests :package :activity-servist/tests/activity-vocabulary)) (defun run-with-summary () "Run tests with summary for ACTIVITY-VOCABULARY." @@ -37,7 +37,7 @@ ;;; ———————————————————————————————————————— (defmacro relative-pathname (path) "Return an absolute path adding the relative PATH to the system’s path." - `(asdf:system-relative-pathname :activitypub-servist/tests/activity-vocabulary ,path)) + `(asdf:system-relative-pathname :activity-servist/tests/activity-vocabulary ,path)) (defmacro define-json-test (path tags) "Define a lisp-unit2 test for parsing of the given JSON file. @@ -52,7 +52,7 @@ ensuring they are semantically equivalent. White-space and key order are ignored (yason:parse (yason:with-output-to-string* () (yason:encode-object - (av:parse ,content))))))))) + (as/av:parse ,content))))))))) (defun sort-alist (alist predicate) "Sort an associative list by its keys." diff --git a/t/signatures.lisp b/t/signatures.lisp index 244eba3..dd97884 100644 --- a/t/signatures.lisp +++ b/t/signatures.lisp @@ -1,4 +1,4 @@ -;;;; activitypub-servist/tests/signatures: Testing activitypub-servist/signatures. +;;;; activity-servist/tests/signatures: Testing activity-servist/signatures. ;; Copyright © 2024 Jaidyn Levesque ;; @@ -15,16 +15,16 @@ ;; You should have received a copy of the GNU Affero General Public License ;; along with this program. If not, see . -(defpackage :activitypub-servist/tests/signatures +(defpackage :activity-servist/tests/signatures (:use :cl :lisp-unit2) - (:nicknames "AP-S/T/S") + (:nicknames "AS/T/S") (:export :run :run-with-summary)) -(in-package :activitypub-servist/tests/signatures) +(in-package :activity-servist/tests/signatures) (defun run () "Run all SIGNATURES tests." - (lisp-unit2:run-tests :package :activitypub-servist/tests/signatures)) + (lisp-unit2:run-tests :package :activity-servist/tests/signatures)) (defun run-with-summary () "Run tests with summary for SIGNATURES." @@ -38,4 +38,4 @@ (define-test string-sha256sum (:tags '(misc)) (assert-equal "erws/VxJ7XO5xQBqpwHIUwG0P4q1Ek2D4N053+E2Ib8=" - (ap-s/s::string-sha256sum "This is a testing string~! ♥ ĉu ne?~"))) + (as/s::string-sha256sum "This is a testing string~! ♥ ĉu ne?~")))