New command: paket update nuget <package id> - closes fsprojects#239

RELEASE_NOTES.md

@@ -1,3 +1,6 @@
+#### 0.7.1 - 14.10.2014
+* New command: `paket update nuget <package id>` - http://fsprojects.github.io/Paket/paket-update.html#Updating-a-single-package
+
 #### 0.7.0 - 14.10.2014
 * Initial support for referencing full github projects - http://fsprojects.github.io/Paket/github-dependencies.html#Referencing-a-GitHub-repository
 * Allow to use all branches in GitHub sources - https://github.com/fsprojects/Paket/pull/249
@@ -15,12 +18,10 @@
 * New restore command - http://fsprojects.github.io/Paket/paket-restore.html
 * Report if we can't find packages for top level dependencies.
 * Faster resolver
+* Try /FindPackagesById before /Packages for nuget package version no. retrieval
 * New Paket.Core package on NuGet - https://www.nuget.org/packages/Paket.Core/
 * BUGFIX: Prefer full platform builds over portable builds
 
-#### 0.5.2 - 10.10.2014
-* Try /FindPackagesById before /Packages for nuget package version no. retrieval
-
 #### 0.5.0 - 09.10.2014
 * Bootstrapper will only download stable releases by default - http://fsprojects.github.io/Paket/bootstrapper.html
 * New installer model allows better compatibility with NuGet and should be much faster

docs/content/paket-update.md

@@ -3,7 +3,20 @@
 Recomputes the dependency resolution, updates the [`paket.lock` file](lock-file.html) and propagates any resulting package changes into all project files referencing updated packages.
 
     [lang=batchfile]
-    $ paket update [--force] [--hard]
+    $ paket update [--force] [--hard]	
+
+Options:
+
+  `--force`: Forces the download and reinstallation of all packages.
+
+  `--hard`: Replaces package references within project files even if they are not yet adhering to to Paket's conventions (and hence considered manually managed). See [convert from NuGet](convert-from-nuget.html).
+
+## Updating a single package
+
+It's also possible to update only a single package and to keep all othere dependencies fixed:
+
+    [lang=batchfile]
+    $ paket update nuget PACKAGENAME [--force] [--hard]	
 
 Options:
 

src/Paket.Bootstrapper/Properties/AssemblyInfo.cs

@@ -4,10 +4,10 @@
 [assembly: AssemblyTitleAttribute("Paket.Bootstrapper")]
 [assembly: AssemblyProductAttribute("Paket")]
 [assembly: AssemblyDescriptionAttribute("A package dependency manager for .NET with support for NuGet packages and GitHub repositories.")]
-[assembly: AssemblyVersionAttribute("0.7.0")]
-[assembly: AssemblyFileVersionAttribute("0.7.0")]
+[assembly: AssemblyVersionAttribute("0.7.1")]
+[assembly: AssemblyFileVersionAttribute("0.7.1")]
 namespace System {
     internal static class AssemblyVersionInformation {
-        internal const string Version = "0.7.0";
+        internal const string Version = "0.7.1";
     }
 }

src/Paket.Core/AssemblyInfo.fs

@@ -4,9 +4,9 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("Paket.Core")>]
 [<assembly: AssemblyProductAttribute("Paket")>]
 [<assembly: AssemblyDescriptionAttribute("A package dependency manager for .NET with support for NuGet packages and GitHub repositories.")>]
-[<assembly: AssemblyVersionAttribute("0.7.0")>]
-[<assembly: AssemblyFileVersionAttribute("0.7.0")>]
+[<assembly: AssemblyVersionAttribute("0.7.1")>]
+[<assembly: AssemblyFileVersionAttribute("0.7.1")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "0.7.0"
+    let [<Literal>] Version = "0.7.1"

src/Paket.Core/DependenciesFile.fs

@@ -196,17 +196,21 @@ type DependenciesFile(fileName,options,packages : PackageRequirement list, remot
             |> fun df -> df.Packages
 
         let remoteFiles = ModuleResolver.Resolve(resolveSourceFile,getSha1,remoteFiles)
-
-        let dependencies = 
-            remoteFiles 
+        
+        let remoteDependencies = 
+            remoteFiles
             |> List.map (fun f -> f.Dependencies)
-            |> List.concat
-
-        { ResolvedPackages = PackageResolver.Resolve(getVersionF, getPackageDetailsF, dependencies @ packages)
+            |> List.fold (fun set current -> Set.union set current) Set.empty
+            |> Seq.map (fun (n, v) -> 
+                   let p = packages |> Seq.last
+                   { p with Name = n
+                            VersionRequirement = v })
+            |> Seq.toList
+
+        { ResolvedPackages = PackageResolver.Resolve(getVersionF, getPackageDetailsF, remoteDependencies @ packages)
           ResolvedSourceFiles = remoteFiles }        
 
-    member this.Add(packageName,version:string) =
-        if this.HasPackage packageName then failwithf "%s has already package %s" Constants.DependenciesFile packageName
+    member this.AddAdditionionalPackage(packageName,version:string) =
         let versionRange = DependenciesFileParser.parseVersionRequirement (version.Trim '!')
         let sources = 
             match packages |> List.rev with
@@ -218,9 +222,14 @@ type DependenciesFile(fileName,options,packages : PackageRequirement list, remot
               Sources = sources
               ResolverStrategy = DependenciesFileParser.parseResolverStrategy version
               Parent = PackageRequirementSource.DependenciesFile fileName }
-        tracefn "Adding %s %s to paket.dependencies" packageName (versionRange.ToString())
+
         DependenciesFile(fileName,options,packages @ [newPackage], remoteFiles)
 
+    member this.Add(packageName,version:string) =
+        if this.HasPackage packageName then failwithf "%s has already package %s" Constants.DependenciesFile packageName        
+        tracefn "Adding %s %s to paket.dependencies" packageName version
+        this.AddAdditionionalPackage(packageName,version)
+
     override __.ToString() =        
         let sources = 
             packages

src/Paket.Core/LockFile.fs

@@ -59,8 +59,8 @@ module LockFileSerializer =
                 for file in files |> Seq.sortBy (fun f -> f.Owner.ToLower(),f.Project.ToLower(),f.Name.ToLower())  do
                     let path = file.Name.TrimStart '/'
                     yield sprintf "    %s (%s)" path file.Commit 
-                    for dep in file.Dependencies do
-                        yield sprintf "      %s (%s)" dep.Name (formatVersionRange dep.VersionRequirement)]
+                    for (name,v) in file.Dependencies do
+                        yield sprintf "      %s (%s)" name (formatVersionRange v)]
 
         String.Join(Environment.NewLine, all)
 
@@ -116,14 +116,23 @@ module LockFileParser =
                                        Version = SemVer.Parse version } :: state.Packages }
                 | None -> failwith "no source has been specified."
             | NugetDependency (name, _) ->
-                match state.Packages with
-                | currentPackage :: otherPackages -> 
-                    if not state.LastWasPackage then state else
-                    { state with
-                        Packages = { currentPackage with
-                                        Dependencies = Set.add (name, VersionRequirement.AllReleases) currentPackage.Dependencies
-                                    } :: otherPackages }
-                | [] -> failwith "cannot set a dependency - no package has been specified."
+                if state.LastWasPackage then                 
+                    match state.Packages with
+                    | currentPackage :: otherPackages -> 
+                        { state with
+                                Packages = { currentPackage with
+                                                Dependencies = Set.add (name, VersionRequirement.AllReleases) currentPackage.Dependencies
+                                            } :: otherPackages }                    
+                    | [] -> failwith "cannot set a dependency - no package has been specified."
+                else
+                    match state.SourceFiles with
+                    | currentFile :: rest -> 
+                        { state with
+                                SourceFiles = 
+                                    { currentFile with
+                                                Dependencies = Set.add (name, VersionRequirement.AllReleases) currentFile.Dependencies
+                                            } :: rest }                    
+                    | [] -> failwith "cannot set a dependency - no remote file has been specified."
             | SourceFile details ->
                 match state.RemoteUrl |> Option.map(fun s -> s.Split '/') with
                 | Some [| owner; project |] ->
@@ -135,7 +144,7 @@ module LockFileParser =
                         SourceFiles = { Commit = commit
                                         Owner = owner
                                         Project = project
-                                        Dependencies = []
+                                        Dependencies = Set.empty
                                         Name = path } :: state.SourceFiles }
                 | _ -> failwith "invalid remote details.")
 

src/Paket.Core/ModuleResolver.fs

@@ -30,7 +30,7 @@ type ResolvedSourceFile =
       Project : string
       Name : string      
       Commit : string
-      Dependencies : PackageRequirement list }
+      Dependencies : Set<string*VersionRequirement> }
     member this.FilePath = this.ComputeFilePath(this.Name)
 
     member this.ComputeFilePath(name:string) =
@@ -55,8 +55,8 @@ let Resolve(getPackages, getSha1, remoteFiles : UnresolvedSourceFile list) : Res
                            { Commit = sha
                              Owner = file.Owner
                              Project = file.Project
-                             Dependencies = []
+                             Dependencies = Set.empty
                              Name = file.Name }
                        let packages:PackageRequirement list = getPackages naked
 
-                       {naked with Dependencies = packages })
+                       {naked with Dependencies = packages |> Seq.fold (fun set package -> Set.add (package.Name,package.VersionRequirement) set) Set.empty })

src/Paket.Core/UpdateProcess.fs

@@ -25,4 +25,31 @@ let Update(forceResolution, force, hard) =
                 |> PackageSourceParser.getSources
             sources, LockFile.LoadFrom(lockFileName.FullName)
 
+    InstallProcess.Install(sources, force, hard, lockFile)
+
+/// Update a single package command
+let UpdatePackage(packageName : string, force, hard) = 
+    let lockFileName = DependenciesFile.FindLockfile Constants.DependenciesFile
+
+    let sources, lockFile = 
+        let dependenciesFile = DependenciesFile.ReadFromFile Constants.DependenciesFile
+        let oldLockFile = LockFile.LoadFrom(lockFileName.FullName)
+
+        let updatedDependenciesFile = 
+            oldLockFile.ResolvedPackages 
+            |> Seq.fold 
+                   (fun (dependenciesFile : DependenciesFile) kv -> 
+                   let resolvedPackage = kv.Value
+                   if resolvedPackage.Name.ToLower() = packageName.ToLower() then dependenciesFile
+                   else 
+                       dependenciesFile.AddAdditionionalPackage
+                           (resolvedPackage.Name, "== " + resolvedPackage.Version.ToString())) dependenciesFile
+
+        let resolution = updatedDependenciesFile.Resolve(force)
+        let newLockFile = 
+            LockFile
+                (lockFileName.FullName, updatedDependenciesFile.Options, resolution.ResolvedPackages.GetModelOrFail(), 
+                 oldLockFile.SourceFiles)
+        newLockFile.Save()
+        updatedDependenciesFile.Sources, newLockFile
     InstallProcess.Install(sources, force, hard, lockFile)

src/Paket/AssemblyInfo.fs

@@ -4,9 +4,9 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("Paket")>]
 [<assembly: AssemblyProductAttribute("Paket")>]
 [<assembly: AssemblyDescriptionAttribute("A package dependency manager for .NET with support for NuGet packages and GitHub repositories.")>]
-[<assembly: AssemblyVersionAttribute("0.7.0")>]
-[<assembly: AssemblyFileVersionAttribute("0.7.0")>]
+[<assembly: AssemblyVersionAttribute("0.7.1")>]
+[<assembly: AssemblyFileVersionAttribute("0.7.1")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "0.7.0"
+    let [<Literal>] Version = "0.7.1"

src/Paket/Paket.fsproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -40,7 +40,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <WarningLevel>3</WarningLevel>
     <DocumentationFile>..\..\bin\Paket.xml</DocumentationFile>
-    <StartArguments>update</StartArguments>
+    <StartArguments>update nuget fake</StartArguments>
     <StartWorkingDirectory>D:\code\PaketKopie</StartWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup>

src/Paket/Program.fs

@@ -112,7 +112,11 @@ try
             AddProcess.Add(packageName,version,force,hard,interactive,noInstall |> not)
         | Command.Install -> UpdateProcess.Update(false,force,hard) 
         | Command.Restore -> RestoreProcess.Restore(force) 
-        | Command.Update -> UpdateProcess.Update(true,force,hard)
+        | Command.Update -> 
+                 match results.TryGetResult <@ CLIArguments.Nuget @> with
+                | Some packageName -> UpdateProcess.UpdatePackage(packageName,force,hard)
+                | _ -> UpdateProcess.Update(true,force,hard)
+
         | Command.Outdated -> FindOutdated.ListOutdated(strict,includePrereleases)
         | Command.InitAutoRestore -> VSIntegration.InitAutoRestore()
         | Command.ConvertFromNuget -> NuGetConvert.ConvertFromNuget(force,noInstall |> not,noAutoRestore |> not)

tests/Paket.Tests/Lockfile/GeneratorSpecs.fs

@@ -70,7 +70,7 @@ github "owner:project2:commit2" "folder/file.fs" """
         | Some commit ->  { Commit = commit
                             Owner = f.Owner
                             Project = f.Project
-                            Dependencies = []
+                            Dependencies = Set.empty
                             Name = f.Name } : ModuleResolver.ResolvedSourceFile
         | _ -> failwith "error")
     |> LockFileSerializer.serializeSourceFiles

tests/Paket.Tests/Lockfile/ParserSpecs.fs

@@ -52,11 +52,11 @@ let ``should parse lock file``() =
         [ { Owner = "fsharp"
             Project = "FAKE"
             Name = "src/app/FAKE/Cli.fs"
-            Dependencies = []
+            Dependencies = Set.empty
             Commit = "7699e40e335f3cc54ab382a8969253fecc1e08a9" }
           { Owner = "fsharp"
             Project = "FAKE"
-            Dependencies = []
+            Dependencies = Set.empty
             Name = "src/app/Fake.Deploy.Lib/FakeDeployAgentHelper.fs"
             Commit = "Globbing" } ]