Merge pull request #48 from markslater/use-logger-for-output

Use Logger for output

Author: dcoraboeuf

src/main/groovy/net/nemerosa/versioning/VersioningExtension.groovy

@@ -35,7 +35,7 @@ class VersioningExtension {
      * Registry of release modes
      */
     private static final Map<String, Closure<String>> RELEASE_MODES = [
-            tag : { nextTag, lastTag, currentTag, extension ->
+            tag     : { nextTag, lastTag, currentTag, extension ->
                 nextTag
             },
             snapshot: { nextTag, lastTag, currentTag, extension ->
@@ -62,7 +62,7 @@ class VersioningExtension {
      * By default, the environment is not taken into account, in order to be backward compatible
      * with existing build systems.
      */
-    List branchEnv = []
+    List<String> branchEnv = []
 
     /**
      * Getting the version type from a branch. Default: getting the part before the first "/" (or a second
@@ -100,7 +100,7 @@ class VersioningExtension {
     def releaseMode = 'tag'
 
     /**
-     * True if it's release build. Default is true, and branch shoud be in releases-set.
+     * True if it's release build. Default is true, and branch should be in releases-set.
      */
     def releaseBuild = true
 
@@ -131,7 +131,7 @@ class VersioningExtension {
     /**
      * If set to <code>true</code>, no warning will be printed in case the workspace is dirty.
      */
-    boolean noWarningOnDirty = false;
+    boolean noWarningOnDirty = false
 
     /**
      * Credentials (for SVN only)
@@ -240,7 +240,7 @@ class VersioningExtension {
                 throw new DirtyException()
             } else {
                 if (!noWarningOnDirty) {
-                    println "[versioning] WARNING - the working copy has unstaged or uncommitted changes."
+                    project.getLogger().warn("[versioning] WARNING - the working copy has unstaged or uncommitted changes.")
                 }
                 versionDisplay = dirty(versionDisplay)
                 versionFull = dirty(versionFull)
@@ -305,8 +305,8 @@ class VersioningExtension {
         }
     }
 
-    public static String normalise(String value) {
-        value.replaceAll(/[^A-Za-z0-9\.\-_]/, '-')
+    static String normalise(String value) {
+        value.replaceAll(/[^A-Za-z0-9.\-_]/, '-')
     }
 
     private static SCMInfoService getSCMInfoService(String type) {

src/main/groovy/net/nemerosa/versioning/svn/SVNInfoService.groovy

@@ -4,6 +4,8 @@ import net.nemerosa.versioning.SCMInfo
 import net.nemerosa.versioning.SCMInfoService
 import net.nemerosa.versioning.VersioningExtension
 import org.gradle.api.Project
+import org.gradle.api.logging.Logger
+import org.gradle.api.logging.Logging
 import org.tmatesoft.svn.core.SVNDepth
 import org.tmatesoft.svn.core.SVNDirEntry
 import org.tmatesoft.svn.core.SVNException
@@ -14,6 +16,8 @@ import org.tmatesoft.svn.core.wc.*
 
 class SVNInfoService implements SCMInfoService {
 
+    private static final Logger LOGGER = Logging.getLogger(this.getClass())
+
     @Override
     SCMInfo getInfo(Project project, VersioningExtension extension) {
         // Is SVN enabled?
@@ -130,7 +134,7 @@ class SVNInfoService implements SCMInfoService {
         }
         // Gets the list of tags
         String tagsUrl = "${baseUrl}/tags"
-        println "[version] Getting list of tags from ${tagsUrl}..."
+        LOGGER.info("[version] Getting list of tags from ${tagsUrl}...")
         // Gets the list
         List<SVNDirEntry> entries = []
         try {
@@ -179,15 +183,15 @@ class SVNInfoService implements SCMInfoService {
     protected static SVNClientManager getClientManager(VersioningExtension extension) {
         def clientManager = SVNClientManager.newInstance()
         if (extension.user && extension.password) {
-            println "[version] Authenticating with ${extension.user}"
-            clientManager.setAuthenticationManager(BasicAuthenticationManager.newInstance(extension.user, extension.password.toCharArray()));
+            LOGGER.info("[version] Authenticating with ${extension.user}")
+            clientManager.setAuthenticationManager(BasicAuthenticationManager.newInstance(extension.user, extension.password.toCharArray()))
             // The BasicAuthenticationManager trusts the certificates by default
         } else if (extension.trustServerCert) {
-            println "[version] Trusting certificate by default"
-            println "[version] WARNING The `trustServerCert` is now deprecated - and should not be used any longer."
-            clientManager.setAuthenticationManager(BasicAuthenticationManager.newInstance(new SVNAuthentication[0]));
+            LOGGER.info("[version] Trusting certificate by default")
+            LOGGER.warn("[version] WARNING The `trustServerCert` is now deprecated - and should not be used any longer.")
+            clientManager.setAuthenticationManager(BasicAuthenticationManager.newInstance(new SVNAuthentication[0]))
         } else {
-            println "[version] Using default SVN configuration"
+            LOGGER.info("[version] Using default SVN configuration")
             clientManager.setAuthenticationManager(SVNWCUtil.createDefaultAuthenticationManager())
         }
         return clientManager