diff --git a/Dockerfile b/Dockerfile index 172feb1..378a0a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ FROM rust:1.78.0-slim-bullseye AS build -WORKDIR /usr/src/generic-merge +WORKDIR /usr/src/last-merge COPY . . RUN cargo build --release FROM gcr.io/distroless/cc-debian12 -COPY --from=build /usr/src/generic-merge/target/release/generic-merge / -CMD [ "./generic-merge" ] +COPY --from=build /usr/src/last-merge/target/release/last-merge / +CMD [ "./last-merge" ] diff --git a/README.md b/README.md index 392f2d2..35ef681 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# generic-merge +# L.A.S.T.Merge -[![CI](https://github.com/jpedroh/generic-merge/actions/workflows/ci.yml/badge.svg)](https://github.com/jpedroh/generic-merge/actions/workflows/ci.yml) -[![Coverage Status](https://coveralls.io/repos/github/jpedroh/generic-merge/badge.svg)](https://coveralls.io/github/jpedroh/generic-merge) +[![CI](https://github.com/jpedroh/last-merge/actions/workflows/ci.yml/badge.svg)](https://github.com/jpedroh/last-merge/actions/workflows/ci.yml) +[![Coverage Status](https://coveralls.io/repos/github/jpedroh/last-merge/badge.svg)](https://coveralls.io/github/jpedroh/last-merge) -An experiment to build a generic semi-structure merge algorithm +Language Agnostic Structured Tool for Code Merging. diff --git a/bin/Cargo.toml b/bin/Cargo.toml index 0176679..56a145b 100644 --- a/bin/Cargo.toml +++ b/bin/Cargo.toml @@ -16,5 +16,5 @@ log = { workspace = true } env_logger = "0.10.1" [[bin]] -name = "generic-merge" +name = "last-merge" path = "src/main.rs" diff --git a/bin/src/main.rs b/bin/src/main.rs index 07a500d..7aa5963 100644 --- a/bin/src/main.rs +++ b/bin/src/main.rs @@ -10,7 +10,7 @@ fn main() { let args = CliArgs::parse(); env_logger::builder().filter_level(args.log_level).init(); - log::info!("Starting Generic Merge tool execution"); + log::info!("Starting last Merge tool execution"); log::debug!("Parsed arguments: {:?}", args); match args.command { diff --git a/bin/tests/cli.rs b/bin/tests/cli.rs index dfc1c3a..7f3be7a 100644 --- a/bin/tests/cli.rs +++ b/bin/tests/cli.rs @@ -4,7 +4,7 @@ use assert_cmd::prelude::*; #[test] fn if_there_is_a_conflict_it_returns_valid_exit_code() { - let mut cmd = Command::cargo_bin("generic-merge").unwrap(); + let mut cmd = Command::cargo_bin("last-merge").unwrap(); cmd.arg("merge") .arg("--base-path=tests/scenarios/smoke_java/base.java") .arg("--left-path=tests/scenarios/smoke_java/left.java") @@ -17,7 +17,7 @@ fn if_there_is_a_conflict_it_returns_valid_exit_code() { #[test] fn if_there_is_no_conflict_it_returns_valid_exit_code() { - let mut cmd = Command::cargo_bin("generic-merge").unwrap(); + let mut cmd = Command::cargo_bin("last-merge").unwrap(); cmd.arg("merge") .arg("--base-path=tests/scenarios/no_conflicts/base.java") .arg("--left-path=tests/scenarios/no_conflicts/left.java") @@ -30,7 +30,7 @@ fn if_there_is_no_conflict_it_returns_valid_exit_code() { #[test] fn if_i_am_running_on_diff_mode_and_files_fully_match_it_returns_zero() { - let mut cmd = Command::cargo_bin("generic-merge").unwrap(); + let mut cmd = Command::cargo_bin("last-merge").unwrap(); cmd.arg("diff") .arg("--left-path=tests/diff_scenarios/java_files_full_match/left.java") .arg("--right-path=tests/diff_scenarios/java_files_full_match/right.java") @@ -41,7 +41,7 @@ fn if_i_am_running_on_diff_mode_and_files_fully_match_it_returns_zero() { #[test] fn if_i_am_running_on_diff_mode_and_files_do_not_fully_match_it_returns_one() { - let mut cmd = Command::cargo_bin("generic-merge").unwrap(); + let mut cmd = Command::cargo_bin("last-merge").unwrap(); cmd.arg("diff") .arg("--left-path=tests/diff_scenarios/java_files_not_fully_matching/left.java") .arg("--right-path=tests/diff_scenarios/java_files_not_fully_matching/right.java")