Merge pull request #57 from StartAutomating/EZOutUpdates

Ez out updates
StartAutomating · Jul 26, 2022 · ba0a9dc · ba0a9dc
2 parents ae4744e + 293cf98
commit ba0a9dc
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 105 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.8.8:
+* Write-EZFormatFile generates scripts that output files.  Fixes #56 and #43.
+---
+
 ## 1.8.7:
 * Out-FormatData: Now supports -Debug (#46)
 * Format-YAML: Fixing Indentation (#49)

diff --git a/EZOut.ezformat.ps1 b/EZOut.ezformat.ps1
@@ -1,32 +1,39 @@
-#requires -Module EZOut
+#requires -Module EZOut
 #  Install-Module EZOut or https://github.com/StartAutomating/EZOut
 $myFile = $MyInvocation.MyCommand.ScriptBlock.File
-$myModuleName = $($myFile | Split-Path -Leaf) -replace '\.ezformat\.ps1', ''
+$myModuleName = 'EZOut'
 $myRoot = $myFile | Split-Path
+Push-Location $myRoot
 $formatting = @(
-    # Write-FormatView
-<#    Write-FormatTreeView -TypeName System.IO.FileInfo, System.IO.DirectoryInfo -Branch ([char]9500 + [char]9472 + [char]9472) -Property Name -HasChildren {
-            if (-not $_.EnumerateFiles) { return $false }
-            foreach ($f in $_.EnumerateFiles()) {$f;break}
-        },
-        {
-            if (-not $_.EnumerateDirectories) { return $false }
-            foreach ($f in $_.EnumerateDirectories()) {$f;break}
-        } -Children {
-            $_.EnumerateFiles()
-        }, {
-            foreach ($d in $_.EnumerateDirectories()) {
-                if ($d.Attributes -band 'Hidden') { continue }
-                $d
-            }
-        }
-#>
-    Join-Path $myRoot Formatting | Import-FormatView -FilePath { $_ }
+    # Add your own Write-FormatView here,
+    # or put them in a Formatting or Views directory
+    foreach ($potentialDirectory in 'Formatting','Views') {
+        Join-Path $myRoot $potentialDirectory |
+            Get-ChildItem -ea ignore |
+            Import-FormatView -FilePath {$_.Fullname}
+    }
 )
-$myFormatFile = Join-Path $myRoot "$myModuleName.format.ps1xml"
-$formatting | Out-FormatData -ModuleName EZOut | Set-Content -Path $myFormatFile -Encoding UTF8
+
+$destinationRoot = $myRoot
+
+if ($formatting) {
+    $myFormatFile = Join-Path $destinationRoot "$myModuleName.format.ps1xml"
+    $formatting | Out-FormatData -Module $MyModuleName | Set-Content $myFormatFile -Encoding UTF8
+    Get-Item $myFormatFile
+}
+
 $types = @(
-    # Write-TypeView
+    # Add your own Write-TypeView statements here
+    # or declare them in the 'Types' directory
+    Join-Path $myRoot Types |
+        Get-Item -ea ignore |
+        Import-TypeView
+
 )
-$myTypesFile = Join-Path $myRoot "$myModuleName.types.ps1xml"
-$types | Out-TypeData | Set-Content $myTypesFile -Encoding UTF8
+
+if ($types) {
+    $myTypesFile = Join-Path $destinationRoot "$myModuleName.types.ps1xml"
+    $types | Out-TypeData | Set-Content $myTypesFile -Encoding UTF8
+    Get-Item $myTypesFile
+}
+Pop-Location
diff --git a/EZOut.format.ps1xml b/EZOut.format.ps1xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-16"?>
-<!-- Generated with EZOut 1.8.6: Install-Module EZOut or https://github.com/StartAutomating/EZOut -->
+<!-- Generated with EZOut 1.8.8: Install-Module EZOut or https://github.com/StartAutomating/EZOut -->
 <Configuration>
   <SelectionSets>
     <SelectionSet>

diff --git a/EZOut.psd1 b/EZOut.psd1
@@ -1,6 +1,6 @@
 @{
     ModuleToProcess = 'EZOut.psm1'
-    ModuleVersion = '1.8.7'
+    ModuleVersion = '1.8.8'
     GUID = 'cef786f0-8a0b-4a5d-a2c6-b433095354cd'
     Author = 'James Brundage'
     CompanyName = 'Start-Automating'
@@ -42,6 +42,10 @@
 
             Tags = '.ps1xml', 'Format','Output','Types', 'Colorized'
             ReleaseNotes = @'
+## 1.8.8:
+* Write-EZFormatFile generates scripts that output files.  Fixes #56 and #43.
+---
+
 ## 1.8.7:
 * Out-FormatData: Now supports -Debug (#46)
 * Format-YAML: Fixing Indentation (#49)

diff --git a/README.md b/README.md
@@ -1,48 +1,10 @@
-
-EzOut [1.8.6]
-=============
-Easily Author Rich Format Files to Customize PowerShell Output
---------------------------------------------------------------
-### Commands
-|Verb     |Noun                |
-|---------|--------------------|
-|Add      |FormatData          |
-|Add      |TypeData            |
-|Clear    |FormatData          |
-|Clear    |TypeData            |
-|ConvertTo|PropertySet         |
-|Find     |FormatView          |
-|Format   |Heatmap             |
-|Format   |Markdown            |
-|Format   |Object              |
-|Format   |RichText            |
-|Format   |YAML                |
-|Get      |EZOutExtension      |
-|Get      |FormatFile          |
-|Get      |PropertySet         |
-|Import   |FormatView          |
-|Import   |TypeView            |
-|Out      |FormatData          |
-|Out      |TypeData            |
-|Remove   |FormatData          |
-|Remove   |TypeData            |
-|Write    |EZFormatFile        |
-|Write    |FormatControl       |
-|Write    |FormatCustomView    |
-|Write    |FormatListView      |
-|Write    |FormatTableView     |
-|Write    |FormatTreeView      |
-|Write    |FormatView          |
-|Write    |FormatViewExpression|
-|Write    |FormatWideView      |
-|Write    |PropertySet         |
-|Write    |TypeView            |
 ### Installing EZOut
 
 You can install EZOut from the PowerShell Gallery.  Simply:
 ~~~PowerShell
 Install-Module EZOut -AllowClobber -Scope CurrentUser
 ~~~
+
 ### Understanding PowerShell Formatting
 
 Unlike many languages, PowerShell has a formatting engine built into the box.  

diff --git a/Write-EZFormatFile.ps1 b/Write-EZFormatFile.ps1
@@ -59,6 +59,7 @@ $destinationRoot = $_MyDestination
 if ($formatting) {
     $myFormatFile = Join-Path $destinationRoot "$myModuleName.format.ps1xml"
     $formatting | Out-FormatData -Module $MyModuleName | Set-Content $myFormatFile -Encoding UTF8
+    Get-Item $myFormatFile
 }
 
 $types = @(
@@ -73,6 +74,7 @@ $types = @(
 if ($types) {
     $myTypesFile = Join-Path $destinationRoot "$myModuleName.types.ps1xml"
     $types | Out-TypeData | Set-Content $myTypesFile -Encoding UTF8
+    Get-Item $myTypesFile
 }
 Pop-Location
 '@

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.8.8:
+* Write-EZFormatFile generates scripts that output files.  Fixes #56 and #43.
+---
+
 ## 1.8.7:
 * Out-FormatData: Now supports -Debug (#46)
 * Format-YAML: Fixing Indentation (#49)

diff --git a/docs/README.md b/docs/README.md
@@ -1,48 +1,10 @@
-
-EzOut [1.8.6]
-=============
-Easily Author Rich Format Files to Customize PowerShell Output
---------------------------------------------------------------
-### Commands
-|Verb     |Noun                |
-|---------|--------------------|
-|Add      |FormatData          |
-|Add      |TypeData            |
-|Clear    |FormatData          |
-|Clear    |TypeData            |
-|ConvertTo|PropertySet         |
-|Find     |FormatView          |
-|Format   |Heatmap             |
-|Format   |Markdown            |
-|Format   |Object              |
-|Format   |RichText            |
-|Format   |YAML                |
-|Get      |EZOutExtension      |
-|Get      |FormatFile          |
-|Get      |PropertySet         |
-|Import   |FormatView          |
-|Import   |TypeView            |
-|Out      |FormatData          |
-|Out      |TypeData            |
-|Remove   |FormatData          |
-|Remove   |TypeData            |
-|Write    |EZFormatFile        |
-|Write    |FormatControl       |
-|Write    |FormatCustomView    |
-|Write    |FormatListView      |
-|Write    |FormatTableView     |
-|Write    |FormatTreeView      |
-|Write    |FormatView          |
-|Write    |FormatViewExpression|
-|Write    |FormatWideView      |
-|Write    |PropertySet         |
-|Write    |TypeView            |
 ### Installing EZOut
 
 You can install EZOut from the PowerShell Gallery.  Simply:
 ~~~PowerShell
 Install-Module EZOut -AllowClobber -Scope CurrentUser
 ~~~
+
 ### Understanding PowerShell Formatting
 
 Unlike many languages, PowerShell has a formatting engine built into the box.