Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: renamed init command internals #854

Merged
merged 2 commits into from
Oct 15, 2024
Merged

fix: renamed init command internals #854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f918da9
fix: renamed init command internals
yevheniyJ Oct 14, 2024
bb8f8cf
fix naming
yevheniyJ Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/crowdin/cli/commands/Actions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ NewAction<PropertiesWithFiles, ProjectClient> download(
boolean ignoreMatch, boolean isVerbose, boolean plainView, boolean userServerSources, boolean keepArchive
);

NewAction<NoProperties, NoClient> generate(FilesInterface files, String token, String baseUrl, String basePath,
String projectId, String source, String translation, Boolean preserveHierarchy, Path destinationPath, boolean skipGenerateDescription);
NewAction<NoProperties, NoClient> init(FilesInterface files, String token, String baseUrl, String basePath,
String projectId, String source, String translation, Boolean preserveHierarchy, Path destinationPath, boolean quiet);

NewAction<ProjectProperties, ProjectClient> listBranches(boolean noProgress, boolean plainView);

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/crowdin/cli/commands/actions/CliActions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ public NewAction<PropertiesWithFiles, ProjectClient> download(
}

@Override
public NewAction<NoProperties, NoClient> generate(FilesInterface files, String token, String baseUrl, String basePath,
String projectId, String source, String translation, Boolean preserveHierarchy, Path destinationPath, boolean skipGenerateDescription
public NewAction<NoProperties, NoClient> init(FilesInterface files, String token, String baseUrl, String basePath,
String projectId, String source, String translation, Boolean preserveHierarchy, Path destinationPath, boolean quiet
) {
return new GenerateAction(files, token, baseUrl, basePath, projectId, source, translation, preserveHierarchy, destinationPath, skipGenerateDescription);
return new InitAction(files, token, baseUrl, basePath, projectId, source, translation, preserveHierarchy, destinationPath, quiet);
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions .../cli/commands/actions/GenerateAction.java → ...wdin/cli/commands/actions/InitAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import static java.util.Objects.nonNull;

@RequiredArgsConstructor
class GenerateAction implements NewAction<NoProperties, NoClient> {
class InitAction implements NewAction<NoProperties, NoClient> {

public static final String BASE_PATH_DEFAULT = ".";
public static final String BASE_URL_DEFAULT = "https://api.crowdin.com";
Expand All @@ -52,7 +52,7 @@ class GenerateAction implements NewAction<NoProperties, NoClient> {
private final String translation;
private final Boolean preserveHierarchy;
private final Path destinationPath;
private final boolean skipGenerateDescription;
private final boolean quiet;

@Override
public void act(Outputter out, NoProperties noProperties, NoClient noClient) {
Expand All @@ -69,7 +69,7 @@ public void act(Outputter out, NoProperties noProperties, NoClient noClient) {
}

List<String> fileLines = Utils.readResource("/crowdin.yml");
if (!skipGenerateDescription) {
if (!quiet) {
this.updateWithUserInputs(out, asking, fileLines);
}
files.writeToFile(
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/crowdin/cli/commands/picocli/InitSubcommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
)
public class InitSubcommand extends GenericActCommand<NoProperties, NoClient> {

@CommandLine.Option(names = {"-d", "--destination"}, paramLabel = "...", descriptionKey = "crowdin.generate.destination", defaultValue = "crowdin.yml", order = -2)
@CommandLine.Option(names = {"-d", "--destination"}, paramLabel = "...", descriptionKey = "crowdin.init.destination", defaultValue = "crowdin.yml", order = -2)
private Path destinationPath;

@CommandLine.Option(names = {"-T", "--token"}, paramLabel = "...", descriptionKey = "params.token", order = -2)
Expand All @@ -43,10 +43,10 @@ public class InitSubcommand extends GenericActCommand<NoProperties, NoClient> {
private Boolean preserveHierarchy;

@CommandLine.Option(names = "--quiet", descriptionKey = "params.quiet", order = -2)
private boolean skipGenerateDescription;
private boolean quiet;

protected NewAction<NoProperties, NoClient> getAction(Actions actions) {
return actions.generate(new FsFiles(), token, baseUrl, basePath, projectId, source, translation, preserveHierarchy, destinationPath, skipGenerateDescription);
return actions.init(new FsFiles(), token, baseUrl, basePath, projectId, source, translation, preserveHierarchy, destinationPath, quiet);
}

protected NoProperties getProperties(PropertiesBuilders propertiesBuilders, Outputter out) {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/crowdin/cli/commands/actions/CliActionsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public void testDownload() {

@Test
public void testGenerate() {
assertNotNull(actions.generate(new FsFiles(), null, null, null, null, null, null, null, null, false));
assertNotNull(actions.init(new FsFiles(), null, null, null, null, null, null, null, null, false));
}

@Test
Expand Down
18 changes: 9 additions & 9 deletions .../commands/actions/GenerateActionTest.java → .../cli/commands/actions/InitActionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.*;

public class GenerateActionTest {
public class InitActionTest {

TempProject project;

Expand All @@ -46,7 +46,7 @@ public void simpleTest() throws IOException {
InputStream responsesIS = setResponses(false, false, "apiToken", "42", ".");
System.setIn(responsesIS);

action = new GenerateAction(files, null, null, null, null, null, null, null, Paths.get(project.getBasePath() + "/crowdin.yml"), false);
action = new InitAction(files, null, null, null, null, null, null, null, Paths.get(project.getBasePath() + "/crowdin.yml"), false);
action.act(Outputter.getDefault(), new NoProperties(), mock(NoClient.class));

verify(files).writeToFile(anyString(), any());
Expand All @@ -57,7 +57,7 @@ public void simpleTest() throws IOException {
public void userInputTest() throws IOException {
FilesInterface files = mock(FilesInterface.class);

action = new GenerateAction(files, "token", "", ".", "42", "file.json", "translation.json", true, Paths.get(project.getBasePath() + "/crowdin.yml"), false);
action = new InitAction(files, "token", "", ".", "42", "file.json", "translation.json", true, Paths.get(project.getBasePath() + "/crowdin.yml"), false);
action.act(Outputter.getDefault(), new NoProperties(), mock(NoClient.class));

verify(files).writeToFile(anyString(), any());
Expand All @@ -68,7 +68,7 @@ public void userInputTest() throws IOException {
public void userInputAllTest() throws IOException {
FilesInterface files = mock(FilesInterface.class);

action = new GenerateAction(files, "token", "https://api.crowdin.com", ".", "42", "file.json", "translation.json", true, Paths.get(project.getBasePath() + "/crowdin.yml"), false);
action = new InitAction(files, "token", "https://api.crowdin.com", ".", "42", "file.json", "translation.json", true, Paths.get(project.getBasePath() + "/crowdin.yml"), false);
action.act(Outputter.getDefault(), new NoProperties(), mock(NoClient.class));

ArgumentCaptor<InputStream> contentCaptor = ArgumentCaptor.forClass(InputStream.class);
Expand All @@ -95,7 +95,7 @@ public void writeToFileThrowsTest() throws IOException {
InputStream responsesIS = setResponses(false, false, "apiToken", "42", ".");
System.setIn(responsesIS);

action = new GenerateAction(files, null, null, null, null, null, null, null, Paths.get(project.getBasePath() + "/crowdin.yml"), false);
action = new InitAction(files, null, null, null, null, null, null, null, Paths.get(project.getBasePath() + "/crowdin.yml"), false);
assertThrows(RuntimeException.class, () -> action.act(Outputter.getDefault(), new NoProperties(), mock(NoClient.class)));

verify(files).writeToFile(anyString(), any());
Expand All @@ -109,7 +109,7 @@ public void enterprisetest() throws IOException {
InputStream responsesIS = setResponses(false, true, "undefined", "apiToken", "42", ".");
System.setIn(responsesIS);

action = new GenerateAction(files, null, null, null, null, null, null, null, Paths.get(project.getBasePath() + "/crowdin.yml"), false);
action = new InitAction(files, null, null, null, null, null, null, null, Paths.get(project.getBasePath() + "/crowdin.yml"), false);
assertThrows(RuntimeException.class, () -> action.act(Outputter.getDefault(), new NoProperties(), mock(NoClient.class)));

verify(files).writeToFile(anyString(), any());
Expand All @@ -123,7 +123,7 @@ public void enterpriseUrlTest() throws IOException {
InputStream responsesIS = setResponses(false, true, "https://undefined.crowdin.com", "apiToken", "42", ".");
System.setIn(responsesIS);

action = new GenerateAction(files, null, null, null, null, null, null, null, Paths.get(project.getBasePath() + "/crowdin.yml"), false);
action = new InitAction(files, null, null, null, null, null, null, null, Paths.get(project.getBasePath() + "/crowdin.yml"), false);
assertThrows(RuntimeException.class, () -> action.act(Outputter.getDefault(), new NoProperties(), mock(NoClient.class)));

verify(files).writeToFile(anyString(), any());
Expand All @@ -137,7 +137,7 @@ public void enterpriseNoNametest() throws IOException {
InputStream responsesIS = setResponses(false, true, "", "apiToken", "42", ".");
System.setIn(responsesIS);

action = new GenerateAction(files, null, null, null, null, null, null, null, Paths.get(project.getBasePath() + "/crowdin.yml"), false);
action = new InitAction(files, null, null, null, null, null, null, null, Paths.get(project.getBasePath() + "/crowdin.yml"), false);
assertThrows(RuntimeException.class, () -> action.act(Outputter.getDefault(), new NoProperties(), mock(NoClient.class)));

verify(files).writeToFile(anyString(), any());
Expand All @@ -152,7 +152,7 @@ public void fileExists() throws IOException {
InputStream responsesIS = setResponses(false, true, "https://undefined.crowdin.com", "apiToken", "42", ".");
System.setIn(responsesIS);

action = new GenerateAction(files, null, null, null, null, null, null, null, Paths.get(project.getBasePath() + "/crowdin.yml"), false);
action = new InitAction(files, null, null, null, null, null, null, null, Paths.get(project.getBasePath() + "/crowdin.yml"), false);
action.act(Outputter.getDefault(), new NoProperties(), mock(NoClient.class));

verifyNoMoreInteractions(files);
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/crowdin/cli/commands/picocli/InitSubcommandTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class InitSubcommandTest extends PicocliTestUtils {
public void testGenerate() {
this.execute(CommandNames.INIT);
verify(actionsMock)
.generate(any(), any(), any(), any(), any(), any(), any(), any(), any(), anyBoolean());
.init(any(), any(), any(), any(), any(), any(), any(), any(), any(), anyBoolean());
this.check(false);
}
}
2 changes: 1 addition & 1 deletion src/test/java/com/crowdin/cli/commands/picocli/PicocliTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void mockActions() {

when(actionsMock.download(any(), anyBoolean(), any(), any(), anyBoolean(), any(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean(), anyBoolean()))
.thenReturn(actionMock);
when(actionsMock.generate(any(), any(), any(), any(), any(), any(), any(), any(), any(), anyBoolean()))
when(actionsMock.init(any(), any(), any(), any(), any(), any(), any(), any(), any(), anyBoolean()))
.thenReturn(actionMock);
when(actionsMock.listBranches(anyBoolean(), anyBoolean()))
.thenReturn(actionMock);
Expand Down
Loading