Add greeter with exposed module

Split saturnin-demo to a double-package distribution, where one package
provides core saturnin-demo with its subcommands and the other provides
a Shellfu/Bash module saturnin_demo_greet.sh used by the first one.

mkit.ini

@@ -33,6 +33,7 @@
     doc     = [ENV:PREFIX]/share/doc/saturnin-demo
     etc     = /etc/saturnin-demo
     etc_bc  = /etc/bash_completion.d
+    sfincb  = [ENV:PREFIX]/share/shellfu/include-bash
 
 [tokens]
     __SATURNIN_DATA_HOME__    = [ENV:XDG_DATA_HOME]/saturnin-demo
@@ -52,6 +53,8 @@
     etc_bc  = src/complete.bash              saturnin-demo.bash
     libexec = src/libexec/saturnin-demo-dump
     libexec = src/libexec/saturnin-demo-echo
+    libexec = src/libexec/saturnin-demo-greet
+    sfincb  = src/shellfu/saturnin_demo_greet.sh
     share   = src/help
     share   = src/ini.d
 

packaging/debian/control

@@ -20,6 +20,7 @@ Depends:
  shellfu-bash-pretty,
  shellfu-bash-saturnin (>= 0.4.8),
  shellfu-bash-saturnin (<< 5.0),
+ shellfu-bash-saturnin_demo,
 Description: __MKIT_PROJ_NAME__ - __MKIT_PROJ_TAGLINE__
  saturnin is Shellfu library that helps you easily build toolkit from
  various scripts that you may have lying around.  Instead of having a
@@ -30,4 +31,20 @@ Description: __MKIT_PROJ_NAME__ - __MKIT_PROJ_TAGLINE__
  This package contains a demo meta-command built with saturnin; you can
  also re-use the source as template for your new toolkit.
 
+Package: shellfu-bash-saturnin_demo
+Architecture: all
+Depends:
+ shellfu (>= 0.10),
+ shellfu (<< 0.11),
+ shellfu-bash-pretty,
+Description: __MKIT_PROJ_NAME__ - __MKIT_PROJ_TAGLINE__
+ saturnin is Shellfu library that helps you easily build toolkit from
+ various scripts that you may have lying around.  Instead of having a
+ herd of untamed undocumented and hard-to-share scripts, with help of
+ saturnin you can easily create and package a meta-command with a set
+ of discoverable and maintainable sub-commands.
+ .
+ This sub-package contains Shellfu/Bash modules used by
+ *saturnin-demo*.
+
 # control file built with MKit __MKIT_SELF_VERSION__

packaging/debian/rules

@@ -13,4 +13,5 @@ override_dh_auto_test:
 	make clean
 	make install PREFIX=/usr DESTDIR=TEST
 	make test \
-		PATH="$(shell pwd)/TEST/usr/bin:$(PATH)"
+		PATH="$(shell pwd)/TEST/usr/bin:$(PATH)" \
+		SHELLFU_PATH="$(shell pwd)/TEST/usr/share/shellfu/include-bash"

packaging/debian/install → packaging/debian/saturnin-demo.install

@@ -2,6 +2,7 @@
 /usr/bin/saturnin-demo
 /usr/libexec/saturnin-demo/saturnin-demo-dump
 /usr/libexec/saturnin-demo/saturnin-demo-echo
+/usr/libexec/saturnin-demo/saturnin-demo-greet
 /usr/share/doc/saturnin-demo/README.md
 /usr/share/saturnin-demo/help
 /usr/share/saturnin-demo/ini.d/main/echo.ini

packaging/debian/shellfu-saturnin_demo.install

@@ -0,0 +1 @@
+/usr/share/shellfu/include-bash/saturnin_demo_greet.sh

packaging/template.spec

@@ -1,3 +1,4 @@
+%define sfincb %{_datadir}/shellfu/include-bash
 %define shellfu_req shellfu >= 0.10.4, shellfu < 0.11
 %define saturnin_req shellfu-bash-saturnin >= 0.4.10, shellfu-bash-saturnin < 0.5
 
@@ -14,6 +15,7 @@ BuildRequires:  %shellfu_req
 
 Requires:   %shellfu_req
 Requires:   %saturnin_req
+Requires:   shellfu-bash-saturnin_demo
 %description
 saturnin is Shellfu library that helps you easily build toolkit from
 various scripts that you may have lying around.  Instead of having a
@@ -24,6 +26,14 @@ of discoverable and maintainable sub-commands.
 This package contains a demo meta-command built with saturnin; you can
 also re-use the source as template for your new toolkit.
 
+%package -n shellfu-bash-saturnin_demo
+Summary: Shellfu/Bash modules for saturnin-demo
+Requires: %saturnin_req
+Requires: shellfu-bash
+Requires: shellfu-bash-pretty
+%description -n shellfu-bash-saturnin_demo
+This sub-package contains Shellfu/Bash modules used by *saturnin-demo*.
+
 %prep
 %setup -q
 
@@ -35,7 +45,8 @@ make %{?_smp_mflags} PREFIX=/usr
 
 %check
 make test \
-    PATH="%{buildroot}/%{_bindir}:$PATH"
+    PATH="%{buildroot}/%{_bindir}:$PATH" \
+    SHELLFU_PATH="%{buildroot}/%{sfincb}"
 
 %files
 %config %{_sysconfdir}/bash_completion.d/%{name}.bash
@@ -49,7 +60,10 @@ make test \
 %{_datadir}/%{name}/ini.d/main/echo.ini
 %{_libexecdir}/%{name}/%{name}-dump
 %{_libexecdir}/%{name}/%{name}-echo
+%{_libexecdir}/%{name}/%{name}-greet
 
+%files -n shellfu-bash-saturnin_demo
+%{sfincb}/saturnin_demo_greet.sh
 
 %changelog
 

src/libexec/saturnin-demo-greet

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+. "$(sfpath)" || exit 3
+
+shellfu import pretty
+
+shellfu import saturnin_demo_greet
+
+usage() {
+    mkusage "$@" \
+        "-u [USER]" \
+        "[-w]" \
+      -c \
+        "-u [USER]    greet user USER or current user" \
+        "-w           greet the world (default mode)"
+}
+
+main() {
+    local mode=world
+    local user=
+    while true; do case $1 in
+        -u) mode=user; user=$2; break ;;
+        -w) mode=world; break ;;
+        "") break ;;
+        *) usage -w "unknown argument: $1" ;;
+    esac done
+    debug -v mode user
+    case $mode in
+        user)   saturnin_demo_greet__user "$user" ;;
+        world)  saturnin_demo_greet__world ;;
+    esac
+}
+
+main "$@"

src/shellfu/saturnin_demo_greet.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+shellfu import pretty
+
+saturnin_demo_greet__world() {
+    #
+    # Greet the world
+    #
+    think "greeting the world"
+    echos "Hello, world!"
+}
+
+saturnin_demo_greet__user() {
+    #
+    # Greet user $1 or $USER
+    #
+    local user=${1:-$USER}
+    debug -v user
+    think "greeting user: $user"
+    echos "Hello, $user!"
+}