[fix] 0.4.1 #2

mazzy-ax · Jan 8, 2019 · 5bf3078 · 5bf3078
1 parent f87b94d
commit 5bf3078
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to the [project](https://github.com/mazzy-ax/Update-Lbi) will be documented in this file. See also <https://github.com/mazzy-ax/Update-Lbi/releases>.
 
+## [0.4.1](https://github.com/mazzy-ax/Update-Lbi/compare/v0.4.0...v0.4.1) - 2019-01-08
+
+* Fix bug #2 with extra space
+
 ## [0.4.0](https://github.com/mazzy-ax/Update-Lbi/compare/v0.3.0...v0.4.0) - 2018-05-12
 
 * The directory structure reorganized to remove media, examples and tests from nuget downloads and powershell gallery

diff --git a/Tests/TestData/Library/testdiv.lbi b/Tests/TestData/Library/testdiv.lbi
@@ -1,4 +1,5 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <div>
- div content
+ div line 1
+ div line 2
 </div>
diff --git a/Tests/TestData/index.expected b/Tests/TestData/index.expected
@@ -1,9 +1,10 @@
 <html>
 <body>
  <p>some text content with <!-- #BeginLibraryItem "/Library/onliner.lbi" --><span>onliner!</span><!-- #EndLibraryItem -->.</p>
- anoter text<!-- #BeginLibraryItem "/Library/testdiv.lbi" -->
+ another text<!-- #BeginLibraryItem "/Library/testdiv.lbi" -->
  <div>
- div content
+ div line 1
+ div line 2
  </div>
  <!-- #EndLibraryItem -->
 </body>

diff --git a/Tests/TestData/index.html b/Tests/TestData/index.html
@@ -1,6 +1,6 @@
 <html>
 <body>
  <p>some text content with <!-- #BeginLibraryItem "/Library/onliner.lbi" -->is it updated from lbi-file?<!-- #EndLibraryItem -->.</p>
- anoter text<!-- #BeginLibraryItem "/Library/testdiv.lbi" -->is it indented?<!-- #EndLibraryItem -->
+ another text<!-- #BeginLibraryItem "/Library/testdiv.lbi" -->is it indented?<!-- #EndLibraryItem -->
 </body>
 </html>
diff --git a/Tests/TestData/test.expected b/Tests/TestData/test.expected
@@ -1,10 +1,20 @@
 <!-- html fragment -->
+
+ <!-- #BeginLibraryItem "/Library/testdiv.lbi" -->
+ <div>
+ div line 1
+ div line 2
+ </div>
+ <!-- #EndLibraryItem -->
+
  more <!-- #BeginLibraryItem "/Library/testdiv.lbi" -->
  <div>
- div content
+ div line 1
+ div line 2
  </div>
  <!-- #EndLibraryItem --><!-- #BeginLibraryItem "/Library/testdiv.lbi" -->
  <div>
- div content
+ div line 1
+ div line 2
  </div>
- <!-- #EndLibraryItem -->
+ <!-- #EndLibraryItem -->
diff --git a/Tests/TestData/test.html b/Tests/TestData/test.html
@@ -1,2 +1,7 @@
 <!-- html fragment -->
- more <!-- #BeginLibraryItem "/Library/testdiv.lbi" -->is it indented?<!-- #EndLibraryItem --><!-- #BeginLibraryItem "/Library/testdiv.lbi" -->is it indented?<!-- #EndLibraryItem -->
+
+ <!-- #BeginLibraryItem "/Library/testdiv.lbi" -->
+ multiline with ident after whitespace lines
+ <!-- #EndLibraryItem -->
+
+ more <!-- #BeginLibraryItem "/Library/testdiv.lbi" -->is it indented?<!-- #EndLibraryItem --><!-- #BeginLibraryItem "/Library/testdiv.lbi" -->is it indented?<!-- #EndLibraryItem -->
diff --git a/Tests/Update-Lbi.Tests.ps1 b/Tests/Update-Lbi.Tests.ps1
@@ -4,7 +4,7 @@ $moduleName = Split-Path $moduleRoot -Leaf
 
 $assets = "$projectRoot\Tests\TestData"
 
-#Import-Module $moduleRoot -Force
+Import-Module $moduleRoot -Force
 
 Describe $moduleName -Tags Run, UnitTest, UT {
 

diff --git a/Update-Lbi.nuspec b/Update-Lbi.nuspec
@@ -3,23 +3,17 @@
  <metadata>
  <id>update-lbi</id>
  <title>update-Lbi</title>
- <version>0.4.0</version>
+ <version>0.4.1</version>
  <authors>Sergey Mazurkin</authors>
- <licenseUrl>https://github.com/mazzy-ax/Update-Lbi/blob/master/LICENSE</licenseUrl>
+ <license type="expression">MIT</license>
  <projectUrl>https://github.com/mazzy-ax/Update-Lbi</projectUrl>
  <iconUrl>https://github.com/mazzy-ax/Update-Lbi/blob/master/Media/Update-Lbi-icon.png?raw=true</iconUrl>
  <requireLicenseAcceptance>false</requireLicenseAcceptance>
- <description>Powershell cmdlet updates Dreamweaver library items (LBI) within html-files.</description>
+ <description>Powershell advanced function updates Dreamweaver library items (LBI) within html-files.</description>
  <releaseNotes>
-## 0.4.0
+## 0.4.1
 
-* The directory structure reorganized to remove media, examples and tests from nuget downloads and powershell gallery
-* Cmdlets extracted to separate files
-* The list of public cmdlets changed. Public cmdlets are: Update-Lbi, Read-Lbi, Reset-LbiCache. Other cmdlets are internal
-* A required version changed from 3.0 to 5.0 because a 'class' used
-* Project meta info tests added
-* The name of the cmdlet Update-LbiItems changed to Update-LbiItem due psScriptAnalyzer recommendations
-* Readme and typo cleared
+* Fix bug #2 with extra space
  </releaseNotes>
  <tags>dreamweaver library lbi html</tags>
  </metadata>

diff --git a/Update-Lbi/Classes/Classes.ps1 b/Update-Lbi/Classes/Classes.ps1
@@ -17,7 +17,7 @@ Class HtmlFragment {
  }
 
  [String]LastLineIndent([String]$PreviousIndent = '') {
- if ( $this.Value -match '(?<indent>\n\s*)(?:.*)$' ) {
+ if ( $this.Value -match '(?<indent>\n[\t ]*)(?:.*)$' ) {
  return $Matches['indent']
  }
 

diff --git a/Update-Lbi/Update-Lbi.psd1 b/Update-Lbi/Update-Lbi.psd1
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,6 +1,6 @@
 # See http:https://www.appveyor.com/docs/appveyor-yml for many more options
 
-version: 0.4.0.{build}
+version: 0.4.1.{build}
 
 only_commits:
  files: