Skip to content

Commit

Permalink
MediaWiki support, using lib 1.2 #feature
Browse files Browse the repository at this point in the history
  • Loading branch information
tomasbjerre committed Nov 17, 2015
1 parent 76ebb6f commit ecc10fd
Show file tree
Hide file tree
Showing 7 changed files with 87 additions and 20 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,20 @@
Changelog of Git Changelog.

## Next release
### Features

MediaWiki support, using lib 1.2

### Jira

Changing release instructions.

* There is currently a bug in Gradle release plugin plugin that requires the keys to be passed as parameters instead of gradle.properties.

### Other changes

Updating example plugin to use 1.2 snapshot

## 1.1
### Other changes

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ repositories {
}

dependencies {
compile 'se.bjurr.gitchangelog:git-changelog-lib:1.1'
compile 'se.bjurr.gitchangelog:git-changelog-lib:1.2'
}

eclipse {
Expand Down
8 changes: 8 additions & 0 deletions git-changelog-gradle-plugin-example/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,20 @@
Changelog of Git Changelog.

## Next release
### Features

MediaWiki support, using lib 1.2

### Jira

Changing release instructions.

* There is currently a bug in Gradle release plugin plugin that requires the keys to be passed as parameters instead of gradle.properties.

### Other changes

Updating example plugin to use 1.2 snapshot

## 1.1
### Other changes

Expand Down
7 changes: 6 additions & 1 deletion git-changelog-gradle-plugin-example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,17 @@ buildscript {
apply plugin: 'se.bjurr.gitchangelog.git-changelog-gradle-plugin'

task gitChangelogTask(type: se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask) {
//gitChangelogPlugin.fromRef;
//gitChangelogPlugin.fromCommit;
gitChangelogPlugin.toRef = "refs/heads/master";
//gitChangelogPlugin.toCommit;
//gitChangelogPlugin.fromRef;
gitChangelogPlugin.templateContent = new File('changelog.mustache').getText('UTF-8');
gitChangelogPlugin.filePath = "CHANGELOG.md";
gitChangelogPlugin.settingsFile = "changelog.json";
//gitChangelogPlugin.mediaWikiUrl = "http://localhost/mediawiki/";
//gitChangelogPlugin.mediaWikiTitle = "Tomas Title";
//gitChangelogPlugin.mediaWikiUsername = "tomas";
//gitChangelogPlugin.mediaWikiPassword = "tomaskod";
}


Expand Down
2 changes: 1 addition & 1 deletion git-changelog-gradle-plugin-example/changelog.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

"jiraIssuePattern": "\\b[a-zA-Z]([a-zA-Z]+)-([0-9]+)\\b",

"githubIssuePattern": "#[0-9]*",
"githubIssuePattern": "#[0-9]+",

"customIssues": [
{ "name": "Bugs", "pattern": "#bug" },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ public class GitChangelogPluginExtension {
private String filePath;
private String settingsFile;
private String templateContent;
private String mediaWikiUrl;
private String mediaWikiTitle;
private String mediaWikiUsername;
private String mediaWikiPassword;

public void setTemplateContent(String templateContent) {
this.templateContent = templateContent;
Expand Down Expand Up @@ -65,4 +69,36 @@ public void setToCommit(String toCommit) {
public void setToRef(String toRef) {
this.toRef = toRef;
}

public void setMediaWikiPassword(String mediaWikiPassword) {
this.mediaWikiPassword = mediaWikiPassword;
}

public void setMediaWikiTitle(String mediaWikiTitle) {
this.mediaWikiTitle = mediaWikiTitle;
}

public void setMediaWikiUrl(String mediaWikiUrl) {
this.mediaWikiUrl = mediaWikiUrl;
}

public void setMediaWikiUsername(String mediaWikiUsername) {
this.mediaWikiUsername = mediaWikiUsername;
}

public String getMediaWikiPassword() {
return mediaWikiPassword;
}

public String getMediaWikiTitle() {
return mediaWikiTitle;
}

public String getMediaWikiUrl() {
return mediaWikiUrl;
}

public String getMediaWikiUsername() {
return mediaWikiUsername;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,36 +23,46 @@ public void gitChangelogPluginTasks() throws TaskExecutionException {
try {
GitChangelogPluginExtension extension = getProject().getExtensions().findByType(GitChangelogPluginExtension.class);

String fromCommit = extension.getFromCommit();
URL settingsFile = new File(extension.getSettingsFile()).toURI().toURL();
String filePath = extension.getFilePath();
String fromRef = extension.getFromRef();
String toCommit = extension.getToCommit();
String toRef = extension.getToRef();
String templateContent = extension.getTemplateContent();

GitChangelogApi builder = gitChangelogApiBuilder() //
.withSettings(settingsFile) //
.withTemplateContent(templateContent) //
.withToRef(toRef);
.withTemplateContent(extension.getTemplateContent()) //
.withToRef(extension.getToRef());

if (!isNullOrEmpty(fromCommit)) {
if (!isNullOrEmpty(extension.getFromCommit())) {
builder //
.withFromCommit(fromCommit);
.withFromCommit(extension.getFromCommit());
}
if (!isNullOrEmpty(fromRef)) {
if (!isNullOrEmpty(extension.getFromRef())) {
builder //
.withFromRef(fromRef);
.withFromRef(extension.getFromRef());
}
if (!isNullOrEmpty(toCommit)) {

if (!isNullOrEmpty(extension.getToCommit())) {
builder //
.withToCommit(extension.getToCommit());
}
if (!isNullOrEmpty(extension.getToRef())) {
builder //
.withToCommit(toCommit);
.withToRef(extension.getToRef());
}

builder //
.toFile(filePath);
if (!isNullOrEmpty(extension.getFilePath())) {
builder //
.toFile(extension.getFilePath());
log.info("Git Changelog written to " + extension.getFilePath());
}

log.info("Git Changelog written to " + filePath);
if (!isNullOrEmpty(extension.getMediaWikiUrl())) {
builder//
.toMediaWiki(//
extension.getMediaWikiUsername(),//
extension.getMediaWikiPassword(), //
extension.getMediaWikiUrl(),//
extension.getMediaWikiTitle());
log.info("Git Changelog written to " + extension.getMediaWikiUrl() + "/index.php/" + extension.getMediaWikiTitle());
}

} catch (Exception e) {
throw new TaskExecutionException(this, e);
Expand Down

0 comments on commit ecc10fd

Please sign in to comment.