Merge branch 'release/1.1.0'

.gitignore

@@ -0,0 +1,12 @@
+# Created by https://www.gitignore.io/
+
+### NuGet Packages ###
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+
+### VisualStudioCode ###
+.vscode
+
+### Pester Test Result ###
+TestResult.xml

README.markdown

@@ -1,6 +1,8 @@
 Welcome to the psake-contrib project.
 =====================================
 
+[![Join the chat at https://gitter.im/psake/psake-contrib](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/psake/psake-contrib?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 psake-contrib is a repository for scripts, modules and functions that are useful for running a build with [psake](http://github.com/JamesKovacs/psake).
 
 

Run-Tests.ps1

@@ -0,0 +1,13 @@
+Import-Module Pester
+
+Invoke-Pester tests\** -OutputFile TestResult.xml -OutputFormat NUnitXml
+
+$appVeyorJobId = $env:APPVEYOR_JOB_ID
+if ($appVeyorJobId) {
+	$url = "https://ci.appveyor.com/api/testresults/nunit/$appVeyorJobId"
+
+	$wc = New-Object 'System.Net.WebClient'
+	$wc.UploadFile($url, (Resolve-Path '.\TestResult.xml'));
+
+	"Uploaded test results to AppVeyor."
+}

appveyor.yml

@@ -0,0 +1,17 @@
+# psake-contrib
+
+version: 1.0.0-build-{build}
+
+branches:
+  except:
+    - gh-pages
+
+os: Visual Studio 2015
+
+install:
+  - cinst pester
+
+build: false
+
+test_script:
+  - ps: . .\Run-Tests.ps1

build.cmd

@@ -0,0 +1,8 @@
+@echo off
+
+NuGet.exe install Pester -OutputDirectory packages -ExcludeVersion -Verbosity quiet
+
+set pester=.\packages\Pester\tools\Pester.psm1
+
+powershell -NoProfile -ExecutionPolicy Bypass -Command "Import-Module '%pester%'; Invoke-Pester tests\**;"
+goto :eof

nuget/psake-contrib.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>psake-contrib</id>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
     <authors>James Kovacs,James Crowley,Rafal Klys,Artur Dorochowicz,Scott Banwart,Ales Roubicek,C-J Berg,Pepa Stefan</authors>
     <projectUrl>https://github.com/psake/psake-contrib</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -14,4 +14,4 @@
   <files>
     <file src="..\*.psm1" target="tools\" />
   </files>
-</package>
+</package>

teamcity.psm1

@@ -15,6 +15,30 @@ if ($env:TEAMCITY_VERSION) {
 	}
 }
 
+function TeamCity-Message([string]$text, [string]$status = 'NORMAL', [string]$errorDetails) {
+  $messageAttributes = @{ text=$text; status=$status }
+
+  if ($errorDetails) {
+    $messageAttributes.errorDetails = $errorDetails
+  }
+
+	TeamCity-WriteServiceMessage 'message' $messageAttributes
+}
+
+function TeamCity-BlockOpened([string]$name, [string]$description) {
+  $messageAttributes = @{ name=$name }
+
+  if ($description) {
+    $messageAttributes.description = $description
+  }
+
+	TeamCity-WriteServiceMessage 'blockOpened' $messageAttributes
+}
+
+function TeamCity-BlockClosed([string]$name) {
+	TeamCity-WriteServiceMessage 'blockClosed' @{ name=$name }
+}
+
 function TeamCity-TestSuiteStarted([string]$name) {
 	TeamCity-WriteServiceMessage 'testSuiteStarted' @{ name=$name }
 }
@@ -112,18 +136,36 @@ function TeamCity-ReportBuildFinish([string]$message) {
 	TeamCity-WriteServiceMessage 'progressFinish' $message
 }
 
-function TeamCity-ReportBuildStatus([string]$status, [string]$text='') {
-	TeamCity-WriteServiceMessage 'buildStatus' @{ status=$status; text=$text }
+function TeamCity-ReportBuildStatus([string]$status=$null, [string]$text='') {
+	$messageAttributes = @{ text=$text }
+
+	if (![string]::IsNullOrEmpty($status)) {
+		$messageAttributes.status=$status
+	}
+
+	TeamCity-WriteServiceMessage 'buildStatus' $messageAttributes
 }
 
 function TeamCity-SetBuildNumber([string]$buildNumber) {
 	TeamCity-WriteServiceMessage 'buildNumber' $buildNumber
 }
 
+function TeamCity-SetParameter([string]$name, [string]$value) {
+	TeamCity-WriteServiceMessage 'setParameter' @{ name=$name; value=$value }
+}
+
 function TeamCity-SetBuildStatistic([string]$key, [string]$value) {
 	TeamCity-WriteServiceMessage 'buildStatisticValue' @{ key=$key; value=$value }
 }
 
+function TeamCity-EnableServiceMessages() {
+	TeamCity-WriteServiceMessage 'enableServiceMessages'
+}
+
+function TeamCity-DisableServiceMessages() {
+	TeamCity-WriteServiceMessage 'disableServiceMessages'
+}
+
 function TeamCity-CreateInfoDocument([string]$buildNumber='', [boolean]$status=$true, [string[]]$statusText=$null, [System.Collections.IDictionary]$statistics=$null) {
 	$doc=New-Object xml;
 	$buildEl=$doc.CreateElement('build');
@@ -198,9 +240,10 @@ function TeamCity-WriteServiceMessage([string]$messageName, $messageAttributesHa
 	if ($messageAttributesHashOrSingleValue -is [hashtable]) {
 		$messageAttributesString = ($messageAttributesHashOrSingleValue.GetEnumerator() | 
 			%{ "{0}='{1}'" -f $_.Key, (escape $_.Value) }) -join ' '
-	} else {
-		$messageAttributesString = ("'{0}'" -f (escape $messageAttributesHashOrSingleValue))
+      $messageAttributesString = " $messageAttributesString"
+	} elseif ($messageAttributesHashOrSingleValue) {
+		$messageAttributesString = (" '{0}'" -f (escape $messageAttributesHashOrSingleValue))
 	}
 
-	Write-Output "##teamcity[$messageName $messageAttributesString]"
+	Write-Output "##teamcity[$messageName$messageAttributesString]"
 }