New mojo parameter <customProperties> to evaluate arbitrary expressions based on build properties

Author: dobladez

pom.xml

@@ -93,7 +93,7 @@
           <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
           <preBuildHookScript>setup.groovy</preBuildHookScript>
           <postBuildHookScript>verify.groovy</postBuildHookScript>
-          <debug>false</debug>
+          <debug>true</debug>
           <properties>
             <!-- <clojure.version>${clojure.version}</clojure.version> -->
           </properties>

src/it/custom-properties/pom.xml

@@ -24,34 +24,14 @@
                 <goals><goal>set-properties</goal></goals>
 		        <configuration>
                   <tstampFormat>yyyy-MM-dd</tstampFormat>
+                  <customProperties>
+                    { :build-tag-lowercase (clojure.string/lower-case build-tag) }
+                  </customProperties>
                 </configuration>
               </execution>
             </executions>
           </plugin>
 
-		    <plugin>
-		        <groupId>org.apache.maven.plugins</groupId>
-		        <artifactId>maven-antrun-plugin</artifactId>
-		        <executions>
-		            <execution>
-		                <id>echo-stuff</id>
-		                <phase>initialize</phase>
-		                <goals>
-		                    <goal>run</goal>
-		                </goals>
-		                <configuration>
-		                    <tasks>
-		                        <echo message="build-version: ${build-version}" />
-		                        <echo message="build-tag: ${build-tag}" />
-		                        <echo message="build-tag-delta: ${build-tag-delta}" />
-		                        <echo message="build-tstamp: ${build-tstamp}" />
-		                        <echo message="build-commit: ${build-commit}" />
-		                        <echo message="build-commit-abbrev: ${build-commit-abbrev}" />
-		                    </tasks>
-		                </configuration>
-		            </execution>
-		        </executions>
-		    </plugin>
         </plugins>
     </build>
 

src/it/custom-properties/verify.groovy

@@ -3,6 +3,10 @@
 // looking for timestamp with custom format yyyy-MM-dd
 
 def build_log = new File("target/it/custom-properties/build.log").text
-boolean success = (build_log =~ /build-tstamp: \d\d\d\d-\d\d-\d\d/)
-return success
+
+boolean tstamp = (build_log =~ /build-tstamp: \d\d\d\d-\d\d-\d\d/)
+
+boolean customLowerCaseProperty = ( build_log =~ /build-tag-lowercase: n\/a/ )
+
+return tstamp && customLowerCaseProperty
 

src/it/simple-project/pom.xml

@@ -26,29 +26,6 @@
             </executions>
           </plugin>
 
-		    <plugin>
-		        <groupId>org.apache.maven.plugins</groupId>
-		        <artifactId>maven-antrun-plugin</artifactId>
-		        <executions>
-		            <execution>
-		                <id>echo-stuff</id>
-		                <phase>initialize</phase>
-		                <goals>
-		                    <goal>run</goal>
-		                </goals>
-		                <configuration>
-		                    <tasks>
-		                        <echo message="build-version: ${build-version}" />
-		                        <echo message="build-tag: ${build-tag}" />
-		                        <echo message="build-tag-delta: ${build-tag-delta}" />
-		                        <echo message="build-tstamp: ${build-tstamp}" />
-		                        <echo message="build-commit: ${build-commit}" />
-		                        <echo message="build-commit-abbrev: ${build-commit-abbrev}" />
-		                    </tasks>
-		                </configuration>
-		            </execution>
-		        </executions>
-		    </plugin>
         </plugins>
     </build>
 

src/main/clojure/buildversion_plugin/git.clj

@@ -37,10 +37,11 @@ and :git-tag-delta (number of commits -couting on first-parent paths only- from
     (sh/destroy p)
     {:git-tag tag, :git-tag-delta delta}))
 
-(defn infer-project-version [dir {tstamp-format "tstamp-format"}]
+(defn infer-project-version [dir config-map]
   "Infer the current project version from tags on the source-control system"
 
-  (let [commit-tstamp (-> (run-git-wait dir "log -n 1 --format='%ct'")
+  (let [tstamp-format (:tstamp-format config-map)
+        commit-tstamp (-> (run-git-wait dir "log -n 1 --format='%ct'")
                           trim-newline
                           (Long/parseLong)
                           (* 1000)

src/main/clojure/buildversion_plugin/mojo.clj

@@ -4,28 +4,48 @@
   (:require [clojure.maven.mojo.log :as log]
             [buildversion-plugin.git :as git]))
 
+
+(defn- eval-custom-script [properties snippet-str]
+  (let [props-as-bindings (vec (mapcat
+                                (fn [[k v]] [(symbol (name k)) v])
+                                properties))
+        snippet (read-string snippet-str)]
+
+    (eval `(let ~props-as-bindings ~snippet))))
+
+
 (defmojo BuildVersionMojo
 
   {:goal "set-properties" :phase "initialize" }
 
   ;; Mojo parameters
+  
   [project  {:expression "${project}" :required true :readonly true}
+
    tstamp-format {:alias "tstampFormat" :default "yyyyMMddHHmmss"
-                  :typename "java.lang.String"} ]
+                  :typename "java.lang.String"}
 
+   custom-script {:alias "customProperties" :typename "java.lang.String"} ]
 
-  ;; Goal execution
-  (let [versions-map (git/infer-project-version "." {"tstamp-format" tstamp-format})
-        props (.getProperties project)]
 
-    (log/debug (str "buildnumber-plugin - Setting properties: "))
+  ;; Goal execution
+  (let [git-versions (git/infer-project-version "." {:tstamp-format tstamp-format} )
+        custom-versions (if custom-script
+                          (eval-custom-script git-versions custom-script)
+                          {})
+        versions-map (merge git-versions custom-versions)
+        props (.getProperties project)
+        ]
+
+    (log/warn (str "buildversion-plugin **** custom-versions map: " (pr-str custom-versions )))
+    (log/warn (str "buildversion-plugin **** versions-map : " (pr-str versions-map )))
+    (log/debug (str "buildversion-plugin - Setting properties: "))
     (doseq [[prop value] versions-map]
-      (log/debug (str (name prop) "=" value))
+      (log/debug (str (name prop) ": " value))
       (.put props (name prop) value))))
 
 
 
 
     ;; injecting project version does not working well :-(
     ;; (.setVersion project (:maven-artifact-version versions-map))
-

src/test/clojure/buildversion_plugin/test/git.clj

@@ -152,7 +152,7 @@
 
 (deftest test-tstamp-format-option
   (let [actual-versions (git/infer-project-version sample-project-dir
-                                                   { "tstamp-format" "SSS"})]
+                                                   { :tstamp-format "SSS"})]
     (println actual-versions)
     (is (re-find #"000" (:build-tstamp actual-versions))
         "Always expecting 000 milliseconds. Git precision is up to seconds")))