@@ -5,66 +5,48 @@
55{-# LANGUAGE MultiWayIf #-}
66{-# LANGUAGE OverloadedStrings #-}
77{-# LANGUAGE PatternGuards #-}
8+{-# LANGUAGE QuasiQuotes #-}
89{-# LANGUAGE ScopedTypeVariables #-}
910{-# LANGUAGE TypeApplications #-}
10−module Obelisk.Command.Thunk
11− ( GitHubSource (..)
12− , GitUri (..)
13− , ReadThunkError (..)
14− , ThunkConfig (..)
15− , ThunkData (..)
16− , ThunkPackConfig (..)
17− , ThunkPtr (..)
18− , ThunkRev (..)
19− , ThunkSource (..)
20− , ThunkUpdateConfig (..)
21− , createThunk
22− , createThunkWithLatest
23− , getLatestRev
24− , getThunkGitBranch
25− , getThunkPtr
26− , gitUriToText
27− , nixBuildAttrWithCache
28− , nixBuildThunkAttrWithCache
29− , packThunk
30− , parseGitUri
31− , readThunk
32− , unpackThunk
33− , updateThunk
34− , updateThunkToLatest
35− , uriThunkPtr
36− ) where
11+module Obelisk.Command.Thunk where
3712
3813import Control.Applicative
3914import Control.Exception (displayException, try)
40−import qualified Control.Lens as Lens
41−import Control.Lens.Indexed hiding ((<.>))
15+import Control.Lens (ifor, ifor_, (.~))
4216import Control.Monad
43−import Control.Monad.Catch (handle)
17+import Control.Monad.Extra (findM)
18+import Control.Monad.Catch (MonadCatch, handle)
4419import Control.Monad.Except
4520import Data.Aeson ((.=))
4621import qualified Data.Aeson as Aeson
4722import Data.Aeson.Encode.Pretty
4823import qualified Data.Aeson.Types as Aeson
24+import Data.Bifunctor (first)
4925import qualified Data.ByteString.Lazy as LBS
5026import Data.Containers.ListUtils (nubOrd)
5127import Data.Default
5228import Data.Either.Combinators (fromRight', rightToMaybe)
29+import Data.Foldable (toList)
30+import Data.Function ((&))
31+import Data.Functor ((<&>))
5332import Data.Git.Ref (Ref)
5433import qualified Data.Git.Ref as Ref
5534import qualified Data.List as L
56−import Data.List.NonEmpty (NonEmpty (..))
35+import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
5736import qualified Data.List.NonEmpty as NonEmpty
5837import Data.Map (Map)
5938import qualified Data.Map as Map
6039import Data.Maybe
6140import Data.Set (Set)
6241import qualified Data.Set as Set
42+import Data.String.Here.Interpolated (i)
43+import Data.String.Here.Uninterpolated (here)
6344import Data.Text (Text)
6445import qualified Data.Text as T
6546import Data.Text.Encoding
6647import qualified Data.Text.IO as T
6748import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
49+import Data.Traversable (for)
6850import Data.Yaml (parseMaybe)
6951import GitHub
7052import GitHub.Data.Name
@@ -74,7 +56,7 @@ import System.Exit
7456import System.FilePath
7557import System.IO.Error
7658import System.IO.Temp
77−import System.Posix (getSymbolicLinkStatus, modificationTime)
59+import System.PosixCompat.Files (getSymbolicLinkStatus, modificationTime)
7860import qualified Text.URI as URI
7961
8062import Obelisk.App (MonadObelisk)
@@ -83,11 +65,10 @@ import Obelisk.Command.Utils
8365
8466--TODO: Support symlinked thunk data
8567data ThunkData
86− = ThunkData_Packed ThunkPtr
68+ = ThunkData_Packed ThunkSpec ThunkPtr
8769 -- ^ Packed thunk
88− | ThunkData_Checkout (Maybe ThunkPtr)
70+ | ThunkData_Checkout
8971 -- ^ Checked out thunk that was unpacked from this pointer
90− deriving (Show, Eq, Ord)
9172
9273-- | A reference to the exact data that a thunk should translate into
9374data ThunkPtr = ThunkPtr
@@ -113,6 +94,11 @@ data ThunkSource
11394 | ThunkSource_Git GitSource
11495 deriving (Show, Eq, Ord)
11596
97+thunkSourceToGitSource :: ThunkSource -> GitSource
98+thunkSourceToGitSource = \case
99+ ThunkSource_GitHub s -> forgetGithub False s
100+ ThunkSource_Git s -> s
101+
116102data GitHubSource = GitHubSource
117103 { _gitHubSource_owner :: Name Owner
118104 , _gitHubSource_repo :: Name Repo
@@ -192,14 +178,14 @@ getNixSha256ForUriUnpacked
192178getNixSha256ForUriUnpacked uri =
193179 withExitFailMessage ("nix-prefetch-url: Failed to determine sha256 hash of URL " <> gitUriToText uri) $ do
194180 [hash] <- fmap T.lines $ readProcessAndLogOutput (Debug, Debug) $
195− proc "nix-prefetch-url" ["--unpack", "--type", "sha256", T.unpack $ gitUriToText uri]
181+ proc nixPrefetchUrlPath ["--unpack", "--type", "sha256", T.unpack $ gitUriToText uri]
196182 pure hash
197183
198184nixPrefetchGit :: MonadObelisk m => GitUri -> Text -> Bool -> m NixSha256
199185nixPrefetchGit uri rev fetchSubmodules =
200186 withExitFailMessage ("nix-prefetch-git: Failed to determine sha256 hash of Git repo " <> gitUriToText uri <> " at " <> rev) $ do
201187 out <- readProcessAndLogStderr Debug $
202− proc "nix-prefetch-git" $ filter (/="")
188+ proc nixPrefetchGitPath $ filter (/="")
203189 [ "--url", T.unpack $ gitUriToText uri
204190 , "--rev", T.unpack rev
205191 , if fetchSubmodules then "--fetch-submodules" else ""
@@ -212,93 +198,117 @@ nixPrefetchGit uri rev fetchSubmodules =
212198
213199--TODO: Pretty print these
214200data ReadThunkError
215− = ReadThunkError_UnrecognizedFiles
216− | ReadThunkError_AmbiguousFiles
217− | ReadThunkError_UnrecognizedLoader Text
218− | ReadThunkError_UnparseablePtr LBS.ByteString
219− deriving (Show)
220−
221−-- | Read a thunk and validate that it is only a thunk, either packed or unpacked.
222−-- If the thunk is packed and additional data is present, fail.
223−readThunk :: MonadObelisk m => FilePath -> m (Either ReadThunkError ThunkData)
224−readThunk thunkDir = do
225− files <- liftIO $ listDirectory thunkDir
226− case ".git" `elem` files of
227− True -> fmap ThunkData_Checkout <$> do
228− let origThunkPath = thunkDir </> ".git" </> "obelisk" </> "orig-thunk"
229− liftIO $ doesDirectoryExist origThunkPath >>= \case
230− True -> fmap Just <$> readPackedThunk origThunkPath
231− False -> return $ return Nothing
232− False -> liftIO $ fmap ThunkData_Packed <$> readPackedThunk thunkDir
233−
234−data ThunkType = ThunkType
235− { _thunkType_loader :: FilePath
236− , _thunkType_json :: FilePath
237− , _thunkType_optional :: Set FilePath
238− , _thunkType_loaderVersions :: NonEmpty Text
239− , _thunkType_parser :: Aeson.Object -> Aeson.Parser ThunkPtr
240− }
241−
242−gitHubThunkType :: ThunkType
243−gitHubThunkType = ThunkType
244− { _thunkType_loader = "default.nix"
245− , _thunkType_json = "github.json"
246− , _thunkType_optional = Set.fromList [".attr-cache"]
247− , _thunkType_loaderVersions = gitHubStandaloneLoaders
248− , _thunkType_parser = parseThunkPtr $ \v ->
249− ThunkSource_GitHub <$> parseGitHubSource v <|> ThunkSource_Git <$> parseGitSource v
201+ = ReadThunkError_UnrecognizedThunk
202+ | ReadThunkError_UnrecognizedPaths (NonEmpty FilePath)
203+ | ReadThunkError_MissingPaths (NonEmpty FilePath)
204+ | ReadThunkError_UnparseablePtr FilePath String
205+ | ReadThunkError_FileError IOError
206+ | ReadThunkError_FileDoesNotMatch FilePath Text
207+ | ReadThunkError_UnrecognizedState String
208+ | ReadThunkError_AmbiguousPackedState ThunkPtr ThunkPtr
209+ deriving (Show)
210+
211+unpackedDirName :: FilePath
212+unpackedDirName = "."
213+
214+attrCacheFileName :: FilePath
215+attrCacheFileName = ".attr-cache"
216+
217+-- | Specification for how a file in a thunk version works.
218+data ThunkFileSpec
219+ = ThunkFileSpec_Ptr (LBS.ByteString -> Either String ThunkPtr) -- ^ This file specifies 'ThunkPtr' data
220+ | ThunkFileSpec_FileMatches Text -- ^ This file must match the given content exactly
221+ | ThunkFileSpec_CheckoutIndicator -- ^ Existence of this directory indicates that the thunk is unpacked
222+ | ThunkFileSpec_AttrCache -- ^ This directory is an attribute cache
223+
224+-- | Specification for how a set of files in a thunk version work.
225+data ThunkSpec = ThunkSpec
226+ { _thunkSpec_name :: !Text
227+ , _thunkSpec_files :: !(Map FilePath ThunkFileSpec)
250228 }
251229
252−gitThunkType :: ThunkType
253−gitThunkType = ThunkType
254− { _thunkType_loader = "default.nix"
255− , _thunkType_json = "git.json"
256− , _thunkType_optional = Set.fromList [".attr-cache"]
257− , _thunkType_loaderVersions = plainGitStandaloneLoaders
258− , _thunkType_parser = parseThunkPtr $ fmap ThunkSource_Git . parseGitSource
259− }
260−
261−thunkTypes :: [ThunkType]
262−thunkTypes = [gitThunkType, gitHubThunkType]
263−
264−findThunkType :: [ThunkType] -> FilePath -> IO (Either ReadThunkError ThunkType)
265−findThunkType types thunkDir = do
266− matches <- fmap catMaybes $ forM types $ \thunkType -> do
267− let
268− expectedContents = Set.fromList $ (thunkDir </>) <$>
269− [ _thunkType_loader thunkType
270− , _thunkType_json thunkType
271− ]
272− optionalContents = Set.map (thunkDir </>) (_thunkType_optional thunkType)
273−
274− -- Ensure that there aren't any other files in the thunk
275− -- NB: System.Directory.listDirectory returns the contents without the directory path
276− files <- liftIO $ Set.fromList . fmap (thunkDir </>) <$> listDirectory thunkDir
277− let unexpectedContents = files `Set.difference` (expectedContents `Set.union` optionalContents)
278− missingContents = expectedContents `Set.difference` files
279− pure $ if Set.null unexpectedContents && Set.null missingContents
280− then Just thunkType
281− else Nothing
282−
283− pure $ case matches of
284− [singleMatch] -> Right singleMatch
285− [] -> Left ReadThunkError_UnrecognizedFiles
286− _ -> Left ReadThunkError_AmbiguousFiles
230+thunkSpecTypes :: NonEmpty (NonEmpty ThunkSpec)
231+thunkSpecTypes = gitThunkSpecs :| [gitHubThunkSpecs]
232+
233+-- | Attempts to match a 'ThunkSpec' to a given directory.
234+matchThunkSpecToDir
235+ :: (MonadError ReadThunkError m, MonadIO m, MonadCatch m)
236+ => ThunkSpec -- ^ 'ThunkSpec' to match against the given files/directory
237+ -> FilePath -- ^ Path to directory
238+ -> Set FilePath -- ^ Set of file paths relative to the given directory
239+ -> m ThunkData
240+matchThunkSpecToDir thunkSpec dir dirFiles = do
241+ case nonEmpty (toList $ dirFiles `Set.difference` expectedPaths) of
242+ Just fs -> throwError $ ReadThunkError_UnrecognizedPaths $ (dir </>) <$> fs
243+ Nothing -> pure ()
244+ case nonEmpty (toList $ requiredPaths `Set.difference` dirFiles) of
245+ Just fs -> throwError $ ReadThunkError_MissingPaths $ (dir </>) <$> fs
246+ Nothing -> pure ()
247+ datas <- fmap toList $ flip Map.traverseMaybeWithKey (_thunkSpec_files thunkSpec) $ \expectedPath -> \case
248+ ThunkFileSpec_AttrCache -> Nothing <$ dirMayExist expectedPath
249+ ThunkFileSpec_CheckoutIndicator -> liftIO (doesDirectoryExist (dir </> expectedPath)) <&> \case
250+ False -> Nothing
251+ True -> Just ThunkData_Checkout
252+ ThunkFileSpec_FileMatches expectedContents -> handle (\(e :: IOError) -> throwError $ ReadThunkError_FileError e) $ do
253+ actualContents <- liftIO (T.readFile $ dir </> expectedPath)
254+ case T.strip expectedContents == T.strip actualContents of
255+ True -> pure Nothing
256+ False -> throwError $ ReadThunkError_FileDoesNotMatch (dir </> expectedPath) expectedContents
257+ ThunkFileSpec_Ptr parser -> handle (\(e :: IOError) -> throwError $ ReadThunkError_FileError e) $ do
258+ let path = dir </> expectedPath
259+ liftIO (doesFileExist path) >>= \case
260+ False -> pure Nothing
261+ True -> do
262+ actualContents <- liftIO $ LBS.readFile path
263+ case parser actualContents of
264+ Right v -> pure $ Just (ThunkData_Packed thunkSpec v)
265+ Left e -> throwError $ ReadThunkError_UnparseablePtr (dir </> expectedPath) e
266+
267+ case nonEmpty datas of
268+ Nothing -> throwError ReadThunkError_UnrecognizedThunk
269+ Just xs -> fold1WithM xs $ \a b -> either throwError pure (mergeThunkData a b)
270+ where
271+ rootPathsOnly = Set.fromList . mapMaybe takeRootDir . Map.keys
272+ takeRootDir = fmap NonEmpty.head . nonEmpty . splitPath
273+
274+ expectedPaths = rootPathsOnly $ _thunkSpec_files thunkSpec
275+
276+ requiredPaths = rootPathsOnly $ Map.filter isRequiredFileSpec $ _thunkSpec_files thunkSpec
277+ isRequiredFileSpec = \case
278+ ThunkFileSpec_FileMatches _ -> True
279+ _ -> False
280+
281+ dirMayExist expectedPath = liftIO (doesFileExist (dir </> expectedPath)) >>= \case
282+ True -> throwError $ ReadThunkError_UnrecognizedPaths $ expectedPath :| []
283+ False -> pure ()
284+
285+ -- Combine 'ThunkData' from different files, preferring "Checkout" over "Packed"
286+ mergeThunkData ThunkData_Checkout ThunkData_Checkout = Right ThunkData_Checkout
287+ mergeThunkData ThunkData_Checkout ThunkData_Packed{} = Left bothPackedAndUnpacked
288+ mergeThunkData ThunkData_Packed{} ThunkData_Checkout = Left bothPackedAndUnpacked
289+ mergeThunkData a@(ThunkData_Packed _ ptrA) (ThunkData_Packed _ ptrB) =
290+ if ptrA == ptrB then Right a else Left $ ReadThunkError_AmbiguousPackedState ptrA ptrB
291+
292+ bothPackedAndUnpacked = ReadThunkError_UnrecognizedState "Both packed data and checkout present"
293+
294+ fold1WithM (x :| xs) f = foldM f x xs
295+
296+readThunkWith
297+ :: (MonadObelisk m)
298+ => NonEmpty (NonEmpty ThunkSpec) -> FilePath -> m (Either ReadThunkError ThunkData)
299+readThunkWith specTypes dir = do
300+ dirFiles <- Set.fromList <$> liftIO (listDirectory dir)
301+ let specs = concatMap toList $ toList $ NonEmpty.transpose specTypes -- Interleave spec types so we try each one in a "fair" ordering
302+ flip fix specs $ \loop -> \case
303+ [] -> pure $ Left ReadThunkError_UnrecognizedThunk
304+ spec:rest -> runExceptT (matchThunkSpecToDir spec dir dirFiles) >>= \case
305+ Left e -> putLog Debug [i|Thunk specification ${_thunkSpec_name spec} did not match ${dir}: ${e}|] *> loop rest
306+ x@(Right _) -> x <$ putLog Debug [i|Thunk specification ${_thunkSpec_name spec} matched ${dir}|]
287307
288308-- | Read a thunk and validate that it is exactly a packed thunk.
289309-- If additional data is present, fail.
290−readPackedThunk :: FilePath -> IO (Either ReadThunkError ThunkPtr)
291−readPackedThunk thunkDir = runExceptT $ do
292− thunkType <- ExceptT $ findThunkType thunkTypes thunkDir
293− -- Ensure that we recognize the thunk loader
294− loader <- liftIO $ T.readFile $ thunkDir </> _thunkType_loader thunkType
295− unless (loader `elem` _thunkType_loaderVersions thunkType) $ do
296− throwError $ ReadThunkError_UnrecognizedLoader loader
297−
298− txt <- liftIO $ LBS.readFile $ thunkDir </> _thunkType_json thunkType
299− case parseMaybe (_thunkType_parser thunkType) =<< Aeson.decode txt of
300− Nothing -> throwError $ ReadThunkError_UnparseablePtr txt
301− Just ptr -> return ptr
310+readThunk :: (MonadObelisk m) => FilePath -> m (Either ReadThunkError ThunkData)
311+readThunk = readThunkWith thunkSpecTypes
302312
303313parseThunkPtr :: (Aeson.Object -> Aeson.Parser ThunkSource) -> Aeson.Object -> Aeson.Parser ThunkPtr
304314parseThunkPtr parseSrc v = do
@@ -342,16 +352,18 @@ parseGitSource v = do
342352overwriteThunk :: MonadObelisk m => FilePath -> ThunkPtr -> m ()
343353overwriteThunk target thunk = do
344354 -- Ensure that this directory is a valid thunk (i.e. so we aren't losing any data)
345− Right _ <- readThunk target
355+ readThunk target >>= \case
356+ Left e -> failWith [i|Invalid thunk at ${target}: ${e}|]
357+ Right _ -> pure ()
346358
347359 --TODO: Is there a safer way to do this overwriting?
348− liftIO $ removeDirectoryRecursive target
349− liftIO $ createThunk target thunk
360+ liftIO $ removePathForcibly target
361+ createThunk target $ Right thunk
350362
351−thunkPtrLoader :: ThunkPtr -> Text
352−thunkPtrLoader thunk = case _thunkPtr_source thunk of
353− ThunkSource_GitHub _ -> NonEmpty.head gitHubStandaloneLoaders
354− ThunkSource_Git _ -> NonEmpty.head plainGitStandaloneLoaders
363+thunkPtrToSpec :: ThunkPtr -> ThunkSpec
364+thunkPtrToSpec thunk = case _thunkPtr_source thunk of
365+ ThunkSource_GitHub _ -> NonEmpty.head gitHubThunkSpecs
366+ ThunkSource_Git _ -> NonEmpty.head gitThunkSpecs
355367
356368-- It's important that formatting be very consistent here, because
357369-- otherwise when people update thunks, their patches will be messy
@@ -398,35 +410,41 @@ encodeThunkPtrData (ThunkPtr rev src) = case src of
398410 , confTrailingNewline = True
399411 }
400412
401−createThunk :: MonadIO m => FilePath -> ThunkPtr -> m ()
402−createThunk target thunk = liftIO $ do
403− createDirectoryIfMissing True (target </> ".attr-cache")
404− T.writeFile (target </> "default.nix") (thunkPtrLoader thunk)
405− let
406− jsonFileName = case _thunkPtr_source thunk of
407− ThunkSource_GitHub _ -> "github"
408− ThunkSource_Git _ -> "git"
409− LBS.writeFile (target </> jsonFileName <.> "json") (encodeThunkPtrData thunk)
413+createThunk :: MonadObelisk m => FilePath -> Either ThunkSpec ThunkPtr -> m ()
414+createThunk target ptrInfo =
415+ ifor_ (_thunkSpec_files spec) $ \path -> \case
416+ ThunkFileSpec_FileMatches content -> withReadyPath path $ \p -> liftIO $ T.writeFile p content
417+ ThunkFileSpec_Ptr _ -> case ptrInfo of
418+ Left _ -> pure () -- We can't write the ptr without it
419+ Right ptr -> withReadyPath path $ \p -> liftIO $ LBS.writeFile p (encodeThunkPtrData ptr)
420+ _ -> pure ()
421+ where
422+ spec = either id thunkPtrToSpec ptrInfo
423+ withReadyPath path f = do
424+ let fullPath = target </> path
425+ putLog Debug $ "Writing thunk file " <> T.pack fullPath
426+ liftIO $ createDirectoryIfMissing True $ takeDirectory fullPath
427+ f fullPath
410428
411429createThunkWithLatest :: MonadObelisk m => FilePath -> ThunkSource -> m ()
412430createThunkWithLatest target s = do
413431 rev <- getLatestRev s
414− createThunk target $ ThunkPtr
432+ createThunk target $ Right $ ThunkPtr
415433 { _thunkPtr_source = s
416434 , _thunkPtr_rev = rev
417435 }
418436
419437updateThunkToLatest :: MonadObelisk m => ThunkUpdateConfig -> FilePath -> m ()
420−updateThunkToLatest (ThunkUpdateConfig mBranch thunkConfig) target = withSpinner' ("Updating thunk " <> T.pack target <> " to latest") (pure $ const $ "Thunk " <> T.pack target <> " updated to latest") $ do
421− checkThunkDirectory "ob thunk update directory cannot be '.'" target
438+updateThunkToLatest (ThunkUpdateConfig mBranch thunkConfig) target = spinner $ do
439+ checkThunkDirectory target
422440 -- check to see if thunk should be updated to a specific branch or just update it's current branch
423441 case mBranch of
424442 Nothing -> do
425443 (overwrite, ptr) <- readThunk target >>= \case
426− Left err -> failWith $ T.pack $ "thunk update: " <> show err
444+ Left err -> failWith [i|Thunk update: ${err}|]
427445 Right c -> case c of
428− ThunkData_Packed t -> return (target, t)
429− ThunkData_Checkout _ -> failWith "cannot update an unpacked thunk"
446+ ThunkData_Packed _ t -> return (target, t)
447+ ThunkData_Checkout -> failWith "cannot update an unpacked thunk"
430448 let src = _thunkPtr_source ptr
431449 rev <- getLatestRev src
432450 overwriteThunk overwrite $ modifyThunkPtrByConfig thunkConfig $ ThunkPtr
@@ -434,38 +452,36 @@ updateThunkToLatest (ThunkUpdateConfig mBranch thunkConfig) target = withSpinner
434452 , _thunkPtr_rev = rev
435453 }
436454 Just branch -> readThunk target >>= \case
437− Left err -> failWith $ T.pack $ "thunk update: " <> show err
455+ Left err -> failWith [i|Thunk update: ${err}|]
438456 Right c -> case c of
439− ThunkData_Packed t -> case _thunkPtr_source t of
440− ThunkSource_Git tsg -> setThunk thunkConfig target tsg branch
441− ThunkSource_GitHub tsgh -> do
442− let tsg = forgetGithub False tsgh
443− setThunk thunkConfig target tsg branch
444− ThunkData_Checkout _ -> failWith $ T.pack $ "thunk located at " <> show target <> " is unpacked. Use ob thunk pack on the desired directory and then try ob thunk update again."
457+ ThunkData_Packed _ t -> setThunk thunkConfig target (thunkSourceToGitSource $ _thunkPtr_source t) branch
458+ ThunkData_Checkout -> failWith [i|Thunk located at ${target} is unpacked. Use 'ob thunk pack' on the desired directory and then try 'ob thunk update' again.|]
459+ where
460+ spinner = withSpinner' ("Updating thunk " <> T.pack target <> " to latest") (pure $ const $ "Thunk " <> T.pack target <> " updated to latest")
445461
446462setThunk :: MonadObelisk m => ThunkConfig -> FilePath -> GitSource -> String -> m ()
447463setThunk thunkConfig target gs branch = do
448− newThunkPtr <- uriThunkPtr (_gitSource_url gs) (Just $ T.pack branch) Nothing
464+ newThunkPtr <- uriThunkPtr (_gitSource_url gs) (_thunkConfig_private thunkConfig) (Just $ T.pack branch) Nothing
449465 overwriteThunk target newThunkPtr
450466 updateThunkToLatest (ThunkUpdateConfig Nothing thunkConfig) target
451467
452468-- | All recognized github standalone loaders, ordered from newest to oldest.
453469-- This tool will only ever produce the newest one when it writes a thunk.
454−gitHubStandaloneLoaders :: NonEmpty Text
455−gitHubStandaloneLoaders =
456− gitHubStandaloneLoaderV4 :|
457− [ gitHubStandaloneLoaderV3
458− , gitHubStandaloneLoaderV2
459− , gitHubStandaloneLoaderV1
470+gitHubThunkSpecs :: NonEmpty ThunkSpec
471+gitHubThunkSpecs =
472+ gitHubThunkSpecV5 :|
473+ [ gitHubThunkSpecV4
474+ , gitHubThunkSpecV3
475+ , gitHubThunkSpecV2
476+ , gitHubThunkSpecV1
460477 ]
461478
462−gitHubStandaloneLoaderV1 :: Text
463−gitHubStandaloneLoaderV1 = T.unlines
464− [ "import ((import <nixpkgs> {}).fetchFromGitHub (builtins.fromJSON (builtins.readFile ./github.json)))"
465− ]
479+gitHubThunkSpecV1 :: ThunkSpec
480+gitHubThunkSpecV1 = legacyGitHubThunkSpec "github-v1"
481+ "import ((import <nixpkgs> {}).fetchFromGitHub (builtins.fromJSON (builtins.readFile ./github.json)))"
466482
467−gitHubStandaloneLoaderV2 :: Text
468−gitHubStandaloneLoaderV2 = T.unlines
483+gitHubThunkSpecV2 :: ThunkSpec
484+gitHubThunkSpecV2 = legacyGitHubThunkSpec "github-v2" $ T.unlines
469485 [ "# DO NOT HAND-EDIT THIS FILE" --TODO: Add something about how to get more info on Obelisk, etc.
470486 , "import ((import <nixpkgs> {}).fetchFromGitHub ("
471487 , " let json = builtins.fromJSON (builtins.readFile ./github.json);"
@@ -475,8 +491,8 @@ gitHubStandaloneLoaderV2 = T.unlines
475491 , "))"
476492 ]
477493
478−gitHubStandaloneLoaderV3 :: Text
479−gitHubStandaloneLoaderV3 = T.unlines
494+gitHubThunkSpecV3 :: ThunkSpec
495+gitHubThunkSpecV3 = legacyGitHubThunkSpec "github-v3" $ T.unlines
480496 [ "# DO NOT HAND-EDIT THIS FILE"
481497 , "let"
482498 , " fetch = { private ? false, ... }@args: if private && builtins.hasAttr \"fetchGit\" builtins"
@@ -495,8 +511,8 @@ gitHubStandaloneLoaderV3 = T.unlines
495511 , "in import (fetch (builtins.fromJSON (builtins.readFile ./github.json)))"
496512 ]
497513
498−gitHubStandaloneLoaderV4 :: Text
499−gitHubStandaloneLoaderV4 = T.unlines
514+gitHubThunkSpecV4 :: ThunkSpec
515+gitHubThunkSpecV4 = legacyGitHubThunkSpec "github-v4" $ T.unlines
500516 [ "# DO NOT HAND-EDIT THIS FILE"
501517 , "let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:"
502518 , " if !fetchSubmodules && !private then builtins.fetchTarball {"
@@ -507,23 +523,50 @@ gitHubStandaloneLoaderV4 = T.unlines
507523 , "in import (fetch (builtins.fromJSON (builtins.readFile ./github.json)))"
508524 ]
509525
510−plainGitStandaloneLoaders :: NonEmpty Text
511−plainGitStandaloneLoaders =
512− plainGitStandaloneLoaderV3 :|
513− [ plainGitStandaloneLoaderV1
514− , plainGitStandaloneLoaderV2
526+legacyGitHubThunkSpec :: Text -> Text -> ThunkSpec
527+legacyGitHubThunkSpec name loader = ThunkSpec name $ Map.fromList
528+ [ ("default.nix", ThunkFileSpec_FileMatches $ T.strip loader)
529+ , ("github.json" , ThunkFileSpec_Ptr parseGitHubJsonBytes)
530+ , (attrCacheFileName, ThunkFileSpec_AttrCache)
531+ , (".git", ThunkFileSpec_CheckoutIndicator)
515532 ]
516533
517−plainGitStandaloneLoaderV1 :: Text
518−plainGitStandaloneLoaderV1 = T.unlines
534+gitHubThunkSpecV5 :: ThunkSpec
535+gitHubThunkSpecV5 = mkThunkSpec "github-v5" "github.json" parseGitHubJsonBytes [here|
536+# DO NOT HAND-EDIT THIS FILE
537+let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:
538+ if !fetchSubmodules && !private then builtins.fetchTarball {
539+ url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; inherit sha256;
540+ } else (import <nixpkgs> {}).fetchFromGitHub {
541+ inherit owner repo rev sha256 fetchSubmodules private;
542+ };
543+ json = builtins.fromJSON (builtins.readFile ./github.json);
544+in fetch json
545+|]
546+
547+parseGitHubJsonBytes :: LBS.ByteString -> Either String ThunkPtr
548+parseGitHubJsonBytes = parseJsonObject $ parseThunkPtr $ \v ->
549+ ThunkSource_GitHub <$> parseGitHubSource v <|> ThunkSource_Git <$> parseGitSource v
550+
551+gitThunkSpecs :: NonEmpty ThunkSpec
552+gitThunkSpecs =
553+ gitThunkSpecV5 :|
554+ [ gitThunkSpecV4
555+ , gitThunkSpecV3
556+ , gitThunkSpecV2
557+ , gitThunkSpecV1
558+ ]
559+
560+gitThunkSpecV1 :: ThunkSpec
561+gitThunkSpecV1 = legacyGitThunkSpec "git-v1" $ T.unlines
519562 [ "# DO NOT HAND-EDIT THIS FILE"
520563 , "let fetchGit = {url, rev, ref ? null, branch ? null, sha256 ? null, fetchSubmodules ? null}:"
521564 , " assert !fetchSubmodules; (import <nixpkgs> {}).fetchgit { inherit url rev sha256; };"
522565 , "in import (fetchGit (builtins.fromJSON (builtins.readFile ./git.json)))"
523566 ]
524567
525−plainGitStandaloneLoaderV2 :: Text
526−plainGitStandaloneLoaderV2 = T.unlines
568+gitThunkSpecV2 :: ThunkSpec
569+gitThunkSpecV2 = legacyGitThunkSpec "git-v2" $ T.unlines
527570 [ "# DO NOT HAND-EDIT THIS FILE"
528571 , "let fetchGit = {url, rev, ref ? null, branch ? null, sha256 ? null, fetchSubmodules ? null}:"
529572 , " if builtins.hasAttr \"fetchGit\" builtins"
@@ -532,8 +575,10 @@ plainGitStandaloneLoaderV2 = T.unlines
532575 , "in import (fetchGit (builtins.fromJSON (builtins.readFile ./git.json)))"
533576 ]
534577
535−plainGitStandaloneLoaderV3 :: Text
536−plainGitStandaloneLoaderV3 = T.unlines
578+-- This loader has a bug because @builtins.fetchGit@ is not given a @ref@
579+-- and will fail to find commits without this because it does shallow clones.
580+gitThunkSpecV3 :: ThunkSpec
581+gitThunkSpecV3 = legacyGitThunkSpec "git-v3" $ T.unlines
537582 [ "# DO NOT HAND-EDIT THIS FILE"
538583 , "let fetch = {url, rev, ref ? null, sha256 ? null, fetchSubmodules ? false, private ? false, ...}:"
539584 , " let realUrl = let firstChar = builtins.substring 0 1 url; in"
@@ -548,10 +593,69 @@ plainGitStandaloneLoaderV3 = T.unlines
548593 , "in import (fetch (builtins.fromJSON (builtins.readFile ./git.json)))"
549594 ]
550595
551−thunkFileNames :: [FilePath]
552−thunkFileNames = ["default.nix", "github.json", "git.json"]
596+gitThunkSpecV4 :: ThunkSpec
597+gitThunkSpecV4 = legacyGitThunkSpec "git-v4" $ T.unlines
598+ [ "# DO NOT HAND-EDIT THIS FILE"
599+ , "let fetch = {url, rev, branch ? null, sha256 ? null, fetchSubmodules ? false, private ? false, ...}:"
600+ , " let realUrl = let firstChar = builtins.substring 0 1 url; in"
601+ , " if firstChar == \"/\" then /. + url"
602+ , " else if firstChar == \".\" then ./. + url"
603+ , " else url;"
604+ , " in if !fetchSubmodules && private then builtins.fetchGit {"
605+ , " url = realUrl; inherit rev;"
606+ , " ${if branch == null then null else \"ref\"} = branch;"
607+ , " } else (import <nixpkgs> {}).fetchgit {"
608+ , " url = realUrl; inherit rev sha256;"
609+ , " };"
610+ , "in import (fetch (builtins.fromJSON (builtins.readFile ./git.json)))"
611+ ]
553612
554−--TODO: when checking something out, make a shallow clone
613+legacyGitThunkSpec :: Text -> Text -> ThunkSpec
614+legacyGitThunkSpec name loader = ThunkSpec name $ Map.fromList
615+ [ ("default.nix", ThunkFileSpec_FileMatches $ T.strip loader)
616+ , ("git.json" , ThunkFileSpec_Ptr parseGitJsonBytes)
617+ , (attrCacheFileName, ThunkFileSpec_AttrCache)
618+ , (".git", ThunkFileSpec_CheckoutIndicator)
619+ ]
620+
621+gitThunkSpecV5 :: ThunkSpec
622+gitThunkSpecV5 = mkThunkSpec "git-v5" "git.json" parseGitJsonBytes [here|
623+# DO NOT HAND-EDIT THIS FILE
624+let fetch = {url, rev, branch ? null, sha256 ? null, fetchSubmodules ? false, private ? false, ...}:
625+ let realUrl = let firstChar = builtins.substring 0 1 url; in
626+ if firstChar == "/" then /. + url
627+ else if firstChar == "." then ./. + url
628+ else url;
629+ in if !fetchSubmodules && private then builtins.fetchGit {
630+ url = realUrl; inherit rev;
631+ ${if branch == null then null else "ref"} = branch;
632+ } else (import <nixpkgs> {}).fetchgit {
633+ url = realUrl; inherit rev sha256;
634+ };
635+ json = builtins.fromJSON (builtins.readFile ./git.json);
636+in fetch json
637+|]
638+
639+parseGitJsonBytes :: LBS.ByteString -> Either String ThunkPtr
640+parseGitJsonBytes = parseJsonObject $ parseThunkPtr $ fmap ThunkSource_Git . parseGitSource
641+
642+mkThunkSpec :: Text -> FilePath -> (LBS.ByteString -> Either String ThunkPtr) -> Text -> ThunkSpec
643+mkThunkSpec name jsonFileName parser srcNix = ThunkSpec name $ Map.fromList
644+ [ ("default.nix", ThunkFileSpec_FileMatches defaultNixViaSrc)
645+ , ("thunk.nix", ThunkFileSpec_FileMatches srcNix)
646+ , (jsonFileName, ThunkFileSpec_Ptr parser)
647+ , (attrCacheFileName, ThunkFileSpec_AttrCache)
648+ , (normalise $ unpackedDirName </> ".git", ThunkFileSpec_CheckoutIndicator)
649+ ]
650+ where
651+ defaultNixViaSrc = [here|
652+# DO NOT HAND-EDIT THIS FILE
653+import (import ./thunk.nix)
654+|]
655+
656+
657+parseJsonObject :: (Aeson.Object -> Aeson.Parser a) -> LBS.ByteString -> Either String a
658+parseJsonObject p bytes = Aeson.parseEither p =<< Aeson.eitherDecode bytes
555659
556660-- | Checks a cache directory to see if there is a fresh symlink
557661-- to the result of building an attribute of a thunk.
@@ -559,44 +663,49 @@ thunkFileNames = ["default.nix", "github.json", "git.json"]
559663-- and the result is symlinked into the cache.
560664nixBuildThunkAttrWithCache
561665 :: MonadObelisk m
562− => FilePath
666+ => ThunkSpec
667+ -> FilePath
563668 -- ^ Path to directory containing Thunk
564669 -> String
565670 -- ^ Attribute to build
566− -> m FilePath
671+ -> m (Maybe FilePath)
567672 -- ^ Symlink to cached or built nix output
568673-- WARNING: If the thunk uses an impure reference such as '<nixpkgs>'
569674-- the caching mechanism will fail as it merely measures the modification
570675-- time of the cache link and the expression to build.
571−nixBuildThunkAttrWithCache thunkDir attr = do
572− --NB: Expects thunkDir to be normalised with no trailing path separator.
573− --This should be guaranteed by the command argument parser.
574− let cacheErrHandler e
575− | isDoesNotExistError e = return Nothing -- expected from a cache miss
576− | otherwise = putLog Error (T.pack $ displayException e) >> return Nothing
577− cacheDir = thunkDir </> ".attr-cache"
578− cachePath = cacheDir </> attr <.> "out"
676+nixBuildThunkAttrWithCache thunkSpec thunkDir attr = do
579677 latestChange <- liftIO $ do
580− createDirectoryIfMissing False cacheDir
581− let getModificationTimeMaybe = fmap rightToMaybe . try @IOError . getModificationTime
582− maximum . catMaybes <$> mapM (getModificationTimeMaybe . (thunkDir </>)) thunkFileNames
583− cacheHit <- handle cacheErrHandler $ do
584− cacheTime <- liftIO $ posixSecondsToUTCTime . realToFrac . modificationTime <$> getSymbolicLinkStatus cachePath
585− return $ if latestChange <= cacheTime
586− then Just cachePath
587− else Nothing
588− case cacheHit of
589− Just c -> return c
590− Nothing -> do
591− putLog Warning $ T.pack $ mconcat [thunkDir, ": ", attr, " not cached, building ..."]
592− _ <- nixCmd $ NixCmd_Build $ def
593− Lens.& nixBuildConfig_outLink Lens..~ OutLink_IndirectRoot cachePath
594− Lens.& nixCmdConfig_target Lens..~ Target
595− { _target_path = Just thunkDir
596− , _target_attr = Just attr
597− , _target_expr = Nothing
598− }
599− return cachePath
678+ let
679+ getModificationTimeMaybe = fmap rightToMaybe . try @IOError . getModificationTime
680+ thunkFileNames = Map.keys $ _thunkSpec_files thunkSpec
681+ maximum . catMaybes <$> traverse (getModificationTimeMaybe . (thunkDir </>)) thunkFileNames
682+
683+ let cachePaths' = nonEmpty $ Map.keys $ Map.filter (\case ThunkFileSpec_AttrCache -> True; _ -> False) $
684+ _thunkSpec_files thunkSpec
685+ for cachePaths' $ \cachePaths ->
686+ fmap NonEmpty.head $ for cachePaths $ \cacheDir -> do
687+ let
688+ cachePath = thunkDir </> cacheDir </> attr <.> "out"
689+ cacheErrHandler e
690+ | isDoesNotExistError e = pure Nothing -- expected from a cache miss
691+ | otherwise = Nothing <$ putLog Error (T.pack $ displayException e)
692+ cacheHit <- handle cacheErrHandler $ do
693+ cacheTime <- liftIO $ posixSecondsToUTCTime . realToFrac . modificationTime <$> getSymbolicLinkStatus cachePath
694+ pure $ if latestChange <= cacheTime
695+ then Just cachePath
696+ else Nothing
697+ case cacheHit of
698+ Just c -> pure c
699+ Nothing -> do
700+ putLog Warning $ T.pack $ mconcat [thunkDir, ": ", attr, " not cached, building ..."]
701+ liftIO $ createDirectoryIfMissing True (takeDirectory cachePath)
702+ (cachePath <$) $ nixCmd $ NixCmd_Build $ def
703+ & nixBuildConfig_outLink .~ OutLink_IndirectRoot cachePath
704+ & nixCmdConfig_target .~ Target
705+ { _target_path = Just thunkDir
706+ , _target_attr = Just attr
707+ , _target_expr = Nothing
708+ }
600709
601710-- | Build a nix attribute, and cache the result if possible
602711nixBuildAttrWithCache
@@ -607,13 +716,15 @@ nixBuildAttrWithCache
607716 -- ^ Attribute to build
608717 -> m FilePath
609718 -- ^ Symlink to cached or built nix output
610−nixBuildAttrWithCache exprPath attr = do
611− readThunk exprPath >>= \case
612− -- Only packed thunks are cached. in particular, checkouts are not
613− Right (ThunkData_Packed _) -> nixBuildThunkAttrWithCache exprPath attr
614− _ -> nixCmd $ NixCmd_Build $ def
615− Lens.& nixBuildConfig_outLink Lens..~ OutLink_None
616− Lens.& nixCmdConfig_target Lens..~ Target
719+nixBuildAttrWithCache exprPath attr = readThunk exprPath >>= \case
720+ -- Only packed thunks are cached. In particular, checkouts are not.
721+ Right (ThunkData_Packed spec _) ->
722+ maybe build pure =<< nixBuildThunkAttrWithCache spec exprPath attr
723+ _ -> build
724+ where
725+ build = nixCmd $ NixCmd_Build $ def
726+ & nixBuildConfig_outLink .~ OutLink_None
727+ & nixCmdConfig_target .~ Target
617728 { _target_path = Just exprPath
618729 , _target_attr = Just attr
619730 , _target_expr = Nothing
@@ -634,7 +745,7 @@ updateThunk p f = withSystemTempDirectory "obelisk-thunkptr-" $ \tmpDir -> do
634745 where
635746 copyThunkToTmp tmpDir thunkDir = readThunk thunkDir >>= \case
636747 Left err -> failWith $ "withThunkUnpacked: " <> T.pack (show err)
637− Right (ThunkData_Packed _) -> do
748+ Right ThunkData_Packed{} -> do
638749 let tmpThunk = tmpDir </> "thunk"
639750 callProcessAndLogOutput (Notice, Error) $
640751 proc cp ["-r", "-T", thunkDir, tmpThunk]
@@ -648,62 +759,81 @@ updateThunk p f = withSystemTempDirectory "obelisk-thunkptr-" $ \tmpDir -> do
648759finalMsg :: Bool -> (a -> Text) -> Maybe (a -> Text)
649760finalMsg noTrail s = if noTrail then Nothing else Just s
650761
651−unpackThunk :: MonadObelisk m => FilePath -> m ()
652−unpackThunk = unpackThunk' False
653−
654762-- | Check that we are not somewhere inside the thunk directory
655−checkThunkDirectory :: MonadObelisk m => Text -> FilePath -> m ()
656−checkThunkDirectory msg thunkDir = do
763+checkThunkDirectory :: MonadObelisk m => FilePath -> m ()
764+checkThunkDirectory thunkDir = do
657765 currentDir <- liftIO getCurrentDirectory
658766 thunkDir' <- liftIO $ canonicalizePath thunkDir
659− when (thunkDir' `L.isInfixOf` currentDir) $ failWith msg
767+ when (thunkDir' `L.isInfixOf` currentDir) $
768+ failWith [i|Can't perform thunk operations from within the thunk directory: ${thunkDir}|]
769+
770+ -- Don't let thunk commands work when directly given an unpacked repo
771+ when (takeFileName thunkDir == unpackedDirName) $
772+ readThunk (takeDirectory thunkDir) >>= \case
773+ Right _ -> failWith [i|Refusing to perform thunk operation on ${thunkDir} because it is a thunk's unpacked source|]
774+ Left _ -> pure ()
775+
776+unpackThunk :: MonadObelisk m => FilePath -> m ()
777+unpackThunk = unpackThunk' False
660778
661779unpackThunk' :: MonadObelisk m => Bool -> FilePath -> m ()
662−unpackThunk' noTrail thunkDir = checkThunkDirectory "Can't pack/unpack from within the thunk directory" thunkDir >> readThunk thunkDir >>= \case
663− Left err -> failWith $ "thunk unpack: " <> T.pack (show err)
780+unpackThunk' noTrail thunkDir = checkThunkDirectory thunkDir *> readThunk thunkDir >>= \case
781+ Left err -> failWith [i|Invalid thunk at ${thunkDir}: ${err}|]
664782 --TODO: Overwrite option that rechecks out thunk; force option to do so even if working directory is dirty
665− Right (ThunkData_Checkout _) -> failWith "thunk unpack: thunk is already unpacked"
666− Right (ThunkData_Packed tptr) -> do
783+ Right ThunkData_Checkout -> failWith [i|Thunk at ${thunkDir} is already unpacked|]
784+ Right (ThunkData_Packed _ tptr) -> do
667785 let (thunkParent, thunkName) = splitFileName thunkDir
668− withTempDirectory thunkParent thunkName $ \tmpRepo -> do
669− let obGitDir = tmpRepo </> ".git" </> "obelisk"
670− s = case _thunkPtr_source tptr of
671− ThunkSource_GitHub s' -> forgetGithub False s'
672− ThunkSource_Git s' -> s'
786+ withTempDirectory thunkParent thunkName $ \tmpThunk -> do
787+ let
788+ gitSrc = thunkSourceToGitSource $ _thunkPtr_source tptr
789+ newSpec = case _thunkPtr_source tptr of
790+ ThunkSource_GitHub _ -> NonEmpty.head gitHubThunkSpecs
791+ ThunkSource_Git _ -> NonEmpty.head gitThunkSpecs
673792 withSpinner' ("Fetching thunk " <> T.pack thunkName)
674793 (finalMsg noTrail $ const $ "Fetched thunk " <> T.pack thunkName) $ do
675− let git = callProcessAndLogOutput (Notice, Notice) . gitProc tmpRepo
676− git $ [ "clone" ]
677− ++ ("--recursive" <$ guard (_gitSource_fetchSubmodules s))
678− ++ [ T.unpack $ gitUriToText $ _gitSource_url s ]
679− ++ do branch <- maybeToList $ _gitSource_branch s
680− [ "--branch", T.unpack $ untagName branch ]
681− git ["reset", "--hard", Ref.toHexString $ _thunkRev_commit $ _thunkPtr_rev tptr]
682− when (_gitSource_fetchSubmodules s) $
683− git ["submodule", "update", "--recursive", "--init"]
684−
685− liftIO $ createDirectory obGitDir
686− callProcessAndLogOutput (Notice, Error) $
687− proc cp ["-r", "-T", thunkDir </> ".", obGitDir </> "orig-thunk"]
688− callProcessAndLogOutput (Notice, Error) $
689− proc "rm" ["-r", thunkDir]
690− callProcessAndLogOutput (Notice, Error) $
691− proc "mv" ["-T", tmpRepo, thunkDir]
794+ let unpackedPath = tmpThunk </> unpackedDirName
795+ gitCloneForThunkUnpack gitSrc (_thunkRev_commit $ _thunkPtr_rev tptr) unpackedPath
796+
797+ let normalizeMore = dropTrailingPathSeparator . normalise
798+ when (normalizeMore unpackedPath /= normalizeMore tmpThunk) $ -- Only write meta data if the checkout is not inplace
799+ createThunk tmpThunk $ Left newSpec
800+
801+ liftIO $ do
802+ removePathForcibly thunkDir
803+ renameDirectory tmpThunk thunkDir
804+
805+gitCloneForThunkUnpack
806+ :: MonadObelisk m
807+ => GitSource -- ^ Git source to use
808+ -> Ref hash -- ^ Commit hash to reset to
809+ -> FilePath -- ^ Directory to clone into
810+ -> m ()
811+gitCloneForThunkUnpack gitSrc commit dir = do
812+ let git = callProcessAndLogOutput (Notice, Notice) . gitProc dir
813+ git $ [ "clone" ]
814+ ++ ["--recursive" | _gitSource_fetchSubmodules gitSrc]
815+ ++ [ T.unpack $ gitUriToText $ _gitSource_url gitSrc ]
816+ ++ do branch <- maybeToList $ _gitSource_branch gitSrc
817+ [ "--branch", T.unpack $ untagName branch ]
818+ git ["reset", "--hard", Ref.toHexString commit]
819+ when (_gitSource_fetchSubmodules gitSrc) $
820+ git ["submodule", "update", "--recursive", "--init"]
692821
693822--TODO: add a rollback mode to pack to the original thunk
694823packThunk :: MonadObelisk m => ThunkPackConfig -> FilePath -> m ThunkPtr
695824packThunk = packThunk' False
696825
697826packThunk' :: MonadObelisk m => Bool -> ThunkPackConfig -> FilePath -> m ThunkPtr
698−packThunk' noTrail (ThunkPackConfig force thunkConfig) thunkDir = checkThunkDirectory "Can't pack/unpack from within the thunk directory" thunkDir >> readThunk thunkDir >>= \case
699− Left err -> failWith $ T.pack $ "thunk pack: " <> show err
700− Right (ThunkData_Packed _) -> failWith "pack: thunk is already packed"
701− Right (ThunkData_Checkout _) -> do
702− withSpinner' ("Packing thunk " <> T.pack thunkDir)
703− (finalMsg noTrail $ const $ "Packed thunk " <> T.pack thunkDir) $ do
704− thunkPtr <- modifyThunkPtrByConfig thunkConfig <$> getThunkPtr (not force) thunkDir
705− callProcessAndLogOutput (Debug, Error) $ proc "rm" ["-rf", thunkDir]
706− liftIO $ createThunk thunkDir thunkPtr
827+packThunk' noTrail (ThunkPackConfig force thunkConfig) thunkDir = checkThunkDirectory thunkDir *> readThunk thunkDir >>= \case
828+ Right ThunkData_Packed{} -> failWith [i|Thunk at ${thunkDir} is is already packed|]
829+ _ -> withSpinner'
830+ ("Packing thunk " <> T.pack thunkDir)
831+ (finalMsg noTrail $ const $ "Packed thunk " <> T.pack thunkDir) $
832+ do
833+ let checkClean = if force then CheckClean_NoCheck else CheckClean_FullCheck
834+ thunkPtr <- modifyThunkPtrByConfig thunkConfig <$> getThunkPtr checkClean thunkDir (_thunkConfig_private thunkConfig)
835+ liftIO $ removePathForcibly thunkDir
836+ createThunk thunkDir $ Right thunkPtr
707837 pure thunkPtr
708838
709839modifyThunkPtrByConfig :: ThunkConfig -> ThunkPtr -> ThunkPtr
@@ -714,29 +844,43 @@ modifyThunkPtrByConfig (ThunkConfig markPrivate') ptr = case markPrivate' of
714844 ThunkSource_GitHub s -> ThunkSource_GitHub $ s { _gitHubSource_private = markPrivate }
715845 }
716846
717−getThunkPtr :: forall m. MonadObelisk m => Bool -> FilePath -> m ThunkPtr
718−getThunkPtr checkClean thunkDir = do
719− when checkClean $ ensureCleanGitRepo thunkDir True
847+data CheckClean
848+ = CheckClean_FullCheck
849+ -- ^ Check that the repo is clean, including .gitignored files
850+ | CheckClean_NotIgnored
851+ -- ^ Check that the repo is clean, not including .gitignored files
852+ | CheckClean_NoCheck
853+ -- ^ Don't check that the repo is clean
854+
855+getThunkPtr :: forall m. MonadObelisk m => CheckClean -> FilePath -> Maybe Bool -> m ThunkPtr
856+getThunkPtr gitCheckClean dir mPrivate = do
857+ let repoLocations = nubOrd $ map (first normalise)
858+ [(".git", "."), (unpackedDirName </> ".git", unpackedDirName)]
859+ repoLocation' <- liftIO $ flip findM repoLocations $ doesDirectoryExist . (dir </>) . fst
860+ thunkDir <- case repoLocation' of
861+ Nothing -> failWith [i|Can't find an unpacked thunk in ${dir}|]
862+ Just (_, path) -> pure $ normalise $ dir </> path
863+
864+ let (checkClean, checkIgnored) = case gitCheckClean of
865+ CheckClean_FullCheck -> (True, True)
866+ CheckClean_NotIgnored -> (True, False)
867+ CheckClean_NoCheck -> (False, False)
868+ when checkClean $ ensureCleanGitRepo thunkDir checkIgnored
720869 "thunk pack: thunk checkout contains unsaved modifications"
721870
722871 -- Check whether there are any stashes
723− stashOutput <- readGitProcess thunkDir ["stash", "list"]
724− when checkClean $ case T.null stashOutput of
725− False -> do
872+ when checkClean $ do
873+ stashOutput <- readGitProcess thunkDir ["stash", "list"]
874+ unless (T.null stashOutput) $
726875 failWith $ T.unlines $
727876 [ "thunk pack: thunk checkout has stashes"
728877 , "git stash list:"
729878 ] ++ T.lines stashOutput
730− True -> return ()
731879
732− -- Get current branch ``
880+ -- Get current branch
733881 (mCurrentBranch, mCurrentCommit) <- do
734− b <- listToMaybe
735− <$> T.lines
736− <$> readGitProcess thunkDir ["rev-parse", "--abbrev-ref", "HEAD"]
737− c <- listToMaybe
738− <$> T.lines
739− <$> readGitProcess thunkDir ["rev-parse", "HEAD"]
882+ b <- listToMaybe . T.lines <$> readGitProcess thunkDir ["rev-parse", "--abbrev-ref", "HEAD"]
883+ c <- listToMaybe . T.lines <$> readGitProcess thunkDir ["rev-parse", "HEAD"]
740884 case b of
741885 (Just "HEAD") -> failWith $ T.unlines
742886 [ "thunk pack: You are in 'detached HEAD' state."
@@ -747,7 +891,7 @@ getThunkPtr checkClean thunkDir = do
747891
748892 -- Get information on all branches and their (optional) designated upstream
749893 -- correspondents
750− (headDump :: [Text]) <- T.lines <$> readGitProcess thunkDir
894+ headDump :: [Text] <- T.lines <$> readGitProcess thunkDir
751895 [ "for-each-ref"
752896 , "--format=%(refname:short) %(upstream:short) %(upstream:remotename)"
753897 , "refs/heads/"
@@ -793,7 +937,7 @@ getThunkPtr checkClean thunkDir = do
793937 ]
794938
795939 -- loosely by https://stackoverflow.com/questions/7773939/show-git-ahead-and-behind-info-for-all-branches-including-remotes
796− stats <- iforM headUpstream $ \branch (upstream, _remote) -> do
940+ stats <- ifor headUpstream $ \branch (upstream, _remote) -> do
797941 (stat :: [Text]) <- T.lines <$> readGitProcess thunkDir
798942 [ "rev-list", "--left-right"
799943 , T.unpack branch <> "..." <> T.unpack upstream
@@ -817,8 +961,9 @@ getThunkPtr checkClean thunkDir = do
817961 \pushed but this repo's remote tracking branches don't know it.)"
818962 ]
819963
820− -- We assume it's safe to pack the thunk at this point
821− putLog Informational "All changes safe in git remotes. OK to pack thunk."
964+ when checkClean $ do
965+ -- We assume it's safe to pack the thunk at this point
966+ putLog Informational "All changes safe in git remotes. OK to pack thunk."
822967
823968 let remote = maybe "origin" snd $ flip Map.lookup headUpstream =<< mCurrentBranch
824969
@@ -831,14 +976,12 @@ getThunkPtr checkClean thunkDir = do
831976 remoteUri <- case parseGitUri remoteUri' of
832977 Nothing -> failWith $ "Could not identify git remote: " <> remoteUri'
833978 Just uri -> pure uri
834− uriThunkPtr remoteUri mCurrentBranch mCurrentCommit
979+ uriThunkPtr remoteUri mPrivate mCurrentBranch mCurrentCommit
835980
836981-- | Get the latest revision available from the given source
837982getLatestRev :: MonadObelisk m => ThunkSource -> m ThunkRev
838983getLatestRev os = do
839− let gitS = case os of
840− ThunkSource_GitHub s -> forgetGithub False s
841− ThunkSource_Git s -> s
984+ let gitS = thunkSourceToGitSource os
842985 (_, commit) <- gitGetCommitBranch (_gitSource_url gitS) (untagName <$> _gitSource_branch gitS)
843986 case os of
844987 ThunkSource_GitHub s -> githubThunkRev s commit
@@ -850,12 +993,12 @@ getLatestRev os = do
850993-- performance. If that doesn't work (e.g. authentication issue), we fall back
851994-- on just doing things the normal way for git repos in general, and save it as
852995-- a regular git thunk.
853−uriThunkPtr :: MonadObelisk m => GitUri -> Maybe Text -> Maybe Text -> m ThunkPtr
854−uriThunkPtr uri mbranch mcommit = do
996+uriThunkPtr :: MonadObelisk m => GitUri -> Maybe Bool -> Maybe Text -> Maybe Text -> m ThunkPtr
997+uriThunkPtr uri mPrivate mbranch mcommit = do
855998 commit <- case mcommit of
856− Nothing -> gitGetCommitBranch uri mbranch >>= return . snd -- return . (\(_, y, _)->y) --perhaps do io here instead of making uriToTHunkSource effectful ?
999+ Nothing -> gitGetCommitBranch uri mbranch >>= return . snd
8571000 (Just c) -> return c
858− (src, rev) <- uriToThunkSource uri mbranch >>= \case
1001+ (src, rev) <- uriToThunkSource uri mPrivate mbranch >>= \case
8591002 ThunkSource_GitHub s -> do
8601003 rev <- runExceptT $ githubThunkRev s commit
8611004 case rev of
@@ -878,8 +1021,8 @@ uriThunkPtr uri mbranch mcommit = do
8781021-- If the thunk is a GitHub thunk and fails, we do *not* fall back like with
8791022-- `uriThunkPtr`. Unlike a plain URL, a thunk src explicitly states which method
8801023-- should be employed, and so we respect that.
881−uriToThunkSource :: MonadObelisk m => GitUri -> Maybe Text -> m ThunkSource
882−uriToThunkSource (GitUri u)
1024+uriToThunkSource :: MonadObelisk m => GitUri -> Maybe Bool -> Maybe Text -> m ThunkSource
1025+uriToThunkSource (GitUri u) mPrivate
8831026 | Right uriAuth <- URI.uriAuthority u
8841027 , Just scheme <- URI.unRText <$> URI.uriScheme u
8851028 , case scheme of
@@ -892,7 +1035,7 @@ uriToThunkSource (GitUri u)
8921035 && URI.unRText (URI.authHost uriAuth) == "github.com"
8931036 , Just (_, owner :| [repoish]) <- URI.uriPath u
8941037 = \mbranch -> do
895− isPrivate <- guessGitRepoIsPrivate $ GitUri u
1038+ isPrivate <- getIsPrivate
8961039 pure $ ThunkSource_GitHub $ GitHubSource
8971040 { _gitHubSource_owner = N $ URI.unRText owner
8981041 , _gitHubSource_repo = N $ let
@@ -903,13 +1046,15 @@ uriToThunkSource (GitUri u)
9031046 }
9041047
9051048 | otherwise = \mbranch -> do
906− isPrivate <- guessGitRepoIsPrivate $ GitUri u
1049+ isPrivate <- getIsPrivate
9071050 pure $ ThunkSource_Git $ GitSource
9081051 { _gitSource_url = GitUri u
9091052 , _gitSource_branch = N <$> mbranch
9101053 , _gitSource_fetchSubmodules = False -- TODO: How do we determine if this should be true?
9111054 , _gitSource_private = isPrivate
9121055 }
1056+ where
1057+ getIsPrivate = maybe (guessGitRepoIsPrivate $ GitUri u) pure mPrivate
9131058
9141059guessGitRepoIsPrivate :: MonadObelisk m => GitUri -> m Bool
9151060guessGitRepoIsPrivate uri = flip fix urisToTry $ \loop -> \case
@@ -931,7 +1076,7 @@ guessGitRepoIsPrivate uri = flip fix urisToTry $ \loop -> \case
9311076 urisToTry = nubOrd $
9321077 -- Include the original URI if it isn't using SSH because SSH will certainly fail.
9331078 [uri | fmap URI.unRText (URI.uriScheme (unGitUri uri)) /= Just "ssh"] <>
934− [changeScheme "https" uri, changeScheme "http" uri, changeScheme "git" uri]
1079+ [changeScheme "https" uri, changeScheme "http" uri]
9351080 changeScheme scheme (GitUri u) = GitUri $ u
9361081 { URI.uriScheme = URI.mkScheme scheme
9371082 , URI.uriAuthority = (\x -> x { URI.authUserInfo = Nothing }) <$> URI.uriAuthority u