From b136477e9a5d76e43ad3a55e7f4b8243e5ee7889 Mon Sep 17 00:00:00 2001 From: Dongdong Zhou Date: Sat, 6 Apr 2024 15:14:01 +0100 Subject: [PATCH] rename lapon to tiron --- .github/workflows/ci.yml | 6 +- .github/workflows/release.yml | 164 +++++++++--------- Cargo.lock | 142 +++++++-------- Cargo.toml | 38 ++-- .../jobs/job1/files/test.rcl | 0 .../jobs/job1/main.rcl | 0 .../jobs/test_job.rcl | 0 .../main.rcl | 0 .../tiron.rcl} | 0 lapon/src/main.rs | 6 - {lapon-common => tiron-common}/Cargo.toml | 2 +- {lapon-common => tiron-common}/src/action.rs | 0 {lapon-common => tiron-common}/src/event.rs | 0 {lapon-common => tiron-common}/src/lib.rs | 0 {lapon-common => tiron-common}/src/node.rs | 0 {lapon-common => tiron-common}/src/run.rs | 0 {lapon-lsp => tiron-lsp}/Cargo.toml | 2 +- {lapon-lsp => tiron-lsp}/lapon-lsp/Cargo.toml | 2 +- .../lapon-lsp/src/main.rs | 0 {lapon-lsp => tiron-lsp}/src/main.rs | 0 {lapon-node => tiron-node}/Cargo.toml | 4 +- .../src/action/command.rs | 2 +- {lapon-node => tiron-node}/src/action/copy.rs | 2 +- {lapon-node => tiron-node}/src/action/data.rs | 2 +- {lapon-node => tiron-node}/src/action/mod.rs | 2 +- .../src/action/package.rs | 2 +- {lapon-node => tiron-node}/src/job.rs | 2 +- {lapon-node => tiron-node}/src/lib.rs | 0 {lapon-node => tiron-node}/src/main.rs | 2 +- {lapon-node => tiron-node}/src/node.rs | 4 +- {lapon-node => tiron-node}/src/stdio.rs | 0 {lapon-tui => tiron-tui}/Cargo.toml | 6 +- {lapon-tui => tiron-tui}/src/app.rs | 2 +- {lapon-tui => tiron-tui}/src/event.rs | 2 +- {lapon-tui => tiron-tui}/src/lib.rs | 0 {lapon-tui => tiron-tui}/src/reflow.rs | 0 {lapon-tui => tiron-tui}/src/run.rs | 2 +- {lapon-tui => tiron-tui}/src/tui.rs | 0 {lapon => tiron}/Cargo.toml | 8 +- {lapon => tiron}/src/cli.rs | 4 +- {lapon => tiron}/src/config.rs | 42 ++--- {lapon => tiron}/src/core.rs | 4 +- {lapon => tiron}/src/lib.rs | 0 {lapon => tiron}/src/local.rs | 4 +- tiron/src/main.rs | 6 + {lapon => tiron}/src/remote.rs | 42 ++--- {lapon => tiron}/src/run.rs | 8 +- 47 files changed, 257 insertions(+), 257 deletions(-) rename examples/{example_lapon_project => example_tiron_project}/jobs/job1/files/test.rcl (100%) rename examples/{example_lapon_project => example_tiron_project}/jobs/job1/main.rcl (100%) rename examples/{example_lapon_project => example_tiron_project}/jobs/test_job.rcl (100%) rename examples/{example_lapon_project => example_tiron_project}/main.rcl (100%) rename examples/{example_lapon_project/lapon.rcl => example_tiron_project/tiron.rcl} (100%) delete mode 100644 lapon/src/main.rs rename {lapon-common => tiron-common}/Cargo.toml (91%) rename {lapon-common => tiron-common}/src/action.rs (100%) rename {lapon-common => tiron-common}/src/event.rs (100%) rename {lapon-common => tiron-common}/src/lib.rs (100%) rename {lapon-common => tiron-common}/src/node.rs (100%) rename {lapon-common => tiron-common}/src/run.rs (100%) rename {lapon-lsp => tiron-lsp}/Cargo.toml (80%) rename {lapon-lsp => tiron-lsp}/lapon-lsp/Cargo.toml (80%) rename {lapon-lsp => tiron-lsp}/lapon-lsp/src/main.rs (100%) rename {lapon-lsp => tiron-lsp}/src/main.rs (100%) rename {lapon-node => tiron-node}/Cargo.toml (85%) rename {lapon-node => tiron-node}/src/action/command.rs (96%) rename {lapon-node => tiron-node}/src/action/copy.rs (97%) rename {lapon-node => tiron-node}/src/action/data.rs (98%) rename {lapon-node => tiron-node}/src/action/mod.rs (87%) rename {lapon-node => tiron-node}/src/action/package.rs (97%) rename {lapon-node => tiron-node}/src/job.rs (98%) rename {lapon-node => tiron-node}/src/lib.rs (100%) rename {lapon-node => tiron-node}/src/main.rs (59%) rename {lapon-node => tiron-node}/src/node.rs (98%) rename {lapon-node => tiron-node}/src/stdio.rs (100%) rename {lapon-tui => tiron-tui}/Cargo.toml (76%) rename {lapon-tui => tiron-tui}/src/app.rs (99%) rename {lapon-tui => tiron-tui}/src/event.rs (90%) rename {lapon-tui => tiron-tui}/src/lib.rs (100%) rename {lapon-tui => tiron-tui}/src/reflow.rs (100%) rename {lapon-tui => tiron-tui}/src/run.rs (99%) rename {lapon-tui => tiron-tui}/src/tui.rs (100%) rename {lapon => tiron}/Cargo.toml (76%) rename {lapon => tiron}/src/cli.rs (68%) rename {lapon => tiron}/src/config.rs (86%) rename {lapon => tiron}/src/core.rs (96%) rename {lapon => tiron}/src/lib.rs (100%) rename {lapon => tiron}/src/local.rs (84%) create mode 100644 tiron/src/main.rs rename {lapon => tiron}/src/remote.rs (90%) rename {lapon => tiron}/src/run.rs (98%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7a4a8b..204081e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,13 +41,13 @@ jobs: run: cargo fetch --locked - name: Build - run: cargo build -p lapon --frozen + run: cargo build -p tiron --frozen - name: Build node - run: cargo build -p lapon-node --frozen + run: cargo build -p tiron-node --frozen - name: Build lsp - run: cargo build -p lapon-lsp --frozen + run: cargo build -p tiron-lsp --frozen - name: Run tests run: cargo test --workspace diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d59a79f..ec1f291 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,8 +2,8 @@ name: Release on: workflow_dispatch: inputs: - lapon_version: - description: "Lapon version for release" + tiron_version: + description: "Tiron version for release" required: true push: tags: @@ -31,40 +31,40 @@ jobs: - name: Fetch dependencies run: cargo fetch --locked - - name: Build lapon + - name: Build tiron run: | - RUSTFLAGS="-C linker=aarch64-linux-gnu-gcc" cargo build -p lapon --release --locked --target aarch64-unknown-linux-gnu - cargo build -p lapon --release --locked --target x86_64-unknown-linux-gnu + RUSTFLAGS="-C linker=aarch64-linux-gnu-gcc" cargo build -p tiron --release --locked --target aarch64-unknown-linux-gnu + cargo build -p tiron --release --locked --target x86_64-unknown-linux-gnu - - name: Build lapon-node + - name: Build tiron-node run: | - RUSTFLAGS="-C linker=aarch64-linux-gnu-gcc" cargo build -p lapon-node --release --locked --target aarch64-unknown-linux-gnu - cargo build -p lapon-node --release --locked --target x86_64-unknown-linux-gnu + RUSTFLAGS="-C linker=aarch64-linux-gnu-gcc" cargo build -p tiron-node --release --locked --target aarch64-unknown-linux-gnu + cargo build -p tiron-node --release --locked --target x86_64-unknown-linux-gnu - - name: Build lapon-lsp + - name: Build tiron-lsp run: | - RUSTFLAGS="-C linker=aarch64-linux-gnu-gcc" cargo build -p lapon-lsp --release --locked --target aarch64-unknown-linux-gnu - cargo build -p lapon-lsp --release --locked --target x86_64-unknown-linux-gnu + RUSTFLAGS="-C linker=aarch64-linux-gnu-gcc" cargo build -p tiron-lsp --release --locked --target aarch64-unknown-linux-gnu + cargo build -p tiron-lsp --release --locked --target x86_64-unknown-linux-gnu - name: Gzip run: | - gzip -c ./target/x86_64-unknown-linux-gnu/release/lapon > ./lapon-${{ github.event.inputs.lapon_version }}-linux-amd64.gz - gzip -c ./target/aarch64-unknown-linux-gnu/release/lapon > ./lapon-${{ github.event.inputs.lapon_version }}-linux-arm64.gz - gzip -c ./target/x86_64-unknown-linux-gnu/release/lapon-node > ./lapon-node-${{ github.event.inputs.lapon_version }}-linux-amd64.gz - gzip -c ./target/aarch64-unknown-linux-gnu/release/lapon-node > ./lapon-node-${{ github.event.inputs.lapon_version }}-linux-arm64.gz - gzip -c ./target/x86_64-unknown-linux-gnu/release/lapon-lsp > ./lapon-lsp-${{ github.event.inputs.lapon_version }}-linux-amd64.gz - gzip -c ./target/aarch64-unknown-linux-gnu/release/lapon-lsp > ./lapon-lsp-${{ github.event.inputs.lapon_version }}-linux-arm64.gz + gzip -c ./target/x86_64-unknown-linux-gnu/release/tiron > ./tiron-${{ github.event.inputs.tiron_version }}-linux-amd64.gz + gzip -c ./target/aarch64-unknown-linux-gnu/release/tiron > ./tiron-${{ github.event.inputs.tiron_version }}-linux-arm64.gz + gzip -c ./target/x86_64-unknown-linux-gnu/release/tiron-node > ./tiron-node-${{ github.event.inputs.tiron_version }}-linux-amd64.gz + gzip -c ./target/aarch64-unknown-linux-gnu/release/tiron-node > ./tiron-node-${{ github.event.inputs.tiron_version }}-linux-arm64.gz + gzip -c ./target/x86_64-unknown-linux-gnu/release/tiron-lsp > ./tiron-lsp-${{ github.event.inputs.tiron_version }}-linux-amd64.gz + gzip -c ./target/aarch64-unknown-linux-gnu/release/tiron-lsp > ./tiron-lsp-${{ github.event.inputs.tiron_version }}-linux-arm64.gz - uses: actions/upload-artifact@v4 with: - name: lapon-linux + name: tiron-linux path: | - ./lapon-${{ github.event.inputs.lapon_version }}-linux-amd64.gz - ./lapon-${{ github.event.inputs.lapon_version }}-linux-arm64.gz - ./lapon-node-${{ github.event.inputs.lapon_version }}-linux-amd64.gz - ./lapon-node-${{ github.event.inputs.lapon_version }}-linux-arm64.gz - ./lapon-lsp-${{ github.event.inputs.lapon_version }}-linux-amd64.gz - ./lapon-lsp-${{ github.event.inputs.lapon_version }}-linux-arm64.gz + ./tiron-${{ github.event.inputs.tiron_version }}-linux-amd64.gz + ./tiron-${{ github.event.inputs.tiron_version }}-linux-arm64.gz + ./tiron-node-${{ github.event.inputs.tiron_version }}-linux-amd64.gz + ./tiron-node-${{ github.event.inputs.tiron_version }}-linux-arm64.gz + ./tiron-lsp-${{ github.event.inputs.tiron_version }}-linux-amd64.gz + ./tiron-lsp-${{ github.event.inputs.tiron_version }}-linux-arm64.gz retention-days: 1 macos: @@ -84,67 +84,67 @@ jobs: - name: Fetch dependencies run: cargo fetch --locked - - name: Build lapon + - name: Build tiron run: | - cargo build -p lapon --release --locked --target aarch64-apple-darwin - cargo build -p lapon --release --locked --target x86_64-apple-darwin + cargo build -p tiron --release --locked --target aarch64-apple-darwin + cargo build -p tiron --release --locked --target x86_64-apple-darwin - - name: Build lapon-node + - name: Build tiron-node run: | - cargo build -p lapon-node --release --locked --target aarch64-apple-darwin - cargo build -p lapon-node --release --locked --target x86_64-apple-darwin + cargo build -p tiron-node --release --locked --target aarch64-apple-darwin + cargo build -p tiron-node --release --locked --target x86_64-apple-darwin - - name: Build lapon-lsp + - name: Build tiron-lsp run: | - cargo build -p lapon-lsp --release --locked --target aarch64-apple-darwin - cargo build -p lapon-lsp --release --locked --target x86_64-apple-darwin + cargo build -p tiron-lsp --release --locked --target aarch64-apple-darwin + cargo build -p tiron-lsp --release --locked --target x86_64-apple-darwin - name: codesign run: | - /usr/bin/codesign -vvv --deep --strict --options=runtime --force -s ADD049AE64FD743A8E91A47525EFED47153971CB ./target/x86_64-apple-darwin/release/lapon - /usr/bin/codesign -vvv --deep --strict --options=runtime --force -s ADD049AE64FD743A8E91A47525EFED47153971CB ./target/aarch64-apple-darwin/release/lapon - /usr/bin/codesign -vvv --deep --strict --options=runtime --force -s ADD049AE64FD743A8E91A47525EFED47153971CB ./target/x86_64-apple-darwin/release/lapon-node - /usr/bin/codesign -vvv --deep --strict --options=runtime --force -s ADD049AE64FD743A8E91A47525EFED47153971CB ./target/aarch64-apple-darwin/release/lapon-node - /usr/bin/codesign -vvv --deep --strict --options=runtime --force -s ADD049AE64FD743A8E91A47525EFED47153971CB ./target/x86_64-apple-darwin/release/lapon-lsp - /usr/bin/codesign -vvv --deep --strict --options=runtime --force -s ADD049AE64FD743A8E91A47525EFED47153971CB ./target/aarch64-apple-darwin/release/lapon-lsp + /usr/bin/codesign -vvv --deep --strict --options=runtime --force -s ADD049AE64FD743A8E91A47525EFED47153971CB ./target/x86_64-apple-darwin/release/tiron + /usr/bin/codesign -vvv --deep --strict --options=runtime --force -s ADD049AE64FD743A8E91A47525EFED47153971CB ./target/aarch64-apple-darwin/release/tiron + /usr/bin/codesign -vvv --deep --strict --options=runtime --force -s ADD049AE64FD743A8E91A47525EFED47153971CB ./target/x86_64-apple-darwin/release/tiron-node + /usr/bin/codesign -vvv --deep --strict --options=runtime --force -s ADD049AE64FD743A8E91A47525EFED47153971CB ./target/aarch64-apple-darwin/release/tiron-node + /usr/bin/codesign -vvv --deep --strict --options=runtime --force -s ADD049AE64FD743A8E91A47525EFED47153971CB ./target/x86_64-apple-darwin/release/tiron-lsp + /usr/bin/codesign -vvv --deep --strict --options=runtime --force -s ADD049AE64FD743A8E91A47525EFED47153971CB ./target/aarch64-apple-darwin/release/tiron-lsp - name: Notarize Release Build uses: lando/notarize-action@v2 with: - product-path: "./target/x86_64-apple-darwin/release/lapon" + product-path: "./target/x86_64-apple-darwin/release/tiron" appstore-connect-username: ${{ secrets.NOTARIZE_USERNAME }} appstore-connect-password: ${{ secrets.NOTARIZE_PASSWORD }} appstore-connect-team-id: CYSGAZFR8D - primary-bundle-id: "io.lapon" + primary-bundle-id: "io.tiron" - name: Notarize Release Build uses: lando/notarize-action@v2 with: - product-path: "./target/aarch64-apple-darwin/release/lapon" + product-path: "./target/aarch64-apple-darwin/release/tiron" appstore-connect-username: ${{ secrets.NOTARIZE_USERNAME }} appstore-connect-password: ${{ secrets.NOTARIZE_PASSWORD }} appstore-connect-team-id: CYSGAZFR8D - primary-bundle-id: "io.lapon" + primary-bundle-id: "io.tiron" - name: Gzip run: | - gzip -c ./target/x86_64-apple-darwin/release/lapon > ./lapon-${{ github.event.inputs.lapon_version }}-darwin-amd64.gz - gzip -c ./target/aarch64-apple-darwin/release/lapon > ./lapon-${{ github.event.inputs.lapon_version }}-darwin-arm64.gz - gzip -c ./target/x86_64-apple-darwin/release/lapon-node > ./lapon-node-${{ github.event.inputs.lapon_version }}-darwin-amd64.gz - gzip -c ./target/aarch64-apple-darwin/release/lapon-node > ./lapon-node-${{ github.event.inputs.lapon_version }}-darwin-arm64.gz - gzip -c ./target/x86_64-apple-darwin/release/lapon-lsp > ./lapon-lsp-${{ github.event.inputs.lapon_version }}-darwin-amd64.gz - gzip -c ./target/aarch64-apple-darwin/release/lapon-lsp > ./lapon-lsp-${{ github.event.inputs.lapon_version }}-darwin-arm64.gz + gzip -c ./target/x86_64-apple-darwin/release/tiron > ./tiron-${{ github.event.inputs.tiron_version }}-darwin-amd64.gz + gzip -c ./target/aarch64-apple-darwin/release/tiron > ./tiron-${{ github.event.inputs.tiron_version }}-darwin-arm64.gz + gzip -c ./target/x86_64-apple-darwin/release/tiron-node > ./tiron-node-${{ github.event.inputs.tiron_version }}-darwin-amd64.gz + gzip -c ./target/aarch64-apple-darwin/release/tiron-node > ./tiron-node-${{ github.event.inputs.tiron_version }}-darwin-arm64.gz + gzip -c ./target/x86_64-apple-darwin/release/tiron-lsp > ./tiron-lsp-${{ github.event.inputs.tiron_version }}-darwin-amd64.gz + gzip -c ./target/aarch64-apple-darwin/release/tiron-lsp > ./tiron-lsp-${{ github.event.inputs.tiron_version }}-darwin-arm64.gz - uses: actions/upload-artifact@v4 with: - name: lapon-macos + name: tiron-macos path: | - ./lapon-${{ github.event.inputs.lapon_version }}-darwin-amd64.gz - ./lapon-${{ github.event.inputs.lapon_version }}-darwin-arm64.gz - ./lapon-node-${{ github.event.inputs.lapon_version }}-darwin-amd64.gz - ./lapon-node-${{ github.event.inputs.lapon_version }}-darwin-arm64.gz - ./lapon-lsp-${{ github.event.inputs.lapon_version }}-darwin-amd64.gz - ./lapon-lsp-${{ github.event.inputs.lapon_version }}-darwin-arm64.gz + ./tiron-${{ github.event.inputs.tiron_version }}-darwin-amd64.gz + ./tiron-${{ github.event.inputs.tiron_version }}-darwin-arm64.gz + ./tiron-node-${{ github.event.inputs.tiron_version }}-darwin-amd64.gz + ./tiron-node-${{ github.event.inputs.tiron_version }}-darwin-arm64.gz + ./tiron-lsp-${{ github.event.inputs.tiron_version }}-darwin-amd64.gz + ./tiron-lsp-${{ github.event.inputs.tiron_version }}-darwin-arm64.gz retention-days: 1 windows: @@ -162,40 +162,40 @@ jobs: - name: Fetch dependencies run: cargo fetch --locked - - name: Build lapon + - name: Build tiron run: | - cargo build -p lapon --release --locked --target aarch64-pc-windows-msvc - cargo build -p lapon --release --locked --target x86_64-pc-windows-msvc + cargo build -p tiron --release --locked --target aarch64-pc-windows-msvc + cargo build -p tiron --release --locked --target x86_64-pc-windows-msvc - - name: Build lapon-node + - name: Build tiron-node run: | - cargo build -p lapon-node --release --locked --target aarch64-pc-windows-msvc - cargo build -p lapon-node --release --locked --target x86_64-pc-windows-msvc + cargo build -p tiron-node --release --locked --target aarch64-pc-windows-msvc + cargo build -p tiron-node --release --locked --target x86_64-pc-windows-msvc - - name: Build lapon-lsp + - name: Build tiron-lsp run: | - cargo build -p lapon-lsp --release --locked --target aarch64-pc-windows-msvc - cargo build -p lapon-lsp --release --locked --target x86_64-pc-windows-msvc + cargo build -p tiron-lsp --release --locked --target aarch64-pc-windows-msvc + cargo build -p tiron-lsp --release --locked --target x86_64-pc-windows-msvc - name: Gzip run: | - gzip -c ./target/x86_64-pc-windows-msvc/release/lapon > ./lapon-${{ github.event.inputs.lapon_version }}-windows-amd64.gz - gzip -c ./target/aarch64-pc-windows-msvc/release/lapon > ./lapon-${{ github.event.inputs.lapon_version }}-windows-arm64.gz - gzip -c ./target/x86_64-pc-windows-msvc/release/lapon-node > ./lapon-node-${{ github.event.inputs.lapon_version }}-windows-amd64.gz - gzip -c ./target/aarch64-pc-windows-msvc/release/lapon-node > ./lapon-node-${{ github.event.inputs.lapon_version }}-windows-arm64.gz - gzip -c ./target/x86_64-pc-windows-msvc/release/lapon-lsp > ./lapon-lsp-${{ github.event.inputs.lapon_version }}-windows-amd64.gz - gzip -c ./target/aarch64-pc-windows-msvc/release/lapon-lsp > ./lapon-lsp-${{ github.event.inputs.lapon_version }}-windows-arm64.gz + gzip -c ./target/x86_64-pc-windows-msvc/release/tiron > ./tiron-${{ github.event.inputs.tiron_version }}-windows-amd64.gz + gzip -c ./target/aarch64-pc-windows-msvc/release/tiron > ./tiron-${{ github.event.inputs.tiron_version }}-windows-arm64.gz + gzip -c ./target/x86_64-pc-windows-msvc/release/tiron-node > ./tiron-node-${{ github.event.inputs.tiron_version }}-windows-amd64.gz + gzip -c ./target/aarch64-pc-windows-msvc/release/tiron-node > ./tiron-node-${{ github.event.inputs.tiron_version }}-windows-arm64.gz + gzip -c ./target/x86_64-pc-windows-msvc/release/tiron-lsp > ./tiron-lsp-${{ github.event.inputs.tiron_version }}-windows-amd64.gz + gzip -c ./target/aarch64-pc-windows-msvc/release/tiron-lsp > ./tiron-lsp-${{ github.event.inputs.tiron_version }}-windows-arm64.gz - uses: actions/upload-artifact@v4 with: - name: lapon-windows + name: tiron-windows path: | - ./lapon-${{ github.event.inputs.lapon_version }}-windows-amd64.gz - ./lapon-${{ github.event.inputs.lapon_version }}-windows-arm64.gz - ./lapon-node-${{ github.event.inputs.lapon_version }}-windows-amd64.gz - ./lapon-node-${{ github.event.inputs.lapon_version }}-windows-arm64.gz - ./lapon-lsp-${{ github.event.inputs.lapon_version }}-windows-amd64.gz - ./lapon-lsp-${{ github.event.inputs.lapon_version }}-windows-arm64.gz + ./tiron-${{ github.event.inputs.tiron_version }}-windows-amd64.gz + ./tiron-${{ github.event.inputs.tiron_version }}-windows-arm64.gz + ./tiron-node-${{ github.event.inputs.tiron_version }}-windows-amd64.gz + ./tiron-node-${{ github.event.inputs.tiron_version }}-windows-arm64.gz + ./tiron-lsp-${{ github.event.inputs.tiron_version }}-windows-amd64.gz + ./tiron-lsp-${{ github.event.inputs.tiron_version }}-windows-arm64.gz retention-days: 1 @@ -218,12 +218,12 @@ jobs: - uses: actions/download-artifact@v4 - if: github.event_name == 'workflow_dispatch' - run: echo "TAG_NAME=v${{ github.event.inputs.lapon_version }}" >> $GITHUB_ENV + run: echo "TAG_NAME=v${{ github.event.inputs.tiron_version }}" >> $GITHUB_ENV - name: Publish release if: github.event_name != 'pull_request' run: | gh release create $TAG_NAME --title "$TAG_NAME" --target $GITHUB_SHA \ - lapon-linux/* \ - lapon-macos/* \ - lapon-windows/* \ + tiron-linux/* \ + tiron-macos/* \ + tiron-windows/* \ diff --git a/Cargo.lock b/Cargo.lock index c2f3ef5..6d7537a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -231,77 +231,6 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" -[[package]] -name = "lapon" -version = "0.1.1" -dependencies = [ - "anyhow", - "bincode", - "clap", - "crossbeam-channel", - "lapon-common", - "lapon-node", - "lapon-tui", - "rcl", - "serde", - "strum", - "strum_macros", - "uuid", -] - -[[package]] -name = "lapon-common" -version = "0.1.1" -dependencies = [ - "anyhow", - "rcl", - "serde", - "uuid", -] - -[[package]] -name = "lapon-lsp" -version = "0.1.1" - -[[package]] -name = "lapon-node" -version = "0.1.1" -dependencies = [ - "anyhow", - "bincode", - "clap", - "crossbeam-channel", - "lapon-common", - "rcl", - "serde", - "uuid", -] - -[[package]] -name = "lapon-tui" -version = "0.1.1" -dependencies = [ - "anyhow", - "crossbeam-channel", - "crossterm", - "lapon-common", - "lapon-node", - "ratatui", - "unicode-segmentation", - "unicode-width", - "uuid", -] - -[[package]] -name = "lapon-workspace" -version = "0.1.1" -dependencies = [ - "anyhow", - "clap", - "lapon", - "lapon-node", -] - [[package]] name = "libc" version = "0.2.153" @@ -569,6 +498,77 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "tiron" +version = "0.1.1" +dependencies = [ + "anyhow", + "bincode", + "clap", + "crossbeam-channel", + "rcl", + "serde", + "strum", + "strum_macros", + "tiron-common", + "tiron-node", + "tiron-tui", + "uuid", +] + +[[package]] +name = "tiron-common" +version = "0.1.1" +dependencies = [ + "anyhow", + "rcl", + "serde", + "uuid", +] + +[[package]] +name = "tiron-lsp" +version = "0.1.1" + +[[package]] +name = "tiron-node" +version = "0.1.1" +dependencies = [ + "anyhow", + "bincode", + "clap", + "crossbeam-channel", + "rcl", + "serde", + "tiron-common", + "uuid", +] + +[[package]] +name = "tiron-tui" +version = "0.1.1" +dependencies = [ + "anyhow", + "crossbeam-channel", + "crossterm", + "ratatui", + "tiron-common", + "tiron-node", + "unicode-segmentation", + "unicode-width", + "uuid", +] + +[[package]] +name = "tiron-workspace" +version = "0.1.1" +dependencies = [ + "anyhow", + "clap", + "tiron", + "tiron-node", +] + [[package]] name = "unicode-ident" version = "1.0.12" diff --git a/Cargo.toml b/Cargo.toml index 0a9d56b..44d941c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,36 +3,36 @@ version = "0.1.1" edition = "2021" [package] -name = "lapon-workspace" +name = "tiron-workspace" version.workspace = true edition.workspace = true -default-run = "lapon" +default-run = "tiron" [[bin]] -name = "lapon" -path = "lapon/src/main.rs" +name = "tiron" +path = "tiron/src/main.rs" [[bin]] -name = "lapon-node" -path = "lapon-node/src/main.rs" +name = "tiron-node" +path = "tiron-node/src/main.rs" [[bin]] -name = "lapon-lsp" -path = "lapon-lsp/src/main.rs" +name = "tiron-lsp" +path = "tiron-lsp/src/main.rs" [dependencies] clap = { workspace = true } anyhow = { workspace = true } -lapon = { workspace = true } -lapon-node = { workspace = true } +tiron = { workspace = true } +tiron-node = { workspace = true } [workspace] members = [ - "lapon", - "lapon-tui", - "lapon-lsp", - "lapon-node", - "lapon-common", + "tiron", + "tiron-tui", + "tiron-lsp", + "tiron-node", + "tiron-common", ] [workspace.dependencies] @@ -47,7 +47,7 @@ strum = { version = "0.26.2" } strum_macros = { version = "0.26.2" } serde = { version = "1.0.197", features = ["derive"] } rcl = { git = "https://github.com/ruuda/rcl", rev = "6bb68da8ef1ef36f8a38453e7832efb498dc082e" } -lapon = { path = "./lapon" } -lapon-tui = { path = "./lapon-tui" } -lapon-node = { path = "./lapon-node" } -lapon-common = { path = "./lapon-common" } +tiron = { path = "./tiron" } +tiron-tui = { path = "./tiron-tui" } +tiron-node = { path = "./tiron-node" } +tiron-common = { path = "./tiron-common" } diff --git a/examples/example_lapon_project/jobs/job1/files/test.rcl b/examples/example_tiron_project/jobs/job1/files/test.rcl similarity index 100% rename from examples/example_lapon_project/jobs/job1/files/test.rcl rename to examples/example_tiron_project/jobs/job1/files/test.rcl diff --git a/examples/example_lapon_project/jobs/job1/main.rcl b/examples/example_tiron_project/jobs/job1/main.rcl similarity index 100% rename from examples/example_lapon_project/jobs/job1/main.rcl rename to examples/example_tiron_project/jobs/job1/main.rcl diff --git a/examples/example_lapon_project/jobs/test_job.rcl b/examples/example_tiron_project/jobs/test_job.rcl similarity index 100% rename from examples/example_lapon_project/jobs/test_job.rcl rename to examples/example_tiron_project/jobs/test_job.rcl diff --git a/examples/example_lapon_project/main.rcl b/examples/example_tiron_project/main.rcl similarity index 100% rename from examples/example_lapon_project/main.rcl rename to examples/example_tiron_project/main.rcl diff --git a/examples/example_lapon_project/lapon.rcl b/examples/example_tiron_project/tiron.rcl similarity index 100% rename from examples/example_lapon_project/lapon.rcl rename to examples/example_tiron_project/tiron.rcl diff --git a/lapon/src/main.rs b/lapon/src/main.rs deleted file mode 100644 index be18da4..0000000 --- a/lapon/src/main.rs +++ /dev/null @@ -1,6 +0,0 @@ -use clap::Parser; - -fn main() -> anyhow::Result<()> { - let cli = lapon::cli::Cli::parse(); - lapon::core::start(&cli) -} diff --git a/lapon-common/Cargo.toml b/tiron-common/Cargo.toml similarity index 91% rename from lapon-common/Cargo.toml rename to tiron-common/Cargo.toml index 02251d8..1075d5c 100644 --- a/lapon-common/Cargo.toml +++ b/tiron-common/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "lapon-common" +name = "tiron-common" version.workspace = true edition.workspace = true diff --git a/lapon-common/src/action.rs b/tiron-common/src/action.rs similarity index 100% rename from lapon-common/src/action.rs rename to tiron-common/src/action.rs diff --git a/lapon-common/src/event.rs b/tiron-common/src/event.rs similarity index 100% rename from lapon-common/src/event.rs rename to tiron-common/src/event.rs diff --git a/lapon-common/src/lib.rs b/tiron-common/src/lib.rs similarity index 100% rename from lapon-common/src/lib.rs rename to tiron-common/src/lib.rs diff --git a/lapon-common/src/node.rs b/tiron-common/src/node.rs similarity index 100% rename from lapon-common/src/node.rs rename to tiron-common/src/node.rs diff --git a/lapon-common/src/run.rs b/tiron-common/src/run.rs similarity index 100% rename from lapon-common/src/run.rs rename to tiron-common/src/run.rs diff --git a/lapon-lsp/Cargo.toml b/tiron-lsp/Cargo.toml similarity index 80% rename from lapon-lsp/Cargo.toml rename to tiron-lsp/Cargo.toml index c888bd3..fb4f878 100644 --- a/lapon-lsp/Cargo.toml +++ b/tiron-lsp/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "lapon-lsp" +name = "tiron-lsp" version.workspace = true edition.workspace = true diff --git a/lapon-lsp/lapon-lsp/Cargo.toml b/tiron-lsp/lapon-lsp/Cargo.toml similarity index 80% rename from lapon-lsp/lapon-lsp/Cargo.toml rename to tiron-lsp/lapon-lsp/Cargo.toml index c888bd3..fb4f878 100644 --- a/lapon-lsp/lapon-lsp/Cargo.toml +++ b/tiron-lsp/lapon-lsp/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "lapon-lsp" +name = "tiron-lsp" version.workspace = true edition.workspace = true diff --git a/lapon-lsp/lapon-lsp/src/main.rs b/tiron-lsp/lapon-lsp/src/main.rs similarity index 100% rename from lapon-lsp/lapon-lsp/src/main.rs rename to tiron-lsp/lapon-lsp/src/main.rs diff --git a/lapon-lsp/src/main.rs b/tiron-lsp/src/main.rs similarity index 100% rename from lapon-lsp/src/main.rs rename to tiron-lsp/src/main.rs diff --git a/lapon-node/Cargo.toml b/tiron-node/Cargo.toml similarity index 85% rename from lapon-node/Cargo.toml rename to tiron-node/Cargo.toml index fb17ae9..5ced866 100644 --- a/lapon-node/Cargo.toml +++ b/tiron-node/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "lapon-node" +name = "tiron-node" version.workspace = true edition.workspace = true @@ -11,4 +11,4 @@ serde = { workspace = true } anyhow = { workspace = true } bincode = { workspace = true } crossbeam-channel = { workspace = true } -lapon-common = { workspace = true } +tiron-common = { workspace = true } diff --git a/lapon-node/src/action/command.rs b/tiron-node/src/action/command.rs similarity index 96% rename from lapon-node/src/action/command.rs rename to tiron-node/src/action/command.rs index 4563344..ec97700 100644 --- a/lapon-node/src/action/command.rs +++ b/tiron-node/src/action/command.rs @@ -5,7 +5,7 @@ use std::{ use anyhow::Result; use crossbeam_channel::Sender; -use lapon_common::action::{ActionId, ActionMessage}; +use tiron_common::action::{ActionId, ActionMessage}; pub fn run_command( id: ActionId, diff --git a/lapon-node/src/action/copy.rs b/tiron-node/src/action/copy.rs similarity index 97% rename from lapon-node/src/action/copy.rs rename to tiron-node/src/action/copy.rs index f04aaf1..2fd8018 100644 --- a/lapon-node/src/action/copy.rs +++ b/tiron-node/src/action/copy.rs @@ -2,9 +2,9 @@ use std::path::{Path, PathBuf}; use anyhow::{anyhow, Context, Result}; use crossbeam_channel::Sender; -use lapon_common::action::{ActionId, ActionMessage}; use rcl::runtime::Value; use serde::{Deserialize, Serialize}; +use tiron_common::action::{ActionId, ActionMessage}; use super::Action; diff --git a/lapon-node/src/action/data.rs b/tiron-node/src/action/data.rs similarity index 98% rename from lapon-node/src/action/data.rs rename to tiron-node/src/action/data.rs index 480cf50..437d37e 100644 --- a/lapon-node/src/action/data.rs +++ b/tiron-node/src/action/data.rs @@ -1,8 +1,8 @@ use std::{collections::HashMap, path::Path}; use anyhow::{anyhow, Result}; -use lapon_common::action::{ActionData, ActionId}; use rcl::runtime::Value; +use tiron_common::action::{ActionData, ActionId}; use crate::job::Job; diff --git a/lapon-node/src/action/mod.rs b/tiron-node/src/action/mod.rs similarity index 87% rename from lapon-node/src/action/mod.rs rename to tiron-node/src/action/mod.rs index 236388f..852eaaa 100644 --- a/lapon-node/src/action/mod.rs +++ b/tiron-node/src/action/mod.rs @@ -1,5 +1,5 @@ use crossbeam_channel::Sender; -use lapon_common::action::{ActionId, ActionMessage}; +use tiron_common::action::{ActionId, ActionMessage}; mod command; mod copy; diff --git a/lapon-node/src/action/package.rs b/tiron-node/src/action/package.rs similarity index 97% rename from lapon-node/src/action/package.rs rename to tiron-node/src/action/package.rs index f9fb0b1..5efe468 100644 --- a/lapon-node/src/action/package.rs +++ b/tiron-node/src/action/package.rs @@ -1,8 +1,8 @@ use anyhow::anyhow; use crossbeam_channel::Sender; -use lapon_common::action::{ActionId, ActionMessage}; use rcl::runtime::Value; use serde::{Deserialize, Serialize}; +use tiron_common::action::{ActionId, ActionMessage}; use super::{command::run_command, Action}; diff --git a/lapon-node/src/job.rs b/tiron-node/src/job.rs similarity index 98% rename from lapon-node/src/job.rs rename to tiron-node/src/job.rs index 8a639c2..ed51c28 100644 --- a/lapon-node/src/job.rs +++ b/tiron-node/src/job.rs @@ -1,8 +1,8 @@ use std::path::{Path, PathBuf}; use anyhow::{anyhow, Result}; -use lapon_common::action::ActionData; use rcl::markup::MarkupMode; +use tiron_common::action::ActionData; use crate::action::data; diff --git a/lapon-node/src/lib.rs b/tiron-node/src/lib.rs similarity index 100% rename from lapon-node/src/lib.rs rename to tiron-node/src/lib.rs diff --git a/lapon-node/src/main.rs b/tiron-node/src/main.rs similarity index 59% rename from lapon-node/src/main.rs rename to tiron-node/src/main.rs index 191c1af..29679dd 100644 --- a/lapon-node/src/main.rs +++ b/tiron-node/src/main.rs @@ -1,4 +1,4 @@ fn main() -> anyhow::Result<()> { - lapon_node::node::start()?; + tiron_node::node::start()?; Ok(()) } diff --git a/lapon-node/src/node.rs b/tiron-node/src/node.rs similarity index 98% rename from lapon-node/src/node.rs rename to tiron-node/src/node.rs index 0003a7e..8b2008b 100644 --- a/lapon-node/src/node.rs +++ b/tiron-node/src/node.rs @@ -6,7 +6,7 @@ use std::{ use anyhow::{anyhow, Result}; use clap::Parser; use crossbeam_channel::{Receiver, Sender}; -use lapon_common::{ +use tiron_common::{ action::{ActionData, ActionMessage}, node::NodeMessage, }; @@ -17,7 +17,7 @@ use crate::{ }; #[derive(Parser)] -#[clap(name = "lapon-node")] +#[clap(name = "tiron-node")] #[clap(version = env!("CARGO_PKG_VERSION"))] pub struct Cli {} diff --git a/lapon-node/src/stdio.rs b/tiron-node/src/stdio.rs similarity index 100% rename from lapon-node/src/stdio.rs rename to tiron-node/src/stdio.rs diff --git a/lapon-tui/Cargo.toml b/tiron-tui/Cargo.toml similarity index 76% rename from lapon-tui/Cargo.toml rename to tiron-tui/Cargo.toml index 1589e5a..124dc51 100644 --- a/lapon-tui/Cargo.toml +++ b/tiron-tui/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "lapon-tui" +name = "tiron-tui" version.workspace = true edition.workspace = true @@ -11,5 +11,5 @@ ratatui = { workspace = true } crossterm = { workspace = true } anyhow = { workspace = true } crossbeam-channel = { workspace = true } -lapon-node = { workspace = true } -lapon-common = { workspace = true } +tiron-node = { workspace = true } +tiron-common = { workspace = true } diff --git a/lapon-tui/src/app.rs b/tiron-tui/src/app.rs similarity index 99% rename from lapon-tui/src/app.rs rename to tiron-tui/src/app.rs index 2c235a5..fb18269 100644 --- a/lapon-tui/src/app.rs +++ b/tiron-tui/src/app.rs @@ -1,6 +1,5 @@ use anyhow::{anyhow, Result}; use crossbeam_channel::{Receiver, Sender}; -use lapon_common::action::ActionMessage; use ratatui::{ buffer::Buffer, layout::{Constraint, Direction, Layout, Rect}, @@ -8,6 +7,7 @@ use ratatui::{ widgets::{Block, Borders, List, Widget}, Frame, }; +use tiron_common::action::ActionMessage; use uuid::Uuid; use crate::{ diff --git a/lapon-tui/src/event.rs b/tiron-tui/src/event.rs similarity index 90% rename from lapon-tui/src/event.rs rename to tiron-tui/src/event.rs index 0189f01..3e3b4c1 100644 --- a/lapon-tui/src/event.rs +++ b/tiron-tui/src/event.rs @@ -1,4 +1,4 @@ -use lapon_common::action::ActionMessage; +use tiron_common::action::ActionMessage; use uuid::Uuid; pub enum AppEvent { diff --git a/lapon-tui/src/lib.rs b/tiron-tui/src/lib.rs similarity index 100% rename from lapon-tui/src/lib.rs rename to tiron-tui/src/lib.rs diff --git a/lapon-tui/src/reflow.rs b/tiron-tui/src/reflow.rs similarity index 100% rename from lapon-tui/src/reflow.rs rename to tiron-tui/src/reflow.rs diff --git a/lapon-tui/src/run.rs b/tiron-tui/src/run.rs similarity index 99% rename from lapon-tui/src/run.rs rename to tiron-tui/src/run.rs index f92beed..9568752 100644 --- a/lapon-tui/src/run.rs +++ b/tiron-tui/src/run.rs @@ -1,11 +1,11 @@ use anyhow::{anyhow, Result}; -use lapon_common::action::{ActionId, ActionOutput, ActionOutputLevel, ActionOutputLine}; use ratatui::{ buffer::Buffer, layout::{Alignment, Rect}, style::{Color, Style}, text::StyledGrapheme, }; +use tiron_common::action::{ActionId, ActionOutput, ActionOutputLevel, ActionOutputLine}; use unicode_segmentation::UnicodeSegmentation; use unicode_width::UnicodeWidthStr; use uuid::Uuid; diff --git a/lapon-tui/src/tui.rs b/tiron-tui/src/tui.rs similarity index 100% rename from lapon-tui/src/tui.rs rename to tiron-tui/src/tui.rs diff --git a/lapon/Cargo.toml b/tiron/Cargo.toml similarity index 76% rename from lapon/Cargo.toml rename to tiron/Cargo.toml index fd76f25..0de7b38 100644 --- a/lapon/Cargo.toml +++ b/tiron/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "lapon" +name = "tiron" version.workspace = true edition.workspace = true @@ -13,6 +13,6 @@ bincode = { workspace = true } anyhow = { workspace = true } uuid = { workspace = true } rcl = { workspace = true } -lapon-tui = { workspace = true } -lapon-node = { workspace = true } -lapon-common = { workspace = true } +tiron-tui = { workspace = true } +tiron-node = { workspace = true } +tiron-common = { workspace = true } diff --git a/lapon/src/cli.rs b/tiron/src/cli.rs similarity index 68% rename from lapon/src/cli.rs rename to tiron/src/cli.rs index 65ad1c3..a47fa78 100644 --- a/lapon/src/cli.rs +++ b/tiron/src/cli.rs @@ -1,9 +1,9 @@ use clap::Parser; #[derive(Parser)] -#[clap(name = "lapon")] +#[clap(name = "tiron")] #[clap(version = env!("CARGO_PKG_VERSION"))] pub struct Cli { - /// the runbooks for lapon to run + /// the runbooks for tiron to run pub runbooks: Vec, } diff --git a/lapon/src/config.rs b/tiron/src/config.rs similarity index 86% rename from lapon/src/config.rs rename to tiron/src/config.rs index 5a5b304..06d4e17 100644 --- a/lapon/src/config.rs +++ b/tiron/src/config.rs @@ -35,8 +35,8 @@ pub struct Config { impl Config { pub fn load() -> Result { let path = match std::env::current_dir() { - Ok(path) => path.join("lapon.rcl"), - Err(_) => PathBuf::from("lapon.rcl"), + Ok(path) => path.join("tiron.rcl"), + Err(_) => PathBuf::from("tiron.rcl"), }; let data = std::fs::read_to_string(&path) .with_context(|| format!("can't reading config {}", path.to_string_lossy()))?; @@ -60,7 +60,7 @@ impl Config { })?; let Value::Dict(value) = value else { - return Err(anyhow!("invalid lapon.rcl: root should be dict")); + return Err(anyhow!("invalid tiron.rcl: root should be dict")); }; let mut config = Config { @@ -69,11 +69,11 @@ impl Config { if let Some(groups) = value.get(&Value::String("groups".into())) { let Value::Dict(groups) = groups else { - return Err(anyhow!("invalid lapon.rcl: hosts should be dict")); + return Err(anyhow!("invalid tiron.rcl: hosts should be dict")); }; for (key, group) in groups.iter() { let Value::String(group_name) = key else { - return Err(anyhow!("invalid lapon.rcl: group key should be a string")); + return Err(anyhow!("invalid tiron.rcl: group key should be a string")); }; let group = Self::parse_group(groups, group_name, group)?; config.groups.insert(group_name.to_string(), group); @@ -89,17 +89,17 @@ impl Config { value: &Value, ) -> Result { let Value::Dict(group) = value else { - return Err(anyhow!("invalid lapon.rcl: group value should be a dict")); + return Err(anyhow!("invalid tiron.rcl: group value should be a dict")); }; let mut group_config = GroupConfig { hosts: Vec::new(), vars: HashMap::new(), }; let Some(group_hosts) = group.get(&Value::String("hosts".into())) else { - return Err(anyhow!("invalid lapon.rcl: group should have hosts")); + return Err(anyhow!("invalid tiron.rcl: group should have hosts")); }; let Value::List(group_hosts) = group_hosts else { - return Err(anyhow!("invalid lapon.rcl: group value should be a list")); + return Err(anyhow!("invalid tiron.rcl: group value should be a list")); }; for host in group_hosts.iter() { @@ -110,18 +110,18 @@ impl Config { if let Some(vars) = group.get(&Value::String("vars".into())) { let Value::Dict(vars) = vars else { return Err(anyhow!( - "invalid lapon.rcl: group entry {group_name} vars should be a dict" + "invalid tiron.rcl: group entry {group_name} vars should be a dict" )); }; for (key, var) in vars.iter() { let Value::String(key) = key else { return Err(anyhow!( - "invalid lapon.rcl: group entry {group_name} vars key should be a string" + "invalid tiron.rcl: group entry {group_name} vars key should be a string" )); }; let Value::String(var) = var else { return Err(anyhow!( - "invalid lapon.rcl: group entry {group_name} vars {key} value should be a string" + "invalid tiron.rcl: group entry {group_name} vars {key} value should be a string" )); }; group_config.vars.insert(key.to_string(), var.to_string()); @@ -137,45 +137,45 @@ impl Config { value: &Value, ) -> Result { let Value::Dict(host) = value else { - return Err(anyhow!("invalid lapon.rcl: group entry should be a dict")); + return Err(anyhow!("invalid tiron.rcl: group entry should be a dict")); }; if host.contains_key(&Value::String("host".into())) && host.contains_key(&Value::String("group".into())) { return Err(anyhow!( - "invalid lapon.rcl: group entry can't have host and group at the same time" + "invalid tiron.rcl: group entry can't have host and group at the same time" )); } let host_or_group = if let Some(v) = host.get(&Value::String("host".into())) { let Value::String(v) = v else { return Err(anyhow!( - "invalid lapon.rcl: group entry host value should be a string" + "invalid tiron.rcl: group entry host value should be a string" )); }; HostOrGroup::Host(v.to_string()) } else if let Some(v) = host.get(&Value::String("group".into())) { let Value::String(v) = v else { return Err(anyhow!( - "invalid lapon.rcl: group entry group value should be a string" + "invalid tiron.rcl: group entry group value should be a string" )); }; if v.as_ref() == group_name { return Err(anyhow!( - "invalid lapon.rcl: group entry group can't point to itself" + "invalid tiron.rcl: group entry group can't point to itself" )); } if !groups.contains_key(&Value::String(v.clone())) { return Err(anyhow!( - "invalid lapon.rcl: group entry group {v} doesn't exist" + "invalid tiron.rcl: group entry group {v} doesn't exist" )); } HostOrGroup::Group(v.to_string()) } else { return Err(anyhow!( - "invalid lapon.rcl: group entry should have either host or group" + "invalid tiron.rcl: group entry should have either host or group" )); }; let mut host_config = HostOrGroupConfig { @@ -186,18 +186,18 @@ impl Config { if let Some(vars) = host.get(&Value::String("vars".into())) { let Value::Dict(vars) = vars else { return Err(anyhow!( - "invalid lapon.rcl: group entry {group_name} vars should be a dict" + "invalid tiron.rcl: group entry {group_name} vars should be a dict" )); }; for (key, var) in vars.iter() { let Value::String(key) = key else { return Err(anyhow!( - "invalid lapon.rcl: group entry {group_name} vars key should be a string" + "invalid tiron.rcl: group entry {group_name} vars key should be a string" )); }; let Value::String(var) = var else { return Err(anyhow!( - "invalid lapon.rcl: group entry {group_name} vars {key} value should be a string" + "invalid tiron.rcl: group entry {group_name} vars {key} value should be a string" )); }; host_config.vars.insert(key.to_string(), var.to_string()); diff --git a/lapon/src/core.rs b/tiron/src/core.rs similarity index 96% rename from lapon/src/core.rs rename to tiron/src/core.rs index 958b8bc..d19020c 100644 --- a/lapon/src/core.rs +++ b/tiron/src/core.rs @@ -2,8 +2,8 @@ use std::path::PathBuf; use anyhow::{anyhow, Context, Result}; use crossbeam_channel::Sender; -use lapon_tui::event::{AppEvent, RunEvent}; use rcl::{markup::MarkupMode, runtime::Value}; +use tiron_tui::event::{AppEvent, RunEvent}; use crate::{cli::Cli, config::Config, run::Run}; @@ -16,7 +16,7 @@ pub fn start(cli: &Cli) -> Result<()> { cli.runbooks.clone() }; - let mut app = lapon_tui::app::App::new(); + let mut app = tiron_tui::app::App::new(); let runs: Result>> = runbooks .iter() diff --git a/lapon/src/lib.rs b/tiron/src/lib.rs similarity index 100% rename from lapon/src/lib.rs rename to tiron/src/lib.rs diff --git a/lapon/src/local.rs b/tiron/src/local.rs similarity index 84% rename from lapon/src/local.rs rename to tiron/src/local.rs index f8be310..0d11b31 100644 --- a/lapon/src/local.rs +++ b/tiron/src/local.rs @@ -1,7 +1,7 @@ use anyhow::Result; use crossbeam_channel::{Receiver, Sender}; -use lapon_common::{action::ActionMessage, node::NodeMessage}; -use lapon_node::node; +use tiron_common::{action::ActionMessage, node::NodeMessage}; +use tiron_node::node; pub fn start_local() -> (Sender, Receiver) { let (writer_tx, writer_rx) = crossbeam_channel::unbounded::(); diff --git a/tiron/src/main.rs b/tiron/src/main.rs new file mode 100644 index 0000000..41da689 --- /dev/null +++ b/tiron/src/main.rs @@ -0,0 +1,6 @@ +use clap::Parser; + +fn main() -> anyhow::Result<()> { + let cli = tiron::cli::Cli::parse(); + tiron::core::start(&cli) +} diff --git a/lapon/src/remote.rs b/tiron/src/remote.rs similarity index 90% rename from lapon/src/remote.rs rename to tiron/src/remote.rs index acb0f90..c35c895 100644 --- a/lapon/src/remote.rs +++ b/tiron/src/remote.rs @@ -5,9 +5,9 @@ use std::{ use anyhow::{anyhow, Result}; use crossbeam_channel::{Receiver, Sender}; -use lapon_common::{action::ActionMessage, node::NodeMessage}; -use lapon_node::stdio::stdio_transport; use serde::{Deserialize, Serialize}; +use tiron_common::{action::ActionMessage, node::NodeMessage}; +use tiron_node::stdio::stdio_transport; #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Hash)] pub struct SshHost { @@ -87,26 +87,26 @@ pub fn start_remote(remote: SshRemote) -> Result<(Sender, Receiver< // ! Below paths have to be synced with what is // ! returned by Config::proxy_directory() - let lapon_node_path = match platform { - HostPlatform::Windows => "%HOMEDRIVE%%HOMEPATH%\\AppData\\Local\\lapon\\lapon\\data", - HostPlatform::Darwin => "~/Library/Application\\ Support/dev.lapon.lapon", - _ => "~/.local/share/lapon", + let tiron_node_path = match platform { + HostPlatform::Windows => "%HOMEDRIVE%%HOMEPATH%\\AppData\\Local\\tiron\\tiron\\data", + HostPlatform::Darwin => "~/Library/Application\\ Support/dev.tiron.tiron", + _ => "~/.local/share/tiron", }; - let lapon_node_file = match platform { + let tiron_node_file = match platform { HostPlatform::Windows => { - format!("{lapon_node_path}\\lapon-{}.exe", env!("CARGO_PKG_VERSION")) + format!("{tiron_node_path}\\tiron-{}.exe", env!("CARGO_PKG_VERSION")) } - _ => format!("{lapon_node_path}/lapon-{}", env!("CARGO_PKG_VERSION")), + _ => format!("{tiron_node_path}/tiron-{}", env!("CARGO_PKG_VERSION")), }; if !remote .command_builder() - .args([&lapon_node_file, "--version"]) + .args([&tiron_node_file, "--version"]) .output() .map(|output| { String::from_utf8_lossy(&output.stdout).trim() - == format!("lapon-node {}", env!("CARGO_PKG_VERSION")) + == format!("tiron-node {}", env!("CARGO_PKG_VERSION")) }) .unwrap_or(false) { @@ -114,8 +114,8 @@ pub fn start_remote(remote: SshRemote) -> Result<(Sender, Receiver< &remote, &platform, &architecture, - lapon_node_path, - &lapon_node_file, + tiron_node_path, + &tiron_node_file, )?; }; @@ -124,13 +124,13 @@ pub fn start_remote(remote: SshRemote) -> Result<(Sender, Receiver< HostPlatform::Windows => remote .command_builder() .args(["cmd", "/c"]) - .arg(&lapon_node_file) + .arg(&tiron_node_file) .stdin(Stdio::piped()) .stdout(Stdio::piped()) .spawn()?, _ => remote .command_builder() - .arg(&lapon_node_file) + .arg(&tiron_node_file) .stdin(Stdio::piped()) .stdout(Stdio::piped()) .spawn()?, @@ -157,11 +157,11 @@ fn download_remote( remote: &SshRemote, platform: &HostPlatform, architecture: &HostArchitecture, - lapon_node_path: &str, - lapon_node_file: &str, + tiron_node_path: &str, + tiron_node_file: &str, ) -> Result<()> { let url = format!( - "https://github.com/lapce/lapon/releases/download/v{}/lapon-node-{}-{platform}-{architecture}.gz", + "https://github.com/lapce/tiron/releases/download/v{}/tiron-node-{}-{platform}-{architecture}.gz", env!("CARGO_PKG_VERSION"), env!("CARGO_PKG_VERSION") ); @@ -170,7 +170,7 @@ fn download_remote( .args([ "mkdir", "-p", - lapon_node_path, + tiron_node_path, "&&", "curl", "-L", @@ -179,11 +179,11 @@ fn download_remote( "gzip", "-d", ">", - lapon_node_file, + tiron_node_file, "&&", "chmod", "+x", - lapon_node_file, + tiron_node_file, ]) .output()?; Ok(()) diff --git a/lapon/src/run.rs b/tiron/src/run.rs similarity index 98% rename from lapon/src/run.rs rename to tiron/src/run.rs index 0545baf..0a28bfc 100644 --- a/lapon/src/run.rs +++ b/tiron/src/run.rs @@ -2,16 +2,16 @@ use std::{collections::HashMap, path::Path}; use anyhow::{anyhow, Result}; use crossbeam_channel::Sender; -use lapon_common::{ +use rcl::runtime::Value; +use tiron_common::{ action::{ActionData, ActionMessage}, node::NodeMessage, }; -use lapon_node::action::data; -use lapon_tui::{ +use tiron_node::action::data; +use tiron_tui::{ event::AppEvent, run::{ActionSection, HostSection, RunPanel}, }; -use rcl::runtime::Value; use uuid::Uuid; use crate::{