erik/semver
erik/semver
1
1
Fork 0
Code Issues Pull requests Releases Activity

Added file paths to log.

Browse source
This commit is contained in:
Erik C. Thauvin 2018-07-02 01:49:40 -07:00
parent e735ca02ed
commit d72dab7593
1 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/main/java/net/thauvin/erik/semver/VersionProcessor.java
View file

@ -70,30 +70,31 @@ public class VersionProcessor extends AbstractProcessor {
} }
private VersionInfo findValues(final Version version) private VersionInfo findValues(final Version version)
throws IOException { throws IOException {
final VersionInfo versionInfo = new VersionInfo(version); final VersionInfo versionInfo = new VersionInfo(version);
if (version.properties().length() > 0) { if (version.properties().length() > 0) {
final File propsFile = new File(version.properties()); final File propsFile = new File(version.properties());
if (propsFile.exists()) { if (propsFile.exists()) {
note("Found properties: " + propsFile); note("Found properties: " + propsFile + " (" + propsFile.getAbsoluteFile().getParent() + ')');
final Properties p = new Properties(); final Properties p = new Properties();
try (FileReader reader = new FileReader(propsFile)) { try (final FileReader reader = new FileReader(propsFile)) {
p.load(reader); p.load(reader);
versionInfo.setProject( versionInfo.setProject(
p.getProperty(version.keysPrefix() + version.projectKey(), version.project())); p.getProperty(version.keysPrefix() + version.projectKey(), version.project()));
versionInfo.setMajor( versionInfo.setMajor(
parseIntProperty(p, version.keysPrefix() + version.majorKey(), version.major())); parseIntProperty(p, version.keysPrefix() + version.majorKey(), version.major()));
versionInfo.setMinor( versionInfo.setMinor(
parseIntProperty(p, version.keysPrefix() + version.minorKey(), version.minor())); parseIntProperty(p, version.keysPrefix() + version.minorKey(), version.minor()));
versionInfo.setPatch( versionInfo.setPatch(
parseIntProperty(p, version.keysPrefix() + version.patchKey(), version.patch())); parseIntProperty(p, version.keysPrefix() + version.patchKey(), version.patch()));
versionInfo.setBuildMeta( versionInfo.setBuildMeta(
p.getProperty(version.keysPrefix() + version.buildMetaKey(), version.buildMeta())); p.getProperty(version.keysPrefix() + version.buildMetaKey(), version.buildMeta()));
versionInfo.setPreRelease( versionInfo.setPreRelease(
p.getProperty(version.keysPrefix() + version.preReleaseKey(), version.preRelease())); p.getProperty(version.keysPrefix() + version.preReleaseKey(), version.preRelease()));
} }
} else { } else {
error("Could not find: " + propsFile); error("Could not find: " + propsFile);
@ -168,10 +169,10 @@ public class VersionProcessor extends AbstractProcessor {
note("Found version: " + versionInfo.getVersion()); note("Found version: " + versionInfo.getVersion());
final String template; final String template;
if (version.template().equals(Constants.DEFAULT_JAVA_TEMPLATE) && if (version.template().equals(Constants.DEFAULT_JAVA_TEMPLATE) &&
new File(Constants.DEFAULT_TEMPLATE_NAME).exists()) { new File(Constants.DEFAULT_TEMPLATE_NAME).exists()) {
template = Constants.DEFAULT_TEMPLATE_NAME; template = Constants.DEFAULT_TEMPLATE_NAME;
} else if (version.template().equals(Constants.DEFAULT_JAVA_TEMPLATE) && } else if (version.template().equals(Constants.DEFAULT_JAVA_TEMPLATE) &&
version.type().equals(Constants.KOTLIN_TYPE)) { version.type().equals(Constants.KOTLIN_TYPE)) {
template = Constants.DEFAULT_KOTLIN_TEMPLATE; template = Constants.DEFAULT_KOTLIN_TEMPLATE;
} else { } else {
template = version.template(); template = version.template();
@ -191,24 +192,29 @@ public class VersionProcessor extends AbstractProcessor {
} }
private void writeTemplate(final String type, final VersionInfo versionInfo, final String template) private void writeTemplate(final String type, final VersionInfo versionInfo, final String template)
throws IOException { throws IOException {
final MustacheFactory mf = new DefaultMustacheFactory(); final MustacheFactory mf = new DefaultMustacheFactory();
final Mustache mustache = mf.compile(template); final Mustache mustache = mf.compile(template);
final String templateName; final String templateName;
if (mustache.getName().equals(Constants.DEFAULT_JAVA_TEMPLATE)) { switch (mustache.getName()) {
templateName = "default (Java)"; case Constants.DEFAULT_JAVA_TEMPLATE:
} else if (mustache.getName().equals(Constants.DEFAULT_KOTLIN_TEMPLATE)) { templateName = "default (Java)";
templateName = "default (Kotlin)"; break;
} else { case Constants.DEFAULT_KOTLIN_TEMPLATE:
templateName = mustache.getName(); templateName = "default (Kotlin)";
break;
default:
templateName = mustache.getName();
break;
} }
note("Loaded template: " + templateName); note("Loaded template: " + templateName);
final FileObject jfo; final FileObject jfo;
final String fileName = versionInfo.getClassName() + '.' + type;
if (type.equalsIgnoreCase(Constants.KOTLIN_TYPE)) { if (type.equalsIgnoreCase(Constants.KOTLIN_TYPE)) {
jfo = filer.createResource(StandardLocation.SOURCE_OUTPUT, versionInfo.getPackageName(), jfo = filer.createResource(StandardLocation.SOURCE_OUTPUT, versionInfo.getPackageName(),
versionInfo.getClassName() + '.' + type); fileName);
} else { } else {
jfo = filer.createSourceFile(versionInfo.getPackageName() + '.' + versionInfo.getClassName()); jfo = filer.createSourceFile(versionInfo.getPackageName() + '.' + versionInfo.getClassName());
} }
@ -217,7 +223,7 @@ public class VersionProcessor extends AbstractProcessor {
mustache.execute(writer, versionInfo).flush(); mustache.execute(writer, versionInfo).flush();
} }
note("Generated source: " + jfo.getName()); note("Generated source: " + fileName + " (" + new File(jfo.getName()).getAbsoluteFile().getParent() + ')');
} }
} }