Merge pull request #263 from LoopPerfect/bugfix/262

bugfix/262

Author: nikhedonia

buckaroo-tests/Command.fs

@@ -8,13 +8,33 @@ let private defaultLoggingLevel = LoggingLevel.Info
 
 let private verboseLoggingLevel = LoggingLevel.Trace
 
+let private abcDef = Adhoc { Owner = "abc"; Project = "def" }
+let private ijkXyz = GitHub { Owner = "ijk"; Project = "xyz" }
+
 [<Fact>]
 let ``Command.parse works correctly`` () =
   let cases = [
     (Result.Ok (Command.Init, defaultLoggingLevel), "init");
+    (Result.Ok (Command.Install, defaultLoggingLevel), "   install  ");
     (Result.Ok (Command.Resolve, defaultLoggingLevel), "resolve");
     (Result.Ok (Command.Resolve, verboseLoggingLevel), "resolve --verbose");
+    (Result.Ok (Command.UpgradeDependencies [], defaultLoggingLevel), "upgrade");
+    (Result.Ok (Command.UpgradeDependencies [ abcDef ], defaultLoggingLevel), "upgrade  abc/def");
+    (Result.Ok (Command.UpgradeDependencies [], verboseLoggingLevel), "  upgrade  --verbose  ");
+    (Result.Ok (Command.UpgradeDependencies [ abcDef ], verboseLoggingLevel), "upgrade  abc/def --verbose ");
+
+    (
+      Result.Ok (Command.UpgradeDependencies [ abcDef; ijkXyz ], verboseLoggingLevel),
+      "upgrade  abc/def github.com/ijk/xyz --verbose "
+    );
   ]
 
   for (expected, input) in cases do
-    Assert.Equal(expected, Command.parse input)
+    let actual = Command.parse input
+
+    match actual with
+    | Result.Error error ->
+      System.Console.WriteLine (error + "\nfor \"" + input + "\"")
+    | _ -> ()
+
+    Assert.Equal(expected, actual)

buckaroo/Command.fs

@@ -1,8 +1,8 @@
 namespace Buckaroo
 
-open Tasks
-open Console
 open FSharp.Control
+open Buckaroo.Console
+open Buckaroo.Tasks
 
 type Command =
 | Start
@@ -22,6 +22,7 @@ module Command =
   open System
   open System.IO
   open FParsec
+  open Buckaroo.RichOutput
 
   let verboseParser : Parser<bool, Unit> = parse {
     let! maybeSkip =
@@ -81,23 +82,31 @@ module Command =
     do! CharParsers.spaces
     do! CharParsers.skipString "add"
     do! CharParsers.spaces1
+
     let! deps = Primitives.sepEndBy1 Dependency.parser CharParsers.spaces1
+
     return AddDependencies deps
   }
 
   let upgradeDepenenciesParser = parse {
-    do! CharParsers.spaces
     do! CharParsers.skipString "upgrade"
-    do! CharParsers.spaces1
-    let! packages = Primitives.sepEndBy PackageIdentifier.parser CharParsers.spaces1
+
+    let! packages =
+      (attempt >> Primitives.many)
+        <| parse {
+          do! CharParsers.spaces1
+          return! PackageIdentifier.parser
+        }
+
     return UpgradeDependencies packages
   }
 
   let removeDependenciesParser = parse {
     do! CharParsers.spaces
     do! CharParsers.skipString "remove"
     do! CharParsers.spaces1
-    let! deps = Primitives.sepEndBy1 PackageIdentifier.parser CharParsers.spaces1
+    let! deps = Primitives.sepBy PackageIdentifier.parser CharParsers.spaces1
+    do! CharParsers.spaces
     return RemoveDependencies deps
   }
 
@@ -109,6 +118,8 @@ module Command =
   }
 
   let parser = parse {
+    do! CharParsers.spaces
+
     let! command =
       resolveParser
       <|> upgradeDepenenciesParser
@@ -122,9 +133,15 @@ module Command =
       <|> showCompletionsParser
       <|> startParser
 
+    do! CharParsers.spaces
+
     let! isVerbose = verboseParser
 
-    return (command, if isVerbose then LoggingLevel.Trace else LoggingLevel.Info)
+    do! CharParsers.spaces
+
+    let loggingLevel = if isVerbose then LoggingLevel.Trace else LoggingLevel.Info
+
+    return (command, loggingLevel)
   }
 
   let parse (x : string) =
@@ -133,8 +150,6 @@ module Command =
     | Failure(error, _, _) -> Result.Error error
 
   let add (context : Tasks.TaskContext) dependencies = async {
-    let sourceExplorer = context.SourceExplorer
-
     let! manifest = Tasks.readManifest "."
     let newManifest = {
       manifest with
@@ -143,50 +158,32 @@ module Command =
           |> Seq.append dependencies
           |> Set.ofSeq;
     }
+
     if manifest = newManifest
-    then return ()
+    then
+      return ()
     else
       let! maybeLock = async {
-        if File.Exists(Constants.LockFileName)
+        if File.Exists (Constants.LockFileName)
         then
           let! lock = Tasks.readLock
           return Some lock
         else
           return None
       }
+
       let! resolution = Solver.solve context Solution.empty newManifest ResolutionStyle.Quick maybeLock
+
       match resolution with
       | Resolution.Ok solution ->
         do! Tasks.writeManifest newManifest
         do! Tasks.writeLock (Lock.fromManifestAndSolution newManifest solution)
         do! InstallCommand.task context
       | _ -> ()
-      System.Console.WriteLine ("Success. ")
-      return ()
-  }
 
-  let upgrade context (packages : List<PackageIdentifier>) = async {
-    // TODO: Roll-back on failure!
-    let! maybeLock = async {
-      if File.Exists(Constants.LockFileName)
-      then
-        let! lock = Tasks.readLock
-        let! partial =
-          if packages |> Seq.isEmpty
-          then async { return Solution.empty }
-          else async {
-            let! solution = Solver.fromLock context.SourceExplorer lock
-            return packages |> Set.ofList |> Solver.unlock solution
-          }
-
-        do! ResolveCommand.task context partial ResolutionStyle.Upgrading
-        do! InstallCommand.task context
-        return None
-      else
-        return None
-    }
+      System.Console.WriteLine ("Success. ")
 
-    return ()
+      return ()
   }
 
   let init context = async {
@@ -212,7 +209,7 @@ module Command =
       | Resolve -> ResolveCommand.task context Solution.empty ResolutionStyle.Quick
       | Install -> InstallCommand.task context
       | Quickstart -> QuickstartCommand.task context
-      | UpgradeDependencies dependencies -> upgrade context dependencies
+      | UpgradeDependencies dependencies -> UpgradeCommand.task context dependencies
       | AddDependencies dependencies -> AddCommand.task context dependencies
       | RemoveDependencies dependencies -> RemoveCommand.task context dependencies
       | ShowCompletions -> ShowCompletions.task context

buckaroo/UpgradeCommand.fs

@@ -0,0 +1,44 @@
+module Buckaroo.UpgradeCommand
+
+open System
+open System.IO
+open Buckaroo
+open Buckaroo.Tasks
+open Buckaroo.RichOutput
+
+let task context (packages : List<PackageIdentifier>) = async {
+  if File.Exists (Constants.LockFileName)
+  then
+    let! lock = Tasks.readLock
+    let! partial =
+      if packages |> Seq.isEmpty
+      then async { return Solution.empty }
+      else
+        async {
+          let! solution = Solver.fromLock context.SourceExplorer lock
+
+          return
+            packages
+            |> Set.ofList
+            |> Solver.unlock solution
+        }
+
+    do! ResolveCommand.task context partial ResolutionStyle.Upgrading
+    do! InstallCommand.task context
+
+    return ()
+  else
+    context.Console.Write (
+      (
+        "warning "
+        |> text
+        |> foreground ConsoleColor.Yellow
+      ) +
+      "There is no lock-file to upgrade. A fresh lock-file will be generated. "
+    )
+
+    do! ResolveCommand.task context Solution.empty ResolutionStyle.Upgrading
+    do! InstallCommand.task context
+
+    return ()
+}

buckaroo/buckaroo.fsproj

@@ -51,6 +51,7 @@
     <Compile Include="RemoveCommand.fs" />
     <Compile Include="QuickstartCommand.fs" />
     <Compile Include="AddCommand.fs" />
+    <Compile Include="UpgradeCommand.fs" />
     <Compile Include="VersionCommand.fs" />
     <Compile Include="ShowCompletions.fs" />
     <Compile Include="Command.fs" />