Merge branch 'release/0.3.0'

* release/0.3.0: (24 commits) (doc) Added blog posts Reaction to Wyam changes in Cake.Recipe, moves most Wyam settings to setup.cake (maint) Corrected BaseEditUrl (GH-17) Corrected Wyam Config (GH-17) Dry run from Wyam generation (GH-17) Removing mkdocs file (GH-17) First pass at adding Wyam docs (GH-16) Changed cache invalidation logic (GH-10) Removed unnecessary nuget packages (GH-15) Corrected regular expression (GH-10) Use Cake.Recipe (GH-12) Updated to latest Cake (GH-14) Corrected exclusions (GH-13) Changed name of appveyor file (doc) Updated Repo Url (doc) Minor typos in documentation (GH-7) Changed URL's to new location (build) Removing temp comment (GH-5) Added Coveralls Badge (build) AppVeyor Cache ...
cake-contrib · Jan 26, 2017 · 8c21496 · 8c21496
2 parents 2f2df40 + 26af420
commit 8c21496
Show file tree

Hide file tree

Showing 20 changed files with 144 additions and 133 deletions.
diff --git a/appveyor.yml → .appveyor.yml b/appveyor.yml → .appveyor.yml
@@ -31,11 +31,11 @@ notifications:
 #---------------------------------#
 cache:
 - Source\packages -> Source\**\packages.config
-- Tools -> build.ps1
+- tools -> setup.cake
 
 #---------------------------------#
 #  Skip builds for doc changes    #
 #---------------------------------#
 skip_commits:
   # Regex for matching commit message
-  message: /(doc).*/
+  message: /\(doc\).*/
diff --git a/.gitignore b/.gitignore
@@ -252,5 +252,6 @@ paket-files/
 *.sln.iml
 
 # Build related
-tools/
+tools/**
+!tools/packages.config
 BuildArtifacts/
diff --git a/README.md b/README.md
@@ -18,6 +18,10 @@ Cake.Coveralls is an Addin for [Cake](http://cakebuild.net/) with ability to pus
 |:--:|:--:|
 |[![Build status](https://ci.appveyor.com/api/projects/status/y19f0qk1uupbc8dm/branch/develop?svg=true)](https://ci.appveyor.com/project/cakecontrib/cake-coveralls/branch/develop)|[![Build status](https://ci.appveyor.com/api/projects/status/y19f0qk1uupbc8dm/branch/develop?svg=true)](https://ci.appveyor.com/project/cakecontrib/cake-coveralls/branch/master)|
 
+## Code Coverage
+
+[![Coverage Status](https://coveralls.io/repos/github/cake-contrib/Cake.Coveralls/badge.svg?branch=develop)](https://coveralls.io/github/cake-contrib/Cake.Coveralls?branch=develop)
+
 ## Quick Links
 
 - [Documentation](http://cakecoveralls.readthedocs.org/en/develop/)

diff --git a/Source/Cake.Coveralls.Tests/Cake.Coveralls.Tests.csproj b/Source/Cake.Coveralls.Tests/Cake.Coveralls.Tests.csproj
@@ -86,13 +86,6 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\gep13.xUnitRunner.0.1.0\build\gep13.xUnitRunner.targets" Condition="Exists('..\packages\gep13.xUnitRunner.0.1.0\build\gep13.xUnitRunner.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\gep13.xUnitRunner.0.1.0\build\gep13.xUnitRunner.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\gep13.xUnitRunner.0.1.0\build\gep13.xUnitRunner.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/Source/Cake.Coveralls.Tests/packages.config b/Source/Cake.Coveralls.Tests/packages.config
@@ -2,7 +2,6 @@
 <packages>
   <package id="Cake.Core" version="0.15.2" targetFramework="net452" />
   <package id="Cake.Testing" version="0.15.2" targetFramework="net452" />
-  <package id="gep13.xUnitRunner" version="0.1.0" targetFramework="net452" />
   <package id="NSubstitute" version="1.10.0.0" targetFramework="net452" />
   <package id="xunit" version="2.1.0" targetFramework="net452" />
   <package id="xunit.abstractions" version="2.0.0" targetFramework="net452" />

diff --git a/Source/Cake.Coveralls/Cake.Coveralls.csproj b/Source/Cake.Coveralls/Cake.Coveralls.csproj
@@ -78,13 +78,6 @@
     <Analyzer Include="..\packages\StyleCop.Analyzers.1.0.0\analyzers\dotnet\cs\StyleCop.Analyzers.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\gep13.ApplicationRunner.0.1.2\build\gep13.ApplicationRunner.targets" Condition="Exists('..\packages\gep13.ApplicationRunner.0.1.2\build\gep13.ApplicationRunner.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\gep13.ApplicationRunner.0.1.2\build\gep13.ApplicationRunner.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\gep13.ApplicationRunner.0.1.2\build\gep13.ApplicationRunner.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/Source/Cake.Coveralls/packages.config b/Source/Cake.Coveralls/packages.config
@@ -2,6 +2,5 @@
 <packages>
   <package id="Cake.Common" version="0.15.2" targetFramework="net452" />
   <package id="Cake.Core" version="0.15.2" targetFramework="net452" />
-  <package id="gep13.ApplicationRunner" version="0.1.2" targetFramework="net452" />
   <package id="StyleCop.Analyzers" version="1.0.0" targetFramework="net452" developmentDependency="true" />
 </packages>
diff --git a/build.ps1 b/build.ps1
@@ -5,14 +5,11 @@
 ##########################################################################
 
 <#
-
 .SYNOPSIS
 This is a Powershell script to bootstrap a Cake build.
-
 .DESCRIPTION
 This Powershell script will download NuGet if missing, restore NuGet tools (including Cake)
 and execute your Cake build script with the parameters you provide.
-
 .PARAMETER Script
 The build script to execute.
 .PARAMETER Target
@@ -32,10 +29,8 @@ Tells Cake to use the Mono scripting engine.
 Skips restoring of packages.
 .PARAMETER ScriptArgs
 Remaining arguments are added here.
-
 .LINK
 http://cakebuild.net
-
 #>
 
 [CmdletBinding()]
@@ -165,7 +160,7 @@ if(-Not $SkipToolPackageRestore.IsPresent) {
     }
 
     Write-Verbose -Message "Restoring tools from NuGet..."
-    $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`""
+    $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -PreRelease -OutputDirectory `"$TOOLS_DIR`" -Source https://www.myget.org/F/cake/api/v3/index.json"
 
     if ($LASTEXITCODE -ne 0) {
         Throw "An error occured while restoring NuGet tools."
@@ -183,9 +178,6 @@ if (!(Test-Path $CAKE_EXE)) {
     Throw "Could not find Cake.exe at $CAKE_EXE"
 }
 
-# Make sure that re-usable build.cake file exists.
-Invoke-Expression "&`"$NUGET_EXE`" install gep13.DefaultBuild -ExcludeVersion -PreRelease -OutputDirectory `"$TOOLS_DIR`" -Source `"https://www.myget.org/F/gep13/api/v3/index.json`""
-
 # Start Cake
 Write-Host "Running build script..."
 Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs"

diff --git a/config.wyam b/config.wyam
@@ -0,0 +1,3 @@
+System.Globalization.CultureInfo.DefaultThreadCurrentCulture = System.Globalization.CultureInfo.CreateSpecificCulture("en-GB");
+Settings.Host = GlobalMetadata.String("Host");
+Settings.LinkRoot = GlobalMetadata.String("LinkRoot");
diff --git a/docs/index.md b/docs/index.md
diff --git a/docs/input/blog/new-release-0.1.0.md b/docs/input/blog/new-release-0.1.0.md
@@ -0,0 +1,17 @@
+---
+Title: New Release - 0.1.0
+Published: 18/8/2016
+Category: Release
+Author: gep13
+---
+
+# First Release Completed
+
+Very happy to announce the initial release of the Cake.Coveralls addin for [Cake](http://cakebuild.net/).
+
+This initial release shipped with two main features:
+
+- [**#2**](https://github.com/gep13/Cake.Coveralls/issues/2) Add support for Coveralls.io
+- [**#1**](https://github.com/gep13/Cake.Coveralls/issues/1) Add support for Coveralls.net
+
+Please do not hesitate to reach out in the [Gitter Channel](https://gitter.im/cake-contrib/Lobby) if you have any issues using this addin.
diff --git a/docs/input/blog/new-release-0.2.0.md b/docs/input/blog/new-release-0.2.0.md
@@ -0,0 +1,22 @@
+---
+Title: New Release - 0.2.0
+Published: 22/8/2016
+Category: Release
+Author: gep13
+---
+
+# Hot off the press, another release for Cake.Coveralls
+
+After the initial release of Cake.Coveralls a couple days ago, we noticed a couple problems, that warranted a new release, so here it is.
+
+This release includes the following:
+
+## Bug
+
+- [**#3**](https://github.com/cake-contrib/Cake.Coveralls/issues/3) Remove duplicate summary in alias
+
+## Improvement
+
+- [**#4**](https://github.com/cake-contrib/Cake.Coveralls/issues/4) Ensure correct stamping version number in generated assemblies
+
+Please do not hesitate to reach out in the [Gitter Channel](https://gitter.im/cake-contrib/Lobby) if you have any issues using this addin.
diff --git a/docs/input/blog/new-release-0.2.1.md b/docs/input/blog/new-release-0.2.1.md
@@ -0,0 +1,16 @@
+---
+Title: New Release - 0.2.1
+Published: 8/11/2016
+Category: Release
+Author: gep13
+---
+
+# Correcting NuGet Folder Structure
+
+In order to allow Cake to correctly load addin's, we have updated the NuGet package structure to include a lib folder.
+
+Full details about this release can be found here:
+
+- [**#11**](https://github.com/cake-contrib/Cake.Coveralls/issues/11) Add lib folder structure to NuGet package
+
+Please do not hesitate to reach out in the [Gitter Channel](https://gitter.im/cake-contrib/Lobby) if you have any issues using this addin.
diff --git a/docs/input/blog/new-release-0.3.0.md b/docs/input/blog/new-release-0.3.0.md
@@ -0,0 +1,32 @@
+---
+Title: New Release - 0.3.0
+Published: 26/1/2017
+Category: Release
+Author: gep13
+---
+
+# It's been a while...
+
+Since the last release, but I hope you will agree that it has been worth waiting for.  This release includes the following:
+
+## Improvements
+
+- [__#10__](https://github.com/cake-contrib/Cake.Coveralls/issues/10) Switch away from using gep13.DefaultBuild and use Cake.Recipe instead
+- [__#7__](https://github.com/cake-contrib/Cake.Coveralls/issues/7) Update nuspec with correct information
+
+## Documentation
+
+- [__#17__](https://github.com/cake-contrib/Cake.Coveralls/issues/17) Add Wyam Documentation generation
+- [__#6__](https://github.com/cake-contrib/Cake.Coveralls/issues/6) Correct usage documentation
+
+The main one here is the inclusion of [Cake.Recipe](https://github.com/cake-contrib/Cake.Recipe).  For a while now, I have been working on the concept of a convention driven, drop in, build system, that can be applied to any number of projects.  This is very much nearing completion, with all the main parts now in place.
+
+In this most recent version, I have added:
+
+- Execution of GitLink to allow debugging of assemblies generated as part of the build
+- Wyam documentation generation, including this blog post that you are reading now.
+- Removal of some dependencies in the build process which meant additional nuget packages were required
+
+More details will follow on all of this when the Cake.Recipe project is officially released.  This release of Cake.Coveralls is really just taking it for it's initial spin.
+
+Please do not hesitate to reach out in the [Gitter Channel](https://gitter.im/cake-contrib/Lobby) if you have any issues using this addin.
diff --git a/docs/usage.md → docs/input/docs/usage.md b/docs/usage.md → docs/input/docs/usage.md
@@ -9,7 +9,7 @@ Within your build script, you will need to add the following (normally near the
 and either one of the following:
 
 ```csharp
-#tools coveralls.net
+#tool coveralls.net
 ```
 
 ```csharp
@@ -41,7 +41,7 @@ Task("Upload-Coverage-Report")
 Task("Upload-Coverage-Report")
     .Does(() =>
 {
-    CoverallsIo("coverage.xml", CoverallsNetReportType.OpenCover);
+    CoverallsNet("coverage.xml", CoverallsNetReportType.OpenCover);
 });
 ```
 

diff --git a/docs/input/index.cshtml b/docs/input/index.cshtml
@@ -0,0 +1,13 @@
+---
+Title: Cake.Coveralls
+NoSidebar: true
+NoContainer: false
+NoGutter: true
+---
+
+<div class="container">				
+	<h1>What is it?</h1>
+    <p>
+        Cake.Coveralls is an Addin for <a href="http://cakebuild.net/">Cake</a> which allows the posting of code coverage reports to <a href="https://coveralls.io/">coveralls.io</a>.
+    </p>
+</div>
diff --git a/mkdocs.yml b/mkdocs.yml
diff --git a/nuspec/nuget/Cake.Coveralls.nuspec b/nuspec/nuget/Cake.Coveralls.nuspec
@@ -18,4 +18,4 @@
     <file src="Cake.Coveralls.pdb" target="lib\net45" />
     <file src="Cake.Coveralls.xml" target="lib\net45" />
   </files>
-</package>
+</package>
diff --git a/setup.cake b/setup.cake
@@ -1,72 +1,25 @@
-///////////////////////////////////////////////////////////////////////////////
-// ENVIRONMENT VARIABLE NAMES
-///////////////////////////////////////////////////////////////////////////////
-
-private static string githubUserNameVariable = "GITHUB_USERNAME";
-private static string githubPasswordVariable = "GITHUB_PASSWORD";
-private static string myGetApiKeyVariable = "MYGET_API_KEY";
-private static string myGetSourceUrlVariable = "MYGET_SOURCE";
-private static string nuGetApiKeyVariable = "NUGET_API_KEY";
-private static string nuGetSourceUrlVariable = "NUGET_SOURCE";
-private static string chocolateyApiKeyVariable = "CHOCOLATEY_API_KEY";
-private static string chocolateySourceUrlVariable = "CHOCOLATEY_SOURCE";
-private static string gitterTokenVariable = "GITTER_TOKEN";
-private static string gitterRoomIdVariable = "GITTER_ROOM_ID";
-private static string slackTokenVariable = "SLACK_TOKEN";
-private static string slackChannelVariable = "SLACK_CHANNEL";
-private static string twitterConsumerKeyVariable = "TWITTER_CONSUMER_KEY";
-private static string twitterConsumerSecretVariable = "TWITTER_CONSUMER_SECRET";
-private static string twitterAccessTokenVariable = "TWITTER_ACCESS_TOKEN";
-private static string twitterAccessTokenSecretVariable = "TWITTER_ACCESS_TOKEN_SECRET";
-private static string appVeyorApiTokenVariable = "APPVEYOR_API_TOKEN";
-private static string coverallsRepoTokenVariable = "COVERALLS_REPO_TOKEN";
-
-///////////////////////////////////////////////////////////////////////////////
-// BUILD ACTIONS
-///////////////////////////////////////////////////////////////////////////////
-
-var sendMessageToGitterRoom = true;
-var sendMessageToSlackChannel = true;
-var sendMessageToTwitter = true;
-
-///////////////////////////////////////////////////////////////////////////////
-// PROJECT SPECIFIC VARIABLES
-///////////////////////////////////////////////////////////////////////////////
-
-var rootDirectoryPath         = MakeAbsolute(Context.Environment.WorkingDirectory);
-var solutionFilePath          = "./Source/Cake.Coveralls.sln";
-var sourceDirectoryPath       = "./Source";
-var solutionDirectoryPath     = "./Source/Cake.Coveralls";
-var title                     = "Cake.Coveralls";
-var resharperSettingsFileName = "Cake.Coveralls.sln.DotSettings";
-var repositoryOwner           = "cake-contrib";
-var repositoryName            = "Cake.Coveralls";
-var appVeyorAccountName       = "cakecontrib";
-var appVeyorProjectSlug       = "cake-coveralls";
-
-// NOTE: Only populate this, if required, but leave as is otherwise.
-var dupFinderExcludePattern   = new string[] { rootDirectoryPath + "/Source/Cake.Coveralls.Tests/*.cs" };
-var testCoverageFilter = "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* ";
-var testCoverageExcludeByAttribute = "*.ExcludeFromCodeCoverage*";
-var testCoverageExcludeByFile = "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs";
-
-///////////////////////////////////////////////////////////////////////////////
-// CAKE FILES TO LOAD IN
-///////////////////////////////////////////////////////////////////////////////
-
-#l .\Tools\gep13.DefaultBuild\Content\appveyor.cake
-#l .\Tools\gep13.DefaultBuild\Content\chocolatey.cake
-#l .\Tools\gep13.DefaultBuild\Content\coveralls.cake
-#l .\Tools\gep13.DefaultBuild\Content\credentials.cake
-#l .\Tools\gep13.DefaultBuild\Content\gitreleasemanager.cake
-#l .\Tools\gep13.DefaultBuild\Content\gitter.cake
-#l .\Tools\gep13.DefaultBuild\Content\gitversion.cake
-#l .\Tools\gep13.DefaultBuild\Content\nuget.cake
-#l .\Tools\gep13.DefaultBuild\Content\packages.cake
-#l .\Tools\gep13.DefaultBuild\Content\parameters.cake
-#l .\Tools\gep13.DefaultBuild\Content\paths.cake
-#l .\Tools\gep13.DefaultBuild\Content\resharper.cake
-#l .\Tools\gep13.DefaultBuild\Content\slack.cake
-#l .\Tools\gep13.DefaultBuild\Content\testing.cake
-#l .\Tools\gep13.DefaultBuild\Content\twitter.cake
-#l .\Tools\gep13.DefaultBuild\Content\build.cake
+#load nuget:https://www.myget.org/F/cake-contrib/api/v2?package=Cake.Recipe&prerelease
+
+Environment.SetVariableNames();
+
+BuildParameters.SetParameters(context: Context, 
+                            buildSystem: BuildSystem,
+                            sourceDirectoryPath: "./Source",
+                            title: "Cake.Coveralls",
+                            repositoryOwner: "cake-contrib",
+                            repositoryName: "Cake.Coveralls",
+                            appVeyorAccountName: "cakecontrib",
+                            webHost: "cake-contrib.github.io",
+                            webLinkRoot: "Cake.Coveralls",
+                            webBaseEditUrl: "https://github.com/cake-contrib/Cake.Coveralls/tree/develop/docs/input/");
+
+BuildParameters.PrintParamters(Context);
+
+ToolSettings.SetToolSettings(context: Context,
+                            dupFinderExcludePattern: new string[] { 
+                                BuildParameters.RootDirectoryPath + "/Source/Cake.Coveralls.Tests/*.cs" },
+                            testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* ",
+                            testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
+                            testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");
+
+Build.Run();
diff --git a/tools/packages.config b/tools/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+	<package id="Cake" version="0.18.0-alpha0033" />
+</packages>