diff --git a/ImportExcel.psd1 b/ImportExcel.psd1 index 26f996f..ba42b13 100644 --- a/ImportExcel.psd1 +++ b/ImportExcel.psd1 @@ -3,25 +3,25 @@ RequiredAssemblies = @('.\EPPlus.dll') # Script module or binary module file associated with this manifest. - RootModule = 'ImportExcel.psm1' + RootModule = 'ImportExcel.psm1' # Version number of this module. - ModuleVersion = '6.5.3' + ModuleVersion = '7.0.0' # ID used to uniquely identify this module - GUID = '60dd4136-feff-401a-ba27-a84458c57ede' + GUID = '60dd4136-feff-401a-ba27-a84458c57ede' # Author of this module - Author = 'Douglas Finke' + Author = 'Douglas Finke' # Company or vendor of this module - CompanyName = 'Doug Finke' + CompanyName = 'Doug Finke' # Copyright statement for this module - Copyright = 'c 2019 All rights reserved.' + Copyright = 'c 2019 All rights reserved.' # Description of the functionality provided by this module - Description = @' + Description = @' PowerShell module to import/export Excel spreadsheets, without Excel. Check out the How To Videos https://www.youtube.com/watch?v=U3Ne_yX4tYo&list=PL5uoqS92stXioZw-u-ze_NtvSo0k0K0kq '@ @@ -60,7 +60,7 @@ Check out the How To Videos https://www.youtube.com/watch?v=U3Ne_yX4tYo&list=PL5 # NestedModules = @() # Functions to export from this module - FunctionsToExport = @( + FunctionsToExport = @( 'Add-ConditionalFormatting', 'Add-ExcelChart', 'Add-ExcelDataValidationRule', @@ -132,7 +132,7 @@ Check out the How To Videos https://www.youtube.com/watch?v=U3Ne_yX4tYo&list=PL5 #VariablesToExport = '*' # Aliases to export from this module - AliasesToExport = @( + AliasesToExport = @( 'Convert-XlRangeToImage' 'New-ExcelChart', 'Set-Column', @@ -145,7 +145,7 @@ Check out the How To Videos https://www.youtube.com/watch?v=U3Ne_yX4tYo&list=PL5 # ModuleList = @() # List of all files packaged with this module - FileList = @( + FileList = @( '.\EPPlus.dll', '.\Export-charts.ps1', '.\GetExcelTable.ps1', @@ -160,12 +160,12 @@ Check out the How To Videos https://www.youtube.com/watch?v=U3Ne_yX4tYo&list=PL5 '.\InferData\InferData.ps1', '.\Pivot\Pivot.ps1', '.\spikes\ConvertFrom-ExcelColumnName.ps1', - '.\Examples', '.\images', '.\Testimonials' ,'.\Public' , ".\Private" + '.\Examples', '.\images', '.\Testimonials' , '.\Public' ) # Private data to pass to the module specified in RootModule/ModuleToProcess - PrivateData = @{ + PrivateData = @{ # PSData is module packaging and gallery metadata embedded in PrivateData # It's for rebuilding PowerShellGet (and PoshCode) NuGet-style packages # We had to do this because it's the only place we're allowed to extend the manifest diff --git a/ImportExcel.psm1 b/ImportExcel.psm1 index ec49780..2ae628a 100644 --- a/ImportExcel.psm1 +++ b/ImportExcel.psm1 @@ -1,11 +1,11 @@ #region import everything we need -$culture= $host.CurrentCulture.Name -replace '-\w*$','' +$culture = $host.CurrentCulture.Name -replace '-\w*$', '' Import-LocalizedData -UICulture $culture -BindingVariable Strings -FileName Strings -ErrorAction Ignore if (-not $Strings) { Import-LocalizedData -UICulture "en" -BindingVariable Strings -FileName Strings -ErrorAction Ignore } -try {[void] [System.Reflection.Assembly]::LoadWithPartialName("System.Drawing")} -catch {Write-Warning -Message $Strings.SystemDrawingAvaialable} +try { [void] [System.Reflection.Assembly]::LoadWithPartialName("System.Drawing") } +catch { Write-Warning -Message $Strings.SystemDrawingAvaialable } foreach ($directory in @('Private', 'Public','Charting','InferData','Pivot')) { Get-ChildItem -Path "$PSScriptRoot\$directory\*.ps1" | ForEach-Object {. $_.FullName} @@ -42,15 +42,21 @@ if (($IsLinux -or $IsMacOS) -or $env:NoAutoSize) { catch { $env:NoAutoSize = $true if ($IsLinux) { - Write-Warning -Message ('ImportExcel Module Cannot Autosize. Please run the following command to install dependencies:' + [environment]::newline + - '"sudo apt-get install -y --no-install-recommends libgdiplus libc6-dev"') + $msg = @" +ImportExcel Module Cannot Autosize. Please run the following command to install dependencies: +apt-get -y update && apt-get install -y --no-install-recommends libgdiplus libc6-dev +"@ + Write-Warning -Message $msg } if ($IsMacOS) { - Write-Warning -Message ('ImportExcel Module Cannot Autosize. Please run the following command to install dependencies:' + [environment]::newline + - '"brew install mono-libgdiplus"') + $msg = @" +ImportExcel Module Cannot Autosize. Please run the following command to install dependencies: +brew install mono-libgdiplus +"@ + Write-Warning -Message $msg + } + finally { + $ExcelPackage | Close-ExcelPackage -NoSave } } - finally { - $ExcelPackage | Close-ExcelPackage -NoSave - } -} +} \ No newline at end of file diff --git a/README.md b/README.md index dba7450..95e4fc6 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,16 @@ Plus, wiring the [PowerShell ScriptAnalyzer Excel report](https://github.com/dfi ![](./images/ScriptAnalyzerReport.png) +# What's new 7.0.0 +## Refactor + +- Remove all functions from the `psm1` +- Move functions into public subdirectory +- Align TDD and continuous integration workflow for this refactor +- Move help from functions to mdHelp and use [PlatyPS](https://www.powershellgallery.com/packages/platyPS) to generate external help file + +Thanks to [James O'Neill](https://twitter.com/jamesoneill) for the refactor and [Illy](https://twitter.com/ili_z) on the continuous integration. + # What's new 6.5.3 Thanks again to the community for making this module even better.