diff --git a/.gitignore b/.gitignore index 922fe5fd0..2f8bf2153 100644 --- a/.gitignore +++ b/.gitignore @@ -58,6 +58,7 @@ reports/ merged/ test/ Documentation-*/ +Output/ #nCrunch files *.crunchproject.local.xml diff --git a/NOTICE b/NOTICE deleted file mode 100644 index bd2073615..000000000 --- a/NOTICE +++ /dev/null @@ -1,4 +0,0 @@ -Pickles - Copyright 2011 Jeffrey Cameron - - This product includes software developed by several other open source projects. \ No newline at end of file diff --git a/ReleaseNotes.md b/ReleaseNotes.md index ad57a6403..f79091e2a 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,5 +1,17 @@ # Pickles Release Notes +## v0.20.0 - 2014-12-10 + +### Breaking Change + +- The msbuild runner will now break the build when an error occurs. This reflects our belief that the Living Documentation is a first class output of the software development process. + +### New Features + +- The command line and powershell runners now return an error code of 0 when everything went fine, and 1 if there was an error. +- The HTML and DHTML output versions no longer horizontally spread tables. +- The GUI version has an icon + ## v0.19.0 - 2014-11-25 ### Breaking Change diff --git a/build.bat b/build.bat index 74f0c32d7..f7b634223 100644 --- a/build.bat +++ b/build.bat @@ -1,12 +1,34 @@ @echo off +set "picklesVersion=0.20.0" + cls + cd ".\src\Pickles\packages\NuGet.CommandLine.2.8.3\tools\" ".\NuGet.exe" "Install" "FAKE" "-OutputDirectory" "..\..\..\..\..\packages" "-ExcludeVersion" cd ..\..\..\..\.. -"packages\FAKE\tools\Fake.exe" build.fsx --envvar version 0.19.0 -"packages\FAKE\tools\Fake.exe" nuget.fsx --envvar version 0.19.0 -"packages\FAKE\tools\Fake.exe" chocolatey.fsx --envvar version 0.19.0 \ No newline at end of file + +"packages\FAKE\tools\Fake.exe" build.fsx --envvar version %picklesVersion% +"packages\FAKE\tools\Fake.exe" nuget.fsx --envvar version %picklesVersion% +"packages\FAKE\tools\Fake.exe" chocolatey.fsx --envvar version %picklesVersion% + +call unzip.cmd %picklesVersion% + +FOR %%A IN (testRunnerCmd testRunnerMsBuild testRunnerPowerShell) DO ( +call %%A.cmd %picklesVersion% +if errorlevel 1 goto handleerror1orhigher +) + + +@ECHO all fine +goto end + +:handleerror1orhigher + +@ECHO Something went wrong! +goto end + +:end diff --git a/chocolatey.fsx b/chocolatey.fsx index 6f214bdbb..08df1a3f3 100644 --- a/chocolatey.fsx +++ b/chocolatey.fsx @@ -4,6 +4,7 @@ open Fake // Properties let cmdDir = "./build/exe/" +let guiDir = "./build/gui/" let deployDir = "./deploy/chocolatey/" let packagingDir = "./packaging/" let chocoDir = "./chocolatey/" @@ -15,19 +16,34 @@ Target "Clean" (fun _ -> CleanDirs [deployDir; packagingDir] ) -Target "CreatePackage" (fun _ -> - CopyFiles packagingDir [chocoDir + "chocolateyInstall.ps1"; cmdDir + "Pickles.exe"; cmdDir + "NLog.config"] + +Target "CreatePackage CMD" (fun _ -> + CopyFiles packagingDir [cmdDir + "Pickles.exe"; cmdDir + "NLog.config"] WriteFile (packagingDir + "version.ps1") [("$version = \"" + version + "\"")] - NuGet (fun p -> + NuGet (fun p -> {p with OutputPath = deployDir WorkingDir = packagingDir Version = version - Publish = false }) + Publish = false }) (chocoDir + "Pickles.nuspec") ) +Target "CreatePackage GUI" (fun _ -> + CopyFiles packagingDir [guiDir + "picklesui.exe"; guiDir + "NLog.config"; guiDir + "PicklesUI.exe.config"] + WriteFile (packagingDir + "version.ps1") [("$version = \"" + version + "\"")] + WriteFile (packagingDir + "picklesui.exe.gui") [("")] + NuGet (fun p -> + {p with + OutputPath = deployDir + WorkingDir = packagingDir + Version = version + Publish = false }) + (chocoDir + "picklesui.nuspec") +) + + Target "Default" (fun _ -> trace ("Starting build of Pickles version " + version) DeleteDir packagingDir @@ -36,7 +52,8 @@ Target "Default" (fun _ -> // Dependencies "Clean" - ==> "CreatePackage" + ==> "CreatePackage CMD" + ==> "CreatePackage GUI" ==> "Default" diff --git a/chocolatey/chocolateyInstall.ps1 b/chocolatey/chocolateyInstall.ps1 deleted file mode 100644 index 04819419f..000000000 --- a/chocolatey/chocolateyInstall.ps1 +++ /dev/null @@ -1,12 +0,0 @@ - -$packageName = "pickles" -$toolsPath = Split-Path -parent $MyInvocation.MyCommand.Definition - -# Newer choco.exe will support passing the package's version number to this script; so this -# can eventually be cleaned up and version.ps1 removed. -Write-Debug "toolsPath is: $toolsPath" -$versionFile = Join-Path $toolsPath "version.ps1" -Import-Module $versionFile -$url = "https://github.com/picklesdoc/pickles/releases/download/v$version/Pickles-exe-$version.zip" - -Install-ChocolateyZipPackage $packageName $url $toolsPath diff --git a/chocolatey/pickles.nuspec b/chocolatey/pickles.nuspec index 58c0761fb..6d781ad5f 100644 --- a/chocolatey/pickles.nuspec +++ b/chocolatey/pickles.nuspec @@ -1,24 +1,41 @@ - - pickles - Pickles - The Open Source Living Documentation Generator - @build.number@ - PicklesDoc and contributors - Jeffrey Cameron, Dirk Rombauts - A documentation generator for features written in the Gherkin language - Pickles is an open source living documentation generator that works on feature files written in the Gherkin language, popularized in tools like Cucumber and SpecFlow. Pickles can be incorporated into your build process to produce living documenation in a format that is more accessible to your clients. Gherkin language files are written in plain text and stored in your source folder. This can make them inaccessible to clients who may not know how to work with source control or who are not interested in seeing all of the source code, just the features. - http://www.picklesdoc.com/ - SpecificationByExample BDD SpecFlow Gherkin Cucumber SpecByEx LivingDocumentation Documentation - - http://apache.org/licenses/LICENSE-2.0.html - false - https://cdn.rawgit.com/picklesdoc/pickles/master/pickles.jpeg - - - - - - + + pickles + Pickles - The Open Source Living Documentation Generator + @build.number@ + PicklesDoc and contributors + Jeffrey Cameron, Dirk Rombauts + A documentation generator for features written in the Gherkin language + **Pickles** is an open source **living documentation** generator that works on feature files written in the *Gherkin* language, popularized in tools like *Cucumber* and *SpecFlow*. + +*Pickles* can be incorporated into your build process to produce living documentation in a format that is more accessible to your clients. *Gherkin* language files are written in plain text and stored in your source folder. This can make them inaccessible to clients who may not know how to work with source control or who are not interested in seeing all of the source code, just the features. + +*Pickles* can produce output in different formats: + +- Static HTML: a set of HTML files with minimal JavaScript +- Dynamic HTML: a JavaScript-rich single page app with integrated search +- Word: Microsoft Word +- Excel: Microsoft Excel +- JSON: a custom JSON format + +Optionally, *Pickles* can **integrate test results**, so that your stakeholders know which scenarios pass validation. *Pickles* supports these test formats: + +- NUnit +- MSTest +- XUnit +- SpecRun +- Cucumber JSON + + http://www.picklesdoc.com/ + SpecificationByExample BDD SpecFlow Gherkin Cucumber SpecByEx LivingDocumentation Documentation + Copyright © 2010-2012 Jeffrey Cameron, Copyright © 2013-present PicklesDoc and contributors + http://apache.org/licenses/LICENSE-2.0.html + false + https://cdn.rawgit.com/picklesdoc/pickles/master/pickles.jpeg + + + + diff --git a/chocolatey/picklesui.nuspec b/chocolatey/picklesui.nuspec new file mode 100644 index 000000000..0bd9207a8 --- /dev/null +++ b/chocolatey/picklesui.nuspec @@ -0,0 +1,44 @@ + + + + picklesui + Pickles UI - The Open Source Living Documentation Generator (GUI) + @build.number@ + PicklesDoc and contributors + Jeffrey Cameron, Dirk Rombauts + A documentation generator for features written in the Gherkin language + **Pickles** is an open source **living documentation** generator that works on feature files written in the *Gherkin* language, popularized in tools like *Cucumber* and *SpecFlow*. + +This GUI version of Pickles provides an easy way to produce living documentation in a format that is more accessible to your clients. *Gherkin* language files are written in plain text and stored in your source folder. This can make them inaccessible to clients who may not know how to work with source control or who are not interested in seeing all of the source code, just the features. + +*Pickles* can produce output in different formats: + +- Static HTML: a set of HTML files with minimal JavaScript +- Dynamic HTML: a JavaScript-rich single page app with integrated search +- Word: Microsoft Word +- Excel: Microsoft Excel +- JSON: a custom JSON format + +Optionally, *Pickles* can **integrate test results**, so that your stakeholders know which scenarios pass validation. *Pickles* supports these test formats: + +- NUnit +- MSTest +- XUnit +- SpecRun +- Cucumber JSON + + http://www.picklesdoc.com/ + SpecificationByExample BDD SpecFlow Gherkin Cucumber SpecByEx LivingDocumentation Documentation + Copyright © 2010-2012 Jeffrey Cameron, Copyright © 2013-present PicklesDoc and contributors + http://apache.org/licenses/LICENSE-2.0.html + false + https://cdn.rawgit.com/picklesdoc/pickles/master/pickles.jpeg + + + + + + + + + diff --git a/src/Pickles/Pickles.BaseDhtmlFiles/css/styles.css b/src/Pickles/Pickles.BaseDhtmlFiles/css/styles.css index bc67f27fb..2b9cb48f5 100644 --- a/src/Pickles/Pickles.BaseDhtmlFiles/css/styles.css +++ b/src/Pickles/Pickles.BaseDhtmlFiles/css/styles.css @@ -131,6 +131,16 @@ li.step { border-top: 1px lightgrey solid; } -.clickable { +.clickable { cursor: pointer; } + +.table { + width: 0; + max-width: 90%; +} + +.table-condensed th, +.table-condensed td { + padding: 5px 8px; +} \ No newline at end of file diff --git a/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.nuspec b/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.nuspec index e7765c25b..79716d7e6 100644 --- a/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.nuspec +++ b/src/Pickles/Pickles.CommandLine/Pickles.CommandLine.nuspec @@ -9,10 +9,31 @@ http://www.picklesdoc.com/ false http://apache.org/licenses/LICENSE-2.0.html - Pickles is an open source living documentation generator that works on feature files written in the Gherkin language, popularized in tools like Cucumber and SpecFlow. Pickles can be incorporated into your build process to produce living documenation in a format that is more accessible to your clients. Gherkin language files are written in plain text and stored in your source folder. This can make them inaccessible to clients who may not know how to work with source control or who are not interested in seeing all of the source code, just the features. + + **Pickles** is an open source **living documentation** generator that works on feature files written in the *Gherkin* language, popularized in tools like *Cucumber* and *SpecFlow*. + + *Pickles* can be incorporated into your build process to produce living documentation in a format that is more accessible to your clients. *Gherkin* language files are written in plain text and stored in your source folder. This can make them inaccessible to clients who may not know how to work with source control or who are not interested in seeing all of the source code, just the features. + + *Pickles* can produce output in different formats: + + - Static HTML: a set of HTML files with minimal JavaScript + - Dynamic HTML: a JavaScript-rich single page app with integrated search + - Word: Microsoft Word + - Excel: Microsoft Excel + - JSON: a custom JSON format + + Optionally, *Pickles* can **integrate test results**, so that your stakeholders know which scenarios pass validation. *Pickles* supports these test formats: + + - NUnit + - MSTest + - XUnit + - SpecRun + - Cucumber JSON + A documentation generator for features written in the Gherkin language Copyright © 2010-2012 Jeffrey Cameron, Copyright © 2013-present PicklesDoc and contributors SpecificationByExample BDD SpecFlow Gherkin Cucumber SpecByEx LivingDocumentation Documentation + https://cdn.rawgit.com/picklesdoc/pickles/master/pickles.jpeg diff --git a/src/Pickles/Pickles.CommandLine/Program.cs b/src/Pickles/Pickles.CommandLine/Program.cs index 2571fc0ec..7ac3dca44 100644 --- a/src/Pickles/Pickles.CommandLine/Program.cs +++ b/src/Pickles/Pickles.CommandLine/Program.cs @@ -30,7 +30,7 @@ internal class Program { private static readonly Logger log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.Name); - private static void Main(string[] args) + private static int Main(string[] args) { var builder = new ContainerBuilder(); builder.RegisterAssemblyTypes(typeof(Runner).Assembly); @@ -53,13 +53,23 @@ private static void Main(string[] args) } var runner = container.Resolve(); - runner.Run(container); - if (log.IsInfoEnabled) + try { - log.Info("Pickles completed successfully"); + runner.Run(container); + + if (log.IsInfoEnabled) + { + log.Info("Pickles completed successfully"); + } + } + catch + { + return 1; } } + + return 0; } } } \ No newline at end of file diff --git a/src/Pickles/Pickles.MSBuild/Pickles.MSBuild.nuspec b/src/Pickles/Pickles.MSBuild/Pickles.MSBuild.nuspec index eea7af702..f9c4d2d98 100644 --- a/src/Pickles/Pickles.MSBuild/Pickles.MSBuild.nuspec +++ b/src/Pickles/Pickles.MSBuild/Pickles.MSBuild.nuspec @@ -9,10 +9,31 @@ http://www.picklesdoc.com/ false http://apache.org/licenses/LICENSE-2.0.html - Pickles is an open source living documentation generator that works on feature files written in the Gherkin language, popularized in tools like Cucumber and SpecFlow. Pickles can be incorporated into your build process to produce living documenation in a format that is more accessible to your clients. Gherkin language files are written in plain text and stored in your source folder. This can make them inaccessible to clients who may not know how to work with source control or who are not interested in seeing all of the source code, just the features. + + **Pickles** is an open source **living documentation** generator that works on feature files written in the *Gherkin* language, popularized in tools like *Cucumber* and *SpecFlow*. + + *Pickles* can be incorporated into your build process to produce living documentation in a format that is more accessible to your clients. *Gherkin* language files are written in plain text and stored in your source folder. This can make them inaccessible to clients who may not know how to work with source control or who are not interested in seeing all of the source code, just the features. + + *Pickles* can produce output in different formats: + + - Static HTML: a set of HTML files with minimal JavaScript + - Dynamic HTML: a JavaScript-rich single page app with integrated search + - Word: Microsoft Word + - Excel: Microsoft Excel + - JSON: a custom JSON format + + Optionally, *Pickles* can **integrate test results**, so that your stakeholders know which scenarios pass validation. *Pickles* supports these test formats: + + - NUnit + - MSTest + - XUnit + - SpecRun + - Cucumber JSON + A documentation generator for features written in the Gherkin language Copyright © 2010-2012 Jeffrey Cameron, Copyright © 2013-present PicklesDoc and contributors SpecificationByExample BDD SpecFlow Gherkin Cucumber SpecByEx LivingDocumentation Documentation + https://cdn.rawgit.com/picklesdoc/pickles/master/pickles.jpeg diff --git a/src/Pickles/Pickles.MSBuild/Pickles.cs b/src/Pickles/Pickles.MSBuild/Pickles.cs index 1d8360158..2af61c761 100644 --- a/src/Pickles/Pickles.MSBuild/Pickles.cs +++ b/src/Pickles/Pickles.MSBuild/Pickles.cs @@ -86,10 +86,10 @@ public override bool Execute() } catch (Exception e) { - Log.LogWarningFromException(e, false); + Log.LogErrorFromException(e, false); + return false; } - // HACK - since this is merely producing documentation we do not want it to cause a build to fail if something goes wrong return true; } } diff --git a/src/Pickles/Pickles.PowerShell/Pickles.nuspec b/src/Pickles/Pickles.PowerShell/Pickles.nuspec index 63ab4d9ab..9be18e9ac 100644 --- a/src/Pickles/Pickles.PowerShell/Pickles.nuspec +++ b/src/Pickles/Pickles.PowerShell/Pickles.nuspec @@ -9,10 +9,31 @@ http://www.picklesdoc.com/ false http://apache.org/licenses/LICENSE-2.0.html - Pickles is an open source living documentation generator that works on feature files written in the Gherkin language, popularized in tools like Cucumber and SpecFlow. Pickles can be incorporated into your build process to produce living documenation in a format that is more accessible to your clients. Gherkin language files are written in plain text and stored in your source folder. This can make them inaccessible to clients who may not know how to work with source control or who are not interested in seeing all of the source code, just the features. + + **Pickles** is an open source **living documentation** generator that works on feature files written in the *Gherkin* language, popularized in tools like *Cucumber* and *SpecFlow*. + + *Pickles* can be incorporated into your build process to produce living documentation in a format that is more accessible to your clients. *Gherkin* language files are written in plain text and stored in your source folder. This can make them inaccessible to clients who may not know how to work with source control or who are not interested in seeing all of the source code, just the features. + + *Pickles* can produce output in different formats: + + - Static HTML: a set of HTML files with minimal JavaScript + - Dynamic HTML: a JavaScript-rich single page app with integrated search + - Word: Microsoft Word + - Excel: Microsoft Excel + - JSON: a custom JSON format + + Optionally, *Pickles* can **integrate test results**, so that your stakeholders know which scenarios pass validation. *Pickles* supports these test formats: + + - NUnit + - MSTest + - XUnit + - SpecRun + - Cucumber JSON + A documentation generator for features written in the Gherkin language Copyright © 2010-2012 Jeffrey Cameron, Copyright © 2013-present PicklesDoc and contributors SpecificationByExample BDD SpecFlow Gherkin Cucumber SpecByEx LivingDocumentation Documentation + https://cdn.rawgit.com/picklesdoc/pickles/master/pickles.jpeg diff --git a/src/Pickles/Pickles.UserInterface/MainWindow.xaml b/src/Pickles/Pickles.UserInterface/MainWindow.xaml index af96c40e8..9bb6ca285 100644 --- a/src/Pickles/Pickles.UserInterface/MainWindow.xaml +++ b/src/Pickles/Pickles.UserInterface/MainWindow.xaml @@ -4,7 +4,8 @@ xmlns:mahapps="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro" xmlns:nlogViewer="clr-namespace:NlogViewer;assembly=NlogViewer" Title="Pickles" Height="600" Width="800" Loaded="MetroWindow_Loaded" Closed="MetroWindow_Closed" DataContextChanged="MainWindow_OnDataContextChanged" - DataContext="{Binding Main, Source={StaticResource Locator}}"> + DataContext="{Binding Main, Source={StaticResource Locator}}" + Icon="Pickles.ico"> diff --git a/src/Pickles/Pickles.UserInterface/Pickles.UserInterface.csproj b/src/Pickles/Pickles.UserInterface/Pickles.UserInterface.csproj index d96f378ed..7eab33d60 100644 --- a/src/Pickles/Pickles.UserInterface/Pickles.UserInterface.csproj +++ b/src/Pickles/Pickles.UserInterface/Pickles.UserInterface.csproj @@ -38,6 +38,9 @@ prompt 4 + + Pickles.ico + ..\packages\Autofac.3.5.2\lib\net40\Autofac.dll @@ -131,6 +134,7 @@ True Resources.resx + ResXFileCodeGenerator Resources.Designer.cs diff --git a/src/Pickles/Pickles.UserInterface/Pickles.ico b/src/Pickles/Pickles.UserInterface/Pickles.ico new file mode 100644 index 000000000..4d154e851 Binary files /dev/null and b/src/Pickles/Pickles.UserInterface/Pickles.ico differ diff --git a/src/Pickles/Pickles.sln b/src/Pickles/Pickles.sln index a84ec20aa..e851e80b4 100644 --- a/src/Pickles/Pickles.sln +++ b/src/Pickles/Pickles.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.30110.0 +VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pickles", "Pickles\Pickles.csproj", "{38BAD6E0-78AB-4AC3-91A8-BF72AF5EE394}" EndProject @@ -45,6 +45,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{34E729 .nuget\packages.config = .nuget\packages.config EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuspecs", "nuspecs", "{E1DDC21E-D21E-4B2C-8561-17F630EC8F36}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{52414CCC-E080-4FBF-AA3B-7E0117AE3673}" + ProjectSection(SolutionItems) = preProject + Pickles.CommandLine\Pickles.CommandLine.nuspec = Pickles.CommandLine\Pickles.CommandLine.nuspec + Pickles.MSBuild\Pickles.MSBuild.nuspec = Pickles.MSBuild\Pickles.MSBuild.nuspec + Pickles.PowerShell\Pickles.nuspec = Pickles.PowerShell\Pickles.nuspec + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "chocolatey", "chocolatey", "{632BD477-03C9-4CC6-8840-6723DE75652E}" + ProjectSection(SolutionItems) = preProject + ..\..\chocolatey\pickles.nuspec = ..\..\chocolatey\pickles.nuspec + ..\..\chocolatey\picklesui.nuspec = ..\..\chocolatey\picklesui.nuspec + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -93,6 +108,8 @@ Global {A4EBBB5F-A18D-46D2-9ADE-2B90BD48CEC8} = {4E977674-6919-4F15-A6E3-37BFAC18C7E5} {AD9F6DD1-5C76-45C9-9FF9-DAE37DB7B2D4} = {4E977674-6919-4F15-A6E3-37BFAC18C7E5} {F3768CCA-00C2-4280-9F8D-4585B5E214B1} = {4E977674-6919-4F15-A6E3-37BFAC18C7E5} + {52414CCC-E080-4FBF-AA3B-7E0117AE3673} = {E1DDC21E-D21E-4B2C-8561-17F630EC8F36} + {632BD477-03C9-4CC6-8840-6723DE75652E} = {E1DDC21E-D21E-4B2C-8561-17F630EC8F36} EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution StartupItem = Pickles.CommandLine\Pickles.CommandLine.csproj diff --git a/src/Pickles/Pickles/Resources/Html/css/global.css b/src/Pickles/Pickles/Resources/Html/css/global.css index 6a3462c73..6e7443e27 100644 --- a/src/Pickles/Pickles/Resources/Html/css/global.css +++ b/src/Pickles/Pickles/Resources/Html/css/global.css @@ -1,5 +1,5 @@ /***** Global Settings *****/ - + html, body { border: 0; margin: 0; @@ -7,7 +7,7 @@ html, body { } body { font: 100%/1.25 Arial, Helvetica, sans-serif; } - + /***** Headings *****/ h1, h2, h3, h4, h5, h6 { @@ -32,7 +32,7 @@ h3 { font-size: 1em; font-weight: bold; } - + /***** Common Formatting *****/ p, ul, ol { @@ -78,14 +78,14 @@ strong { em { font-style: oblique; } - + /***** Links *****/ a, a:link, a:visited, a:hover { text-decoration: underline; } - + /***** Forms *****/ form { @@ -102,7 +102,7 @@ textarea { } label { cursor: pointer; } - + /***** Tables *****/ table { @@ -111,15 +111,13 @@ table { padding: 0; } -table tr td { padding: 2px; } - /***** Wrapper *****/ #wrap { margin: 0 auto; width: 960px; } - + /***** Global Classes *****/ .clear { clear: both; } diff --git a/src/Pickles/Pickles/Resources/Html/css/structure.css b/src/Pickles/Pickles/Resources/Html/css/structure.css index b497493db..ace59d8ea 100644 --- a/src/Pickles/Pickles/Resources/Html/css/structure.css +++ b/src/Pickles/Pickles/Resources/Html/css/structure.css @@ -172,12 +172,12 @@ div.description ul { border-collapse: collapse; empty-cells: show; margin: 0 1em 0 1em; - width: 90%; + max-width: 90%; } #feature th, td { border: 1px solid black; - padding: 3px; + padding: 5px 8px; } #feature td { diff --git a/src/Pickles/VersionInfo.cs b/src/Pickles/VersionInfo.cs index 12e00338d..66b4fe8e0 100644 --- a/src/Pickles/VersionInfo.cs +++ b/src/Pickles/VersionInfo.cs @@ -8,10 +8,10 @@ [assembly: AssemblyTrademarkAttribute("")] [assembly: AssemblyCultureAttribute("")] [assembly: ComVisibleAttribute(false)] -[assembly: AssemblyVersionAttribute("0.19.0")] -[assembly: AssemblyFileVersionAttribute("0.19.0")] +[assembly: AssemblyVersionAttribute("0.20.0")] +[assembly: AssemblyFileVersionAttribute("0.20.0")] namespace System { internal static class AssemblyVersionInformation { - internal const string Version = "0.19.0"; + internal const string Version = "0.20.0"; } } diff --git a/testOutput.cmd b/testOutput.cmd deleted file mode 100644 index f46b9da6e..000000000 --- a/testOutput.cmd +++ /dev/null @@ -1 +0,0 @@ -FOR %%A IN (Html Dhtml Word Excel JSON) DO .\deploy\pickles-%1\exe\Pickles.exe -f=.\src\Pickles\Examples\ -o=.\Output\%%A\ --sn=Pickles --sv=%1 --df=%%A diff --git a/testOutput.ps1 b/testOutput.ps1 index a1714bb94..de9b06c46 100644 --- a/testOutput.ps1 +++ b/testOutput.ps1 @@ -2,27 +2,36 @@ $version = $args[0] $formats = @("Html", "Dhtml", "Word", "Excel", "JSON") $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent -foreach ($format in $formats) +Try { - # Setup variables - $FeatureDirectory = $PSScriptRoot + "\src\Pickles\Examples" - $OutputDirectory = $PSScriptRoot + "\Output\" + $format - $DocumentationFormat = $format - $SystemUnderTestName = "Pickles" - $SystemUnderTestVersion = $version - $TestResultsFormat = "" - $TestResultsFile = "" + foreach ($format in $formats) + { + # Setup variables + $FeatureDirectory = $PSScriptRoot + "\src\Pickles\Examples" + $OutputDirectory = $PSScriptRoot + "\Output\" + $format + $DocumentationFormat = $format + $SystemUnderTestName = "Pickles" + $SystemUnderTestVersion = $version + $TestResultsFormat = "" + $TestResultsFile = "" - # Import the Pickles-comandlet - $pathToModule = ".\deploy\pickles-" + $version + "\powershell\PicklesDoc.Pickles.PowerShell.dll" - Import-Module $pathToModule + # Import the Pickles-comandlet + $pathToModule = ".\deploy\pickles-" + $version + "\powershell\PicklesDoc.Pickles.PowerShell.dll" + Import-Module $pathToModule - # Call pickles - Pickle-Features -FeatureDirectory $FeatureDirectory ` - -OutputDirectory $OutputDirectory ` - -DocumentationFormat $DocumentationFormat ` - -SystemUnderTestName $SystemUnderTestName ` - -SystemUnderTestVersion $SystemUnderTestVersion ` - -TestResultsFormat $TestResultsFormat ` - -TestResultsFile $TestResultsFile + # Call pickles + Pickle-Features -FeatureDirectory $FeatureDirectory ` + -OutputDirectory $OutputDirectory ` + -DocumentationFormat $DocumentationFormat ` + -SystemUnderTestName $SystemUnderTestName ` + -SystemUnderTestVersion $SystemUnderTestVersion ` + -TestResultsFormat $TestResultsFormat ` + -TestResultsFile $TestResultsFile + } + + exit 0 +} +Catch +{ + exit 1 } diff --git a/testRunnerCmd.cmd b/testRunnerCmd.cmd new file mode 100644 index 000000000..0c1398094 --- /dev/null +++ b/testRunnerCmd.cmd @@ -0,0 +1,6 @@ +FOR %%A IN (Html Dhtml Word Excel JSON) DO ( +.\deploy\pickles-%1\exe\Pickles.exe -f=.\src\Pickles\Examples\ -o=.\Output\%%A\ --sn=Pickles --sv=%1 --df=%%A +if errorlevel 1 exit /b 1 +) + +exit /b 0 diff --git a/testRunnerMsBuild.cmd b/testRunnerMsBuild.cmd new file mode 100644 index 000000000..9e82180b7 --- /dev/null +++ b/testRunnerMsBuild.cmd @@ -0,0 +1,3 @@ +"\Program Files (x86)\MSBuild\12.0\Bin\MSBuild.exe" testOutput.proj /p:Version=%1 +if errorlevel 1 exit /b 1 +exit /b 0 diff --git a/testRunnerPowerShell.cmd b/testRunnerPowerShell.cmd new file mode 100644 index 000000000..c0b0f5daf --- /dev/null +++ b/testRunnerPowerShell.cmd @@ -0,0 +1,4 @@ +powershell.exe -nologo -noprofile -command "& { .\testOutput.ps1 %1; exit $LastExitCode}" + +if errorlevel 1 exit /b 1 +exit /b 0