Fixed comparison order in bump, diff and validate commands

Author: robinheghan

terminal/Package/Bump.hs

@@ -71,8 +71,8 @@ bump flags@(Flags _ _ knownVersions _ _) currentOutline@(Outline.PkgOutline _ _
 suggestVersion :: Flags -> Outline.PkgOutline -> Outline.PkgOutline -> Task.Task Exit.Bump ()
 suggestVersion flags@(Flags _ root _ (Command.ProjectInfo _ currentSources currentDeps) (Command.ProjectInfo _ publishedSources publishedDeps)) currentOutline@(Outline.PkgOutline _ _ _ vsn _ _ _ _) publishedOutline =
   do
-    oldDocs <- generateDocs root currentOutline currentSources currentDeps
-    newDocs <- generateDocs root publishedOutline publishedSources publishedDeps
+    newDocs <- generateDocs root currentOutline currentSources currentDeps
+    oldDocs <- generateDocs root publishedOutline publishedSources publishedDeps
     let changes = Diff.diff oldDocs newDocs
     let newVersion = Diff.bump changes vsn
     Task.io $

terminal/Package/Diff.hs

@@ -41,11 +41,11 @@ data Flags = Flags
   deriving (Show)
 
 run :: Flags -> IO ()
-run flags@(Flags _ _ firstPackage secondPackage) =
+run flags@(Flags _ _ currentPackage publishedPackage) =
   Reporting.attempt Exit.diffToReport $
-    case (Command._project_outline firstPackage, Command._project_outline secondPackage) of
-      (Outline.Pkg firstOutline, Outline.Pkg secondOutline) ->
-        Task.run (diff flags firstOutline secondOutline)
+    case (Command._project_outline currentPackage, Command._project_outline publishedPackage) of
+      (Outline.Pkg currentOutline, Outline.Pkg publishedOutline) ->
+        Task.run (diff flags currentOutline publishedOutline)
       _ ->
         error "Received outlines are in the wrong format"
 
@@ -55,10 +55,10 @@ type Task a =
   Task.Task Exit.Diff a
 
 diff :: Flags -> Outline.PkgOutline -> Outline.PkgOutline -> Task ()
-diff (Flags _ root (Command.ProjectInfo _ firstSources firstSolution) (Command.ProjectInfo _ secondSources secondSolution)) firstOutline secondOutline =
+diff (Flags _ root (Command.ProjectInfo _ currentSources currentSolution) (Command.ProjectInfo _ publishedSources publishedSolution)) currentOutline publishedOutline =
   do
-    oldDocs <- generateDocs root firstOutline firstSources firstSolution
-    newDocs <- generateDocs root secondOutline secondSources secondSolution
+    newDocs <- generateDocs root currentOutline currentSources currentSolution
+    oldDocs <- generateDocs root publishedOutline publishedSources publishedSolution
     writeDiff oldDocs newDocs
 
 -- GENERATE DOCS

terminal/Package/Validate.hs

@@ -44,23 +44,19 @@ validate (Flags root knownVersions (Command.ProjectInfo currentOutline currentSo
       Task.throw Exit.ValidateApplication
     (Outline.Pkg currentPkgOutline@(Outline.PkgOutline _ _ _ _ _ _ _ _), Nothing) ->
       do
-        _ <- verifyBuild root currentPkgOutline currentSources currentDeps
+        _ <- buildProject root currentPkgOutline currentSources currentDeps
         Task.io $ putStrLn "Everything looks good!"
     (Outline.Pkg (Outline.PkgOutline _ _ _ _ _ _ _ _), Just (Command.ProjectInfo (Outline.App _) _ _)) ->
       error "Previous version is app"
     (Outline.Pkg currentPkgOutline@(Outline.PkgOutline _ _ _ vsn _ _ _ _), Just (Command.ProjectInfo (Outline.Pkg previousOutline) previousSources previousDeps)) ->
       do
-        currentDocs <- verifyBuild root currentPkgOutline currentSources currentDeps
+        currentDocs <- buildProject root currentPkgOutline currentSources currentDeps
         previousDocs <- buildProject root previousOutline previousSources previousDeps
 
         _ <- Task.eio id $ verifyBump vsn currentDocs previousDocs knownVersions
 
         Task.io $ putStrLn "Everything looks good!"
 
-verifyBuild :: FilePath -> Outline.PkgOutline -> Build.Sources -> Map Pkg.Name Details.Dependency -> Task.Task Exit.Validate Docs.Documentation
-verifyBuild root outline sources solution =
-  buildProject root outline sources solution
-
 buildProject :: FilePath -> Outline.PkgOutline -> Build.Sources -> Map Pkg.Name Details.Dependency -> Task.Task Exit.Validate Docs.Documentation
 buildProject root pkgOutline@(Outline.PkgOutline _ _ _ _ _ _ _ _) sources solution =
   do