Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
* development:
  (GH-71) Implemented cChocoFeature
  (GH-87) Moved to using reduced output
  (maint) formatting
  (GH-70) Apply Apache v2 Licensing
  (GH-85) Pass the source to cChocoPackageInstallerSet correctly
  (GH-44) Pass the Source to choco correctly
  Added version to example
  (GH-77) Push to gallery on new tags
  (maint) formatting
  (GH-72) PowerShell scripts in format for signing
  • Loading branch information
ferventcoder committed Aug 29, 2017
2 parents 52c9d7b + 6b8f5a5 commit aeb501f
Show file tree
Hide file tree
Showing 25 changed files with 1,539 additions and 841 deletions.
3 changes: 2 additions & 1 deletion .gitIgnore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
*.mof
!*.schema.mof
!*.schema.mof
TestsResults.xml
29 changes: 22 additions & 7 deletions AppVeyor/AppVeyorBuild.ps1
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
#---------------------------------#
# Header #
#---------------------------------#
# Copyright (c) 2017 Chocolatey Software, Inc.
# Copyright (c) 2013 - 2017 Lawrence Gripper & original authors/contributors from https://github.com/chocolatey/cChoco
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

#---------------------------------#
# Header #
#---------------------------------#
Write-Host 'Running AppVeyor build script' -ForegroundColor Yellow
Write-Host "ModuleName : $env:ModuleName"
Write-Host "Build version : $env:APPVEYOR_BUILD_VERSION"
Expand All @@ -11,7 +26,7 @@ Write-Host "PSModulePath :"

$env:PSModulePath -split ';'

#---------------------------------#
# BuildScript #
#---------------------------------#
Write-Host 'Nothing to build, skipping.....'
#---------------------------------#
# BuildScript #
#---------------------------------#
Write-Host 'Nothing to build, skipping.....'
35 changes: 25 additions & 10 deletions AppVeyor/AppVeyorDeploy.ps1
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
#---------------------------------#
# Header #
#---------------------------------#
# Copyright (c) 2017 Chocolatey Software, Inc.
# Copyright (c) 2013 - 2017 Lawrence Gripper & original authors/contributors from https://github.com/chocolatey/cChoco
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

#---------------------------------#
# Header #
#---------------------------------#
Write-Host 'Running AppVeyor deploy script' -ForegroundColor Yellow

#---------------------------------#
# Update module manifest #
#---------------------------------#
#---------------------------------#
# Update module manifest #
#---------------------------------#
Write-Host 'Creating new module manifest'

$ModuleManifestPath = Join-Path -path "$pwd" -ChildPath ("$env:ModuleName"+'.psd1')
Expand All @@ -14,11 +29,11 @@ $ModuleManifest = Get-Content $ModuleManifestPath -Raw
Write-Host "Updating module manifest to version: $env:APPVEYOR_BUILD_VERSION"
[regex]::replace($ModuleManifest,'(ModuleVersion = )(.*)',"`$1'$env:APPVEYOR_BUILD_VERSION'") | Out-File -LiteralPath $ModuleManifestPath

#---------------------------------#
# Publish to PS Gallery #
#---------------------------------#
#---------------------------------#
# Publish to PS Gallery #
#---------------------------------#

if ( ($env:APPVEYOR_REPO_NAME -notmatch 'chocolatey') -or ($env:APPVEYOR_REPO_BRANCH -notmatch 'master') )
if ( ($env:APPVEYOR_REPO_NAME -notmatch 'chocolatey') -or (!$env:APPVEYOR_REPO_TAG_NAME) )
{
Write-Host "Finished testing of branch: $env:APPVEYOR_REPO_BRANCH - Exiting"
exit;
Expand Down
51 changes: 33 additions & 18 deletions AppVeyor/AppVeyorInstall.ps1
Original file line number Diff line number Diff line change
@@ -1,35 +1,50 @@
#---------------------------------#
# Header #
#---------------------------------#
# Copyright (c) 2017 Chocolatey Software, Inc.
# Copyright (c) 2013 - 2017 Lawrence Gripper & original authors/contributors from https://github.com/chocolatey/cChoco
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

#---------------------------------#
# Header #
#---------------------------------#
Write-Host 'Running AppVeyor install script' -ForegroundColor Yellow

#---------------------------------#
# Install NuGet #
#---------------------------------#
#---------------------------------#
# Install NuGet #
#---------------------------------#
Write-Host 'Installing NuGet PackageProvide'
$pkg = Install-PackageProvider -Name NuGet -Force -ErrorAction Stop
Write-Host "Installed NuGet version '$($pkg.version)'"
Write-Host "Installed NuGet version '$($pkg.version)'"

#---------------------------------#
# Install Modules #
#---------------------------------#
#---------------------------------#
# Install Modules #
#---------------------------------#
[version]$ScriptAnalyzerVersion = '1.8.1'
Install-Module -Name 'PSScriptAnalyzer' -Repository PSGallery -Force -ErrorAction Stop -MaximumVersion $ScriptAnalyzerVersion
Install-Module -Name 'Pester','xDSCResourceDesigner' -Repository PSGallery -Force -ErrorAction Stop

#---------------------------------#
# Update PSModulePath #
#---------------------------------#
#---------------------------------#
# Update PSModulePath #
#---------------------------------#
Write-Host 'Updating PSModulePath for DSC resource testing'
$env:PSModulePath = $env:PSModulePath + ";" + "C:\projects"

#---------------------------------#
# Validate #
#---------------------------------#
#---------------------------------#
# Validate #
#---------------------------------#
$RequiredModules = 'PSScriptAnalyzer','Pester','xDSCResourceDesigner'
$InstalledModules = Get-Module -Name $RequiredModules -ListAvailable
if ( ($InstalledModules.count -lt $RequiredModules.Count) -or ($Null -eq $InstalledModules)) {
if ( ($InstalledModules.count -lt $RequiredModules.Count) -or ($Null -eq $InstalledModules)) {
throw "Required modules are missing."
} else {
Write-Host 'All modules required found' -ForegroundColor Green
}
}
37 changes: 26 additions & 11 deletions AppVeyor/AppVeyorTest.ps1
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
#---------------------------------#
# Header #
#---------------------------------#
# Copyright (c) 2017 Chocolatey Software, Inc.
# Copyright (c) 2013 - 2017 Lawrence Gripper & original authors/contributors from https://github.com/chocolatey/cChoco
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

#---------------------------------#
# Header #
#---------------------------------#
Write-Host 'Running AppVeyor test script' -ForegroundColor Yellow
Write-Host "Current working directory: $pwd"

#---------------------------------#
# Run Pester Tests #
#---------------------------------#
#---------------------------------#
# Run Pester Tests #
#---------------------------------#
$resultsFile = '.\TestsResults.xml'
$testFiles = Get-ChildItem "$pwd\tests" | Where-Object {$_.FullName -match 'Tests.ps1$'} | Select-Object -ExpandProperty FullName
$results = Invoke-Pester -Script $testFiles -OutputFormat NUnitXml -OutputFile $resultsFile -PassThru
Expand All @@ -18,11 +33,11 @@ try {
throw "Upload failed."
}

#---------------------------------#
# Validate #
#---------------------------------#
if (($results.FailedCount -gt 0) -or ($results.PassedCount -eq 0) -or ($null -eq $results)) {
#---------------------------------#
# Validate #
#---------------------------------#
if (($results.FailedCount -gt 0) -or ($results.PassedCount -eq 0) -or ($null -eq $results)) {
throw "$($results.FailedCount) tests failed."
} else {
Write-Host 'All tests passed' -ForegroundColor Green
}
}
148 changes: 148 additions & 0 deletions DSCResources/cChocoFeature/cChocoFeature.psm1
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
# Copyright (c) 2017 Chocolatey Software, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

<#
.Description
Returns the configuration for cChocoFeature.
.Example
Get-TargetResource -FeatureName allowGlobalConfirmation -Ensure 'Present'
#>
function Get-TargetResource
{
[CmdletBinding()]
[OutputType([System.Collections.Hashtable])]
param
(
[parameter(Mandatory = $true)]
[System.String]
$FeatureName,

[ValidateSet('Present','Absent')]
[System.String]
$Ensure='Present'
)

Write-Verbose "Starting cChocoFeature Get-TargetResource - Feature Name: $FeatureName, Ensure: $Ensure"

$returnValue = @{
FeatureName = $FeatureName
Ensure = $Ensure
}

$returnValue

}

<#
.Description
Performs the set for the cChocoFeature resource.
.Example
Get-TargetResource -FeatureName allowGlobalConfirmation -Ensure 'Present'
#>
function Set-TargetResource
{
[CmdletBinding(SupportsShouldProcess=$true)]
param
(
[parameter(Mandatory = $true)]
[System.String]
$FeatureName,

[ValidateSet('Present','Absent')]
[string]
$Ensure='Present'
)


Write-Verbose "Starting cChocoFeature Set-TargetResource - Feature Name: $FeatureName, Ensure: $Ensure."

if ($pscmdlet.ShouldProcess("Choco feature $FeatureName will be ensured $Ensure."))
{
if ($Ensure -eq 'Present')
{
Write-Verbose "Enabling choco feature $FeatureName."
choco feature enable -n $FeatureName
}
else
{
Write-Verbose "Disabling choco feature $FeatureName."
choco feature disable -n $FeatureName
}
}

}

<#
.Description
Performs the test for cChocoFeature.
.Example
Test-TargetResource -FeatureName allowGlobalConfirmation -Ensure 'Present'
#>
function Test-TargetResource
{
[CmdletBinding()]
[OutputType([System.Boolean])]
param
(
[parameter(Mandatory = $true)]
[System.String]
$FeatureName,

[ValidateSet('Present','Absent')]
[System.String]
$Ensure='Present'
)

Write-Verbose "Starting cChocoFeature Test-TargetResource - Feature Name: $FeatureName, Ensure: $Ensure."

$result = $false
$feature = Get-ChocoFeature -FeatureName $FeatureName | Where-Object {$_.State -eq "Enabled"}

if (($Ensure -eq 'Present' -and ([bool]$feature)) -or ($Ensure -eq 'Absent' -and !([bool]$feature)))
{
Write-Verbose "Test-TargetResource is true, $FeatureName is $Ensure."
$result = $true
}
else
{
Write-Verbose "Test-TargetResource is false, $FeatureName is not $Ensure."
}

return $result

}

<#
.Description
Query chocolatey features.
#>
function Get-ChocoFeature
{
[OutputType([PSCustomObject])]
param(
[string]
$FeatureName
)
choco feature -r | ConvertFrom-Csv -Delimiter "|" -Header Name, State, Description | Where-Object {$_.Name -eq $FeatureName}
}




Export-ModuleMember -Function *-TargetResource

8 changes: 8 additions & 0 deletions DSCResources/cChocoFeature/cChocoFeature.schema.mof
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

[ClassVersion("1.0.0.0"), FriendlyName("cChocoFeature")]
class cChocoFeature : OMI_BaseResource
{
[Key] String FeatureName;
[Write,ValueMap{"Present", "Absent"},Values{"Present", "Absent"}] String Ensure;
};

Loading

0 comments on commit aeb501f

Please sign in to comment.