Skip to content

Commit e918ff5

Browse files
committed
0.1.4 release
1 parent e7184cc commit e918ff5

23 files changed

Lines changed: 59 additions & 57 deletions

.vscode/tasks.json

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,39 +34,41 @@
3434
"suppressTaskName": true,
3535
"isBuildCommand": true,
3636
"args": [
37-
"${workspaceRoot}\\Build.ps1"
37+
"${workspaceRoot}\\Build.ps1"
3838
]
3939
},
4040
{
4141
"taskName": "Build, Install, and Load Module",
4242
"suppressTaskName": true,
4343
"isBuildCommand": true,
4444
"args": [
45-
"Invoke-Build -Task BuildInstallAndTestModule"
46-
]
45+
"Invoke-Build -Task BuildInstallAndTestModule"
46+
],
47+
"problemMatcher": []
4748
},
4849
{
4950
"taskName": "Build, Install, Load, and Publish Module",
5051
"suppressTaskName": true,
5152
"isBuildCommand": true,
5253
"args": [
53-
"Invoke-Build -Task BuildInstallTestAndPublishModule"
54-
]
54+
"Invoke-Build -Task BuildInstallTestAndPublishModule"
55+
],
56+
"problemMatcher": []
5557
},
5658
{
5759
"taskName": "Install and Load Module",
5860
"suppressTaskName": true,
5961
"isBuildCommand": true,
6062
"args": [
61-
"Invoke-Build -Task InstallAndTestModule"
63+
"Invoke-Build -Task InstallAndTestModule"
6264
]
6365
},
6466
{
6567
"taskName": "Publish to PSGallery",
6668
"suppressTaskName": true,
6769
"isBuildCommand": true,
6870
"args": [
69-
"Invoke-Build -Task PublishPSGallery"
71+
"Invoke-Build -Task PublishPSGallery"
7072
]
7173
},
7274
{
@@ -95,7 +97,9 @@
9597
"problemMatcher": [
9698
{
9799
"owner": "powershell",
98-
"fileLocation": ["absolute"],
100+
"fileLocation": [
101+
"absolute"
102+
],
99103
"severity": "error",
100104
"pattern": [
101105
{
@@ -111,5 +115,5 @@
111115
}
112116
]
113117
}
114-
]
118+
]
115119
}

ModuleBuild.build.ps1

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -635,10 +635,11 @@ task CreateReadTheDocsYML -if {$Script:BuildEnv.OptionGenerateReadTheDocs} Confi
635635

636636
$DocsReleasePath = Join-Path $Script:BuildEnv.BaseReleaseFolder $Script:BuildEnv.ModuleToBuild
637637
$ProjectDocsPath = Join-Path $BuildRoot 'docs'
638-
638+
$ProjectFunctionDocsPath = Join-Path $ProjectDocsPath 'Functions'
639639
$YMLFile = Join-Path $BuildRoot 'mkdocs.yml'
640640

641641
if (-not (Test-Path $YMLFile)) {
642+
# If the yml file doesn't exist then go ahead and create it from scratch
642643
$Pages = @()
643644

644645
$RTDFolders = Get-ChildItem -Path $ProjectDocsPath -Directory | Sort-Object -Property Name
@@ -671,11 +672,11 @@ task CreateReadTheDocsYML -if {$Script:BuildEnv.OptionGenerateReadTheDocs} Confi
671672
copyright = "$($Script:BuildEnv.ModuleToBuild) is licensed under this <a href='$($Script:BuildEnv.ModuleWebsite)/blob/master/License.md'> license"
672673
pages = $Pages
673674
}
674-
675675
$RTD | ConvertTo-Yaml | Out-File -Encoding $Script:BuildEnv.Encoding -FilePath $YMLFile -Force
676+
676677
}
677678
else {
678-
Write-Warning "Skipping ReadTheDocs manifest file creation as it already exists. Please remove the following file if you want it to be regenerated: $YMLFile"
679+
Write-Warning 'The mkdocs.yml file already exists. If you want this regenerated you will need to delete it first.'
679680
}
680681
}
681682

ModuleBuild.psd1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Zachary Loeber
55
#
6-
# Generated on: 7/8/2017
6+
# Generated on: 7/11/2017
77
#
88

99
@{
@@ -12,7 +12,7 @@
1212
RootModule = 'ModuleBuild.psm1'
1313

1414
# Version number of this module.
15-
ModuleVersion = '0.1.4'
15+
ModuleVersion = '0.1.5'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()
@@ -107,7 +107,7 @@ PrivateData = @{
107107
IconUri = 'https://github.com/zloeber/ModuleBuild/raw/master/src/other/powershell-project.png'
108108

109109
# ReleaseNotes of this module
110-
ReleaseNotes = '0.1.4 release'
110+
ReleaseNotes = '0.1.5 release'
111111

112112
# External dependent modules of this module
113113
# ExternalModuleDependencies = ''

build/docs/Additional/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,4 @@ Project Site: [https://github.com/zloeber/ModuleBuild](https://github.com/zloebe
5555

5656
## Version 0.1.4
5757
- Fixed invalid mkdocs.yml license link reference
58+
- Fixed invalid reference to acknowledgements folder in plaster manifest (thanks Roberto Desideri!)

build/docs/ReadTheDocs/Introduction/Introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Firstly, this module uses everything it creates in its own build process. Since
1919

2020
Aside from the handful of helper functions there is an included 'plaster' folder that includes a customized version of the module of the same name and a manifest folder named ModuleBuild. This ModuleBuild folder contains a scaffold directory structure used to create your projects. The questions asked as well as the actions taken when copying over the scaffold folder items are both contained in the root of the plaster directory in 'plastercontent.ps1' and 'plasterparameters.ps1' and are made into the plaster manifest file at build time.
2121

22-
The scaffolding itself is mostly a big invoke-build script and does not need the ModuleBuild module to perform build tasks.
22+
The scaffolding itself is mostly a big invoke-build script and does not need the ModuleBuild loaded to perform build tasks.
2323

2424
## Folder Structure
2525
A default ModuleBuild project scaffold will look like the following for a project named 'ModuleName' with build version 0.0.1 sucessfully built.

build/docs/ReadTheDocs/Usage/7 - Project Documentation.md

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Keeping documentation updated for your project comes in two forms with the modul
66

77
Your module documentation also comes in a few different forms and locations that are important to know ahead of time.
88

9-
1. **Project documentation** - This is the docs folder at the root of your project. This is fully generated from your build/docs folder at each build. Also, your function documentation gets dropped in here.
9+
1. **Project documentation** - This is the docs folder at the root of your project. This is fully generated from your build\docs folder and automatically from PlatyPS at each build.
1010
2. **Module documentation (distributed)** - This is packaged within your module release docs folder. This is essentially just a trimmed down version of your project documentation that only includes your module function documentation and little else. This is used to create your downloadable documentation (a cab file) and is also used as a point in time documentation for specific versions of your module.
1111
3. **Module documentation (downloadable)** - This is distributed with the module in the en-US folder and includes the local cab/zip/xml files for local module help.
1212

@@ -45,11 +45,19 @@ If you have a large project with little CBH this can be a good way to kickstart
4545

4646
>**NOTE:** This process requires you to copy the resulting files back into your project to be of any use.
4747
48-
## ReadTheDocs.net Integration
49-
If you have enabled readthedocs.net integration in the ModuleBuild configuration then a mkdocs.yml file will get updated automatically at the root of your project directory. It is up to you to setup the integration between your github.com account and readthedocs.net for this to be of any use in your project. When setting up your project at the ReadTheDocs website remember to set the advanced settings for 'mkdocs' processing.
48+
## Generic Documentation
49+
Most of your documentation will come from two sources, the auto-generated function markdown that PlatyPS spits out and the build\docs\Additional folder.
5050

51-
The ReadTheDocs manifest file gets generated from the folder structure in .\build\docs\ReadTheDocs. Each subfolder becomes a category with each markdown document within becoming a specific page within it.
51+
## ReadTheDocs.org Integration
52+
If you have enabled readthedocs.org integration in the ModuleBuild configuration then a mkdocs.yml file will get updated automatically at the root of your project directory. It is up to you to setup the integration between your github.com account and readthedocs.org for this to be of any use in your project. When setting up your project at the ReadTheDocs website remember to set the advanced settings for 'mkdocs' processing.
53+
54+
### ReadTheDocs YAML Configuration
55+
The ReadTheDocs manifest file gets generated from three locations:
56+
57+
1. The folder structure in .\build\docs\ReadTheDocs - Each subfolder becomes a category with each markdown document within becoming a specific page within it.
58+
2. The markdown files in .\build\docs\Additional - Each file is placed at the root of your pages section in the finished yaml file.
59+
3. Markdown files auto-generated by PlatyPS for each function. These get copied over to docs\Functions at every build.
5260

5361
Beware that the order of the pages in this manifest file can be rather random. You will want to update the file to suit your needs (and then possibly disable readthedocs integration within your ModuleBuild config file so it doesn't revert the next build you run).
5462

55-
**mkdocs.yml needs to be manually removed if you want it to be regenerated**
63+
**mkdocs.yml needs to be manually removed if you want it to be entirely regenerated**

docs/ChangeLog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,7 @@ Project Site: [https://github.com/zloeber/ModuleBuild](https://github.com/zloebe
5252
## Version 0.1.3
5353
- Fixes to mkdocs.yml formatting
5454
- Fixed temp build directory exclusion in .gitignore file
55+
56+
## Version 0.1.4
57+
- Fixed invalid mkdocs.yml license link reference
58+
- Fixed invalid reference to acknowledgements folder in plaster manifest (thanks Roberto Desideri!)

docs/Introduction/Introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Firstly, this module uses everything it creates in its own build process. Since
1919

2020
Aside from the handful of helper functions there is an included 'plaster' folder that includes a customized version of the module of the same name and a manifest folder named ModuleBuild. This ModuleBuild folder contains a scaffold directory structure used to create your projects. The questions asked as well as the actions taken when copying over the scaffold folder items are both contained in the root of the plaster directory in 'plastercontent.ps1' and 'plasterparameters.ps1' and are made into the plaster manifest file at build time.
2121

22-
The scaffolding itself is mostly a big invoke-build script and does not need the ModuleBuild module to perform build tasks.
22+
The scaffolding itself is mostly a big invoke-build script and does not need the ModuleBuild loaded to perform build tasks.
2323

2424
## Folder Structure
2525
A default ModuleBuild project scaffold will look like the following for a project named 'ModuleName' with build version 0.0.1 sucessfully built.

docs/Usage/7 - Project Documentation.md

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Keeping documentation updated for your project comes in two forms with the modul
66

77
Your module documentation also comes in a few different forms and locations that are important to know ahead of time.
88

9-
1. **Project documentation** - This is the docs folder at the root of your project. This is fully generated from your build/docs folder at each build. Also, your function documentation gets dropped in here.
9+
1. **Project documentation** - This is the docs folder at the root of your project. This is fully generated from your build\docs folder and automatically from PlatyPS at each build.
1010
2. **Module documentation (distributed)** - This is packaged within your module release docs folder. This is essentially just a trimmed down version of your project documentation that only includes your module function documentation and little else. This is used to create your downloadable documentation (a cab file) and is also used as a point in time documentation for specific versions of your module.
1111
3. **Module documentation (downloadable)** - This is distributed with the module in the en-US folder and includes the local cab/zip/xml files for local module help.
1212

@@ -45,11 +45,19 @@ If you have a large project with little CBH this can be a good way to kickstart
4545

4646
>**NOTE:** This process requires you to copy the resulting files back into your project to be of any use.
4747
48-
## ReadTheDocs.net Integration
49-
If you have enabled readthedocs.net integration in the ModuleBuild configuration then a mkdocs.yml file will get updated automatically at the root of your project directory. It is up to you to setup the integration between your github.com account and readthedocs.net for this to be of any use in your project. When setting up your project at the ReadTheDocs website remember to set the advanced settings for 'mkdocs' processing.
48+
## Generic Documentation
49+
Most of your documentation will come from two sources, the auto-generated function markdown that PlatyPS spits out and the build\docs\Additional folder.
5050

51-
The ReadTheDocs manifest file gets generated from the folder structure in .\build\docs\ReadTheDocs. Each subfolder becomes a category with each markdown document within becoming a specific page within it.
51+
## ReadTheDocs.org Integration
52+
If you have enabled readthedocs.org integration in the ModuleBuild configuration then a mkdocs.yml file will get updated automatically at the root of your project directory. It is up to you to setup the integration between your github.com account and readthedocs.org for this to be of any use in your project. When setting up your project at the ReadTheDocs website remember to set the advanced settings for 'mkdocs' processing.
53+
54+
### ReadTheDocs YAML Configuration
55+
The ReadTheDocs manifest file gets generated from three locations:
56+
57+
1. The folder structure in .\build\docs\ReadTheDocs - Each subfolder becomes a category with each markdown document within becoming a specific page within it.
58+
2. The markdown files in .\build\docs\Additional - Each file is placed at the root of your pages section in the finished yaml file.
59+
3. Markdown files auto-generated by PlatyPS for each function. These get copied over to docs\Functions at every build.
5260

5361
Beware that the order of the pages in this manifest file can be rather random. You will want to update the file to suit your needs (and then possibly disable readthedocs integration within your ModuleBuild config file so it doesn't revert the next build you run).
5462

55-
**mkdocs.yml needs to be manually removed if you want it to be regenerated**
63+
**mkdocs.yml needs to be manually removed if you want it to be entirely regenerated**

mkdocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use_directory_urls: false
22
site_author: Zachary Loeber
3-
copyright: ModuleBuild is licensed under the <a href='https://github.com/zloeber/ModuleBuild/blob/master/License.md'> license"
3+
copyright: ModuleBuild is licensed under the following <a href='https://github.com/zloeber/ModuleBuild/blob/master/License.md'> license"
44
theme: readthedocs
55
site_name: ModuleBuild Docs
66
pages:

0 commit comments

Comments
 (0)