@@ -5,48 +5,66 @@
55{-# LANGUAGE MultiWayIf #-}
66{-# LANGUAGE OverloadedStrings #-}
77{-# LANGUAGE PatternGuards #-}
8−{-# LANGUAGE QuasiQuotes #-}
98{-# LANGUAGE ScopedTypeVariables #-}
109{-# LANGUAGE TypeApplications #-}
11−module Obelisk.Command.Thunk where
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
1237
1338import Control.Applicative
1439import Control.Exception (displayException, try)
15−import Control.Lens (ifor, ifor_, (.~))
40+import qualified Control.Lens as Lens
41+import Control.Lens.Indexed hiding ((<.>))
1642import Control.Monad
17−import Control.Monad.Extra (findM)
18−import Control.Monad.Catch (MonadCatch, handle)
43+import Control.Monad.Catch (handle)
1944import Control.Monad.Except
2045import Data.Aeson ((.=))
2146import qualified Data.Aeson as Aeson
2247import Data.Aeson.Encode.Pretty
2348import qualified Data.Aeson.Types as Aeson
24−import Data.Bifunctor (first)
2549import qualified Data.ByteString.Lazy as LBS
2650import Data.Containers.ListUtils (nubOrd)
2751import Data.Default
2852import Data.Either.Combinators (fromRight', rightToMaybe)
29−import Data.Foldable (toList)
30−import Data.Function ((&))
31−import Data.Functor ((<&>))
3253import Data.Git.Ref (Ref)
3354import qualified Data.Git.Ref as Ref
3455import qualified Data.List as L
35−import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
56+import Data.List.NonEmpty (NonEmpty (..))
3657import qualified Data.List.NonEmpty as NonEmpty
3758import Data.Map (Map)
3859import qualified Data.Map as Map
3960import Data.Maybe
4061import Data.Set (Set)
4162import qualified Data.Set as Set
42−import Data.String.Here.Interpolated (i)
43−import Data.String.Here.Uninterpolated (here)
4463import Data.Text (Text)
4564import qualified Data.Text as T
4665import Data.Text.Encoding
4766import qualified Data.Text.IO as T
4867import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
49−import Data.Traversable (for)
5068import Data.Yaml (parseMaybe)
5169import GitHub
5270import GitHub.Data.Name
@@ -56,7 +74,7 @@ import System.Exit
5674import System.FilePath
5775import System.IO.Error
5876import System.IO.Temp
59−import System.PosixCompat.Files (getSymbolicLinkStatus, modificationTime)
77+import System.Posix (getSymbolicLinkStatus, modificationTime)
6078import qualified Text.URI as URI
6179
6280import Obelisk.App (MonadObelisk)
@@ -65,10 +83,11 @@ import Obelisk.Command.Utils
6583
6684--TODO: Support symlinked thunk data
6785data ThunkData
68− = ThunkData_Packed ThunkSpec ThunkPtr
86+ = ThunkData_Packed ThunkPtr
6987 -- ^ Packed thunk
70− | ThunkData_Checkout
88+ | ThunkData_Checkout (Maybe ThunkPtr)
7189 -- ^ Checked out thunk that was unpacked from this pointer
90+ deriving (Show, Eq, Ord)
7291
7392-- | A reference to the exact data that a thunk should translate into
7493data ThunkPtr = ThunkPtr
@@ -94,11 +113,6 @@ data ThunkSource
94113 | ThunkSource_Git GitSource
95114 deriving (Show, Eq, Ord)
96115
97−thunkSourceToGitSource :: ThunkSource -> GitSource
98−thunkSourceToGitSource = \case
99− ThunkSource_GitHub s -> forgetGithub False s
100− ThunkSource_Git s -> s
101−
102116data GitHubSource = GitHubSource
103117 { _gitHubSource_owner :: Name Owner
104118 , _gitHubSource_repo :: Name Repo
@@ -178,14 +192,14 @@ getNixSha256ForUriUnpacked
178192getNixSha256ForUriUnpacked uri =
179193 withExitFailMessage ("nix-prefetch-url: Failed to determine sha256 hash of URL " <> gitUriToText uri) $ do
180194 [hash] <- fmap T.lines $ readProcessAndLogOutput (Debug, Debug) $
181− proc nixPrefetchUrlPath ["--unpack", "--type", "sha256", T.unpack $ gitUriToText uri]
195+ proc "nix-prefetch-url" ["--unpack", "--type", "sha256", T.unpack $ gitUriToText uri]
182196 pure hash
183197
184198nixPrefetchGit :: MonadObelisk m => GitUri -> Text -> Bool -> m NixSha256
185199nixPrefetchGit uri rev fetchSubmodules =
186200 withExitFailMessage ("nix-prefetch-git: Failed to determine sha256 hash of Git repo " <> gitUriToText uri <> " at " <> rev) $ do
187201 out <- readProcessAndLogStderr Debug $
188− proc nixPrefetchGitPath $ filter (/="")
202+ proc "nix-prefetch-git" $ filter (/="")
189203 [ "--url", T.unpack $ gitUriToText uri
190204 , "--rev", T.unpack rev
191205 , if fetchSubmodules then "--fetch-submodules" else ""
@@ -198,117 +212,93 @@ nixPrefetchGit uri rev fetchSubmodules =
198212
199213--TODO: Pretty print these
200214data ReadThunkError
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)
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
228240 }
229241
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}|]
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
250+ }
251+
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
307287
308288-- | Read a thunk and validate that it is exactly a packed thunk.
309289-- If additional data is present, fail.
310−readThunk :: (MonadObelisk m) => FilePath -> m (Either ReadThunkError ThunkData)
311−readThunk = readThunkWith thunkSpecTypes
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
312302
313303parseThunkPtr :: (Aeson.Object -> Aeson.Parser ThunkSource) -> Aeson.Object -> Aeson.Parser ThunkPtr
314304parseThunkPtr parseSrc v = do
@@ -352,18 +342,16 @@ parseGitSource v = do
352342overwriteThunk :: MonadObelisk m => FilePath -> ThunkPtr -> m ()
353343overwriteThunk target thunk = do
354344 -- Ensure that this directory is a valid thunk (i.e. so we aren't losing any data)
355− readThunk target >>= \case
356− Left e -> failWith [i|Invalid thunk at ${target}: ${e}|]
357− Right _ -> pure ()
345+ Right _ <- readThunk target
358346
359347 --TODO: Is there a safer way to do this overwriting?
360− liftIO $ removePathForcibly target
361− createThunk target $ Right thunk
348+ liftIO $ removeDirectoryRecursive target
349+ liftIO $ createThunk target thunk
362350
363−thunkPtrToSpec :: ThunkPtr -> ThunkSpec
364−thunkPtrToSpec thunk = case _thunkPtr_source thunk of
365− ThunkSource_GitHub _ -> NonEmpty.head gitHubThunkSpecs
366− ThunkSource_Git _ -> NonEmpty.head gitThunkSpecs
351+thunkPtrLoader :: ThunkPtr -> Text
352+thunkPtrLoader thunk = case _thunkPtr_source thunk of
353+ ThunkSource_GitHub _ -> NonEmpty.head gitHubStandaloneLoaders
354+ ThunkSource_Git _ -> NonEmpty.head plainGitStandaloneLoaders
367355
368356-- It's important that formatting be very consistent here, because
369357-- otherwise when people update thunks, their patches will be messy
@@ -410,41 +398,35 @@ encodeThunkPtrData (ThunkPtr rev src) = case src of
410398 , confTrailingNewline = True
411399 }
412400
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
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)
428410
429411createThunkWithLatest :: MonadObelisk m => FilePath -> ThunkSource -> m ()
430412createThunkWithLatest target s = do
431413 rev <- getLatestRev s
432− createThunk target $ Right $ ThunkPtr
414+ createThunk target $ ThunkPtr
433415 { _thunkPtr_source = s
434416 , _thunkPtr_rev = rev
435417 }
436418
437419updateThunkToLatest :: MonadObelisk m => ThunkUpdateConfig -> FilePath -> m ()
438−updateThunkToLatest (ThunkUpdateConfig mBranch thunkConfig) target = spinner $ do
439− checkThunkDirectory target
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
440422 -- check to see if thunk should be updated to a specific branch or just update it's current branch
441423 case mBranch of
442424 Nothing -> do
443425 (overwrite, ptr) <- readThunk target >>= \case
444− Left err -> failWith [i|Thunk update: ${err}|]
426+ Left err -> failWith $ T.pack $ "thunk update: " <> show err
445427 Right c -> case c of
446− ThunkData_Packed _ t -> return (target, t)
447− ThunkData_Checkout -> failWith "cannot update an unpacked thunk"
428+ ThunkData_Packed t -> return (target, t)
429+ ThunkData_Checkout _ -> failWith "cannot update an unpacked thunk"
448430 let src = _thunkPtr_source ptr
449431 rev <- getLatestRev src
450432 overwriteThunk overwrite $ modifyThunkPtrByConfig thunkConfig $ ThunkPtr
@@ -452,36 +434,38 @@ updateThunkToLatest (ThunkUpdateConfig mBranch thunkConfig) target = spinner $ d
452434 , _thunkPtr_rev = rev
453435 }
454436 Just branch -> readThunk target >>= \case
455− Left err -> failWith [i|Thunk update: ${err}|]
437+ Left err -> failWith $ T.pack $ "thunk update: " <> show err
456438 Right c -> case c of
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")
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."
461445
462446setThunk :: MonadObelisk m => ThunkConfig -> FilePath -> GitSource -> String -> m ()
463447setThunk thunkConfig target gs branch = do
464− newThunkPtr <- uriThunkPtr (_gitSource_url gs) (_thunkConfig_private thunkConfig) (Just $ T.pack branch) Nothing
448+ newThunkPtr <- uriThunkPtr (_gitSource_url gs) (Just $ T.pack branch) Nothing
465449 overwriteThunk target newThunkPtr
466450 updateThunkToLatest (ThunkUpdateConfig Nothing thunkConfig) target
467451
468452-- | All recognized github standalone loaders, ordered from newest to oldest.
469453-- This tool will only ever produce the newest one when it writes a thunk.
470−gitHubThunkSpecs :: NonEmpty ThunkSpec
471−gitHubThunkSpecs =
472− gitHubThunkSpecV5 :|
473− [ gitHubThunkSpecV4
474− , gitHubThunkSpecV3
475− , gitHubThunkSpecV2
476− , gitHubThunkSpecV1
454+gitHubStandaloneLoaders :: NonEmpty Text
455+gitHubStandaloneLoaders =
456+ gitHubStandaloneLoaderV4 :|
457+ [ gitHubStandaloneLoaderV3
458+ , gitHubStandaloneLoaderV2
459+ , gitHubStandaloneLoaderV1
477460 ]
478461
479−gitHubThunkSpecV1 :: ThunkSpec
480−gitHubThunkSpecV1 = legacyGitHubThunkSpec "github-v1"
481− "import ((import <nixpkgs> {}).fetchFromGitHub (builtins.fromJSON (builtins.readFile ./github.json)))"
462+gitHubStandaloneLoaderV1 :: Text
463+gitHubStandaloneLoaderV1 = T.unlines
464+ [ "import ((import <nixpkgs> {}).fetchFromGitHub (builtins.fromJSON (builtins.readFile ./github.json)))"
465+ ]
482466
483−gitHubThunkSpecV2 :: ThunkSpec
484−gitHubThunkSpecV2 = legacyGitHubThunkSpec "github-v2" $ T.unlines
467+gitHubStandaloneLoaderV2 :: Text
468+gitHubStandaloneLoaderV2 = T.unlines
485469 [ "# DO NOT HAND-EDIT THIS FILE" --TODO: Add something about how to get more info on Obelisk, etc.
486470 , "import ((import <nixpkgs> {}).fetchFromGitHub ("
487471 , " let json = builtins.fromJSON (builtins.readFile ./github.json);"
@@ -491,8 +475,8 @@ gitHubThunkSpecV2 = legacyGitHubThunkSpec "github-v2" $ T.unlines
491475 , "))"
492476 ]
493477
494−gitHubThunkSpecV3 :: ThunkSpec
495−gitHubThunkSpecV3 = legacyGitHubThunkSpec "github-v3" $ T.unlines
478+gitHubStandaloneLoaderV3 :: Text
479+gitHubStandaloneLoaderV3 = T.unlines
496480 [ "# DO NOT HAND-EDIT THIS FILE"
497481 , "let"
498482 , " fetch = { private ? false, ... }@args: if private && builtins.hasAttr \"fetchGit\" builtins"
@@ -511,8 +495,8 @@ gitHubThunkSpecV3 = legacyGitHubThunkSpec "github-v3" $ T.unlines
511495 , "in import (fetch (builtins.fromJSON (builtins.readFile ./github.json)))"
512496 ]
513497
514−gitHubThunkSpecV4 :: ThunkSpec
515−gitHubThunkSpecV4 = legacyGitHubThunkSpec "github-v4" $ T.unlines
498+gitHubStandaloneLoaderV4 :: Text
499+gitHubStandaloneLoaderV4 = T.unlines
516500 [ "# DO NOT HAND-EDIT THIS FILE"
517501 , "let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:"
518502 , " if !fetchSubmodules && !private then builtins.fetchTarball {"
@@ -523,50 +507,23 @@ gitHubThunkSpecV4 = legacyGitHubThunkSpec "github-v4" $ T.unlines
523507 , "in import (fetch (builtins.fromJSON (builtins.readFile ./github.json)))"
524508 ]
525509
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)
510+plainGitStandaloneLoaders :: NonEmpty Text
511+plainGitStandaloneLoaders =
512+ plainGitStandaloneLoaderV3 :|
513+ [ plainGitStandaloneLoaderV1
514+ , plainGitStandaloneLoaderV2
532515 ]
533516
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
517+plainGitStandaloneLoaderV1 :: Text
518+plainGitStandaloneLoaderV1 = T.unlines
562519 [ "# DO NOT HAND-EDIT THIS FILE"
563520 , "let fetchGit = {url, rev, ref ? null, branch ? null, sha256 ? null, fetchSubmodules ? null}:"
564521 , " assert !fetchSubmodules; (import <nixpkgs> {}).fetchgit { inherit url rev sha256; };"
565522 , "in import (fetchGit (builtins.fromJSON (builtins.readFile ./git.json)))"
566523 ]
567524
568−gitThunkSpecV2 :: ThunkSpec
569−gitThunkSpecV2 = legacyGitThunkSpec "git-v2" $ T.unlines
525+plainGitStandaloneLoaderV2 :: Text
526+plainGitStandaloneLoaderV2 = T.unlines
570527 [ "# DO NOT HAND-EDIT THIS FILE"
571528 , "let fetchGit = {url, rev, ref ? null, branch ? null, sha256 ? null, fetchSubmodules ? null}:"
572529 , " if builtins.hasAttr \"fetchGit\" builtins"
@@ -575,10 +532,8 @@ gitThunkSpecV2 = legacyGitThunkSpec "git-v2" $ T.unlines
575532 , "in import (fetchGit (builtins.fromJSON (builtins.readFile ./git.json)))"
576533 ]
577534
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
535+plainGitStandaloneLoaderV3 :: Text
536+plainGitStandaloneLoaderV3 = T.unlines
582537 [ "# DO NOT HAND-EDIT THIS FILE"
583538 , "let fetch = {url, rev, ref ? null, sha256 ? null, fetchSubmodules ? false, private ? false, ...}:"
584539 , " let realUrl = let firstChar = builtins.substring 0 1 url; in"
@@ -593,69 +548,10 @@ gitThunkSpecV3 = legacyGitThunkSpec "git-v3" $ T.unlines
593548 , "in import (fetch (builtins.fromJSON (builtins.readFile ./git.json)))"
594549 ]
595550
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− ]
551+thunkFileNames :: [FilePath]
552+thunkFileNames = ["default.nix", "github.json", "git.json"]
612553
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
554+--TODO: when checking something out, make a shallow clone
659555
660556-- | Checks a cache directory to see if there is a fresh symlink
661557-- to the result of building an attribute of a thunk.
@@ -663,49 +559,44 @@ parseJsonObject p bytes = Aeson.parseEither p =<< Aeson.eitherDecode bytes
663559-- and the result is symlinked into the cache.
664560nixBuildThunkAttrWithCache
665561 :: MonadObelisk m
666− => ThunkSpec
667− -> FilePath
562+ => FilePath
668563 -- ^ Path to directory containing Thunk
669564 -> String
670565 -- ^ Attribute to build
671− -> m (Maybe FilePath)
566+ -> m FilePath
672567 -- ^ Symlink to cached or built nix output
673568-- WARNING: If the thunk uses an impure reference such as '<nixpkgs>'
674569-- the caching mechanism will fail as it merely measures the modification
675570-- time of the cache link and the expression to build.
676−nixBuildThunkAttrWithCache thunkSpec thunkDir attr = do
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"
677579 latestChange <- liftIO $ do
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− }
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
709600
710601-- | Build a nix attribute, and cache the result if possible
711602nixBuildAttrWithCache
@@ -716,15 +607,13 @@ nixBuildAttrWithCache
716607 -- ^ Attribute to build
717608 -> m FilePath
718609 -- ^ Symlink to cached or built nix output
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
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
728617 { _target_path = Just exprPath
729618 , _target_attr = Just attr
730619 , _target_expr = Nothing
@@ -745,7 +634,7 @@ updateThunk p f = withSystemTempDirectory "obelisk-thunkptr-" $ \tmpDir -> do
745634 where
746635 copyThunkToTmp tmpDir thunkDir = readThunk thunkDir >>= \case
747636 Left err -> failWith $ "withThunkUnpacked: " <> T.pack (show err)
748− Right ThunkData_Packed{} -> do
637+ Right (ThunkData_Packed _) -> do
749638 let tmpThunk = tmpDir </> "thunk"
750639 callProcessAndLogOutput (Notice, Error) $
751640 proc cp ["-r", "-T", thunkDir, tmpThunk]
@@ -759,81 +648,62 @@ updateThunk p f = withSystemTempDirectory "obelisk-thunkptr-" $ \tmpDir -> do
759648finalMsg :: Bool -> (a -> Text) -> Maybe (a -> Text)
760649finalMsg noTrail s = if noTrail then Nothing else Just s
761650
651+unpackThunk :: MonadObelisk m => FilePath -> m ()
652+unpackThunk = unpackThunk' False
653+
762654-- | Check that we are not somewhere inside the thunk directory
763−checkThunkDirectory :: MonadObelisk m => FilePath -> m ()
764−checkThunkDirectory thunkDir = do
655+checkThunkDirectory :: MonadObelisk m => Text -> FilePath -> m ()
656+checkThunkDirectory msg thunkDir = do
765657 currentDir <- liftIO getCurrentDirectory
766658 thunkDir' <- liftIO $ canonicalizePath thunkDir
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
659+ when (thunkDir' `L.isInfixOf` currentDir) $ failWith msg
778660
779661unpackThunk' :: MonadObelisk m => Bool -> FilePath -> m ()
780−unpackThunk' noTrail thunkDir = checkThunkDirectory thunkDir *> readThunk thunkDir >>= \case
781− Left err -> failWith [i|Invalid thunk at ${thunkDir}: ${err}|]
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)
782664 --TODO: Overwrite option that rechecks out thunk; force option to do so even if working directory is dirty
783− Right ThunkData_Checkout -> failWith [i|Thunk at ${thunkDir} is already unpacked|]
784− Right (ThunkData_Packed _ tptr) -> do
665+ Right (ThunkData_Checkout _) -> failWith "thunk unpack: thunk is already unpacked"
666+ Right (ThunkData_Packed tptr) -> do
785667 let (thunkParent, thunkName) = splitFileName thunkDir
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
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'
792673 withSpinner' ("Fetching thunk " <> T.pack thunkName)
793674 (finalMsg noTrail $ const $ "Fetched thunk " <> T.pack thunkName) $ do
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"]
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]
821692
822693--TODO: add a rollback mode to pack to the original thunk
823694packThunk :: MonadObelisk m => ThunkPackConfig -> FilePath -> m ThunkPtr
824695packThunk = packThunk' False
825696
826697packThunk' :: MonadObelisk m => Bool -> ThunkPackConfig -> FilePath -> m 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
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
837707 pure thunkPtr
838708
839709modifyThunkPtrByConfig :: ThunkConfig -> ThunkPtr -> ThunkPtr
@@ -844,43 +714,29 @@ modifyThunkPtrByConfig (ThunkConfig markPrivate') ptr = case markPrivate' of
844714 ThunkSource_GitHub s -> ThunkSource_GitHub $ s { _gitHubSource_private = markPrivate }
845715 }
846716
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
717+getThunkPtr :: forall m. MonadObelisk m => Bool -> FilePath -> m ThunkPtr
718+getThunkPtr checkClean thunkDir = do
719+ when checkClean $ ensureCleanGitRepo thunkDir True
869720 "thunk pack: thunk checkout contains unsaved modifications"
870721
871722 -- Check whether there are any stashes
872− when checkClean $ do
873− stashOutput <- readGitProcess thunkDir ["stash", "list"]
874− unless (T.null stashOutput) $
723+ stashOutput <- readGitProcess thunkDir ["stash", "list"]
724+ when checkClean $ case T.null stashOutput of
725+ False -> do
875726 failWith $ T.unlines $
876727 [ "thunk pack: thunk checkout has stashes"
877728 , "git stash list:"
878729 ] ++ T.lines stashOutput
730+ True -> return ()
879731
880− -- Get current branch
732+ -- Get current branch ``
881733 (mCurrentBranch, mCurrentCommit) <- do
882− b <- listToMaybe . T.lines <$> readGitProcess thunkDir ["rev-parse", "--abbrev-ref", "HEAD"]
883− c <- listToMaybe . T.lines <$> readGitProcess thunkDir ["rev-parse", "HEAD"]
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"]
884740 case b of
885741 (Just "HEAD") -> failWith $ T.unlines
886742 [ "thunk pack: You are in 'detached HEAD' state."
@@ -891,7 +747,7 @@ getThunkPtr gitCheckClean dir mPrivate = do
891747
892748 -- Get information on all branches and their (optional) designated upstream
893749 -- correspondents
894− headDump :: [Text] <- T.lines <$> readGitProcess thunkDir
750+ (headDump :: [Text]) <- T.lines <$> readGitProcess thunkDir
895751 [ "for-each-ref"
896752 , "--format=%(refname:short) %(upstream:short) %(upstream:remotename)"
897753 , "refs/heads/"
@@ -937,7 +793,7 @@ getThunkPtr gitCheckClean dir mPrivate = do
937793 ]
938794
939795 -- loosely by https://stackoverflow.com/questions/7773939/show-git-ahead-and-behind-info-for-all-branches-including-remotes
940− stats <- ifor headUpstream $ \branch (upstream, _remote) -> do
796+ stats <- iforM headUpstream $ \branch (upstream, _remote) -> do
941797 (stat :: [Text]) <- T.lines <$> readGitProcess thunkDir
942798 [ "rev-list", "--left-right"
943799 , T.unpack branch <> "..." <> T.unpack upstream
@@ -961,9 +817,8 @@ getThunkPtr gitCheckClean dir mPrivate = do
961817 \pushed but this repo's remote tracking branches don't know it.)"
962818 ]
963819
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."
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."
967822
968823 let remote = maybe "origin" snd $ flip Map.lookup headUpstream =<< mCurrentBranch
969824
@@ -976,12 +831,14 @@ getThunkPtr gitCheckClean dir mPrivate = do
976831 remoteUri <- case parseGitUri remoteUri' of
977832 Nothing -> failWith $ "Could not identify git remote: " <> remoteUri'
978833 Just uri -> pure uri
979− uriThunkPtr remoteUri mPrivate mCurrentBranch mCurrentCommit
834+ uriThunkPtr remoteUri mCurrentBranch mCurrentCommit
980835
981836-- | Get the latest revision available from the given source
982837getLatestRev :: MonadObelisk m => ThunkSource -> m ThunkRev
983838getLatestRev os = do
984− let gitS = thunkSourceToGitSource os
839+ let gitS = case os of
840+ ThunkSource_GitHub s -> forgetGithub False s
841+ ThunkSource_Git s -> s
985842 (_, commit) <- gitGetCommitBranch (_gitSource_url gitS) (untagName <$> _gitSource_branch gitS)
986843 case os of
987844 ThunkSource_GitHub s -> githubThunkRev s commit
@@ -993,12 +850,12 @@ getLatestRev os = do
993850-- performance. If that doesn't work (e.g. authentication issue), we fall back
994851-- on just doing things the normal way for git repos in general, and save it as
995852-- a regular git thunk.
996−uriThunkPtr :: MonadObelisk m => GitUri -> Maybe Bool -> Maybe Text -> Maybe Text -> m ThunkPtr
997−uriThunkPtr uri mPrivate mbranch mcommit = do
853+uriThunkPtr :: MonadObelisk m => GitUri -> Maybe Text -> Maybe Text -> m ThunkPtr
854+uriThunkPtr uri mbranch mcommit = do
998855 commit <- case mcommit of
999− Nothing -> gitGetCommitBranch uri mbranch >>= return . snd
856+ Nothing -> gitGetCommitBranch uri mbranch >>= return . snd -- return . (\(_, y, _)->y) --perhaps do io here instead of making uriToTHunkSource effectful ?
1000857 (Just c) -> return c
1001− (src, rev) <- uriToThunkSource uri mPrivate mbranch >>= \case
858+ (src, rev) <- uriToThunkSource uri mbranch >>= \case
1002859 ThunkSource_GitHub s -> do
1003860 rev <- runExceptT $ githubThunkRev s commit
1004861 case rev of
@@ -1021,8 +878,8 @@ uriThunkPtr uri mPrivate mbranch mcommit = do
1021878-- If the thunk is a GitHub thunk and fails, we do *not* fall back like with
1022879-- `uriThunkPtr`. Unlike a plain URL, a thunk src explicitly states which method
1023880-- should be employed, and so we respect that.
1024−uriToThunkSource :: MonadObelisk m => GitUri -> Maybe Bool -> Maybe Text -> m ThunkSource
1025−uriToThunkSource (GitUri u) mPrivate
881+uriToThunkSource :: MonadObelisk m => GitUri -> Maybe Text -> m ThunkSource
882+uriToThunkSource (GitUri u)
1026883 | Right uriAuth <- URI.uriAuthority u
1027884 , Just scheme <- URI.unRText <$> URI.uriScheme u
1028885 , case scheme of
@@ -1035,7 +892,7 @@ uriToThunkSource (GitUri u) mPrivate
1035892 && URI.unRText (URI.authHost uriAuth) == "github.com"
1036893 , Just (_, owner :| [repoish]) <- URI.uriPath u
1037894 = \mbranch -> do
1038− isPrivate <- getIsPrivate
895+ isPrivate <- guessGitRepoIsPrivate $ GitUri u
1039896 pure $ ThunkSource_GitHub $ GitHubSource
1040897 { _gitHubSource_owner = N $ URI.unRText owner
1041898 , _gitHubSource_repo = N $ let
@@ -1046,15 +903,13 @@ uriToThunkSource (GitUri u) mPrivate
1046903 }
1047904
1048905 | otherwise = \mbranch -> do
1049− isPrivate <- getIsPrivate
906+ isPrivate <- guessGitRepoIsPrivate $ GitUri u
1050907 pure $ ThunkSource_Git $ GitSource
1051908 { _gitSource_url = GitUri u
1052909 , _gitSource_branch = N <$> mbranch
1053910 , _gitSource_fetchSubmodules = False -- TODO: How do we determine if this should be true?
1054911 , _gitSource_private = isPrivate
1055912 }
1056− where
1057− getIsPrivate = maybe (guessGitRepoIsPrivate $ GitUri u) pure mPrivate
1058913
1059914guessGitRepoIsPrivate :: MonadObelisk m => GitUri -> m Bool
1060915guessGitRepoIsPrivate uri = flip fix urisToTry $ \loop -> \case
@@ -1076,7 +931,7 @@ guessGitRepoIsPrivate uri = flip fix urisToTry $ \loop -> \case
1076931 urisToTry = nubOrd $
1077932 -- Include the original URI if it isn't using SSH because SSH will certainly fail.
1078933 [uri | fmap URI.unRText (URI.uriScheme (unGitUri uri)) /= Just "ssh"] <>
1079− [changeScheme "https" uri, changeScheme "http" uri]
934+ [changeScheme "https" uri, changeScheme "http" uri, changeScheme "git" uri]
1080935 changeScheme scheme (GitUri u) = GitUri $ u
1081936 { URI.uriScheme = URI.mkScheme scheme
1082937 , URI.uriAuthority = (\x -> x { URI.authUserInfo = Nothing }) <$> URI.uriAuthority u