Skip to content

Tokenmacrosupport #10

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

Tokenmacrosupport #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e418c8
Added support for token macro plugin
ohTHATaaronbrown Nov 30, 2012
76147f2
Aded support for TokenMacro plugin
ohTHATaaronbrown Nov 30, 2012
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
8 changes: 8 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@
</developer>
</developers>

<dependencies>
<dependency>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>token-macro</artifactId>
<version>1.0</version>
</dependency>
</dependencies>

<scm>
<connection>scm:git:git://github.com/jenkinsci/rake-plugin.git</connection>
<developerConnection>scm:git:[email protected]:jenkinsci/rake-plugin.git</developerConnection>
Expand Down
19 changes: 18 additions & 1 deletion src/main/java/hudson/plugins/rake/Rake.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import net.sf.json.JSONObject;

import org.apache.commons.lang.StringUtils;
import org.jenkinsci.plugins.tokenmacro.MacroEvaluationException;
import org.jenkinsci.plugins.tokenmacro.TokenMacro;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.StaplerRequest;
Expand Down Expand Up @@ -83,7 +85,22 @@ private Launcher getLastBuiltLauncher(AbstractBuild build, Launcher launcher, Bu
@Override
public boolean perform(AbstractBuild<?,?> build, Launcher launcher, BuildListener listener) throws InterruptedException {
ArgumentListBuilder args = new ArgumentListBuilder();
String normalizedTasks = tasks.replaceAll("[ \r\n]+"," ");
String normalizedTasks = "";

try {
String env = build.getEnvironment(listener).expand(tasks);
env = Util.replaceMacro(env, build.getBuildVariableResolver());
String tokenized = TokenMacro.expand(build, listener, env);
normalizedTasks = tokenized.replaceAll("[ \r\n]+"," ");
}
catch (MacroEvaluationException mee) {
System.err.println("MacroEvaluationException: " + mee.getMessage());
normalizedTasks = tasks.replaceAll("[ \r\n]+"," ");
}
catch (IOException ioe){
normalizedTasks = tasks.replaceAll("[ \r\n]+"," ");

}

Launcher lastBuiltLauncher = getLastBuiltLauncher(build, launcher, listener);

Expand Down