Merge pull request #668 from ili101/TestsRebase

Tests improvments and Linux support
dfinke · Aug 29, 2019 · 29efd50 · 29efd50
2 parents a2b322d + 600d951
commit 29efd50
Show file tree

Hide file tree

Showing 42 changed files with 981 additions and 440 deletions.
diff --git a/.gitignore b/.gitignore
@@ -60,7 +60,6 @@ test.xlsx
 testCCFMT.ps1
 testHide.ps1
 ImportExcel.zip
-.vscode/launch.json
 .vscode/settings.json
 
 ~$*
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,56 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "PowerShell",
+            "request": "launch",
+            "name": "PowerShell Pester Tests",
+            "script": "Import-Module -Name '.\\' -Force ; Invoke-Pester", // Change to '.\\ModuleName.psd1' if Git name different
+            "args": [""],
+            "cwd": "${workspaceFolder}"
+        },
+        {
+            "type": "PowerShell",
+            "request": "launch",
+            "name": "PowerShell Launch Current File",
+            "script": "${file}",
+            "args": [],
+            "cwd": "${file}"
+        },
+        {
+            "type": "PowerShell",
+            "request": "launch",
+            "name": "PowerShell Launch Current File in Temporary Console",
+            "script": "${file}",
+            "args": [],
+            "cwd": "${file}",
+            "createTemporaryIntegratedConsole": true
+        },
+        {
+            "type": "PowerShell",
+            "request": "launch",
+            "name": "PowerShell Launch Current File w/Args Prompt",
+            "script": "${file}",
+            "args": [
+                "${command:SpecifyScriptArgs}"
+            ],
+            "cwd": "${file}"
+        },
+        {
+            "type": "PowerShell",
+            "request": "attach",
+            "name": "PowerShell Attach to Host Process",
+            "processId": "${command:PickPSHostProcess}",
+            "runspaceId": 1
+        },
+        {
+            "type": "PowerShell",
+            "request": "launch",
+            "name": "PowerShell Interactive Session",
+            "cwd": ""
+        }
+    ]
+}
diff --git a/compare-worksheet.ps1 → Compare-WorkSheet.ps1 b/compare-worksheet.ps1 → Compare-WorkSheet.ps1
diff --git a/DoTests.ps1 b/DoTests.ps1
diff --git a/Examples/TryMultiplePivotTablesFromOneSheet.ps1 b/Examples/TryMultiplePivotTablesFromOneSheet.ps1
@@ -1,4 +1,4 @@
-Import-Module ..\ImportExcel.psd1 -Force
+try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
 
 $file = "C:\Temp\test.xlsx"
 

diff --git a/Export-StocksToExcel.ps1 b/Export-StocksToExcel.ps1
@@ -5,7 +5,7 @@
         $measure = "Open"
     )
 
-    $xl = "$env:TEMP\Stocks.xlsx"
+    $xl = Join-Path ([IO.Path]::GetTempPath()) 'Stocks.xlsx'
 
     Remove-Item $xl -ErrorAction SilentlyContinue
 

diff --git a/ImportExcel.psm1 b/ImportExcel.psm1
@@ -4,8 +4,8 @@ Add-Type -Path "$($PSScriptRoot)\EPPlus.dll"
 . $PSScriptRoot\AddDataValidation.ps1
 . $PSScriptRoot\Charting.ps1
 . $PSScriptRoot\ColorCompletion.ps1
+. $PSScriptRoot\Compare-WorkSheet.ps1
 . $PSScriptRoot\ConvertExcelToImageFile.ps1
-. $PSScriptRoot\compare-workSheet.ps1
 . $PSScriptRoot\ConvertFromExcelData.ps1
 . $PSScriptRoot\ConvertFromExcelToSQLInsert.ps1
 . $PSScriptRoot\ConvertToExcelXlsx.ps1
@@ -23,16 +23,17 @@ Add-Type -Path "$($PSScriptRoot)\EPPlus.dll"
 . $PSScriptRoot\InferData.ps1
 . $PSScriptRoot\Invoke-Sum.ps1
 . $PSScriptRoot\Join-Worksheet.ps1
-. $PSScriptRoot\Merge-worksheet.ps1
+. $PSScriptRoot\Merge-Worksheet.ps1
 . $PSScriptRoot\New-ConditionalFormattingIconSet.ps1
 . $PSScriptRoot\New-ConditionalText.ps1
 . $PSScriptRoot\New-ExcelChart.ps1
 . $PSScriptRoot\New-PSItem.ps1
 . $PSScriptRoot\Open-ExcelPackage.ps1
 . $PSScriptRoot\Pivot.ps1
 . $PSScriptRoot\PivotTable.ps1
+#. $PSScriptRoot\Plot.ps1
 . $PSScriptRoot\RemoveWorksheet.ps1
-. $PSScriptRoot\Send-SqlDataToExcel.ps1
+. $PSScriptRoot\Send-SQLDataToExcel.ps1
 . $PSScriptRoot\Set-CellStyle.ps1
 . $PSScriptRoot\Set-Column.ps1
 . $PSScriptRoot\Set-Row.ps1
@@ -45,7 +46,7 @@ Add-Type -Path "$($PSScriptRoot)\EPPlus.dll"
 New-Alias -Name Use-ExcelData -Value "ConvertFrom-ExcelData" -Force
 
 if ($PSVersionTable.PSVersion.Major -ge 5) {
-    . $PSScriptRoot\plot.ps1
+    . $PSScriptRoot\Plot.ps1
 
     Function New-Plot {
         [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseShouldProcessForStateChangingFunctions', '', Justification = 'New-Plot does not change system state')]
@@ -59,6 +60,25 @@ else {
     Write-Warning 'PowerShell 5 is required for plot.ps1'
     Write-Warning 'PowerShell Excel is ready, except for that functionality'
 }
+if ($IsLinux -or $IsMacOS) {
+    $ExcelPackage = [OfficeOpenXml.ExcelPackage]::new()
+    $Cells = ($ExcelPackage | Add-WorkSheet).Cells['A1']
+    $Cells.Value = 'Test'
+    try {
+        $Cells.AutoFitColumns()
+    }
+    catch {
+        if ($IsLinux) {
+            Write-Warning -Message 'ImportExcel Module Cannot Autosize. Please run the following command to install dependencies: "sudo apt-get install -y --no-install-recommends libgdiplus libc6-dev"'
+        }
+        if ($IsMacOS) {
+            Write-Warning -Message 'ImportExcel Module Cannot Autosize. Please run the following command to install dependencies: "brew install mono-libgdiplus"'
+        }
+    }
+    finally {
+        $ExcelPackage | Close-ExcelPackage -NoSave
+    }
+}
 #endregion
 function Import-Excel {
     <#