From f4f0ce42ae55d082e0bf58a92462563723c7f772 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 3 Jul 2018 19:24:30 -0700 Subject: [PATCH] More examples testing. --- .../java/annotation-processor-java_test.iml | 4 +-- .idea/modules/ap-examples-java_test.iml | 4 +-- .idea/modules/examples.iml | 1 + examples/test/.gitignore | 3 +- examples/test/build.gradle | 26 +++++++++++++----- examples/test/example.properties | 7 ----- examples/test/src/main/java/App.class | Bin 513 -> 1093 bytes examples/test/src/main/java/App.java | 25 +++++++++++------ examples/test/src/test/java/AppTest.java | 5 +++- examples/test/test.groovy | 4 +++ examples/test/version.properties | 7 ----- examples/version.properties | 2 +- 12 files changed, 50 insertions(+), 38 deletions(-) delete mode 100644 examples/test/example.properties create mode 100644 examples/test/test.groovy delete mode 100644 examples/test/version.properties diff --git a/.idea/modules/annotation-processor/java/annotation-processor-java_test.iml b/.idea/modules/annotation-processor/java/annotation-processor-java_test.iml index bb2229c..684de73 100644 --- a/.idea/modules/annotation-processor/java/annotation-processor-java_test.iml +++ b/.idea/modules/annotation-processor/java/annotation-processor-java_test.iml @@ -3,9 +3,7 @@ - - - + diff --git a/.idea/modules/ap-examples-java_test.iml b/.idea/modules/ap-examples-java_test.iml index 1cf4c8d..0a8d509 100644 --- a/.idea/modules/ap-examples-java_test.iml +++ b/.idea/modules/ap-examples-java_test.iml @@ -3,9 +3,7 @@ - - - + diff --git a/.idea/modules/examples.iml b/.idea/modules/examples.iml index 455d728..7e87d80 100644 --- a/.idea/modules/examples.iml +++ b/.idea/modules/examples.iml @@ -8,5 +8,6 @@ + \ No newline at end of file diff --git a/examples/test/.gitignore b/examples/test/.gitignore index 6322c7f..950c3cc 100644 --- a/examples/test/.gitignore +++ b/examples/test/.gitignore @@ -3,8 +3,9 @@ **/.idea/libraries **/.idea/tasks.xml **/.idea/workspace.xml -*.sublime-* *.iws +*.properties +*.sublime-* .classpath .DS_Store .gradle diff --git a/examples/test/build.gradle b/examples/test/build.gradle index 1c7642d..3990638 100644 --- a/examples/test/build.gradle +++ b/examples/test/build.gradle @@ -1,9 +1,14 @@ +// plugins { +// id 'java' +// id 'application' +// id "net.thauvin.erik.gradle.semver" version "0.9.4-beta" +// } buildscript { repositories { mavenLocal() } dependencies { - classpath "net.thauvin.erik.gradle:semver:0.9.4-beta" + classpath "net.thauvin.erik.gradle:semver:0.9.5-beta" } } @@ -15,6 +20,8 @@ mainClassName = 'App' version = 1.0 +def f = new File("test.properties") + dependencies { } @@ -23,21 +30,26 @@ repositories { jcenter() } -task cleanVersion { - delete "test.properties" +clean { + delete fileTree(dir: "$projectDir", include: "*.properties") } -clean.dependsOn("cleanVersion") +incrementPatch { + doFirst { + println("[Gradle] exists: " + f.exists() + ", canRead: " + f.canRead()) + } +} run { - //dependsOn("incrementPatch") + //dependsOn("incrementPatch") doFirst { println("Version: $version") + args = [f.name] } } semver { - properties = "$projectDir/example.properties" - keysPrefix = "example." + properties = "$projectDir/${f.name}" + keysPrefix = f.name.substring(0, f.name.indexOf(".") + 1) buildMetaKey = "meta" } \ No newline at end of file diff --git a/examples/test/example.properties b/examples/test/example.properties deleted file mode 100644 index 4deccfb..0000000 --- a/examples/test/example.properties +++ /dev/null @@ -1,7 +0,0 @@ -#Generated by the Semver Plugin for Gradle -#Tue Jul 03 13:33:49 PDT 2018 -example.major=2 -example.meta=007 -example.prerelease=beta -example.minor=1 -example.patch=12 diff --git a/examples/test/src/main/java/App.class b/examples/test/src/main/java/App.class index 08ab6940d2ba274d6966ea14efbab8f947346614..04cd6071371acd003291114e161456a42bb5d564 100644 GIT binary patch literal 1093 zcmZ`&NmCO+7=4|s!(<3c07XCq1d^~safL({k*$iY3JXg;4Pk`AWRglI7XB1Hc;$?T z09sm}{R#dP52CLpY*D;)_qV<8eM^5o{`3{VeJp5bK&QkF4IXr=qf4S&Ll16h=tW-$ zZRii79Z_|}f{1JIW1t3u7}79|gv2d%-fO`(b&3xZ#uVW3e+uHwz*u& zZkUCq#zux3U)Hc}ftKjY#U0~~k;oYKR$|R5SoT&@1$xtlBhVbZ+*-Tl80ptbM&3n} zxFc~_KwHa|3TboJQVD`n`TVeg*3pOv0V(UaidKR8zcWhQ)7gm!5)XBZVoXO8DIJe6 zu44j|0-{I96dp@V>v)10iCG6fV->_R?nDb(XOvr_7wxB|&_`|?#btAs%()LQICk3=noj-Qu~*td zZ>{JU1*iDTa<>07dqP~C-rJ&MW{I6EF++2OBKx+=HFCI2rjb3Xx>`+UdF7Ph4puGM z376P9y7&_s_(K3MI4MMUHc{%}EqMFm2N3&w5P@gFRR&Ol7F^+5xyId4Ap9Ag=Lhh{ zy(4A#&STVP1A?e!lu)~Q68C|6KP~eE-Y@VUB5(+~GpQSR$Ht;;Q7KSm!DP|Kpq!y*v&6DVJvr{K zIe{PVN4_6l4gy7GWApIJyY~8_HwgMiaU|Q_PZG^5ay># zLnx8L%vu-Cta?d%{AbKd;vDn8#@@68iqGh87^jnUa%1vi%)bH~O)_k`apbBfvqtF$ D#i%M` diff --git a/examples/test/src/main/java/App.java b/examples/test/src/main/java/App.java index bd9132e..d1cb582 100644 --- a/examples/test/src/main/java/App.java +++ b/examples/test/src/main/java/App.java @@ -1,12 +1,21 @@ -/* - * This Java source file was generated by the Gradle 'init' task. - */ +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.List; + public class App { - public String getGreeting() { - return "Hello world."; + public static void main(String[] args) { + new App().cat(args[0]); } - public static void main(String[] args) { - System.out.println(new App().getGreeting()); + public void cat(String name) { + try { + final List content = Files.readAllLines(Paths.get(name)); + for (String line : content) { + if (!line.startsWith("#")) System.out.println(line); + } + } catch (IOException e) { + System.out.println(e); + } } -} +} \ No newline at end of file diff --git a/examples/test/src/test/java/AppTest.java b/examples/test/src/test/java/AppTest.java index e611fc7..7bd2702 100644 --- a/examples/test/src/test/java/AppTest.java +++ b/examples/test/src/test/java/AppTest.java @@ -1,11 +1,14 @@ /* * This Java source file was generated by the Gradle 'init' task. */ + import org.junit.Test; + import static org.junit.Assert.*; public class AppTest { - @Test public void testAppHasAGreeting() { + @Test + public void testAppHasAGreeting() { App classUnderTest = new App(); assertNotNull("app should have a greeting", classUnderTest.getGreeting()); } diff --git a/examples/test/test.groovy b/examples/test/test.groovy new file mode 100644 index 0000000..5efb64a --- /dev/null +++ b/examples/test/test.groovy @@ -0,0 +1,4 @@ +f = new File("K:\\kotlin\\semver-gradle\\examples\\test\\examples.properties") +println(f.absoluteFile) +println(f.exists()) +println(f.canRead()) \ No newline at end of file diff --git a/examples/test/version.properties b/examples/test/version.properties deleted file mode 100644 index 0a909a3..0000000 --- a/examples/test/version.properties +++ /dev/null @@ -1,7 +0,0 @@ -#Generated by the Semver Plugin for Gradle -#Mon Jul 02 22:37:14 PDT 2018 -version.prerelease= -version.buildmeta= -version.patch=3 -version.major=1 -version.minor=0 diff --git a/examples/version.properties b/examples/version.properties index dafedd7..69cf961 100644 --- a/examples/version.properties +++ b/examples/version.properties @@ -1,5 +1,5 @@ #Generated by the Semver Plugin for Gradle -#Tue Jul 03 13:33:49 PDT 2018 +#Tue Jul 03 14:16:07 PDT 2018 version.prerelease= version.buildmeta= version.patch=0