Restructure the crates (#549)

* BIG CHANGES

* core metadata

* Added readme.md to the package

* Moved the crate back to tui

Co-authored-by: Liam <lj3954@users.noreply.github.com>

---------

Co-authored-by: Liam <lj3954@users.noreply.github.com>
This commit is contained in:
Adam Perkowski 2024-09-20 02:09:53 +02:00 committed by GitHub
parent 07e754b3f2
commit 216f1a4836
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
76 changed files with 30 additions and 13 deletions

View File

@ -3,11 +3,11 @@ name: Check for bashisms
on: on:
# push: # push:
# paths: # paths:
# - tabs/** # - core/tabs/**
# branches: [ "main" ] # branches: [ "main" ]
pull_request: pull_request:
paths: paths:
- tabs/** - core/tabs/**
merge_group: merge_group:
workflow_dispatch: workflow_dispatch:
@ -24,7 +24,7 @@ jobs:
- name: Check for bashisms in changed files - name: Check for bashisms in changed files
run: | run: |
for file in $(git diff --name-only origin/${{ github.base_ref }} HEAD tabs); do for file in $(git diff --name-only origin/${{ github.base_ref }} HEAD core/tabs); do
if [[ "$file" == *.sh ]]; then if [[ "$file" == *.sh ]]; then
checkbashisms "$file" checkbashisms "$file"
fi fi

View File

@ -3,7 +3,7 @@ name: ShellCheck
on: on:
pull_request: pull_request:
paths: paths:
- 'tabs/**/*.sh' - 'core/tabs/**/*.sh'
workflow_dispatch: workflow_dispatch:
jobs: jobs:
@ -15,5 +15,5 @@ jobs:
- name: Run ShellCheck - name: Run ShellCheck
uses: ludeeus/action-shellcheck@master uses: ludeeus/action-shellcheck@master
with: with:
scandir: 'tabs' scandir: 'core/tabs'
severity: error severity: error

4
Cargo.lock generated
View File

@ -452,7 +452,7 @@ checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
[[package]] [[package]]
name = "linutil_core" name = "linutil_core"
version = "0.1.0" version = "24.9.19"
dependencies = [ dependencies = [
"ego-tree", "ego-tree",
"include_dir", "include_dir",
@ -464,7 +464,7 @@ dependencies = [
[[package]] [[package]]
name = "linutil_tui" name = "linutil_tui"
version = "0.1.0" version = "24.9.19"
dependencies = [ dependencies = [
"chrono", "chrono",
"clap", "clap",

View File

@ -1,6 +1,6 @@
[workspace.package] [workspace.package]
license = "MIT" license = "MIT"
version = "0.1.0" version = "24.9.19"
[workspace.dependencies] [workspace.dependencies]
ego-tree = "0.6.2" ego-tree = "0.6.2"

View File

@ -1,8 +1,15 @@
[package] [package]
name = "linutil_core" name = "linutil_core"
description = "The backend of Linutil."
repository = "https://github.com/ChrisTitusTech/linutil/tree/main/core"
edition = "2021" edition = "2021"
version.workspace = true version.workspace = true
license.workspace = true license.workspace = true
include = [
"src/*.rs",
"Cargo.toml",
"tabs/**",
]
[dependencies] [dependencies]
include_dir = "0.7.4" include_dir = "0.7.4"

View File

@ -5,7 +5,7 @@ use serde::Deserialize;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use tempdir::TempDir; use tempdir::TempDir;
const TAB_DATA: Dir = include_dir!("$CARGO_MANIFEST_DIR/../tabs"); const TAB_DATA: Dir = include_dir!("$CARGO_MANIFEST_DIR/tabs");
pub fn get_tabs(validate: bool) -> Vec<Tab> { pub fn get_tabs(validate: bool) -> Vec<Tab> {
let tab_files = TabList::get_tabs(); let tab_files = TabList::get_tabs();

View File

@ -1,8 +1,18 @@
[package] [package]
name = "linutil_tui" name = "linutil_tui"
description = "Chris Titus Tech's Linux Toolbox - Linutil is a distro-agnostic toolbox designed to simplify everyday Linux tasks."
documentation = "https://christitustech.github.io/linutil"
readme = "../README.md"
edition = "2021" edition = "2021"
version.workspace = true
license.workspace = true license.workspace = true
repository = "https://github.com/ChrisTitusTech/linutil/tree/main/tui"
version.workspace = true
include = [
"src/*.rs",
"Cargo.toml",
"build.rs",
]
build = "build.rs"
[dependencies] [dependencies]
clap = { version = "4.5.16", features = ["derive"] } clap = { version = "4.5.16", features = ["derive"] }
@ -13,7 +23,7 @@ portable-pty = "0.8.1"
ratatui = "0.28.1" ratatui = "0.28.1"
tui-term = "0.1.12" tui-term = "0.1.12"
unicode-width = "0.1.13" unicode-width = "0.1.13"
linutil_core = { path = "../core" } linutil_core = { path = "../core", version = "24.9.19" }
[build-dependencies] [build-dependencies]
chrono = "0.4.33" chrono = "0.4.33"