update to add hash to log dir #71

ligershark · Jun 8, 2015 · f614d13 · f614d13
1 parent 8540212
commit f614d13
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 3 deletions.
diff --git a/src/psbuild.psm1 b/src/psbuild.psm1
@@ -51,6 +51,7 @@ $global:PSBuildSettings = New-Object PSObject -Property @{
     EnableAppVeyorSupport = $true
     AppVeyorLoggerPath = 'C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll'
     EnableMaskLogFiles = $true
+    EnableAddingHashToLogDir = $true
 }
 
 <#
@@ -929,8 +930,15 @@ function Get-PSBuildLogDirectory{
                 $itemResult = (Get-Item $projectPath)
 
                 $projFileName = ((Get-Item $projectPath).Name)
-
-                $logDir = (Join-Path -Path ($global:PSBuildSettings.LogDirectory) -ChildPath ('{0}-log\' -f $projFileName) )
+                $logDir = $null
+                if($global:PSBuildSettings.EnableAddingHashToLogDir -and (-not [string]::IsNullOrWhiteSpace($projectPath))) {
+                    $projfullpath = (Get-Item $projectPath).FullName
+                    $projfilepathhash = Get-StringHash -text $projfullpath
+                    $logDir = (Join-Path -Path ($global:PSBuildSettings.LogDirectory) -ChildPath ('{0}-{1}-log\' -f $projFileName,$projfilepathhash) )
+                }
+                else{
+                    $logDir = (Join-Path -Path ($global:PSBuildSettings.LogDirectory) -ChildPath ('{0}-log\' -f $projFileName) )
+                }
             }
 
             # before returning ensure the log directory is created on disk
@@ -947,6 +955,22 @@ function Get-PSBuildLogDirectory{
     }
 }
 
+#http://jongurgul.com/blog/get-stringhash-get-filehash/
+Function Get-StringHash{
+    [cmdletbinding()]
+    param(
+        [String] $text,
+        $HashName = "MD5"
+    )
+    process{
+        $sb = New-Object System.Text.StringBuilder
+        [System.Security.Cryptography.HashAlgorithm]::Create($HashName).ComputeHash([System.Text.Encoding]::UTF8.GetBytes($text))|%{
+                [Void]$sb.Append($_.ToString("x2"))
+            }
+        $sb.ToString()
+    }
+}
+
 function Open-PSBuildLogDirectory{
     [cmdletbinding()]
     param()

diff --git a/tests/PSBuildLogDirectory.Tests.ps1 b/tests/PSBuildLogDirectory.Tests.ps1
@@ -24,7 +24,9 @@ Describe 'tests for Get-PSBuildLogDirectory' {
     $global:PSBuildSettings.BuildMessageEnabled = $false
     Add-Type -AssemblyName Microsoft.Build
 
-    It 'tests for Get-PSBuildLogDirectory' {
+    It 'tests for Get-PSBuildLogDirectory (no hashing)' {
+        $global:PSBuildSettings.EnableAddingHashToLogDir = $false
+
         $projFilePath = ("$TestDrive\{0}" -f $script:tempPSBuildLogProj01Path)
 
         $projFileInfo = Get-Item $projFilePath
@@ -34,5 +36,19 @@ Describe 'tests for Get-PSBuildLogDirectory' {
         $expectedLogDirName = ('{0}\' -f $projFileInfo.Name)
         # logdir should end in the 'proj-file-name\'
         $logdir | Should Match ".*psbulidlog01.proj-log\\$"
+
+        $global:PSBuildSettings.EnableAddingHashToLogDir = $true
+    }
+
+    It 'tests for Get-PSBuildLogDirectory' {
+        $projFilePath = ("$TestDrive\{0}" -f $script:tempPSBuildLogProj01Path)
+
+        $projFileInfo = Get-Item $projFilePath
+
+        $logdir = Get-PSBuildLogDirectory -projectPath $projFilePath
+
+        $expectedLogDirName = ('{0}\' -f $projFileInfo.Name)
+        # logdir should end in the 'proj-file-name\'
+        $logdir | Should Match ".*psbulidlog01.proj-.*log\\$"
     }
 }