aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKylie McClain <kylie@somas.is>2020-07-07 08:03:08 -0400
committerKylie McClain <kylie@somas.is>2020-07-07 09:33:53 -0400
commit0ce7a125a7f3ae56ab791546b705432520b4939a (patch)
treed548c8a300ff302fbc4987c258ed177c6ee67271
parent5c2f53a87919f4a89ee41bc80e527696a676546a (diff)
downloadpraxis-0ce7a125a7f3ae56ab791546b705432520b4939a.tar.gz
praxis-0ce7a125a7f3ae56ab791546b705432520b4939a.tar.xz
praxis-0ce7a125a7f3ae56ab791546b705432520b4939a.zip
theory-{action,metadata} --> theory-construct-{action,metadata}
-rw-r--r--.gitignore4
-rw-r--r--Makefile4
-rwxr-xr-xpkg-gen.in8
-rw-r--r--praxis.7.adoc7
-rw-r--r--spec/theory-construct-action_spec.sh (renamed from spec/theory-action_spec.sh)8
-rw-r--r--theory-action.1.adoc11
-rw-r--r--theory-construct-action.1 (renamed from theory-action.1)0
-rw-r--r--theory-construct-action.1.adoc11
-rwxr-xr-xtheory-construct-action.in (renamed from theory-action.in)4
-rw-r--r--theory-construct-metadata.1 (renamed from theory-metadata.1)0
-rw-r--r--theory-construct-metadata.1.adoc11
-rwxr-xr-xtheory-construct-metadata.in (renamed from theory-metadata.in)4
-rw-r--r--theory-metadata.1.adoc11
13 files changed, 42 insertions, 41 deletions
diff --git a/.gitignore b/.gitignore
index 0596928..cb4c482 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,8 +4,8 @@ pkg-make
repo-lint
repo-list
repo-update
-theory-action
-theory-metadata
+theory-construct-action
+theory-construct-metadata
# LIBS
theory.sh
diff --git a/Makefile b/Makefile
index a10235c..212ae80 100644
--- a/Makefile
+++ b/Makefile
@@ -34,8 +34,8 @@ BINS = \
repo-lint \
repo-list \
repo-update \
- theory-action \
- theory-metadata
+ theory-construct-action \
+ theory-construct-metadata
LIBS = \
theory.sh
diff --git a/pkg-gen.in b/pkg-gen.in
index 4fd96e3..ebbc3f8 100755
--- a/pkg-gen.in
+++ b/pkg-gen.in
@@ -23,12 +23,12 @@ while [ "$#" -gt 0 ]; do
"BUILDDIR" "@@builddir@@/${1##*/}" \
"IMAGE" "\${BUILDDIR}/image"
- theory-metadata "@@libdir@@/public"
- theory-action "@@libdir@@/public"
+ theory-construct-metadata "@@libdir@@/public"
+ theory-construct-action "@@libdir@@/public"
printf '\n%s\n' '## Package contents follows...'
- theory-metadata -r "${1}"
- theory-action -r "${1}"
+ theory-construct-metadata -r "${1}"
+ theory-construct-action -r "${1}"
# This shouldn't be expanded anyway.
# shellcheck disable=SC2016
diff --git a/praxis.7.adoc b/praxis.7.adoc
index f411e2a..06bd095 100644
--- a/praxis.7.adoc
+++ b/praxis.7.adoc
@@ -49,10 +49,11 @@ require a shell parser for anything other than running the actual actions that b
** [ ] `repo-lint` - lint repositories and check their validity according to theory(5).
*** [ ] Tests
-* [ ] Build theory construction utilities
- ** [x] `theory-action` - resolve and print all action (build script) parts of a theory.
+* [ ] Build theory utilities
+ ** [x] `theory-construct-action` - resolve and print all action (build script) parts of a
+ theory.
*** [ ] Tests
- ** [x] `theory-metadata` - resolve and print all metadata parts of a theory.
+ ** [x] `theory-construct-metadata` - resolve and print all metadata parts of a theory.
*** [ ] Tests
** Open questions:
. Should packages be created by concatenation of things, which creates a mostly
diff --git a/spec/theory-action_spec.sh b/spec/theory-construct-action_spec.sh
index da9c6d0..97ff1b8 100644
--- a/spec/theory-action_spec.sh
+++ b/spec/theory-construct-action_spec.sh
@@ -1,15 +1,15 @@
# shellcheck shell=sh
-Describe "theory-action"
+Describe "theory-construct-action"
It "requires at least one theory as an argument"
- When call theory-action
+ When call theory-construct-action
The status should eq 22
- The stderr should eq 'usage: theory-action [-r] THEORY...'
+ The stderr should eq 'usage: theory-construct-action [-r] THEORY...'
The lines of stderr should eq 1
End
It "will error out if you give it an unknown argument"
- When call theory-action -z
+ When call theory-construct-action -z
The status should eq 22
The lines of the entire stderr should eq 2
The first line of stderr should eq 'error: unknown argument -- z'
diff --git a/theory-action.1.adoc b/theory-action.1.adoc
deleted file mode 100644
index d092f2b..0000000
--- a/theory-action.1.adoc
+++ /dev/null
@@ -1,11 +0,0 @@
-= theory-action(1)
-
-== Name
-
-theory-action - resolve dependencies of a theory and print all action parts
-
-== Description
-
-TODO
-
-include::footer.adoc[]
diff --git a/theory-action.1 b/theory-construct-action.1
index 997dbbe..997dbbe 100644
--- a/theory-action.1
+++ b/theory-construct-action.1
diff --git a/theory-construct-action.1.adoc b/theory-construct-action.1.adoc
new file mode 100644
index 0000000..4c1c6ad
--- /dev/null
+++ b/theory-construct-action.1.adoc
@@ -0,0 +1,11 @@
+= theory-construct-action(1)
+
+== Name
+
+theory-construct-action - resolve dependencies of a theory and print all action parts
+
+== Description
+
+TODO
+
+include::footer.adoc[]
diff --git a/theory-action.in b/theory-construct-action.in
index 837f8e9..a422534 100755
--- a/theory-action.in
+++ b/theory-construct-action.in
@@ -3,7 +3,7 @@
. idioms
. "@@libdir@@"/theory.sh
-myusage() { usage "theory-action [-r] THEORY..."; }
+myusage() { usage "theory-construct-action [-r] THEORY..."; }
recurse=false
while getopts :r arg >/dev/null 2>&1; do
@@ -30,7 +30,7 @@ while [ "$#" -gt 0 ]; do
# TODO(somasis): arguments are not used for anything yet.
# shellcheck disable=SC2034
backslash "${1}"/libraries | while read -r library arguments; do
- theory-action -r "@@dbdir@@/libraries/${library}"
+ theory-construct-action -r "@@dbdir@@/libraries/${library}"
done
fi
diff --git a/theory-metadata.1 b/theory-construct-metadata.1
index 493c436..493c436 100644
--- a/theory-metadata.1
+++ b/theory-construct-metadata.1
diff --git a/theory-construct-metadata.1.adoc b/theory-construct-metadata.1.adoc
new file mode 100644
index 0000000..ec5b0c6
--- /dev/null
+++ b/theory-construct-metadata.1.adoc
@@ -0,0 +1,11 @@
+= theory-construct-metadata(1)
+
+== Name
+
+theory-construct-metadata - print all metadata of a theory
+
+== Description
+
+TODO
+
+include::footer.adoc[]
diff --git a/theory-metadata.in b/theory-construct-metadata.in
index f1cbd63..6a45297 100755
--- a/theory-metadata.in
+++ b/theory-construct-metadata.in
@@ -3,7 +3,7 @@
. idioms
. "@@libdir@@"/theory.sh
-myusage() { usage "theory-metadata [-r] THEORY..."; }
+myusage() { usage "theory-construct-metadata [-r] THEORY..."; }
recurse=false
while getopts :a:o:r arg >/dev/null 2>&1; do
@@ -43,7 +43,7 @@ while [ "$#" -gt 0 ]; do
# TODO(somasis): arguments are not used for anything yet.
# shellcheck disable=SC2034
backslash "${1}"/libraries | while read -r library arguments; do
- theory-metadata -r "@@dbdir@@/libraries/${library}"
+ theory-construct-metadata -r "@@dbdir@@/libraries/${library}"
done
fi
diff --git a/theory-metadata.1.adoc b/theory-metadata.1.adoc
deleted file mode 100644
index 79964aa..0000000
--- a/theory-metadata.1.adoc
+++ /dev/null
@@ -1,11 +0,0 @@
-= theory-metadata(1)
-
-== Name
-
-theory-metadata - print all metadata of a theory
-
-== Description
-
-TODO
-
-include::footer.adoc[]