Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Init command takes the output as last argument

Browse Source 
This commit moves the --output switch to a regular argument. This aligns
to other command, i.e. spring init my-project.zip would save the project
to "my-project.zip" in the current directory.

This commit also auto-detects the --extract option if the location ends
with a slash, i.e. spring init demo/ would extract the content of the
project in a demo directory that is local to the current directory.

Fixes gh-1802
This commit is contained in:
Stephane Nicoll
2014-11-03 11:52:00 +01:00
parent 96198e2999
commit 2e07f003c9
4 changed files with 84 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/InitCommandTests.java
View File

@@ -95,7 +95,21 @@ public class InitCommandTests extends AbstractHttpClientMockTests {
"application/zip", "demo.zip", archive);
mockSuccessfulProjectGeneration(request);
assertEquals(ExitStatus.OK,
this.command.run("--extract", "--output=" + folder.getAbsolutePath()));
this.command.run("--extract", folder.getAbsolutePath()));
File archiveFile = new File(folder, "test.txt");
assertTrue("Archive not extracted properly " + folder.getAbsolutePath()
+ " not found", archiveFile.exists());
}
@Test
public void generateProjectAndExtractWithConvention() throws Exception {
File folder = this.temporaryFolder.newFolder();
byte[] archive = createFakeZipArchive("test.txt", "Fake content");
MockHttpProjectGenerationRequest request = new MockHttpProjectGenerationRequest(
"application/zip", "demo.zip", archive);
mockSuccessfulProjectGeneration(request);
assertEquals(ExitStatus.OK,
this.command.run(folder.getAbsolutePath()+ "/"));
File archiveFile = new File(folder, "test.txt");
assertTrue("Archive not extracted properly " + folder.getAbsolutePath()
+ " not found", archiveFile.exists());
@@ -113,7 +127,7 @@ public class InitCommandTests extends AbstractHttpClientMockTests {
"application/foobar", fileName, archive);
mockSuccessfulProjectGeneration(request);
assertEquals(ExitStatus.OK,
this.command.run("--extract", "--output=" + folder.getAbsolutePath()));
this.command.run("--extract", folder.getAbsolutePath()));
assertTrue("file should have been saved instead", file.exists());
}
finally {
@@ -133,7 +147,7 @@ public class InitCommandTests extends AbstractHttpClientMockTests {
null, fileName, archive);
mockSuccessfulProjectGeneration(request);
assertEquals(ExitStatus.OK,
this.command.run("--extract", "--output=" + folder.getAbsolutePath()));
this.command.run("--extract", folder.getAbsolutePath()));
assertTrue("file should have been saved instead", file.exists());
}
finally {
@@ -175,7 +189,7 @@ public class InitCommandTests extends AbstractHttpClientMockTests {
"application/zip", "demo.zip", archive);
mockSuccessfulProjectGeneration(request);
assertEquals(ExitStatus.ERROR,
this.command.run("--extract", "--output=" + folder.getAbsolutePath()));
this.command.run("--extract", folder.getAbsolutePath()));
assertEquals("File should not have changed", fileLength, conflict.length());
}
@@ -192,8 +206,7 @@ public class InitCommandTests extends AbstractHttpClientMockTests {
mockSuccessfulProjectGeneration(request);
assertEquals(
ExitStatus.OK,
this.command.run("--force", "--extract",
"--output=" + folder.getAbsolutePath()));
this.command.run("--force", "--extract", folder.getAbsolutePath()));
assertTrue("File should have changed", fileLength != conflict.length());
}
@@ -245,12 +258,26 @@ public class InitCommandTests extends AbstractHttpClientMockTests {
}
@Test
public void parseOutput() throws Exception {
public void parseLocation() throws Exception {
this.handler.disableProjectGeneration();
this.command.run("--output=foobar.zip");
this.command.run("foobar.zip");
assertEquals("foobar.zip", this.handler.lastRequest.getOutput());
}
@Test
public void parseLocationWithSlash() throws Exception {
this.handler.disableProjectGeneration();
this.command.run("foobar/");
assertEquals("foobar", this.handler.lastRequest.getOutput());
assertTrue(this.handler.lastRequest.isExtract());
}
@Test
public void parseMoreThanOneArg() throws Exception {
this.handler.disableProjectGeneration();
assertEquals(ExitStatus.ERROR, this.command.run("foobar", "barfoo"));
}
private byte[] createFakeZipArchive(String fileName, String content)
throws IOException {
ByteArrayOutputStream bos = new ByteArrayOutputStream();