Move sources to new structure

Move files to new structure and merge them into one file during build
helenachi-tsc · Apr 19, 2020 · 6ceec22 · 6ceec22
1 parent aa1ba7c
commit 6ceec22
Show file tree

Hide file tree

Showing 177 changed files with 659 additions and 615 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -177,8 +177,6 @@ DocProject/Help/*.hhp
 DocProject/Help/Html2
 DocProject/Help/html
 
-# Click-Once directory
-publish/
 
 # Publish Web Output
 *.[Pp]ublish.xml

diff --git a/.travis.yml b/.travis.yml
@@ -9,13 +9,13 @@ matrix:
         # - brew tap caskroom/cask
         - brew cask install powershell
     - os: linux
-      dist: trusty
+      dist: bionic
       # VM-based builds turned out to be faster
       sudo: required
       addons:
         apt:
           sources:
-            - sourceline: deb [arch=amd64] https://packages.microsoft.com/ubuntu/14.04/prod trusty main
+            - sourceline: deb [arch=amd64] https://packages.microsoft.com/ubuntu/18.04/prod bionic main
               key_url: https://packages.microsoft.com/keys/microsoft.asc
           packages:
             - powershell

diff --git a/Functions/Coverage.Plugin.ps1 b/Functions/Coverage.Plugin.ps1
diff --git a/Functions/Pester.SafeCommands.ps1 b/Functions/Pester.SafeCommands.ps1
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2011 Scott Muc and Manoj Mahalingam
+Copyright 2020 Pester team
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/README.md b/README.md
@@ -420,12 +420,12 @@ Starting test discovery in 1 files.
 Test discovery finished. 83ms
 [-] minimal output.fails 24ms (18ms|5ms)
  Expected 2, but got 1.
- at 1 | Should -Be 2, C:\Projects\pester\new-runtimepoc\Pester.RSpec.Demo.ts.ps1:289
- at <ScriptBlock>, C:\Projects\pester\new-runtimepoc\Pester.RSpec.Demo.ts.ps1:289
+ at 1 | Should -Be 2, C:\Projects\pester\Pester.RSpec.Demo.ts.ps1:289
+ at <ScriptBlock>, C:\Projects\pester\Pester.RSpec.Demo.ts.ps1:289
 [-] minimal output.child.fails 22ms (16ms|5ms)
  Expected 2, but got 1.
- at 1 | Should -Be 2, C:\Projects\pester\new-runtimepoc\Pester.RSpec.Demo.ts.ps1:298
- at <ScriptBlock>, C:\Projects\pester\new-runtimepoc\Pester.RSpec.Demo.ts.ps1:298
+ at 1 | Should -Be 2, C:\Projects\pester\Pester.RSpec.Demo.ts.ps1:298
+ at <ScriptBlock>, C:\Projects\pester\Pester.RSpec.Demo.ts.ps1:298
 Tests completed in 331ms
 Tests Passed: 4, Failed: 2, Skipped: 0, Total: 6, NotRun: 0
 ```

diff --git a/bin/pester.bat b/bin/pester.bat
diff --git a/build.ps1 b/build.ps1
@@ -0,0 +1,71 @@
+$ErrorActionPreference = 'Stop'
+Get-Module Pester | Remove-Module
+if (Test-Path "$PSScriptRoot/bin") {
+    Remove-Item "$PSScriptRoot/bin" -Recurse -Force
+}
+$null = New-Item "$PSScriptRoot/bin" -ItemType Directory -Force
+
+$script = @(
+    "$PSScriptRoot/src/functions/Pester.SafeCommands.ps1"
+    "$PSScriptRoot/src/Pester.Types.ps1"
+    "$PSScriptRoot/src/Pester.State.ps1"
+    "$PSScriptRoot/src/Pester.Utility.ps1"
+    "$PSScriptRoot/src/Pester.Runtime.psm1"
+    "$PSScriptRoot/src/TypeClass.psm1"
+    "$PSScriptRoot/src/Format.psm1"
+    "$PSScriptRoot/src/Pester.RSpec.ps1"
+    "$PSScriptRoot/src/Pester.ps1"
+
+    "$PSScriptRoot/src/functions/assertions/*"
+    "$PSScriptRoot/src/functions/*"
+
+    "$PSScriptRoot/src/Pester.psm1"
+    # "$PSScriptRoot/src/"
+    # "$PSScriptRoot/src/"
+)
+
+$sb = [System.Text.StringBuilder]""
+foreach ($s in $script) {
+    foreach ($f in Get-ChildItem $s -File) {
+        $lines = Get-Content $f
+
+        $relativePath = ($f.FullName -replace ([regex]::Escape($PSScriptRoot))).TrimStart('\').TrimStart('/')
+        $null = $sb.AppendLine("# file $relativePath")
+        $noBuild = $false
+        foreach ($l in $lines) {
+            if ($l -match "^\s*#\s*if\s*-not\s*build\s*$") {
+                $noBuild = $true
+            }
+
+            if (-not $noBuild) {
+                $null = $sb.AppendLine($l)
+            }
+
+            if ($l -match "#\s*endif\s*$") {
+                $noBuild = $false
+            }
+        }
+    }
+}
+
+$sb.ToString() | Set-Content $PSScriptRoot/bin/Pester.psm1 -Encoding UTF8
+
+
+$content = @(
+    ,("$PSScriptRoot/src/csharp/*.cs","$PSScriptRoot/bin/csharp/")
+    ,("$PSScriptRoot/src/en-US/*.txt","$PSScriptRoot/bin/en-US/")
+    ,("$PSScriptRoot/src/nunit_schema_2.5.xsd", "$PSScriptRoot/bin/")
+    ,("$PSScriptRoot/src/report.dtd", "$PSScriptRoot/bin/")
+    ,("$PSScriptRoot/src/Pester.psd1", "$PSScriptRoot/bin/")
+)
+
+foreach ($c in $content) {
+    $source, $destination = $c
+
+    $null = New-Item -Force $destination -ItemType Directory
+
+    Get-ChildItem $source -File | Copy-Item -Destination $destination
+}
+
+
+Import-Module $PSScriptRoot/bin/Pester.psm1 -ErrorAction Stop
diff --git a/CHANGELOG.md → docs/CHANGELOG.md b/CHANGELOG.md → docs/CHANGELOG.md
diff --git a/Examples/Planets/Get-Planet.Tests.ps1 → docs/Examples/Planets/Get-Planet.Tests.ps1 b/Examples/Planets/Get-Planet.Tests.ps1 → docs/Examples/Planets/Get-Planet.Tests.ps1
diff --git a/Examples/Planets/Get-Planet.ps1 → docs/Examples/Planets/Get-Planet.ps1 b/Examples/Planets/Get-Planet.ps1 → docs/Examples/Planets/Get-Planet.ps1
diff --git a/images/logo.png → docs/images/logo.png b/images/logo.png → docs/images/logo.png
diff --git a/images/pester.PNG → docs/images/pester.PNG b/images/pester.PNG → docs/images/pester.PNG
diff --git a/images/pester_blue_darker.pdf → docs/images/pester_blue_darker.pdf b/images/pester_blue_darker.pdf → docs/images/pester_blue_darker.pdf
diff --git a/images/pester_blue_lighter.pdf → docs/images/pester_blue_lighter.pdf b/images/pester_blue_lighter.pdf → docs/images/pester_blue_lighter.pdf
diff --git a/images/pester_white_with_text.pdf → docs/images/pester_white_with_text.pdf b/images/pester_white_with_text.pdf → docs/images/pester_white_with_text.pdf
diff --git a/images/readme/gitter-64.PNG → docs/images/readme/gitter-64.PNG b/images/readme/gitter-64.PNG → docs/images/readme/gitter-64.PNG
diff --git a/images/readme/jacoco.PNG → docs/images/readme/jacoco.PNG b/images/readme/jacoco.PNG → docs/images/readme/jacoco.PNG
diff --git a/images/readme/minimal-output.gif → docs/images/readme/minimal-output.gif b/images/readme/minimal-output.gif → docs/images/readme/minimal-output.gif
diff --git a/images/readme/output.PNG → docs/images/readme/output.PNG b/images/readme/output.PNG → docs/images/readme/output.PNG
diff --git a/images/readme/pshorg-85x64.PNG → docs/images/readme/pshorg-85x64.PNG b/images/readme/pshorg-85x64.PNG → docs/images/readme/pshorg-85x64.PNG
diff --git a/images/readme/single-test.gif → docs/images/readme/single-test.gif b/images/readme/single-test.gif → docs/images/readme/single-test.gif
diff --git a/images/readme/slack-64.PNG → docs/images/readme/slack-64.PNG b/images/readme/slack-64.PNG → docs/images/readme/slack-64.PNG
diff --git a/images/readme/stack-overflow-64.PNG → docs/images/readme/stack-overflow-64.PNG b/images/readme/stack-overflow-64.PNG → docs/images/readme/stack-overflow-64.PNG
diff --git a/images/readme/twitter-64.PNG → docs/images/readme/twitter-64.PNG b/images/readme/twitter-64.PNG → docs/images/readme/twitter-64.PNG
diff --git a/en-US/RSpec.psd1 b/en-US/RSpec.psd1
diff --git a/new-runtimepoc/Pester.Types.ps1 b/new-runtimepoc/Pester.Types.ps1
diff --git a/Pester.nuspec → publish/Pester.nuspec b/Pester.nuspec → publish/Pester.nuspec
diff --git a/buildNugetPackage.ps1 → publish/buildNugetPackage.ps1 b/buildNugetPackage.ps1 → publish/buildNugetPackage.ps1
diff --git a/buildPSGalleryPackage.ps1 → publish/buildPSGalleryPackage.ps1 b/buildPSGalleryPackage.ps1 → publish/buildPSGalleryPackage.ps1
diff --git a/chocolateyInstall.ps1 → publish/chocolateyInstall.ps1 b/chocolateyInstall.ps1 → publish/chocolateyInstall.ps1
diff --git a/cleanUpBeforeBuild.ps1 → publish/cleanUpBeforeBuild.ps1 b/cleanUpBeforeBuild.ps1 → publish/cleanUpBeforeBuild.ps1
diff --git a/getNugetExe.ps1 → publish/getNugetExe.ps1 b/getNugetExe.ps1 → publish/getNugetExe.ps1
diff --git a/publishPSGalleryPackage.ps1 → publish/publishPSGalleryPackage.ps1 b/publishPSGalleryPackage.ps1 → publish/publishPSGalleryPackage.ps1
diff --git a/release.ps1 → publish/release.ps1 b/release.ps1 → publish/release.ps1
diff --git a/signModule.ps1 → publish/signModule.ps1 b/signModule.ps1 → publish/signModule.ps1
diff --git a/testRelease.ps1 → publish/testRelease.ps1 b/testRelease.ps1 → publish/testRelease.ps1
diff --git a/vendor/packages.config → publish/vendor/packages.config b/vendor/packages.config → publish/vendor/packages.config
diff --git a/vendor/tools/nuget.exe → publish/vendor/tools/nuget.exe b/vendor/tools/nuget.exe → publish/vendor/tools/nuget.exe
diff --git a/Dependencies/Format/Format.psm1 → src/Format.psm1 b/Dependencies/Format/Format.psm1 → src/Format.psm1
@@ -1,4 +1,6 @@
-Import-Module $PSScriptRoot\..\TypeClass\TypeClass.psm1 -DisableNameChecking
+# if -not build
+Import-Module "$PSScriptRoot/TypeClass.psm1" -DisableNameChecking
+# endif
 
 function Format-Collection ($Value, [switch]$Pretty) {
     $Limit = 10
@@ -186,7 +188,7 @@ function Format-Type ([Type]$Value) {
     [string]$Value
 }
 
-
+# if -not build
 Export-ModuleMember -Function @(
     'Format-Collection'
     'Format-Object'
@@ -203,3 +205,4 @@ Export-ModuleMember -Function @(
     'Get-DisplayProperty'
     'Get-ShortType'
 )
+# endif
diff --git a/new-runtimepoc/Pester.RSpec.ps1 → src/Pester.RSpec.ps1 b/new-runtimepoc/Pester.RSpec.ps1 → src/Pester.RSpec.ps1
@@ -284,7 +284,7 @@ function PostProcess-RspecTestRun ($TestRun) {
 }
 
 function Get-RSpecObjectDecoratorPlugin () {
-    Pester.Runtime\New-PluginObject -Name "RSpecObjectDecoratorPlugin" `
+    New-PluginObject -Name "RSpecObjectDecoratorPlugin" `
         -EachTestTeardownEnd {
         param ($Context)
 

diff --git a/new-runtimepoc/Pester.Runtime.psm1 → src/Pester.Runtime.psm1 b/new-runtimepoc/Pester.Runtime.psm1 → src/Pester.Runtime.psm1
@@ -1,7 +1,10 @@
-. $PSScriptRoot\Pester.Utility.ps1
-. $PSScriptRoot\..\Functions\Pester.SafeCommands.ps1
-. $PSScriptRoot\Pester.Types.ps1
+# if -not build
+. "$PSScriptRoot/Pester.Utility.ps1"
+. "$PSScriptRoot/functions/Pester.SafeCommands.ps1"
+. "$PSScriptRoot/Pester.Types.ps1"
+# endif
 
+# instances
 $flags = [System.Reflection.BindingFlags]'Instance,NonPublic'
 $script:SessionStateInternalProperty = [System.Management.Automation.SessionState].GetProperty('Internal', $flags)
 $script:ScriptBlockSessionStateInternalProperty = [System.Management.Automation.ScriptBlock].GetProperty('SessionStateInternal', $flags)
@@ -2538,6 +2541,7 @@ function ConvertTo-HumanTime {
 # initialize internal state
 Reset-TestSuiteState
 
+# if -not build
 Export-ModuleMember -Function @(
     # the core stuff I am mostly sure about
     'Reset-TestSuiteState'
@@ -2574,3 +2578,5 @@ Export-ModuleMember -Function @(
     'New-PluginObject'
     'New-BlockContainerObject'
 )
+
+# endif