Skip to content

Feature/look in path #175

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

Open
hpryce wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Feature/look in path #175

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
195d9af
Locate docker and docker-compose using the path variable.
Mar 1, 2017
ab078a6
Merge branch 'feature/use-path-to-find-executables' of https://github…
hpryce Mar 7, 2017
a12076d
Reintroduce support for explicitly setting docker-compose location.
hpryce Mar 7, 2017
35ab870
Docker for Mac is not in the path when tests run from IDE.
hpryce Mar 7, 2017
252a88e
Split out finding possible command locations from testing those locat…
hpryce Mar 7, 2017
0a61921
Add jsr dep
hpryce Mar 7, 2017
d39fb31
Refactor to simply logic and improve test coverage by using Environme…
hpryce Mar 8, 2017
19791dd
Add case for Windows path variable "Path"
hpryce Mar 8, 2017
a734f16
Process builder will look for command on the path
hpryce Mar 8, 2017
fa10060
Merge branch 'master' into feature/look_in_path
hpryce Mar 8, 2017
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
Prev Previous commit
Next Next commit
Add case for Windows path variable "Path"
  • Loading branch information
@hpryce
hpryce committed Mar 8, 2017
commit 19791dd6a73d94d7deb892f38a80ace0661ab68f
6 changes: 4 additions & 2 deletions ...rule-core/src/main/java/com/palantir/docker/compose/execution/DockerCommandLocations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.palantir.docker.compose.execution;

import static com.google.common.base.MoreObjects.firstNonNull;
import static java.util.stream.Collectors.toList;

import com.google.common.collect.ImmutableList;
Expand All @@ -36,7 +35,10 @@ private DockerCommandLocations() {
}

public static List<Path> pathLocations() {
String path = firstNonNull(System.getenv("PATH"), firstNonNull(System.getenv("path"), File.pathSeparator));
String path = Stream.of(System.getenv("PATH"), System.getenv("path"), System.getenv("Path"))
Copy link

@samwright samwright Mar 8, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But what about CrazyOS that uses "pATh"? /s

.filter(s -> s != null)
.findFirst()
.orElse(File.pathSeparator);
Stream<String> pathLocations = Arrays.stream(path.split(File.pathSeparator));
return Stream.concat(pathLocations, MAC_SEARCH_LOCATIONS.stream())
.map(p -> Paths.get(p))
Expand Down
8 changes: 8 additions & 0 deletions ...ore/src/test/java/com/palantir/docker/compose/execution/DockerCommandLocationsShould.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,14 @@ public class DockerCommandLocationsShould {
assertThat(DockerCommandLocations.pathLocations(), hasItem(Paths.get("/lowercase")));
}

@Test public void
contain_the_contents_of_the_path_with_a_windows_environment_variable() {
environmentVariables.set("PATH", null);
environmentVariables.set("Path", "/windows");

assertThat(DockerCommandLocations.pathLocations(), hasItem(Paths.get("/windows")));
}

@Test public void
return_just_the_mac_locations_if_no_path_variable_is_present() {
environmentVariables.set("PATH", null);
Expand Down