Renamed project to 'Trawl' and updated all references

Author: SoumyaRanjanPatnaik

Cargo.lock

@@ -1,7 +1,7 @@
 [workspace]
 
 members = [
-    "resmand",
-    "resdb",
-    "rescat",
+    "trawld",
+    "trawldb",
+    "trawlcat",
 ]

Cargo.toml

@@ -9,20 +9,20 @@ datarootdir = $(prefix)/share
 libdir = $(exec_prefix)/lib
 zshcpl = $(datarootdir)/zsh/site-functions
 
-BIN_D := resmand
-BIN_C := rescat
-BIN_DB := resdb
+BIN_D := trawld
+BIN_C := trawlcat
+BIN_DB := trawldb
 
 all: build
 
 clean:
 	cargo clean
 
 install: 
-	$(INSTALL_PROGRAM) "./target/release/$(BIN_C)" "$(bindir)/$(BIN_C)"
-	$(INSTALL_PROGRAM) "./target/release/$(BIN_D)" "$(bindir)/$(BIN_D)"
-	$(INSTALL_PROGRAM) "./target/release/$(BIN_DB)" "$(bindir)/$(BIN_DB)"
-	$(INSTALL_DATA) "./$(BIN_D).service" "$(libdir)/systemd/user/$(BIN_D).service"
+	sudo $(INSTALL_PROGRAM) "./target/release/$(BIN_C)" "$(bindir)/$(BIN_C)"
+	sudo $(INSTALL_PROGRAM) "./target/release/$(BIN_D)" "$(bindir)/$(BIN_D)"
+	sudo $(INSTALL_PROGRAM) "./target/release/$(BIN_DB)" "$(bindir)/$(BIN_DB)"
+	sudo $(INSTALL_DATA) "./$(BIN_D).service" "$(libdir)/systemd/user/$(BIN_D).service"
 	meson install -C client_api/build
 
 uninstall:
@@ -39,16 +39,16 @@ setup:
 
 build:
 	cargo build --release
-	echo "Ensure you have the latest build of resmand running"
+	echo "Ensure you have the latest build of $(BIN_D) running"
 	./postbuild.sh
 	meson compile -C client_api/build/
 test:
 	cargo test
 
 code-coverage:
-	cargo build --bin resmand
-	cargo targe/debug/resmand &
+	cargo build --bin $(BIN_D)
+	cargo targe/debug/$(BIN_D) &
 	cargo tarpaulin -b -- --test-threads 1 
-	killall resmand
+	killall $(BIN_D)
 
 .PHONY: all clean install uninstall setup build test code-coverage

Makefile

@@ -31,7 +31,7 @@ make setup
 make
 sudo make install
 systemctl daemon-reload
-systemctl enable --now resmand
+systemctl enable --now trawld
 ```
 **Note**: The `make setup` command will fail the first time you run it. This is because the code for dbus-interface is generated at this step. You can ignore this error and proceed to the following commands.
 
@@ -81,63 +81,63 @@ Prefix the binaries with build directory path (`target/debug` or `target/release
   #endif
   ```
 
-## Start the config manager (_resmand_)
+## Start the config manager (trawld)
 
-Run `resmand` to start the config daemon. You can pass optional arguments to the daemon to customize the behavior or to change the logging level. Run `resmand --help` documentation for more information.
+Run `trawld` to start the config daemon. You can pass optional arguments to the daemon to customize the behavior or to change the logging level. Run `trawld --help` documentation for more information.
 
-## Using the CLI Cleint (_resdb_)
+## Using the CLI Cleint (_trawldb_)
 
-The CLI client allows the user to interact with the config manager. Primary functions of the client include loading configurations fromo filesRun `resdb --help` for more information.
+The CLI client allows the user to interact with the config manager. Primary functions of the client include loading configurations fromo filesRun `trawldb --help` for more information.
 
 ### Examples
 
 1. Load a file
    ```bash
    # load a file (doesn't overwrite existing resources)
-   resdb --load example/resources
+   trawldb --load example/resources
    # load a file without preprocessing
    resrdb --load example/resources --nocpp
    ```
 2. Merge resources from a file
    ```bash
    # merge resource from a file (overrides existing resources)
-   resdb --merge example/resources
+   trawldb --merge example/resources
    # merge resource from a file without preprocessing
-   resdb --merge example/resources --nocpp
+   trawldb --merge example/resources --nocpp
    ```
 3. Save currently loaded resources into a file
    ```bash
    # if file exists it is backed up to a file with the same name but with a .bak extension
-   resdb --edit all_resources
+   trawldb --edit all_resources
    # specify suffix for -edit [.bak]
-   resdb --edit all_resources --backup .old
+   trawldb --edit all_resources --backup .old
    ```
 4. Query Resources
    ```bash
    # query all resources
-   resdb --query
+   trawldb --query
    # query a specific resource (partial matches are also shown)
-   resdb --query key1
+   trawldb --query key1
    ```
 5. Get resource values
    ```bash
    # get the value for the resouource whose name is 'key1'
-   resdb --get key1
+   trawldb --get key1
    ```
 
-## Get resource value (rescat)
+## Get resource value (trawlcat)
 
-`rescat` is a drop-in replacement for `xrerscat` and prints the vlaue of the requested resouorce. For more info, see the ([xrerscat](https://github.com/regolith-linux/xrescat)) documentation.
+`trawlcat` is a drop-in replacement for `xrerscat` and prints the vlaue of the requested resouorce. For more info, see the ([xrerscat](https://github.com/regolith-linux/xrescat)) documentation.
 
 ## Client API (for C)
 
 The header and implementation files for the dbus interface is autogenerated from the `service.xml` file during the `meson` build. The `client_api.h` header file provides a simple to use wrapper api. All the dbus method names are in snake case and are prefixed with `conf_client`.
 
 ## Rust Client Library
 
-Include the `resdb` crate in the `Cargo.toml` file. You can then use the Rust client library to interact with the config manager.
+Include the `trawldb` crate in the `Cargo.toml` file. You can then use the Rust client library to interact with the config manager.
 
 ```toml
 [dependencies]
-resdb = { path = "/path/to/resdb" }
+trawldb = { path = "/path/to/trawldb" }
 ```

README.md

@@ -8,8 +8,8 @@ bool conf_client_init(conf_client *proxy, GError **err) {
     *proxy = 
         org_regolith_config1_proxy_new_for_bus_sync( G_BUS_TYPE_SESSION, 
                 G_DBUS_PROXY_FLAGS_NONE,
-                "org.regolith.ConfigMgr", 
-                "/org/regolith/ConfigMgr",
+                "org.regolith.Trawl", 
+                "/org/regolith/Trawl",
                 NULL,
                 err);
     if(*err) {

client_api/client_api.c

@@ -14,7 +14,7 @@ sources += custom_target('dbus_codegen_files',
   command: ['scripts/run_codegen.sh', '@INPUT@', '@OUTPUT@'])
 
 lib_so_version = '0'
-pkg_config_name = 'resdb-0'
+pkg_config_name = 'trawldb-0'
 
 libclient_api = library ('regolith-config-client',
         sources,
@@ -23,10 +23,10 @@ libclient_api = library ('regolith-config-client',
         soversion: lib_so_version,
         install: true)
 
-install_headers(['client_api.h', 'build/config_manager.h', ], subdir: 'resdb')
+install_headers(['client_api.h', 'build/config_manager.h', ], subdir: 'trawldb')
 
 pkg.generate(libclient_api, 
-        name: 'resdb',
+        name: 'trawldb',
         version: meson.project_version(),
         libraries: [libclient_api],
         filebase: pkg_config_name,

client_api/meson.build

@@ -1,6 +1,11 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
  "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
+  <interface name="org.freedesktop.DBus.Introspectable">
+    <method name="Introspect">
+      <arg type="s" direction="out"/>
+    </method>
+  </interface>
   <interface name="org.freedesktop.DBus.Peer">
     <method name="Ping">
     </method>
@@ -38,7 +43,7 @@
       <arg name="cpp" type="s" direction="in"/>
     </method>
     <!--
-     Returns all the matching 
+     Returns all the matching
      *Note*: Also a DBus interface
      -->
     <method name="Query">
@@ -56,15 +61,15 @@
      DBus interface to set the value of a resource. Overwrites exiting value.
      TODO: Separate implementation to make more testable
      # Emits
-     **resources_changed**: This signal indicated the change 
-     in'resources' property value 
+     **resources_changed**: This signal indicated the change
+     in'resources' property value
      -->
     <method name="SetResource">
       <arg name="key" type="s" direction="in"/>
       <arg name="val" type="s" direction="in"/>
     </method>
     <!--
-     DBus interface to add a new resource. Doesn't overwrite exiting 
+     DBus interface to add a new resource. Doesn't overwrite exiting
      values in case of conflicts
      TODO: Separate implementation to make more testable
      -->
@@ -88,11 +93,6 @@
      -->
     <property name="Resources" type="a{ss}" access="read"/>
   </interface>
-  <interface name="org.freedesktop.DBus.Introspectable">
-    <method name="Introspect">
-      <arg type="s" direction="out"/>
-    </method>
-  </interface>
   <interface name="org.freedesktop.DBus.Properties">
     <method name="Get">
       <arg name="interface_name" type="s" direction="in"/>

client_api/service.xml

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Use run this script after building resmand to generate updated 
+# Use run this script after building trawld to generate updated 
 # Introspection xml for the dbus service
 
 dbus-send --session \

postbuild.sh

@@ -1,11 +1,11 @@
 [package]
-name = "rescat"
+name = "trawlcat"
 version = "0.1.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-resdb = { path = "../resdb" }
+trawldb = { path = "../trawldb" }
 clap = { version = "3.2.8", features = ["derive"] }
 tokio = { version = "1", features = ["full"]}

rescat/Cargo.toml trawlcat/Cargo.toml

@@ -1,6 +1,6 @@
 use std::{error::Error, process};
 use clap::{Parser, AppSettings};
-use resdb::Client;
+use trawldb::Client;
 
 #[derive(Parser)]
 #[clap(author, version, about, setting(AppSettings::ArgRequiredElseHelp))]

rescat/src/main.rs trawlcat/src/main.rs

@@ -1,15 +1,15 @@
 [Unit]
-Description=Regolith Config Manager Daemon
+Description=Trawl Configuration Daemon
 StartLimitInterval=200
 StartLimitBurst=2
 
 [Service]
-ExecStart=/usr/bin/resmand
+ExecStart=/usr/bin/trawld
 Restart=on-failure
 Restart=always
 RestartSec=1
 Type=dbus
-BusName=org.regolith.ConfigMgr
+BusName=org.regolith.Trawl
 
 [Install]
-WantedBy=default.target
+WantedBy=default.target

resmand.service trawld.service

@@ -1,5 +1,5 @@
 [package]
-name = "resmand"
+name = "trawld"
 version = "0.1.0"
 edition = "2021"