Merge branch 'master' of github.com:fsprojects/Paket

fsprojects · Nov 14, 2023 · 6bcb14e · 6bcb14e
2 parents a4c4589 + 7749ea3
commit 6bcb14e
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 31 deletions.
diff --git a/completion/README.fish.md b/completion/README.fish.md
@@ -0,0 +1,9 @@
+# Paket shell completion for [fish](https://fishshell.com)
+
+## Installation
+Download and place the completion file in your fish completions directory
+```fish
+$ set target "$HOME/.config/fish/completions/paket.fish"
+$ curl --fail --location --proto-redir -all,https --output "$target" \
+  https://raw.githubusercontent.com/fsprojects/Paket/master/completion/paket-completion.fish
+```
diff --git a/completion/README.md b/completion/README.md
@@ -5,3 +5,5 @@ Currently we provide completion for the following shells:
 * [bash](README.bash.md) *-- currently only implements Paket subcommand
   completion (e.g. `add`, `auto-restore`, ...)*
 * [zsh](README.zsh.md)
+* [fish](README.fish.md) *-- currently only implements Paket subcommand
+  completion (e.g. `add`, `auto-restore`, ...)*
diff --git a/completion/paket-completion.fish b/completion/paket-completion.fish
@@ -0,0 +1,43 @@
+complete --command paket --exclusive --condition __fish_use_subcommand --arguments add
+complete --command paket --exclusive --condition __fish_use_subcommand --arguments auto-restore
+complete --command paket --exclusive --condition __fish_use_subcommand --arguments clear-cache
+complete --command paket --exclusive --condition __fish_use_subcommand --arguments config
+complete --command paket --exclusive --condition __fish_use_subcommand --arguments convert-from-nuget
+complete --command paket --exclusive --condition __fish_use_subcommand --arguments find-package-versions
+complete --command paket --exclusive --condition __fish_use_subcommand --arguments find-packages
+complete --command paket --exclusive --condition __fish_use_subcommand --arguments find-refs
+complete --command paket --exclusive --condition __fish_use_subcommand --arguments generate-load-scripts
+complete --command paket --exclusive --condition __fish_use_subcommand --arguments init
+complete --command paket --exclusive --condition __fish_use_subcommand --arguments install
+complete --command paket --exclusive --condition __fish_use_subcommand --arguments outdated
+complete --command paket --exclusive --condition __fish_use_subcommand --arguments pack
+complete --command paket --exclusive --condition __fish_use_subcommand --arguments push
+complete --command paket --exclusive --condition __fish_use_subcommand --arguments remove
+complete --command paket --exclusive --condition __fish_use_subcommand --arguments restore
+complete --command paket --exclusive --condition __fish_use_subcommand --arguments show-groups
+complete --command paket --exclusive --condition __fish_use_subcommand --arguments show-installed-packages
+complete --command paket --exclusive --condition __fish_use_subcommand --arguments simplify
+complete --command paket --exclusive --condition __fish_use_subcommand --arguments update
+complete --command paket --exclusive --condition __fish_use_subcommand --arguments why
+
+
+complete --command paket --exclusive --long help
+complete --command paket --long log-file
+complete --command paket --long silent
+complete --command paket --long verbose
+complete --command paket --exclusive --long version
+
+
+complete -c paket -A -f -n '__fish_seen_subcommand_from add' --long clean-redirects
+complete -c paket -A -f -n '__fish_seen_subcommand_from add' --long create-new-binding-files
+complete -c paket -A -f -n '__fish_seen_subcommand_from add' --long force
+complete -c paket -A -f -n '__fish_seen_subcommand_from add' --long group
+complete -c paket -A -f -n '__fish_seen_subcommand_from add' --long interactive
+complete -c paket -A -f -n '__fish_seen_subcommand_from add' --long keep-major
+complete -c paket -A -f -n '__fish_seen_subcommand_from add' --long keep-minor
+complete -c paket -A -f -n '__fish_seen_subcommand_from add' --long keep-patch
+complete -c paket -A -f -n '__fish_seen_subcommand_from add' --long no-install
+complete -c paket -A -f -n '__fish_seen_subcommand_from add' --long project
+complete -c paket -A -f -n '__fish_seen_subcommand_from add' --long redirects
+complete -c paket -A -f -n '__fish_seen_subcommand_from add' --long touch-affected-refs
+complete -c paket -A -f -n '__fish_seen_subcommand_from add' --long version
diff --git a/src/Paket.Core/Dependencies/NuGetCache.fs b/src/Paket.Core/Dependencies/NuGetCache.fs
@@ -645,20 +645,20 @@ type UrlToTry =
 type BlockedCacheEntry =
     { BlockedFormats : string list }
 
-let private tryUrlOrBlacklistI =
-    let tryUrlOrBlacklistInner (f : unit -> Async<obj>, isOk : obj -> bool) cacheKey =
+let private tryUrlOrIgnoreI =
+    let tryUrlOrIgnoreInner (f : unit -> Async<obj>, isOk : obj -> bool) cacheKey =
         async {
             //try
             let! res = f ()
             return isOk res, res
         }
-    let memoizedBlackList = memoizeAsyncEx tryUrlOrBlacklistInner
+    let memoizedIgnoreList = memoizeAsyncEx tryUrlOrIgnoreInner
     fun f isOk cacheKey ->
-            memoizedBlackList (f, isOk) cacheKey
+            memoizedIgnoreList (f, isOk) cacheKey
 
-let private tryUrlOrBlacklist (f: _ -> Async<'a>) (isOk : 'a -> bool) (source:NuGetSource, id:UrlId) =
+let private tryUrlOrIgnore (f: _ -> Async<'a>) (isOk : 'a -> bool) (source:NuGetSource, id:UrlId) =
     let res =
-        tryUrlOrBlacklistI
+        tryUrlOrIgnoreI
             (fun s -> async { let! r = f s in return box r })
             (fun s -> isOk (s :?> 'a))
             (source,id)
@@ -669,15 +669,15 @@ let private tryUrlOrBlacklist (f: _ -> Async<'a>) (isOk : 'a -> bool) (source:Nu
 
 type QueryResult = Choice<ODataSearchResult,System.Exception>
 
-let tryAndBlacklistUrl doBlackList doWarn (source:NuGetSource)
+let tryAndIgnoreUrl doIgnore doWarn (source:NuGetSource)
     (tryAgain : QueryResult -> bool) (f : string -> Async<QueryResult>) (urls: UrlToTry list) : Async<QueryResult>=
     async {
         let! tasks, resultIndex =
             urls
             |> Seq.map (fun url -> async {
                 let cached =
-                    if doBlackList then
-                        tryUrlOrBlacklist (fun () -> async { return! f url.InstanceUrl }) (tryAgain >> not) (source, url.UrlId)
+                    if doIgnore then
+                        tryUrlOrIgnore (fun () -> async { return! f url.InstanceUrl }) (tryAgain >> not) (source, url.UrlId)
                     else
                         async {
                             let! result = f url.InstanceUrl
@@ -690,12 +690,12 @@ let tryAndBlacklistUrl doBlackList doWarn (source:NuGetSource)
                         let! result = f url.InstanceUrl
                         return Choice1Of3 result
                     else
-                        return Choice3Of3 () // Url Blacklisted
+                        return Choice3Of3 () // Url Ignored
                 | FirstCall task ->
                     let! isOk, res = task |> Async.AwaitTask
                     if not isOk then
                         if doWarn then
-                            traceWarnIfNotBefore url.InstanceUrl "Possible Performance degradation, blacklist '%s'" url.InstanceUrl
+                            traceWarnIfNotBefore url.InstanceUrl "Possible Performance degradation, ignore '%s'" url.InstanceUrl
                         return Choice2Of3 res
                     else
                         return Choice1Of3 res
@@ -736,5 +736,5 @@ let tryAndBlacklistUrl doBlackList doWarn (source:NuGetSource)
                 | Some res -> res
                 | None ->
                     let urls = urls |> Seq.map (fun u -> u.InstanceUrl) |> fun s -> String.Join("\r\t - ", s)
-                    failwithf "All possible sources are already blacklisted. \r\t - %s" urls
+                    failwithf "All possible sources are already ignored. \r\t - %s" urls
     }
diff --git a/src/Paket.Core/Dependencies/NuGetV2.fs b/src/Paket.Core/Dependencies/NuGetV2.fs
@@ -263,7 +263,7 @@ let parseODataEntryDetails (url,nugetURL,packageName:PackageName,version:SemVerI
 
 
 let getDetailsFromNuGetViaODataFast isVersionAssumed nugetSource (packageName:PackageName) (version:SemVerInfo) =
-    let doBlacklist = not isVersionAssumed
+    let doIgnore = not isVersionAssumed
     async {
         let normalizedVersion = version.Normalize()
         let urls =
@@ -377,7 +377,7 @@ let getDetailsFromNuGetViaODataFast isVersionAssumed nugetSource (packageName:Pa
             | Choice1Of2 _ -> false
             | _ -> true
 
-        let! result = NuGetCache.tryAndBlacklistUrl doBlacklist true nugetSource tryAgain handleUrl urls
+        let! result = NuGetCache.tryAndIgnoreUrl doIgnore true nugetSource tryAgain handleUrl urls
         match result with
         | Choice1Of2 res -> return res
         | Choice2Of2 ex -> return raise (exn("error", ex))

diff --git a/src/Paket.Core/Installation/InstallProcess.fs b/src/Paket.Core/Installation/InstallProcess.fs
@@ -75,7 +75,7 @@ let findPackageFolder root (groupName,packageName) (version,settings) =
             failwithf "Package directory for package %O was not found in %s. Storage mode is \"none\"." packageName d.FullName
         d
 
-let contentFileBlackList : list<FileInfo -> bool> = [
+let contentFileIgnoreList : list<FileInfo -> bool> = [
     fun f -> f.Name = "_._"
     fun f -> f.Name.EndsWith ".transform"
     fun f -> f.Name.EndsWith ".pp"
@@ -112,7 +112,7 @@ let processContentFiles root project (usedPackages:Map<_,_>) gitRemoteItems opti
             |> Seq.toList
 
         let copyContentFiles (project : ProjectFile, packagesWithContent) =
-            let onBlackList (fi : FileInfo) = contentFileBlackList |> List.exists (fun rule -> rule(fi))
+            let onIgnoreList (fi : FileInfo) = contentFileIgnoreList |> List.exists (fun rule -> rule(fi))
 
             let rec copyDirContents (fromDir : DirectoryInfo, contentCopySettings, toDir : Lazy<DirectoryInfo>) =
                 fromDir.GetDirectories() |> Array.toList
@@ -121,7 +121,7 @@ let processContentFiles root project (usedPackages:Map<_,_>) gitRemoteItems opti
                     (fromDir.GetFiles()
                         |> Array.toList
                         |> List.filter (fun file ->
-                            if onBlackList file then false else
+                            if onIgnoreList file then false else
                             if file.Name = "paket.references" then traceWarnfn "You can't use paket.references as a content file in the root of a project. Please take a look at %s" file.FullName; false else true)
                         |> List.map (fun file ->
                             let overwrite = contentCopySettings = ContentCopySettings.Overwrite

diff --git a/src/Paket.Core/PaketConfigFiles/InstallModel.fs b/src/Paket.Core/PaketConfigFiles/InstallModel.fs
@@ -837,7 +837,7 @@ module InstallModel =
             let targetsFile = t.Path
             (String.endsWithIgnoreCase (sprintf "%s.props" installModel.PackageName.Name) targetsFile||
              String.endsWithIgnoreCase (sprintf "%s.targets" installModel.PackageName.Name) targetsFile)))
-    let filterBlackList = filterUnknownFiles
+    let filterIgnoreList = filterUnknownFiles
 
     let applyFrameworkRestrictions (restriction:FrameworkRestriction) (installModel:InstallModel) =
         match restriction with
@@ -960,7 +960,7 @@ module InstallModel =
     let createFromContent packageName packageVersion kind frameworkRestrictions content =
         emptyModel packageName packageVersion kind
         |> addNuGetFiles content
-        |> filterBlackList
+        |> filterIgnoreList
         |> applyFrameworkRestrictions frameworkRestrictions
         |> removeIfCompletelyEmpty
 
@@ -972,7 +972,7 @@ module InstallModel =
         |> addAnalyzerFiles analyzerFiles
         |> addPackageLoadScriptFiles packageLoadScriptFiles
         |> addFrameworkAssemblyReferences nuspec.FrameworkAssemblyReferences
-        |> filterBlackList
+        |> filterIgnoreList
         |> applyFrameworkRestrictions frameworkRestrictions
         |> removeIfCompletelyEmpty
         |> addLicense nuspec.LicenseUrl
@@ -1052,7 +1052,7 @@ type InstallModel with
 
     member this.AddFrameworkAssemblyReferences references = InstallModel.addFrameworkAssemblyReferences references this
 
-    member this.FilterBlackList () = InstallModel.filterBlackList this
+    member this.FilterIgnoreList () = InstallModel.filterIgnoreList this
 
     member this.FilterExcludes excludes = InstallModel.filterExcludes excludes this
 

diff --git a/tests/Paket.Tests/InstallModel/ProcessingSpecs.fs b/tests/Paket.Tests/InstallModel/ProcessingSpecs.fs
@@ -297,10 +297,10 @@ let ``should skip buckets which contain placeholder while adjusting upper versio
         |> Seq.map (fun f -> f.Path) |> shouldNotContain @"..\Rx-Main\lib\net20\Rx.dll"
 
 [<Test>]
-let ``should filter _._ when processing blacklist``() = 
+let ``should filter _._ when processing ignore list``() = 
     let model = 
         emptymodel.AddReferences([ @"..\Rx-Main\lib\net40\_._"; @"..\Rx-Main\lib\net20\_._" ] |> fromLegacyList @"..\Rx-Main\")
-            .FilterBlackList()
+            .FilterIgnoreList()
 
     model.GetLegacyReferences(TargetProfile.SinglePlatform (DotNetFramework FrameworkVersion.V2))
         |> Seq.map (fun f -> f.Path) |> shouldNotContain @"..\Rx-Main\lib\net20\_._"
@@ -406,7 +406,7 @@ let ``should handle lib install of Microsoft.BCL for NET >= 40``() =
               @"..\Microsoft.Bcl\lib\net40\System.Threading.Tasks.dll"
 
               @"..\Microsoft.Bcl\lib\net45\_._" ] |> fromLegacyList @"..\Microsoft.Bcl\")
-              .FilterBlackList()
+              .FilterIgnoreList()
 
     model.GetLegacyReferences(TargetProfile.SinglePlatform (DotNetFramework FrameworkVersion.V3_5))
         |> Seq.map (fun f -> f.Path) |> shouldNotContain  @"..\Microsoft.Bcl\lib\net40\System.IO.dll" 
@@ -432,7 +432,7 @@ let ``should skip lib install of Microsoft.BCL for monotouch and monoandroid``()
               @"..\Microsoft.Bcl\lib\monoandroid\_._"
               @"..\Microsoft.Bcl\lib\monotouch\_._"
               @"..\Microsoft.Bcl\lib\net45\_._" ] |> fromLegacyList @"..\Microsoft.Bcl\")
-            .FilterBlackList()
+            .FilterIgnoreList()
 
     model.GetLegacyReferences(TargetProfile.SinglePlatform (MonoAndroid MonoAndroidVersion.V1)) |> shouldBeEmpty
     model.GetLegacyReferences(TargetProfile.SinglePlatform MonoTouch) |> shouldBeEmpty
@@ -611,7 +611,7 @@ let ``should handle lib install of MicrosoftBcl``() =
               @"..\Microsoft.Bcl\lib\wpa81\_._"
               @"..\Microsoft.Bcl\lib\portable-net451+win81\_._"
               @"..\Microsoft.Bcl\lib\portable-net451+win81+wpa81\_._"]
-             |> fromLegacyList @"..\Microsoft.Bcl\")).FilterBlackList()
+             |> fromLegacyList @"..\Microsoft.Bcl\")).FilterIgnoreList()
 
     model.GetLegacyReferences(TargetProfile.SinglePlatform (DotNetFramework FrameworkVersion.V4))
         |> Seq.map (fun f -> f.Path) |> shouldContain @"..\Microsoft.Bcl\lib\net40\System.IO.dll"
@@ -726,7 +726,7 @@ let ``should only handle dll and exe files``() =
               @"..\Fantomas\lib\FSharp.Core.dll"
               @"..\Fantomas\lib\Fantomas.exe" ] |> fromLegacyList @"..\Fantomas\",
             NuspecReferences.All)
-            .FilterBlackList()
+            .FilterIgnoreList()
 
     model.GetLegacyReferences(TargetProfile.SinglePlatform (DotNetFramework FrameworkVersion.V2))
         |> Seq.map (fun f -> f.Path) |> shouldContain @"..\Fantomas\lib\FantomasLib.dll" 
@@ -773,7 +773,7 @@ let ``should handle props files``() =
         InstallModel.EmptyModel(PackageName "xunit.runner.visualstudio",SemVer.Parse "0.1").AddTargetsFiles(
             [ @"..\xunit.runner.visualstudio\build\net20\xunit.runner.visualstudio.props"
               @"..\xunit.runner.visualstudio\build\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid\xunit.runner.visualstudio.props" ] |> fromLegacyList @"..\xunit.runner.visualstudio\")
-            .FilterBlackList()
+            .FilterIgnoreList()
 
     model.GetTargetsFiles(TargetProfile.SinglePlatform (DotNetFramework FrameworkVersion.V2))
         |> Seq.map (fun f -> f.Path) |> shouldContain @"..\xunit.runner.visualstudio\build\net20\xunit.runner.visualstudio.props"
@@ -784,7 +784,7 @@ let ``should handle global props files``() =
         InstallModel.EmptyModel(PackageName "xunit.runner.visualstudio",SemVer.Parse "0.1").AddTargetsFiles(
             [ @"..\xunit.runner.visualstudio\build\xunit.runner.visualstudio.props"
               @"..\xunit.runner.visualstudio\build\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid\xunit.runner.visualstudio.props" ] |> fromLegacyList @"..\xunit.runner.visualstudio\")
-            .FilterBlackList()
+            .FilterIgnoreList()
 
     model.GetTargetsFiles(TargetProfile.SinglePlatform (DotNetFramework FrameworkVersion.V2))
         |> Seq.map (fun f -> f.Path) |> shouldContain @"..\xunit.runner.visualstudio\build\xunit.runner.visualstudio.props"
@@ -794,7 +794,7 @@ let ``should handle Targets files``() =
     let model =
         InstallModel.EmptyModel(PackageName "StyleCop.MSBuild",SemVer.Parse "0.1").AddTargetsFiles(
             [ @"..\StyleCop.MSBuild\build\StyleCop.MSBuild.Targets" ] |> fromLegacyList @"..\StyleCop.MSBuild\")
-            .FilterBlackList()
+            .FilterIgnoreList()
 
     model.GetTargetsFiles(TargetProfile.SinglePlatform (DotNetFramework FrameworkVersion.V2))
         |> Seq.map (fun f -> f.Path) |> shouldContain @"..\StyleCop.MSBuild\build\StyleCop.MSBuild.Targets"

diff --git a/tests/Playlists/paket.tests.playlist b/tests/Playlists/paket.tests.playlist