release 0.2.0

Author: siordache

build.gradle

@@ -8,7 +8,7 @@ plugins {
     id "com.github.ben-manes.versions" version "0.11.3"
     id "com.jfrog.bintray" version "1.6"
     id "org.asciidoctor.convert" version "1.5.3"
-    id 'org.ajoberstar.github-pages' version '1.5.0'
+    id 'org.ajoberstar.github-pages' version '1.5.1'
     id "com.github.hierynomus.license" version "0.12.1"
     id "net.saliman.properties" version "1.4.4"
     id 'com.gradle.build-receipt' version '1.0'
@@ -98,6 +98,7 @@ configurations {
 }
 
 license {
+    exclude '*.txt'
     header rootProject.file("license-header.txt")
     skipExistingHeaders true
     ignoreFailures false
@@ -107,6 +108,10 @@ signing {
     sign configurations.archives
 }
 
+def isPublishTask(task) {
+  task.name.startsWith('publish') && (task.name != 'publishGhPages')
+}
+
 signArchives {
   onlyIf { gradle.taskGraph.allTasks.findAll {task -> isPublishTask(task)} }
 }
@@ -179,6 +184,45 @@ artifacts {
     (System.getenv("TRAVIS") == "true") ? archives(sourcesJar) : archives(sourcesJar, groovydocJar)
 }
 
+asciidoctor {
+  sourceDir = file("doc")
+  sources {include 'index.adoc'}
+  logDocuments = true
+  attributes 'source-highlighter': 'coderay',
+             'coderay-linenums-mode': 'table',
+             icons: 'font',
+             imagesdir: 'img',
+             'data-uri': '',
+             linkattrs: true,
+             linkcss: true
+}
+githubPages {
+  repoUri = 'https://github.com/beryx/handlebars-java-helpers.git'
+
+  credentials {
+    username = System.getenv('GH_PAGES_ACCESS_TOKEN')
+    password = ''
+  }
+
+  pages {
+    def pgType = project.hasProperty('ghPageType') ? ghPageType : 'latest'
+    if(pgType == 'init') {
+      from file("ghpages")
+    } else {
+      from file("${asciidoctor.outputDir.path}/html5")
+    }
+    def docDir = Boolean.valueOf(hbsHelpersReleaseBuild) ? 'releases' : 'snapshots'
+    if(pgType == 'init') {
+      into "."
+    } else if(pgType == 'version') {
+      publishGhPages.enabled = (docDir != 'snapshots')
+      into "$docDir/$hbsHelpersVersion"
+    } else {
+      into "$docDir/latest"
+    }
+  }
+}
+
 publishing {
     publications {
         hbsHelpers(MavenPublication) {
@@ -275,35 +319,6 @@ ideaWorkspace {
   outputFile = file('hbsHelpers.iws')
 }
 
-asciidoctor {
-  sourceDir = file("doc")
-  sources {include 'index.adoc'}
-  logDocuments = true
-  attributes 'source-highlighter': 'coderay',
-             'coderay-linenums-mode': 'table',
-             icons: 'font',
-             'data-uri': '',
-             linkattrs: true,
-             linkcss: true
-}
-
-githubPages {
-  repoUri = 'https://github.com/beryx/handlebars-java-helpers.git'
-
-  credentials {
-    username = System.getenv('GH_PAGES_ACCESS_TOKEN')
-    password = ''
-  }
-
-  pages {
-    from file("${asciidoctor.outputDir.path}/html5")
-    from file('doc/CNAME')
-    if(!Boolean.valueOf(hbsHelpersReleaseBuild)) {
-      into "snapshots/$hbsHelpersVersion"
-    }
-  }
-}
-
 def readFromConsole(prompt) {
     readFromConsole('', prompt)
 }
@@ -335,10 +350,6 @@ def readFromConsole(header, prompt, isPassword) {
     }
 }
 
-def isPublishTask(task) {
-  task.name.startsWith('publish') && (task.name != 'publishGhPages')
-}
-
 gradle.taskGraph.whenReady { taskGraph ->
     if (gradle.taskGraph.allTasks.findAll {task -> isPublishTask(task)}) {
         def password = readPasswordFromConsole('Please enter your signing credentials', 'PGP Private Key Password')

doc/helpers.adoc

@@ -315,3 +315,32 @@ package: {{asJavaId service camelCase=false underscore=true}}
 serviceId: byteAsAnOctet
 package: byte_as_an_octet
 ----
+
+
+== javaComment
+Inserts the content of a file as a Java comment.
+
+*Syntax*: {{[purple]##javaComment## _commentFile_}}
+
+*Example:*
+
+.Template
+----
+{{javaComment 'license-header.txt'}}
+public class A {}
+----
+
+.license-header.txt
+----
+This is public-domain software.
+Do whatever you want with it.
+----
+
+.Result
+----
+/*
+ * This is public-domain software.
+ * Do whatever you want with it.
+ */
+public class A {}
+----

ghpages/CNAME

@@ -0,0 +1 @@
+handlebars-java-helpers.beryx.org

ghpages/index.html

@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="canonical" href="releases/latest"/>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta http-equiv="refresh" content="0;url=releases/latest" />
+</head>
+</html>

ghpages/releases/latest/index.html

@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html>
+<body>
+<h1>No release yet</h1>
+</body>
+</html>

gradle.properties

@@ -1,5 +1,5 @@
 hbsHelpersVersionMajor = 0
-hbsHelpersVersionMinor = 1
-hbsHelpersVersionPatch = 2
-# hbsHelpersVersionLabel = alpha-3
-hbsHelpersReleaseBuild = false
+hbsHelpersVersionMinor = 2
+hbsHelpersVersionPatch = 0
+# hbsHelpersVersionLabel = rc-1
+hbsHelpersReleaseBuild = true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Apr 25 12:16:33 CEST 2016
+#Wed Jul 20 17:05:51 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip

src/main/groovy/org/beryx/hbs/Helpers.groovy

@@ -152,7 +152,7 @@ enum Helpers implements Helper {
             chars.each {ch ->
                 if(Character.isJavaIdentifierPart(ch)) {
                     if((first && !Character.isJavaIdentifierStart(ch)) || (startNewPart && useUnderscore)) sb << '_'
-                    sb << (first ? ch.toLowerCase() : (startNewPart && useCamelCase) ? ch.toUpperCase() : ch)
+                    sb << (first ? ch.toLowerCase() : (startNewPart ? (useCamelCase ? ch.toUpperCase() : ch.toLowerCase()) : ch))
                     startNewPart = false
                     first= false
                 } else {
@@ -162,6 +162,25 @@ enum Helpers implements Helper {
             buffer.append(sb.toString())
         }
         buffer
+    }),
+
+    JAVA_COMMENT("javaComment", { String commentFile, Options options ->
+        Options.Buffer buffer = options.buffer()
+
+        String comment = null
+        try {
+            comment = options.handlebars.loader.sourceAt(commentFile).content()
+        } catch (Exception e) {
+            log.debug "Comment file $commentFile not found (${options.handlebars.loader.resolve(commentFile)})"
+        }
+        if(comment) {
+            buffer.append('/*\n')
+            comment.eachLine { line ->
+                buffer.append(' * ').append(line).append('\n')
+            }
+            buffer.append(' */\n')
+        }
+        buffer
     })
 
 

src/test/groovy/org/beryx/hbs/HelpersSpec.groovy

@@ -362,4 +362,24 @@ class HelpersSpec extends Specification implements TestUtil {
         "'!!! 6 x 9 = 42'"                                  | '_6X942'
         "'!!! 6 x 9 = 42' camelCase=false underscore=true"  | '_6_x_9_42'
     }
+
+    def "javaComment should insert the commentFile"() {
+        given:
+        def template = """
+            {{javaComment 'This is public-domain software.'}}
+            public class A {}
+        """.stripIndent()
+
+        when:
+        def merged = merge(template, context)
+
+        then:
+        merged == '''
+            /*
+             * This is public-domain software.
+             */
+            public class A {}
+        '''.stripAll()
+
+    }
 }

src/test/resources/license-header.txt

@@ -0,0 +1,2 @@
+This is public domain software.
+Do whatever you want with it.