Skip to content

Commit

Permalink
chore: rename tool
Browse files Browse the repository at this point in the history
  • Loading branch information
jpedroh committed Oct 22, 2024
1 parent dfc4bb4 commit b917395
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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" ]
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion bin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ log = { workspace = true }
env_logger = "0.10.1"

[[bin]]
name = "generic-merge"
name = "last-merge"
path = "src/main.rs"
2 changes: 1 addition & 1 deletion bin/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions bin/tests/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
Expand All @@ -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")
Expand All @@ -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")
Expand Down

0 comments on commit b917395

Please sign in to comment.