Added an option to specify a directory for storing downloaded PostgreSQL distributions [#1]

honourednihilist · honourednihilist · commit aa44f7208a87 · 2017-08-25T17:51:53.000+03:00
diff --git a/README.md b/README.md
@@ -39,15 +39,16 @@ These are all possible configuration options and its default values:
 
 ```groovy
 postgresEmbedded {
-	version = "V9_6_2"
+	version = "V9_6_3"
 	host = "localhost"
 	port = 0 // zero value means a random port
 	dbName = "embedded"
 	username = "username"
 	password = "password"
+	artifactStorePath = "~/.embedpostgresql" // where PostgreSQL distributions are stored after downloading, inside home directory by default 
 	stopWhenBuildFinished = true
 	timeoutMillisBeforeStop = 0
 }
 ```
 
-You can specify any supported version from [postgresql-embedded](https://github.com/yandex-qatools/postgresql-embedded/blob/postgresql-embedded-1.23/src/main/java/ru/yandex/qatools/embed/postgresql/distribution/Version.java), and a custom version of PostgreSQL as well.
+You can specify any supported version from [postgresql-embedded](https://github.com/yandex-qatools/postgresql-embedded/blob/postgresql-embedded-2.4/src/main/java/ru/yandex/qatools/embed/postgresql/distribution/Version.java), and a custom version of PostgreSQL as well.
diff --git a/build.gradle b/build.gradle
@@ -7,8 +7,8 @@ apply plugin: 'maven'
 
 group = 'com.github.honourednihilist'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
 
 compileJava {
     options.encoding = 'UTF-8'
@@ -19,8 +19,8 @@ compileTestJava {
 }
 
 dependencies {
-    compileOnly(group: 'org.projectlombok', name: 'lombok', version: '1.16.16')
-    compile(group: 'ru.yandex.qatools.embed', name: 'postgresql-embedded', version: '1.23')
+    compileOnly(group: 'org.projectlombok', name: 'lombok', version: '1.16.18')
+    compile(group: 'ru.yandex.qatools.embed', name: 'postgresql-embedded', version: '2.4')
 
     testCompile(group: 'junit', name: 'junit', version: '4.12')
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version=0.1.1-SNAPSHOT
+version=0.2.0
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/gradlew b/gradlew
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
diff --git a/src/main/java/com/github/honourednihilist/gradle/postgresql/embedded/EmbeddedPostgres.java b/src/main/java/com/github/honourednihilist/gradle/postgresql/embedded/EmbeddedPostgres.java
@@ -1,14 +1,31 @@
 package com.github.honourednihilist.gradle.postgresql.embedded;
 
+import de.flapdoodle.embed.process.config.IRuntimeConfig;
+import de.flapdoodle.embed.process.config.io.ProcessOutput;
+import de.flapdoodle.embed.process.config.store.IDownloadConfig;
 import de.flapdoodle.embed.process.distribution.IVersion;
+import de.flapdoodle.embed.process.io.Slf4jLevel;
+import de.flapdoodle.embed.process.io.Slf4jStreamProcessor;
+import de.flapdoodle.embed.process.io.directories.FixedPath;
 import de.flapdoodle.embed.process.runtime.Network;
+import de.flapdoodle.embed.process.store.ArtifactStoreBuilder;
+import de.flapdoodle.embed.process.store.PostgresArtifactStoreBuilder;
 
 import java.io.IOException;
+import java.util.HashSet;
 
+import ru.yandex.qatools.embed.postgresql.Command;
+import ru.yandex.qatools.embed.postgresql.PostgresExecutable;
 import ru.yandex.qatools.embed.postgresql.PostgresProcess;
 import ru.yandex.qatools.embed.postgresql.PostgresStarter;
 import ru.yandex.qatools.embed.postgresql.config.AbstractPostgresConfig;
 import ru.yandex.qatools.embed.postgresql.config.PostgresConfig;
+import ru.yandex.qatools.embed.postgresql.config.PostgresDownloadConfigBuilder;
+import ru.yandex.qatools.embed.postgresql.config.RuntimeConfigBuilder;
+import ru.yandex.qatools.embed.postgresql.ext.LogWatchStreamProcessor;
+
+import static java.util.Collections.singletonList;
+import static org.slf4j.LoggerFactory.getLogger;
 
 public class EmbeddedPostgres {
 
@@ -18,30 +35,55 @@ public class EmbeddedPostgres {
 	private final String dbName;
 	private final String username;
 	private final String password;
+	private final String artifactStorePath;
 
 	private PostgresProcess process;
 	private String jdbcUrl;
 
-	public EmbeddedPostgres(IVersion version, String host, int port, String dbName, String username, String password) {
+	public EmbeddedPostgres(IVersion version, String host, int port, String dbName, String username, String password, String artifactStorePath) {
 		this.version = version;
 		this.host = host;
 		this.port = port;
 		this.dbName = dbName;
 		this.username = username;
 		this.password = password;
+		this.artifactStorePath = artifactStorePath;
 	}
 
 	public synchronized void start() throws IOException {
 		if (process != null) {
 			throw new IllegalStateException();
 		}
 
+		Command command = Command.Postgres;
+
+		IDownloadConfig downloadConfig = new PostgresDownloadConfigBuilder()
+				.defaultsForCommand(command)
+				.artifactStorePath(new FixedPath(artifactStorePath))
+				.build();
+
+		ArtifactStoreBuilder artifactStoreBuilder = new PostgresArtifactStoreBuilder()
+				.defaults(command)
+				.download(downloadConfig);
+
+		LogWatchStreamProcessor logWatch = new LogWatchStreamProcessor("started",
+				new HashSet<>(singletonList("failed")),
+				new Slf4jStreamProcessor(getLogger("postgres"), Slf4jLevel.TRACE));
+
+		IRuntimeConfig runtimeConfig = new RuntimeConfigBuilder()
+				.defaults(command)
+				.processOutput(new ProcessOutput(logWatch, logWatch, logWatch))
+				.artifactStore(artifactStoreBuilder)
+				.build();
+
+		PostgresStarter<PostgresExecutable, PostgresProcess> starter = new PostgresStarter<>(PostgresExecutable.class, runtimeConfig);
+
 		PostgresConfig config = new PostgresConfig(version,
 				new AbstractPostgresConfig.Net(host, port == 0 ? Network.getFreeServerPort() : port),
 				new AbstractPostgresConfig.Storage(dbName),
 				new AbstractPostgresConfig.Timeout(),
 				new AbstractPostgresConfig.Credentials(username, password));
-		process = PostgresStarter.getDefaultInstance().prepare(config).start();
+		process = starter.prepare(config).start();
 		jdbcUrl = "jdbc:postgresql://" + config.net().host() + ":" + config.net().port() + "/" + config.storage().dbName();
 	}
 
diff --git a/src/main/java/com/github/honourednihilist/gradle/postgresql/embedded/GradlePostgresqlEmbeddedPlugin.java b/src/main/java/com/github/honourednihilist/gradle/postgresql/embedded/GradlePostgresqlEmbeddedPlugin.java
@@ -9,14 +9,9 @@
 import java.util.Map;
 
 import static ru.yandex.qatools.embed.postgresql.distribution.Version.Main.PRODUCTION;
-import static ru.yandex.qatools.embed.postgresql.distribution.Version.Main.V9_3;
-import static ru.yandex.qatools.embed.postgresql.distribution.Version.Main.V9_4;
 import static ru.yandex.qatools.embed.postgresql.distribution.Version.Main.V9_5;
 import static ru.yandex.qatools.embed.postgresql.distribution.Version.Main.V9_6;
-import static ru.yandex.qatools.embed.postgresql.distribution.Version.V9_3_15;
-import static ru.yandex.qatools.embed.postgresql.distribution.Version.V9_4_10;
-import static ru.yandex.qatools.embed.postgresql.distribution.Version.V9_5_5;
-import static ru.yandex.qatools.embed.postgresql.distribution.Version.V9_6_2;
+import static ru.yandex.qatools.embed.postgresql.distribution.Version.V9_6_3;
 
 public class GradlePostgresqlEmbeddedPlugin implements Plugin<Project> {
 
@@ -32,7 +27,8 @@ public void apply(Project project) {
 					extension.getPort(),
 					extension.getDbName(),
 					extension.getUsername(),
-					extension.getPassword());
+					extension.getPassword(),
+					extension.getArtifactStorePath());
 			startTask.setPostgres(postgres);
 
 			if (extension.isStopWhenBuildFinished()) {
@@ -46,16 +42,8 @@ IVersion parseVersion(String version) {
 		versions.put(PRODUCTION.name(), PRODUCTION);
 		versions.put(V9_6.name(), V9_6);
 		versions.put(V9_5.name(), V9_5);
-		versions.put(V9_4.name(), V9_4);
-		versions.put(V9_3.name(), V9_3);
-		versions.put(V9_6_2.name(), V9_6_2);
-		versions.put(V9_5_5.name(), V9_5_5);
-		versions.put(V9_4_10.name(), V9_4_10);
-		versions.put(V9_3_15.name(), V9_3_15);
-		versions.put(V9_6_2.asInDownloadPath(), V9_6_2);
-		versions.put(V9_5_5.asInDownloadPath(), V9_5_5);
-		versions.put(V9_4_10.asInDownloadPath(), V9_4_10);
-		versions.put(V9_3_15.asInDownloadPath(), V9_3_15);
+		versions.put(V9_6_3.name(), V9_6_3);
+		versions.put(V9_6_3.asInDownloadPath(), V9_6_3);
 		return versions.getOrDefault(version, () -> version);
 	}
 }
diff --git a/src/main/java/com/github/honourednihilist/gradle/postgresql/embedded/PostgresqlEmbeddedExtension.java b/src/main/java/com/github/honourednihilist/gradle/postgresql/embedded/PostgresqlEmbeddedExtension.java
@@ -1,5 +1,7 @@
 package com.github.honourednihilist.gradle.postgresql.embedded;
 
+import java.io.File;
+
 import lombok.Data;
 
 import static ru.yandex.qatools.embed.postgresql.distribution.Version.Main.PRODUCTION;
@@ -15,6 +17,7 @@ public class PostgresqlEmbeddedExtension {
 	private String dbName = "embedded";
 	private String username = "username";
 	private String password = "password";
+	private String artifactStorePath = System.getProperty("user.home") + File.separatorChar + ".embedpostgresql";
 
 	private boolean stopWhenBuildFinished = true;
 	private int timeoutMillisBeforeStop = 0;
diff --git a/src/test/java/com/github/honourednihilist/gradle/postgresql/embedded/GradlePostgresqlEmbeddedPluginTest.java b/src/test/java/com/github/honourednihilist/gradle/postgresql/embedded/GradlePostgresqlEmbeddedPluginTest.java
@@ -5,14 +5,9 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 import static ru.yandex.qatools.embed.postgresql.distribution.Version.Main.PRODUCTION;
-import static ru.yandex.qatools.embed.postgresql.distribution.Version.Main.V9_3;
-import static ru.yandex.qatools.embed.postgresql.distribution.Version.Main.V9_4;
 import static ru.yandex.qatools.embed.postgresql.distribution.Version.Main.V9_5;
 import static ru.yandex.qatools.embed.postgresql.distribution.Version.Main.V9_6;
-import static ru.yandex.qatools.embed.postgresql.distribution.Version.V9_3_15;
-import static ru.yandex.qatools.embed.postgresql.distribution.Version.V9_4_10;
-import static ru.yandex.qatools.embed.postgresql.distribution.Version.V9_5_5;
-import static ru.yandex.qatools.embed.postgresql.distribution.Version.V9_6_2;
+import static ru.yandex.qatools.embed.postgresql.distribution.Version.V9_6_3;
 
 public class GradlePostgresqlEmbeddedPluginTest {
 
@@ -23,18 +18,9 @@ public void testParseVersion() {
 		assertThat(plugin.parseVersion(PRODUCTION.name()), is(PRODUCTION));
 		assertThat(plugin.parseVersion(V9_6.name()), is(V9_6));
 		assertThat(plugin.parseVersion(V9_5.name()), is(V9_5));
-		assertThat(plugin.parseVersion(V9_4.name()), is(V9_4));
-		assertThat(plugin.parseVersion(V9_3.name()), is(V9_3));
-
-		assertThat(plugin.parseVersion(V9_6_2.name()), is(V9_6_2));
-		assertThat(plugin.parseVersion(V9_5_5.name()), is(V9_5_5));
-		assertThat(plugin.parseVersion(V9_4_10.name()), is(V9_4_10));
-		assertThat(plugin.parseVersion(V9_3_15.name()), is(V9_3_15));
-
-		assertThat(plugin.parseVersion(V9_6_2.asInDownloadPath()), is(V9_6_2));
-		assertThat(plugin.parseVersion(V9_5_5.asInDownloadPath()), is(V9_5_5));
-		assertThat(plugin.parseVersion(V9_4_10.asInDownloadPath()), is(V9_4_10));
-		assertThat(plugin.parseVersion(V9_3_15.asInDownloadPath()), is(V9_3_15));
+
+		assertThat(plugin.parseVersion(V9_6_3.name()), is(V9_6_3));
+		assertThat(plugin.parseVersion(V9_6_3.asInDownloadPath()), is(V9_6_3));
 
 		assertThat(plugin.parseVersion("any version").asInDownloadPath(), is("any version"));
 	}

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-version=0.1.1-SNAPSHOT`
	`1`	`+version=0.2.0`