Skip to content

[JENKINS-26436] More robust search for RVM rubies. #22

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
jessebs wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[JENKINS-26436] More robust search for RVM rubies. #22

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fc0dbd
[JENKINS-26436] More robust search for RVM rubies.
Jan 15, 2015
7127531
[JENKINS-26436] Fixed possible issue with null
Jan 15, 2015
ca8d0fa
[JENKINS-26436] Fixed possible issue with null
Jan 15, 2015
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
28 changes: 24 additions & 4 deletions src/main/java/hudson/plugins/rake/RvmUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ public static RubyInstallation[] getRvmRubies(Rvm rvm) {
String newpath = "";
FilePath specifications = getSpecifications(gemCandidate);
if (specifications != null) {
Collection<FilePath> specs = specifications.list(rakeFilter);
if (specs == null || specs.size() == 0) {
Collection<FilePath> specs = getRakeSpecifications(specifications);
if (specs.size() == 0) {
// We did not find the rake gem in this gemset's bin directory; check in global
specifications = getSpecifications(global);
if (specifications != null) {
specs = specifications.list(rakeFilter);
if (specs == null || specs.size() == 0) {
specs = getRakeSpecifications(specifications);
if (specs.size() == 0) {
// Rake not found in global either; this gemset is unusable
continue;
} else {
Expand Down Expand Up @@ -177,5 +177,25 @@ public boolean accept(File pathname) {
}
}

private static Collection<FilePath> getRakeSpecifications(FilePath specifications)
throws InterruptedException, IOException {
Collection<FilePath> rakeSpecs = new LinkedHashSet<FilePath>();

List<FilePath> specs = specifications.list(rakeFilter);
if(specs != null) {
rakeSpecs.addAll(specs);
}


for(FilePath subDirectory: specifications.listDirectories()) {
specs = subDirectory.list(rakeFilter);
if(specs != null) {
rakeSpecs.addAll(specs);
}
}
return rakeSpecs;
}


private static FileFilter rakeFilter = new RakeSpecFilter();
}