bash: remove rose_init

Author: oliver-sanders

.gitignore

@@ -2,7 +2,6 @@
 *.swp
 etc/rose.conf
 etc/opt
-lib/bash/rose_init_site
 doc
 venv
 metomi_rose.egg-info

bin/rose

@@ -37,10 +37,13 @@
 if ${ROSE_DEBUG:-false}; then
     set -x
 fi
-# shellcheck source=lib/bash/rose_init
-# shellcheck source=lib/bash/rose_usage
-. rose_init
-rose_init
+set -eu
+
+ROSE_NS=$(basename "$0")
+ROSE_LIB="$(dirname "$(python3 -c "import metomi.rose; print(metomi.rose.__file__)")")"
+ROSE_HOME_BIN=$(dirname "$(command -v rose)")
+ROSE_VERSION="$(python3 -c "import metomi.rose; print(metomi.rose.__version__)")"
+export ROSE_NS ROSE_LIB ROSE_HOME_BIN ROSE_VERSION
 
 # Print actual command of a command alias
 get_alias() {
@@ -49,6 +52,7 @@ get_alias() {
         "$ROSE_HOME_BIN/$ROSE_NS-$NAME"
 }
 
+
 # Print help for a given utility
 help_util() {
     local NAME=$1
@@ -118,6 +122,8 @@ help|h|?|--help|-h)
     if (($# == 0)); then
         {
             print_version
+            # shellcheck source=../metomi/rose/etc/lib/bash/rose_usage
+            . "$(rose resource lib/bash/rose_usage)"
             rose_usage
             echo
             echo "$ROSE_NS provides the following utilities:"

bin/rose-mpi-launch

@@ -112,9 +112,13 @@
 # DIAGNOSTICS
 #     Return 0 on success, 1 or exit code of the launcher program on failure.
 #-------------------------------------------------------------------------------
-# shellcheck source=lib/bash/rose_init
-. rose_init
-rose_init rose_log
+set -eu
+# shellcheck source=../metomi/rose/etc/lib/bash/rose_log
+. "$(rose resource lib/bash/rose_log)"
+# shellcheck source=../metomi/rose/etc/lib/bash/rose_usage
+. "$(rose resource lib/bash/rose_usage)"
+
+ROSE_CMD="${ROSE_NS}-${ROSE_UTIL}"
 
 # ------------------------------------------------------------------------------
 ROSE_COMMAND=
@@ -201,7 +205,7 @@ else
 fi
 
 ROSE_LAUNCHER_LIST=${ROSE_LAUNCHER_LIST:-$( \
-    rose config --default= "$ROSE_NS" launcher-list)}
+    rose config --default= "$ROSE_CMD" launcher-list)}
 export NPROC=${NPROC:-1}
 
 #-------------------------------------------------------------------------------
@@ -245,7 +249,7 @@ if [[ -n $ROSE_COMMAND_FILE ]]; then
     fi
     ROSE_LAUNCHER_FILEOPTS=${ROSE_LAUNCHER_FILEOPTS:-$( \
         rose config --default= \
-        "$ROSE_NS" "launcher-fileopts.$ROSE_LAUNCHER_BASE")}
+        "$ROSE_CMD" "launcher-fileopts.$ROSE_LAUNCHER_BASE")}
     eval "info 2 exec $ROSE_LAUNCHER $ROSE_LAUNCHER_FILEOPTS $*"
     eval "exec $ROSE_LAUNCHER $ROSE_LAUNCHER_FILEOPTS $*"
 else
@@ -256,9 +260,9 @@ else
         fi
         # Options
         ROSE_LAUNCHER_PREOPTS=${ROSE_LAUNCHER_PREOPTS:-$(rose config -E \
-            --default= "$ROSE_NS" "launcher-preopts.$ROSE_LAUNCHER_BASE")}
+            --default= "$ROSE_CMD" "launcher-preopts.$ROSE_LAUNCHER_BASE")}
         ROSE_LAUNCHER_POSTOPTS=${ROSE_LAUNCHER_POSTOPTS:-$(rose config -E \
-            --default= "$ROSE_NS" "launcher-postopts.$ROSE_LAUNCHER_BASE")}
+            --default= "$ROSE_CMD" "launcher-postopts.$ROSE_LAUNCHER_BASE")}
     else
         ROSE_LAUNCH_INNER=
         ROSE_LAUNCHER_PREOPTS=

bin/rose-tutorial

@@ -30,8 +30,7 @@
 #     Make a copy of one of the tutorial SUITE in the cylc-run directory.
 #
 #-------------------------------------------------------------------------------
-# shellcheck source=lib/bash/rose_init
-. rose_init
+set -eu
 mkdir -p "$HOME/cylc-run"
 
 usage () {
@@ -86,7 +85,7 @@ fi
 
 # Copy files.
 echo -n "Copying tutorial files to ${DIRECTORY} ... "
-rose_init 'rose_log'
+
 mkdir -p "$(dirname "${DIRECTORY}")"
 if run rsync -rLptgoD "${ROSE_HOME}/etc/tutorial/$1/" "${DIRECTORY}" \
     --exclude='.validate'; then

etc/bin/rose-test-battery

@@ -48,14 +48,9 @@
 # SEE ALSO
 #     * `prove(1)`
 #-------------------------------------------------------------------------------
-# shellcheck source=lib/bash/rose_init
-# shellcheck source=lib/bash/rose_log
-. rose_init
-. rose_log
-
 set -eu
-
-rose_init
+# shellcheck source=../../metomi/rose/etc/lib/bash/rose_log
+. "$(rose resource lib/bash/rose_log)"
 
 # Move to folder in which prove command should be run.
 TESTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"

lib/bash/rose_init

@@ -21,7 +21,7 @@
 #     rose_log
 #
 # SYNOPSIS
-#     . $ROSE_HOME/lib/bash/rose_log
+#     . rose_log
 #     info 1 "Hello world"
 #     info 2 "Hello world"
 #     echo "Hello world" | out

lib/bash/rose_init_site.example

@@ -21,7 +21,7 @@
 #     rose_usage
 #
 # SYNOPSIS
-#     . $ROSE_HOME/lib/bash/rose_usage
+#     . $rose_usage
 #     rose_usage [CODE]
 #
 # DESCRIPTION

lib/bash/rose_log metomi/rose/etc/lib/bash/rose_log

@@ -17,7 +17,7 @@
 """Common option parser for Rose command utilities."""
 
 from optparse import OptionParser
-import  metomi.rose.resource
+import metomi.rose.resource
 
 
 class RoseOptionParser(OptionParser):

lib/bash/rose_usage metomi/rose/etc/lib/bash/rose_usage

@@ -80,7 +80,7 @@ def __init__(self, namespace=None, util=None, paths=None):
         self.namespace = namespace
         self.util = util
         if paths:
-            self.paths = list(paths)
+            self.paths = list(map(Path, paths))
         else:
             self.paths = [
                 (ROSE_INSTALL_ROOT / 'etc') / self.get_util_name("-"),

metomi/rose/opt_parse.py

@@ -84,9 +84,10 @@ def find_version(*file_paths):
     version=find_version("metomi", "rose", "__init__.py"),
 
     # Options
-    scripts=glob(join("bin", "*"))
-    + glob(join("sbin", "*"))
-    + glob(join("lib", "bash", "*")),
+    scripts=(
+        glob(join("bin", "*"))
+        + glob(join("sbin", "*"))
+    ),
     install_requires=INSTALL_REQUIRES,
     extras_require=EXTRAS_REQUIRE,
     tests_require=TESTS_REQUIRE,

metomi/rose/resource.py

@@ -1,16 +1,16 @@
 Rose Bash Library
 =================
 
-The Rose bash library lives in ``lib/bash/``. To import a module, load the file
-into your script. E.g. To load ``rose_usage``, you would do::
+Rose includes some bash modules, they can be located by running::
 
-   . lib/bash/rose_usage
+    $ rose resource lib/bash
+
+These modules can be invoked like so::
+
+   . "$(rose resource lib/bash/rose_log)"
 
 The modules are:
 
-``rose_init``
-    Called by ``rose`` on initialisation. This is not meant to be for general
-    use.
 ``rose_log``
     Provide functions to print log messages.
 ``rose_usage``