Release v3.0

lipkau · Mar 23, 2019 · 99f3ba9 · 99f3ba9
2 parents 1b101ef + 0680b85
commit 99f3ba9
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 20 deletions.
diff --git a/PSIni/Functions/Add-IniComment.ps1 b/PSIni/Functions/Add-IniComment.ps1
@@ -1,4 +1,3 @@
-Set-StrictMode -Version Latest
 Function Add-IniComment {
     <#
     .Synopsis

diff --git a/PSIni/Functions/Get-IniContent.ps1 b/PSIni/Functions/Get-IniContent.ps1
@@ -1,5 +1,4 @@
-Set-StrictMode -Version Latest
-Function Get-IniContent {
+Function Get-IniContent {
     <#
     .Synopsis
         Gets the content of an INI file
@@ -88,7 +87,9 @@ Function Get-IniContent {
 
         Write-Verbose "$($MyInvocation.MyCommand.Name):: Function started"
 
-        $commentRegex = "^([$($CommentChar -join '')].*)$"
+        $commentRegex = "^\s*([$($CommentChar -join '')].*)$"
+        $sectionRegex = "^\s*\[(.+)\]\s*$"
+        $keyRegex     = "^\s*(.+?)\s*=\s*(['`"]?)(.*)\2\s*$"
 
         Write-Debug ("commentRegex is {0}." -f $commentRegex)
     }
@@ -97,6 +98,7 @@ Function Get-IniContent {
         Write-Verbose "$($MyInvocation.MyCommand.Name):: Processing file: $Filepath"
 
         $ini = New-Object System.Collections.Specialized.OrderedDictionary([System.StringComparer]::OrdinalIgnoreCase)
+        #$ini = @{}
 
         if (!(Test-Path $Filepath)) {
             Write-Verbose ("Warning: `"{0}`" was not found." -f $Filepath)
@@ -105,7 +107,7 @@ Function Get-IniContent {
 
         $commentCount = 0
         switch -regex -file $FilePath {
-            "^\s*\[(.+)\]\s*$" {
+            $sectionRegex {
                 # Section
                 $section = $matches[1]
                 Write-Verbose "$($MyInvocation.MyCommand.Name):: Adding section : $section"
@@ -133,13 +135,13 @@ Function Get-IniContent {
 
                 continue
             }
-            "(.+?)\s*=\s*(.*)" {
+            $keyRegex {
                 # Key
                 if (!(test-path "variable:local:section")) {
                     $section = $script:NoSection
                     $ini[$section] = New-Object System.Collections.Specialized.OrderedDictionary([System.StringComparer]::OrdinalIgnoreCase)
                 }
-                $name, $value = $matches[1..2]
+                $name, $value = $matches[1, 3]
                 Write-Verbose "$($MyInvocation.MyCommand.Name):: Adding key $name with value: $value"
                 if (-not $ini[$section][$name]) {
                     $ini[$section][$name] = $value

diff --git a/PSIni/Functions/Out-IniFile.ps1 b/PSIni/Functions/Out-IniFile.ps1
@@ -1,4 +1,3 @@
-Set-StrictMode -Version Latest
 Function Out-IniFile {
     <#
     .Synopsis

diff --git a/PSIni/Functions/Remove-IniComment.ps1 b/PSIni/Functions/Remove-IniComment.ps1
@@ -1,4 +1,3 @@
-Set-StrictMode -Version Latest
 Function Remove-IniComment {
     <#
     .Synopsis

diff --git a/PSIni/Functions/Remove-IniEntry.ps1 b/PSIni/Functions/Remove-IniEntry.ps1
@@ -1,4 +1,3 @@
-Set-StrictMode -Version Latest
 Function Remove-IniEntry {
     <#
     .Synopsis

diff --git a/PSIni/Functions/Set-IniContent.ps1 b/PSIni/Functions/Set-IniContent.ps1
@@ -1,4 +1,3 @@
-Set-StrictMode -Version Latest
 Function Set-IniContent {
     <#
     .Synopsis

diff --git a/PSIni/PsIni.psd1 b/PSIni/PsIni.psd1
@@ -4,21 +4,14 @@
 # Generated by: Oliver Lipkau
 #
 # Generated on: 5/3/2013
-# Revisions:
-#   2015-06-01 - CB - incremented ModuleVersion to match .psm1 file
-#   2015-06-18 - OL - Migrate to semantic versioning (GitHub issue#4)
-#   2015-07-14 - OL - Merge Pull Request #7
-#   2015-10-14 - OL - Multiple improvments
-#   2016-08-11 - SS - Added Comment, Uncomment, Remove and Update functions
-#   2016-12-13 - OL - release 1.2
 
 @{
 
     # Script module or binary module file associated with this manifest
     RootModule             = 'PsIni.psm1'
 
     # Version number of this module.
-    ModuleVersion          = '2.0.0'
+    ModuleVersion          = '3.0.0'
 
     # ID used to uniquely identify this module
     GUID                   = '98e1dc0f-2f03-4ca1-98bb-fd7b4b6ac652'

diff --git a/appveyor.yml b/appveyor.yml
@@ -15,7 +15,7 @@ environment:
     PSGalleryAPIKey:
         secure: s9Uw6gnBI2xdDYtpJE5m8C3eDvrXBDGO/abptsu9NCtCrdxoU/N+3YfjffOTysw+
 
-version: 2.0.{build}
+version: 3.0.{build}
 
 # Don't rebuild when I tag a release on GitHub
 skip_tags: true