Merge branch 'main' into update-manifest

Author: ethanbergstrom

CHANGELOG.md

@@ -4,5 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.0.2] - 2023-01-22
+#### Fixed
+Source management error handling no longer references missing function
+
 ## [0.0.1] - 2023-01-21
 Initial release

src/AnyPackage.Chocolatey.psd1

@@ -1,6 +1,6 @@
 @{
 	RootModule = 'AnyPackage.Chocolatey.psm1'
-	ModuleVersion = '0.0.1'
+	ModuleVersion = '0.0.2'
 	CompatiblePSEditions = @('Desktop', 'Core')
 	GUID = '070f2b8f-c7db-4566-9296-2f7cc9146bf0'
 	Author = 'Ethan Bergstrom'

src/private/Find-ChocoPackage.ps1

@@ -14,11 +14,7 @@ function Find-ChocoPackage {
 				# Found the matched registered source
 				$Request.Source
 			} else {
-				ThrowError -ExceptionName 'System.ArgumentException' `
-				-ExceptionMessage ($LocalizedData.PackageSourceNotFound -f ($Request.Source)) `
-				-ErrorId 'PackageSourceNotFound' `
-				-ErrorCategory InvalidArgument `
-				-ExceptionObject $Request.Source
+				throw 'The specified source is not registered with the package provider.'
 			}
 		} else {
 			# User did not specify a source. Now what?
@@ -30,10 +26,7 @@ function Find-ChocoPackage {
 				$DefaultPackageSource
 			} else {
 				# If the default assumed source is not present and no source specified, we can't guess what the user wants - throw an exception
-				ThrowError -ExceptionName 'System.ArgumentException' `
-				-ExceptionMessage $LocalizedData.UnspecifiedSource `
-				-ErrorId 'UnspecifiedSource' `
-				-ErrorCategory InvalidArgument
+				throw 'Multiple non-default sources are defined, but no source was specified. Source could not be determined.'
 			}
 		}
 	)

src/private/Get-ChocoPackage.ps1

@@ -19,6 +19,6 @@ function Get-ChocoPackage {
 	# Filter results by any name and version requirements
 	# We apply additional package name filtering when using wildcards to make Chocolatey's wildcard behavior more PowerShell-esque
 	Foil\Get-ChocoPackage @chocoParams |
-		Where-Object {-Not $Request.Name -Or ($Request.IsMatch($_.Name))} |
+		Where-Object {$Request.IsMatch($_.Name)} |
 			Where-Object {-Not $Request.Version -Or (([NuGet.Versioning.VersionRange]$Request.Version).Satisfies($_.Version))}
 }

test/AnyPackage.Chocolatey.Unit.Tests.ps1

@@ -144,7 +144,7 @@ Describe 'version filters' {
 	}
 }
 
-Describe "error handling on Chocolatey failures" {
+Describe "error handling" {
 	Context 'package installation' {
 		BeforeAll {
 			$package = 'googlechrome'
@@ -172,4 +172,35 @@ Describe "error handling on Chocolatey failures" {
 			{Uninstall-Package -Name $package -ErrorAction Stop -WarningAction SilentlyContinue} | Should -Throw
 		}
 	}
+
+	Context 'ambiguous sources' {
+		BeforeAll {
+			$package = 'cpu-z'
+			$defaultSource = 'chocolatey'
+			$chocoSource = Get-PackageSource -name $defaultSource | Select-Object -ExpandProperty Location
+			Get-PackageSource | Unregister-PackageSource
+			@('test1','test2') | Register-PackageSource -Location $chocoSource -Provider Chocolatey
+		}
+
+		It 'refuses to find packages when the specified source does not exist' {
+			{Find-Package -Name $package -Source $defaultSource -ErrorAction Stop} | Should -Throw 'The specified source is not registered with the package provider.'
+		}
+
+		It 'refuses to install packages when the specified source does not exist' {
+			{Install-Package -Name $package -Source $defaultSource -ErrorAction Stop} | Should -Throw 'The specified source is not registered with the package provider.'
+		}
+
+		It 'refuses to find packages when multiple custom sources are defined and no source specified' {
+			{Find-Package -Name $package -ErrorAction Stop} | Should -Throw 'Multiple non-default sources are defined, but no source was specified. Source could not be determined.'
+		}
+
+		It 'refuses to install packages when multiple custom sources are defined and no source specified' {
+			{Install-Package -Name $package -ErrorAction Stop} | Should -Throw 'Multiple non-default sources are defined, but no source was specified. Source could not be determined.'
+		}
+
+		AfterAll {
+			Get-PackageSource | Unregister-PackageSource
+			Register-PackageSource -Name $defaultSource -Location $chocoSource -Provider Chocolatey
+		}
+	}
 }