* Renamed ProcessScope to JvmScope.

* Fixed tests that were using MainApplicationScope instead of TestApplicationScope.
* Updated dependencies.

Author: cowwoc

java/src/main/java/com/github/cowwoc/requirements10/java/internal/scope/AbstractApplicationScope.java

@@ -4,6 +4,7 @@
  */
 package com.github.cowwoc.requirements10.java.internal.scope;
 
+import com.github.cowwoc.pouch.core.AbstractScope;
 import com.github.cowwoc.pouch.core.ConcurrentLazyReference;
 import com.github.cowwoc.pouch.core.Reference;
 import com.github.cowwoc.requirements10.java.GlobalConfiguration;
@@ -16,9 +17,10 @@
 /**
  * ApplicationScope for the main and test codebases.
  */
-public abstract class AbstractApplicationScope implements ApplicationScope
+public abstract class AbstractApplicationScope extends AbstractScope
+	implements ApplicationScope
 {
-	private final ProcessScope parent;
+	protected final JvmScope parent;
 	/**
 	 * The global configuration.
 	 */
@@ -35,7 +37,7 @@ public abstract class AbstractApplicationScope implements ApplicationScope
 	 * @param globalConfiguration the global configuration
 	 * @throws NullPointerException if any of the arguments are null
 	 */
-	protected AbstractApplicationScope(ProcessScope parent, GlobalConfiguration globalConfiguration)
+	protected AbstractApplicationScope(JvmScope parent, GlobalConfiguration globalConfiguration)
 	{
 		assert (parent != null);
 		assert (globalConfiguration != null);

java/src/main/java/com/github/cowwoc/requirements10/java/internal/scope/ApplicationScope.java

@@ -10,7 +10,7 @@
 /**
  * The configuration of an application. A process may contain multiple applications.
  */
-public interface ApplicationScope extends ProcessScope
+public interface ApplicationScope extends JvmScope
 {
 	/**
 	 * @return the global configuration inherited by all validators

java/src/main/java/com/github/cowwoc/requirements10/java/internal/scope/DefaultJvmScope.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2016 Gili Tzabari
+ * Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.github.cowwoc.requirements10.java.internal.scope;
+
+import com.github.cowwoc.pouch.core.AbstractScope;
+import com.github.cowwoc.requirements10.java.internal.terminal.Terminal;
+
+import java.time.Duration;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * The default implementation of JvmScope.
+ * <p>
+ * This class ensures that globals, such as slf4j, are initialized in a thread-safe manner.
+ */
+public final class DefaultJvmScope extends AbstractScope
+	implements JvmScope
+{
+	/**
+	 * The singleton instance.
+	 */
+	public static final DefaultJvmScope INSTANCE = new DefaultJvmScope();
+	/**
+	 * The maximum amount of time to wait for child scopes to close.
+	 */
+	public static final Duration CLOSE_TIMEOUT = Duration.ofSeconds(10);
+	private final Terminal terminal = new Terminal();
+	private final AtomicBoolean closed = new AtomicBoolean();
+
+	private DefaultJvmScope()
+	{
+	}
+
+	@Override
+	public Terminal getTerminal()
+	{
+		return terminal;
+	}
+
+	@Override
+	public boolean isClosed()
+	{
+		return closed.get();
+	}
+
+	@Override
+	public void close()
+	{
+		if (!closed.compareAndSet(false, true))
+			return;
+		children.shutdown(CLOSE_TIMEOUT);
+	}
+}

java/src/main/java/com/github/cowwoc/requirements10/java/internal/scope/DefaultProcessScope.java

@@ -4,17 +4,18 @@
  */
 package com.github.cowwoc.requirements10.java.internal.scope;
 
+import com.github.cowwoc.pouch.core.Scope;
 import com.github.cowwoc.requirements10.java.internal.terminal.Terminal;
 
 /**
- * The process configuration.
+ * Values specific to the lifetime of a JVM.
  * <p>
- * <b>Thread-safety</b>: Implementations must be thread-safe.
+ * Implementations must be thread-safe.
  */
-public interface ProcessScope extends AutoCloseable
+public interface JvmScope extends Scope
 {
 	/**
-	 * @return the terminal attached to the process
+	 * @return the terminal that the JVM will output to
 	 */
 	Terminal getTerminal();
 

java/src/main/java/com/github/cowwoc/requirements10/java/internal/scope/ProcessScope.java renamed to java/src/main/java/com/github/cowwoc/requirements10/java/internal/scope/JvmScope.java

@@ -4,6 +4,10 @@
  */
 package com.github.cowwoc.requirements10.java.internal.scope;
 
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static com.github.cowwoc.requirements10.java.internal.scope.DefaultJvmScope.CLOSE_TIMEOUT;
+
 /**
  * ApplicationScope for the main codebase.
  */
@@ -12,21 +16,33 @@ public final class MainApplicationScope extends AbstractApplicationScope
 	/**
 	 * The singleton instance.
 	 */
-	public static final MainApplicationScope INSTANCE = new MainApplicationScope(DefaultProcessScope.INSTANCE);
+	public static final MainApplicationScope INSTANCE = new MainApplicationScope(DefaultJvmScope.INSTANCE);
+	private final AtomicBoolean closed = new AtomicBoolean();
 
 	/**
 	 * Creates a new application scope.
 	 *
 	 * @param parent the parent scope
 	 * @throws NullPointerException if {@code parent} is null
 	 */
-	private MainApplicationScope(ProcessScope parent)
+	private MainApplicationScope(JvmScope parent)
 	{
 		super(parent, new MainGlobalConfiguration(parent.getTerminal()));
+		parent.addChild(this);
+	}
+
+	@Override
+	public boolean isClosed()
+	{
+		return closed.get();
 	}
 
 	@Override
 	public void close()
 	{
+		if (!closed.compareAndSet(false, true))
+			return;
+		parent.removeChild(this);
+		children.shutdown(CLOSE_TIMEOUT);
 	}
 }

java/src/main/java/com/github/cowwoc/requirements10/java/internal/scope/MainApplicationScope.java

@@ -30,7 +30,7 @@ public MainGlobalConfiguration(Terminal terminal)
 	@Override
 	public Set<TerminalEncoding> supportedTerminalEncodings()
 	{
-		return terminal.getSupportedTypes();
+		return terminal.getSupportedEncodings();
 	}
 
 	@Override

java/src/main/java/com/github/cowwoc/requirements10/java/internal/scope/MainGlobalConfiguration.java

@@ -13,7 +13,7 @@
  */
 final class Processes
 {
-	private static final String NEWLINE = System.getProperty("line.separator");
+	private static final String NEWLINE = System.lineSeparator();
 
 	/**
 	 * Prevent construction.

java/src/main/java/com/github/cowwoc/requirements10/java/internal/terminal/Processes.java

@@ -21,15 +21,13 @@
 import static com.github.cowwoc.requirements10.java.TerminalEncoding.XTERM_8_COLORS;
 
 /**
- * The terminal associated with the process.
+ * The terminal that the JVM is outputting to.
  */
 public final class Terminal
 {
 	private final AtomicReference<TerminalEncoding> encoding = new AtomicReference<>();
 	private final Reference<Set<TerminalEncoding>> supportedTypes =
-		ConcurrentLazyReference.create(this::getSupportedTypesImpl);
-	private final Reference<Boolean> connectedToStdout =
-		ConcurrentLazyReference.create(this::isConnectedToStdoutImpl);
+		ConcurrentLazyReference.create(this::getSupportedEncodingsImpl);
 
 	/**
 	 * Creates a new instance.
@@ -41,31 +39,31 @@ public Terminal()
 	/**
 	 * @return the ANSI escape codes supported by the terminal
 	 */
-	public Set<TerminalEncoding> getSupportedTypes()
+	public Set<TerminalEncoding> getSupportedEncodings()
 	{
 		return supportedTypes.getValue();
 	}
 
 	/**
 	 * @return the ANSI escape codes supported by the terminal
 	 */
-	private Set<TerminalEncoding> getSupportedTypesImpl()
+	private Set<TerminalEncoding> getSupportedEncodingsImpl()
 	{
 		return switch (OperatingSystem.detected().type)
 		{
-			case WINDOWS -> getSupportedTypesForWindows();
-			case LINUX, MAC -> getSupportedTypesForLinuxOrMac();
+			case WINDOWS -> getSupportedEncodingsForWindows();
+			case LINUX, MAC -> getSupportedEncodingsForLinuxOrMac();
 		};
 	}
 
-	private Set<TerminalEncoding> getSupportedTypesForLinuxOrMac()
+	private Set<TerminalEncoding> getSupportedEncodingsForLinuxOrMac()
 	{
 		String term = System.getenv("TERM");
 		if (term == null)
 			return Set.of(NONE);
 		// Following the approach set out in http://stackoverflow.com/a/39033815/14731, we don't attempt to
-		// support all possible terminal types. Instead, we support mainstream types and require the terminal
-		// to support or emulate them.
+		// support all possible terminal encodings. Instead, we support mainstream encodings and require the
+		// terminal to support or emulate them.
 		Set<TerminalEncoding> result = EnumSet.of(NONE);
 		switch (term)
 		{
@@ -99,8 +97,9 @@ private Set<TerminalEncoding> getSupportedTypesForLinuxOrMac()
 		return result;
 	}
 
-	private Set<TerminalEncoding> getSupportedTypesForWindows()
+	private Set<TerminalEncoding> getSupportedEncodingsForWindows()
 	{
+		// WT_SESSION indicates that we are running in Windows Terminal.
 		if (System.getenv("WT_SESSION") == null)
 			return Set.of(NONE);
 		return Set.of(NONE, XTERM_8_COLORS, XTERM_16_COLORS, XTERM_256_COLORS, RGB_888_COLORS);
@@ -126,7 +125,7 @@ private void setEncodingImpl(TerminalEncoding encoding, boolean force)
 			this.encoding.set(NONE);
 			return;
 		}
-		if (!getSupportedTypes().contains(encoding) && !force)
+		if (!getSupportedEncodings().contains(encoding) && !force)
 		{
 			this.encoding.set(NONE);
 			return;
@@ -141,10 +140,10 @@ private void setEncodingImpl(TerminalEncoding encoding, boolean force)
 	 */
 	public void useBestEncoding()
 	{
-		Set<TerminalEncoding> supportedTypes = getSupportedTypes();
-		List<TerminalEncoding> sortedTypes = new ArrayList<>(supportedTypes);
-		sortedTypes.sort(TerminalEncoding.sortByDecreasingRank());
-		setEncodingImpl(sortedTypes.getFirst(), false);
+		Set<TerminalEncoding> supportedEncodings = getSupportedEncodings();
+		List<TerminalEncoding> sortedEncodings = new ArrayList<>(supportedEncodings);
+		sortedEncodings.sort(TerminalEncoding.sortByDecreasingRank());
+		setEncodingImpl(sortedEncodings.getFirst(), false);
 	}
 
 	/**
@@ -176,21 +175,11 @@ public void setEncoding(TerminalEncoding encoding)
 	}
 
 	/**
-	 * @return true if stdout is connected to the terminal
+	 * @return true if stdout is connected to a terminal
 	 */
 	public boolean isConnectedToStdout()
 	{
-		return connectedToStdout.getValue();
-	}
-
-	/**
-	 * @return true if stdout is connected to the terminal
-	 */
-	private boolean isConnectedToStdoutImpl()
-	{
-		// System.console() is not as accurate as the native library in that it returns null when stdin
-		// is redirected (which we don't care about). We try using System.console() and if we need more
-		// information, we send a follow-up query to the native library.
+		// Reminder: System.console() returns null if stdin is redirected
 		return System.console() != null;
 	}
 }