@@ -5,70 +5,81 @@
55{-# LANGUAGE MultiWayIf #-}
66{-# LANGUAGE OverloadedStrings #-}
77{-# LANGUAGE PatternGuards #-}
8−{-# LANGUAGE QuasiQuotes #-}
9−{-# LANGUAGE ScopedTypeVariables #-}
10−{-# LANGUAGE TypeApplications #-}
11−module Obelisk.Command.Thunk where
8+{-# LANGUAGE TemplateHaskell #-}
9+
10+module Obelisk.Command.Thunk
11+ ( ThunkPtr (..)
12+ , ThunkRev (..)
13+ , ThunkSource (..)
14+ , ThunkData (..)
15+ , GitHubSource (..)
16+ , getLatestRev
17+ , updateThunkToLatest
18+ , createThunk
19+ , createThunkWithLatest
20+ , nixBuildAttrWithCache
21+ , nixBuildThunkAttrWithCache
22+ , unpackThunk
23+ , packThunk
24+ , readThunk
25+ , getThunkPtr
26+ ) where
1227
1328import Control.Applicative
14−import Control.Exception (displayException, try)
15−import Control.Lens (ifor, ifor_, (.~))
29+import Control.Exception (displayException, throwIO)
1630import Control.Monad
17−import Control.Monad.Extra (findM)
18−import Control.Monad.Catch (MonadCatch, handle)
31+import Control.Monad.Catch (handle)
1932import Control.Monad.Except
20−import Data.Aeson ((.=))
33+import Data.Aeson (decode, (.=))
2134import qualified Data.Aeson as Aeson
2235import Data.Aeson.Encode.Pretty
23−import qualified Data.Aeson.Types as Aeson
24−import Data.Bifunctor (first)
2536import qualified Data.ByteString.Lazy as LBS
26−import Data.Containers.ListUtils (nubOrd)
2737import Data.Default
28−import Data.Either.Combinators (fromRight', rightToMaybe)
29−import Data.Foldable (toList)
30−import Data.Function ((&))
31−import Data.Functor ((<&>))
38+import Data.Foldable
3239import Data.Git.Ref (Ref)
3340import qualified Data.Git.Ref as Ref
3441import qualified Data.List as L
35−import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
42+import Data.List.NonEmpty (NonEmpty (..))
3643import qualified Data.List.NonEmpty as NonEmpty
37−import Data.Map (Map)
3844import qualified Data.Map as Map
3945import Data.Maybe
46+import Data.Monoid
4047import Data.Set (Set)
4148import qualified Data.Set as Set
42−import Data.String.Here.Interpolated (i)
43−import Data.String.Here.Uninterpolated (here)
4449import Data.Text (Text)
4550import qualified Data.Text as T
4651import Data.Text.Encoding
4752import qualified Data.Text.IO as T
4853import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
49−import Data.Traversable (for)
50−import Data.Yaml (parseMaybe)
54+import Data.Yaml (parseMaybe, (.:))
55+import qualified Data.Yaml as Yaml
5156import GitHub
5257import GitHub.Data.Name
58+import GitHub.Endpoints.Repos.Contents (archiveForR)
59+import Network.URI
5360import Obelisk.Command.Nix
5461import System.Directory
5562import System.Exit
5663import System.FilePath
64+import System.IO
5765import System.IO.Error
5866import System.IO.Temp
59−import System.PosixCompat.Files (getSymbolicLinkStatus, modificationTime)
60−import qualified Text.URI as URI
67+import System.Posix (getSymbolicLinkStatus, modificationTime)
68+import System.Process (StdStream (CreatePipe), callProcess, createProcess, proc, readProcess, std_err,
69+ std_out, waitForProcess)
6170
71+import Development.Placeholders
6272import Obelisk.App (MonadObelisk)
63−import Obelisk.CliApp
64−import Obelisk.Command.Utils
73+import Obelisk.CLI (Severity (..), callProcessAndLogOutput, failWith, putLog, withSpinner)
74+import Obelisk.Command.Utils (checkGitCleanStatus, cp, procWithPackages)
6575
6676--TODO: Support symlinked thunk data
6777data ThunkData
68− = ThunkData_Packed ThunkSpec ThunkPtr
78+ = ThunkData_Packed ThunkPtr
6979 -- ^ Packed thunk
70− | ThunkData_Checkout
80+ | ThunkData_Checkout (Maybe ThunkPtr)
7181 -- ^ Checked out thunk that was unpacked from this pointer
82+ deriving (Show, Eq, Ord)
7283
7384-- | A reference to the exact data that a thunk should translate into
7485data ThunkPtr = ThunkPtr
@@ -81,7 +92,7 @@ type NixSha256 = Text --TODO: Use a smart constructor and make this actually ver
8192
8293-- | A specific revision of data; it may be available from multiple sources
8394data ThunkRev = ThunkRev
84− { _thunkRev_commit :: Ref Ref.SHA1
95+ { _thunkRev_commit :: Ref
8596 , _thunkRev_nixSha256 :: NixSha256
8697 }
8798 deriving (Show, Eq, Ord)
@@ -94,11 +105,6 @@ data ThunkSource
94105 | ThunkSource_Git GitSource
95106 deriving (Show, Eq, Ord)
96107
97−thunkSourceToGitSource :: ThunkSource -> GitSource
98−thunkSourceToGitSource = \case
99− ThunkSource_GitHub s -> forgetGithub False s
100− ThunkSource_Git s -> s
101−
102108data GitHubSource = GitHubSource
103109 { _gitHubSource_owner :: Name Owner
104110 , _gitHubSource_repo :: Name Repo
@@ -107,263 +113,158 @@ data GitHubSource = GitHubSource
107113 }
108114 deriving (Show, Eq, Ord)
109115
110−newtype GitUri = GitUri { unGitUri :: URI.URI } deriving (Eq, Ord, Show)
111−
112−gitUriToText :: GitUri -> Text
113−gitUriToText (GitUri uri)
114− | (T.toLower . URI.unRText <$> URI.uriScheme uri) == Just "file"
115− , Just (_, path) <- URI.uriPath uri
116− = "/" <> T.intercalate "/" (map URI.unRText $ NonEmpty.toList path)
117− | otherwise = URI.render uri
118−
119116data GitSource = GitSource
120− { _gitSource_url :: GitUri
117+ { _gitSource_url :: URI
118+ --TODO: Is it ok to use the types from the GitHub api bindings?
121119 , _gitSource_branch :: Maybe (Name Branch)
122120 , _gitSource_fetchSubmodules :: Bool
123− , _gitSource_private :: Bool
124121 }
125122 deriving (Show, Eq, Ord)
126123
127−newtype ThunkConfig = ThunkConfig
128− { _thunkConfig_private :: Maybe Bool
129− } deriving Show
130−
131−data ThunkUpdateConfig = ThunkUpdateConfig
132− { _thunkUpdateConfig_branch :: Maybe String
133− , _thunkUpdateConfig_config :: ThunkConfig
134− } deriving Show
135−
136−data ThunkPackConfig = ThunkPackConfig
137− { _thunkPackConfig_force :: Bool
138− , _thunkPackConfig_config :: ThunkConfig
139− } deriving Show
140−
141−-- | Convert a GitHub source to a regular Git source. Assumes no submodules.
142−forgetGithub :: Bool -> GitHubSource -> GitSource
143−forgetGithub useSsh s = GitSource
144− { _gitSource_url = GitUri $ URI.URI
145− { URI.uriScheme = Just $ fromRight' $ URI.mkScheme $ if useSsh then "ssh" else "https"
146− , URI.uriAuthority = Right $ URI.Authority
147− { URI.authUserInfo = URI.UserInfo (fromRight' $ URI.mkUsername "git") Nothing
148− <$ guard useSsh
149− , URI.authHost = fromRight' $ URI.mkHost "github.com"
150− , URI.authPort = Nothing
151− }
152− , URI.uriPath = Just ( False
153− , fromRight' . URI.mkPathPiece <$>
154− untagName (_gitHubSource_owner s)
155− :| [ untagName (_gitHubSource_repo s) <> ".git" ]
156− )
157− , URI.uriQuery = []
158− , URI.uriFragment = Nothing
159− }
160− , _gitSource_branch = _gitHubSource_branch s
161− , _gitSource_fetchSubmodules = False
162− , _gitSource_private = _gitHubSource_private s
163− }
164−
165−getThunkGitBranch :: ThunkPtr -> Maybe Text
166−getThunkGitBranch (ThunkPtr _ src) = fmap untagName $ case src of
167− ThunkSource_GitHub s -> _gitHubSource_branch s
168− ThunkSource_Git s -> _gitSource_branch s
169−
170−commitNameToRef :: Name Commit -> Ref Ref.SHA1
124+commitNameToRef :: Name Commit -> Ref
171125commitNameToRef (N c) = Ref.fromHex $ encodeUtf8 c
172126
173127-- TODO: Use spinner here.
174−getNixSha256ForUriUnpacked
175− :: MonadObelisk m
176− => GitUri
177− -> m NixSha256
178−getNixSha256ForUriUnpacked uri =
179− withExitFailMessage ("nix-prefetch-url: Failed to determine sha256 hash of URL " <> gitUriToText uri) $ do
180− [hash] <- fmap T.lines $ readProcessAndLogOutput (Debug, Debug) $
181− proc nixPrefetchUrlPath ["--unpack", "--type", "sha256", T.unpack $ gitUriToText uri]
182− pure hash
183−
184−nixPrefetchGit :: MonadObelisk m => GitUri -> Text -> Bool -> m NixSha256
185−nixPrefetchGit uri rev fetchSubmodules =
186− withExitFailMessage ("nix-prefetch-git: Failed to determine sha256 hash of Git repo " <> gitUriToText uri <> " at " <> rev) $ do
187− out <- readProcessAndLogStderr Debug $
188− proc nixPrefetchGitPath $ filter (/="")
189− [ "--url", T.unpack $ gitUriToText uri
190− , "--rev", T.unpack rev
191− , if fetchSubmodules then "--fetch-submodules" else ""
192− , "--quiet"
193− ]
128+getNixSha256ForUriUnpacked :: URI -> IO NixSha256
129+getNixSha256ForUriUnpacked uri = do
130+ --TODO: Make this package depend on nix-prefetch-url properly
131+ let cmd = proc "nix-prefetch-url" ["--unpack" , "--type" , "sha256" , show uri]
132+ (_, Just out, Just err, p) <- createProcess cmd
133+ { std_out = CreatePipe
134+ , std_err = CreatePipe
135+ }
136+ --TODO: Deal with errors here; usually they're HTTP errors
137+ waitForProcess p >>= \case
138+ ExitSuccess -> return ()
139+ _ -> do
140+ hPutStrLn stdout =<< hGetContents out
141+ hPutStrLn stderr =<< hGetContents err
142+ --TODO: actual error
143+ fail "nix-prefetch-url"
144+ T.strip <$> T.hGetContents out
194145
195− case parseMaybe (Aeson..: "sha256") =<< Aeson.decodeStrict (encodeUtf8 out) of
196− Nothing -> failWith $ "nix-prefetch-git: unrecognized output " <> out
197− Just x -> pure x
146+-- | Get the latest revision available from the given source
147+getLatestRev :: ThunkSource -> IO ThunkRev
148+getLatestRev = \case
149+ ThunkSource_GitHub s -> do
150+ auth <- getHubAuth "github.com"
151+ commitsResult <- executeRequestMaybe auth $ commitsWithOptionsForR
152+ (_gitHubSource_owner s)
153+ (_gitHubSource_repo s)
154+ (FetchAtLeast 1)
155+ $ case _gitHubSource_branch s of
156+ Nothing -> []
157+ Just b -> [CommitQuerySha $ untagName b]
158+ commitInfos <- either throwIO return commitsResult
159+ commitInfo : _ <- return $ toList commitInfos
160+ let commit = commitSha commitInfo
161+ Right archiveUri <- executeRequestMaybe auth $ archiveForR (_gitHubSource_owner s) (_gitHubSource_repo s) ArchiveFormatTarball $ Just $ untagName commit
162+ nixSha256 <- getNixSha256ForUriUnpacked archiveUri
163+ return $ ThunkRev
164+ { _thunkRev_commit = commitNameToRef commit
165+ , _thunkRev_nixSha256 = nixSha256
166+ }
167+ ThunkSource_Git _s -> do
168+ $notImplemented
198169
199170--TODO: Pretty print these
200171data 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)
228− }
229−
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}|]
172+ = ReadThunkError_WrongContents (Set String) (Set String)
173+ | ReadThunkError_UnrecognizedLoader Text
174+ | ReadThunkError_UnparseablePtr LBS.ByteString
175+ deriving (Show)
176+
177+-- | Read a thunk and validate that it is only a thunk, either packed or unpacked.
178+-- If the thunk is packed and additional data is present, fail.
179+readThunk :: MonadObelisk m => FilePath -> m (Either ReadThunkError ThunkData)
180+readThunk thunkDir = do
181+ files <- liftIO $ listDirectory thunkDir
182+ case ".git" `elem` files of
183+ True -> fmap ThunkData_Checkout <$> do
184+ let origThunkPath = thunkDir </> ".git" </> "obelisk" </> "orig-thunk"
185+ liftIO $ doesDirectoryExist origThunkPath >>= \case
186+ True -> fmap Just <$> readPackedThunk origThunkPath
187+ False -> return $ return Nothing
188+ False -> liftIO $ fmap ThunkData_Packed <$> readPackedThunk thunkDir
307189
308190-- | Read a thunk and validate that it is exactly a packed thunk.
309191-- If additional data is present, fail.
310−readThunk :: (MonadObelisk m) => FilePath -> m (Either ReadThunkError ThunkData)
311−readThunk = readThunkWith thunkSpecTypes
312−
313−parseThunkPtr :: (Aeson.Object -> Aeson.Parser ThunkSource) -> Aeson.Object -> Aeson.Parser ThunkPtr
314−parseThunkPtr parseSrc v = do
315− rev <- v Aeson..: "rev"
316− sha256 <- v Aeson..: "sha256"
317− src <- parseSrc v
318− pure $ ThunkPtr
319− { _thunkPtr_rev = ThunkRev
320− { _thunkRev_commit = Ref.fromHexString rev
321− , _thunkRev_nixSha256 = sha256
322− }
323− , _thunkPtr_source = src
324− }
325−
326−parseGitHubSource :: Aeson.Object -> Aeson.Parser GitHubSource
327−parseGitHubSource v = do
328− owner <- v Aeson..: "owner"
329− repo <- v Aeson..: "repo"
330− branch <- v Aeson..:! "branch"
331− private <- v Aeson..:? "private"
332− pure $ GitHubSource
333− { _gitHubSource_owner = owner
334− , _gitHubSource_repo = repo
335− , _gitHubSource_branch = branch
336− , _gitHubSource_private = fromMaybe False private
337− }
192+readPackedThunk :: FilePath -> IO (Either ReadThunkError ThunkPtr)
193+readPackedThunk thunkDir = runExceptT $ do
194+ let thunkLoader = thunkDir </> "default.nix"
195+ githubJson = thunkDir </> "github.json"
196+ attrCache = thunkDir </> ".attr-cache"
197+ expectedContents = Set.fromList $
198+ [ githubJson
199+ , thunkLoader
200+ ]
201+ optionalContents = Set.fromList $
202+ [ attrCache
203+ ]
338204
339−parseGitSource :: Aeson.Object -> Aeson.Parser GitSource
340−parseGitSource v = do
341− Just url <- parseGitUri <$> v Aeson..: "url"
342− branch <- v Aeson..:! "branch"
343− fetchSubmodules <- v Aeson..:! "fetchSubmodules"
344− private <- v Aeson..:? "private"
345− pure $ GitSource
346− { _gitSource_url = url
347− , _gitSource_branch = branch
348− , _gitSource_fetchSubmodules = fromMaybe False fetchSubmodules
349− , _gitSource_private = fromMaybe False private
350− }
205+ -- Ensure that there aren't any other files in the thunk
206+ -- NB: System.Directory.listDirectory returns the contents without the directory path
207+ files <- liftIO $ Set.fromList . fmap (thunkDir </>) <$> listDirectory thunkDir
208+ let unexpectedContents = files `Set.difference` (expectedContents `Set.union` optionalContents)
209+ missingContents = expectedContents `Set.difference` files
210+ unless (Set.null unexpectedContents && Set.null missingContents) $ do
211+ throwError $ ReadThunkError_WrongContents unexpectedContents missingContents
212+
213+ -- Ensure that we recognize the thunk loader
214+ loader <- liftIO $ T.readFile thunkLoader
215+ unless (loader `elem` gitHubStandaloneLoaders) $ do
216+ throwError $ ReadThunkError_UnrecognizedLoader loader
217+
218+ txt <- liftIO $ LBS.readFile githubJson
219+ let parseThunk v = do
220+ rev <- v Aeson..: "rev"
221+ sha256 <- v Aeson..: "sha256"
222+ src <- parseGitHubSource v
223+ <|> parseGitSource v
224+ return $ ThunkPtr
225+ { _thunkPtr_rev = ThunkRev
226+ { _thunkRev_commit = Ref.fromHexString rev
227+ , _thunkRev_nixSha256 = sha256
228+ }
229+ , _thunkPtr_source = src
230+ }
231+ parseGitHubSource v = do
232+ owner <- v Aeson..: "owner"
233+ repo <- v Aeson..: "repo"
234+ branch <- v Aeson..:! "branch"
235+ mPrivate <- v Aeson..:! "private"
236+ return $ ThunkSource_GitHub $ GitHubSource
237+ { _gitHubSource_owner = owner
238+ , _gitHubSource_repo = repo
239+ , _gitHubSource_branch = branch
240+ , _gitHubSource_private = fromMaybe False mPrivate
241+ }
242+ parseGitSource v = do
243+ Just url <- parseURI <$> v Aeson..: "url"
244+ branch <- v Aeson..:! "branch"
245+ fetchSubmodules <- v Aeson..: "fetchSubmodules"
246+ return $ ThunkSource_Git $ GitSource
247+ { _gitSource_url = url
248+ , _gitSource_branch = branch
249+ , _gitSource_fetchSubmodules = fetchSubmodules
250+ }
251+ case parseMaybe parseThunk =<< decode txt of
252+ Nothing -> throwError $ ReadThunkError_UnparseablePtr txt
253+ Just ptr -> return ptr
351254
352255overwriteThunk :: MonadObelisk m => FilePath -> ThunkPtr -> m ()
353256overwriteThunk target thunk = do
354257 -- 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 ()
258+ Right _ <- readThunk target
358259
359260 --TODO: Is there a safer way to do this overwriting?
360− liftIO $ removePathForcibly target
361− createThunk target $ Right thunk
261+ liftIO $ removeDirectoryRecursive target
262+ liftIO $ createThunk target thunk
362263
363−thunkPtrToSpec :: ThunkPtr -> ThunkSpec
364−thunkPtrToSpec thunk = case _thunkPtr_source thunk of
365− ThunkSource_GitHub _ -> NonEmpty.head gitHubThunkSpecs
366− ThunkSource_Git _ -> NonEmpty.head gitThunkSpecs
264+thunkPtrLoader :: ThunkPtr -> Text
265+thunkPtrLoader thunk = case _thunkPtr_source thunk of
266+ ThunkSource_GitHub _ -> NonEmpty.head gitHubStandaloneLoaders
267+ ThunkSource_Git _ -> NonEmpty.head plainGitStandaloneLoaders
367268
368269-- It's important that formatting be very consistent here, because
369270-- otherwise when people update thunks, their patches will be messy
@@ -372,18 +273,21 @@ encodeThunkPtrData (ThunkPtr rev src) = case src of
372273 ThunkSource_GitHub s -> encodePretty' githubCfg $ Aeson.object $ catMaybes
373274 [ Just $ "owner" .= _gitHubSource_owner s
374275 , Just $ "repo" .= _gitHubSource_repo s
375− , ("branch" .=) <$> _gitHubSource_branch s
276+ , case _gitHubSource_branch s of
277+ Just b -> Just $ "branch" .= b
278+ Nothing -> Nothing
279+ , if _gitHubSource_private s
280+ then Just $ "private" .= True
281+ else Nothing
376282 , Just $ "rev" .= Ref.toHexString (_thunkRev_commit rev)
377283 , Just $ "sha256" .= _thunkRev_nixSha256 rev
378− , Just $ "private" .= _gitHubSource_private s
379284 ]
380285 ThunkSource_Git s -> encodePretty' plainGitCfg $ Aeson.object $ catMaybes
381− [ Just $ "url" .= gitUriToText (_gitSource_url s)
286+ --TODO: Is this safe? read/show is jank for `URI`
287+ [ Just $ "url" .= show (_gitSource_url s)
382288 , Just $ "rev" .= Ref.toHexString (_thunkRev_commit rev)
383− , ("branch" .=) <$> _gitSource_branch s
384289 , Just $ "sha256" .= _thunkRev_nixSha256 rev
385290 , Just $ "fetchSubmodules" .= _gitSource_fetchSubmodules s
386− , Just $ "private" .= _gitSource_private s
387291 ]
388292 where
389293 githubCfg = defConfig
@@ -404,84 +308,54 @@ encodeThunkPtrData (ThunkPtr rev src) = case src of
404308 [ "url"
405309 , "rev"
406310 , "sha256"
407− , "private"
408311 , "fetchSubmodules"
409312 ] <> compare
410313 , confTrailingNewline = True
411314 }
412315
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
316+createThunk :: FilePath -> ThunkPtr -> IO ()
317+createThunk target thunk = do
318+ createDirectoryIfMissing True (target </> ".attr-cache")
319+ T.writeFile (target </> "default.nix") (thunkPtrLoader thunk)
320+ LBS.writeFile (target </> "github.json") (encodeThunkPtrData thunk)
428321
429−createThunkWithLatest :: MonadObelisk m => FilePath -> ThunkSource -> m ()
322+createThunkWithLatest :: FilePath -> ThunkSource -> IO ()
430323createThunkWithLatest target s = do
431324 rev <- getLatestRev s
432− createThunk target $ Right $ ThunkPtr
325+ createThunk target $ ThunkPtr
433326 { _thunkPtr_source = s
434327 , _thunkPtr_rev = rev
435328 }
436329
437−updateThunkToLatest :: MonadObelisk m => ThunkUpdateConfig -> FilePath -> m ()
438−updateThunkToLatest (ThunkUpdateConfig mBranch thunkConfig) target = spinner $ do
439− checkThunkDirectory target
440− -- check to see if thunk should be updated to a specific branch or just update it's current branch
441− case mBranch of
442− Nothing -> do
443− (overwrite, ptr) <- readThunk target >>= \case
444− Left err -> failWith [i|Thunk update: ${err}|]
445− Right c -> case c of
446− ThunkData_Packed _ t -> return (target, t)
447− ThunkData_Checkout -> failWith "cannot update an unpacked thunk"
448− let src = _thunkPtr_source ptr
449− rev <- getLatestRev src
450− overwriteThunk overwrite $ modifyThunkPtrByConfig thunkConfig $ ThunkPtr
451− { _thunkPtr_source = src
452− , _thunkPtr_rev = rev
453− }
454− Just branch -> readThunk target >>= \case
455− Left err -> failWith [i|Thunk update: ${err}|]
456− 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")
461−
462−setThunk :: MonadObelisk m => ThunkConfig -> FilePath -> GitSource -> String -> m ()
463−setThunk thunkConfig target gs branch = do
464− newThunkPtr <- uriThunkPtr (_gitSource_url gs) (_thunkConfig_private thunkConfig) (Just $ T.pack branch) Nothing
465− overwriteThunk target newThunkPtr
466− updateThunkToLatest (ThunkUpdateConfig Nothing thunkConfig) target
330+updateThunkToLatest :: MonadObelisk m => FilePath -> m ()
331+updateThunkToLatest target = do
332+ (overwrite, ptr) <- readThunk target >>= \case
333+ Left err -> failWith $ T.pack $ "thunk update: " <> show err
334+ Right c -> case c of
335+ ThunkData_Packed t -> return (target, t)
336+ ThunkData_Checkout _ -> failWith "cannot update an unpacked thunk"
337+ let src = _thunkPtr_source ptr
338+ rev <- liftIO $ getLatestRev src
339+ overwriteThunk overwrite $ ThunkPtr
340+ { _thunkPtr_source = src
341+ , _thunkPtr_rev = rev
342+ }
467343
468344-- | All recognized github standalone loaders, ordered from newest to oldest.
469345-- 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
346+gitHubStandaloneLoaders :: NonEmpty Text
347+gitHubStandaloneLoaders =
348+ gitHubStandaloneLoaderV2 :|
349+ [ gitHubStandaloneLoaderV1
477350 ]
478351
479−gitHubThunkSpecV1 :: ThunkSpec
480−gitHubThunkSpecV1 = legacyGitHubThunkSpec "github-v1"
481− "import ((import <nixpkgs> {}).fetchFromGitHub (builtins.fromJSON (builtins.readFile ./github.json)))"
352+gitHubStandaloneLoaderV1 :: Text
353+gitHubStandaloneLoaderV1 = T.unlines
354+ [ "import ((import <nixpkgs> {}).fetchFromGitHub (builtins.fromJSON (builtins.readFile ./github.json)))"
355+ ]
482356
483−gitHubThunkSpecV2 :: ThunkSpec
484−gitHubThunkSpecV2 = legacyGitHubThunkSpec "github-v2" $ T.unlines
357+gitHubStandaloneLoaderV2 :: Text
358+gitHubStandaloneLoaderV2 = T.unlines
485359 [ "# DO NOT HAND-EDIT THIS FILE" --TODO: Add something about how to get more info on Obelisk, etc.
486360 , "import ((import <nixpkgs> {}).fetchFromGitHub ("
487361 , " let json = builtins.fromJSON (builtins.readFile ./github.json);"
@@ -491,171 +365,32 @@ gitHubThunkSpecV2 = legacyGitHubThunkSpec "github-v2" $ T.unlines
491365 , "))"
492366 ]
493367
494−gitHubThunkSpecV3 :: ThunkSpec
495−gitHubThunkSpecV3 = legacyGitHubThunkSpec "github-v3" $ T.unlines
496− [ "# DO NOT HAND-EDIT THIS FILE"
497− , "let"
498− , " fetch = { private ? false, ... }@args: if private && builtins.hasAttr \"fetchGit\" builtins"
499− , " then fetchFromGitHubPrivate args"
500− , " else (import <nixpkgs> {}).fetchFromGitHub (builtins.removeAttrs args [\"branch\"]);"
501− , " fetchFromGitHubPrivate ="
502− , " { owner, repo, rev, branch ? null, name ? null, sha256 ? null, private ? false"
503− , " , fetchSubmodules ? false, githubBase ? \"github.com\", ..."
504− , " }: assert !fetchSubmodules;"
505− , " builtins.fetchGit ({"
506− , " url = \"ssh://git@${githubBase}/${owner}/${repo}.git\";"
507− , " inherit rev;"
508− , " }"
509− , " // (if branch == null then {} else { ref = branch; })"
510− , " // (if name == null then {} else { inherit name; }));"
511− , "in import (fetch (builtins.fromJSON (builtins.readFile ./github.json)))"
368+plainGitStandaloneLoaders :: NonEmpty Text
369+plainGitStandaloneLoaders =
370+ plainGitStandaloneLoaderV1 :|
371+ [
512372 ]
513373
514−gitHubThunkSpecV4 :: ThunkSpec
515−gitHubThunkSpecV4 = legacyGitHubThunkSpec "github-v4" $ T.unlines
516− [ "# DO NOT HAND-EDIT THIS FILE"
517− , "let fetch = { private ? false, fetchSubmodules ? false, owner, repo, rev, sha256, ... }:"
518− , " if !fetchSubmodules && !private then builtins.fetchTarball {"
519− , " url = \"https://github.com/${owner}/${repo}/archive/${rev}.tar.gz\"; inherit sha256;"
520− , " } else (import <nixpkgs> {}).fetchFromGitHub {"
521− , " inherit owner repo rev sha256 fetchSubmodules private;"
522− , " };"
523− , "in import (fetch (builtins.fromJSON (builtins.readFile ./github.json)))"
374+plainGitStandaloneLoaderV1 :: Text
375+plainGitStandaloneLoaderV1 = T.unlines
376+ [ $notImplemented
524377 ]
525378
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)
532− ]
533−
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
562− [ "# DO NOT HAND-EDIT THIS FILE"
563− , "let fetchGit = {url, rev, ref ? null, branch ? null, sha256 ? null, fetchSubmodules ? null}:"
564− , " assert !fetchSubmodules; (import <nixpkgs> {}).fetchgit { inherit url rev sha256; };"
565− , "in import (fetchGit (builtins.fromJSON (builtins.readFile ./git.json)))"
566− ]
567−
568−gitThunkSpecV2 :: ThunkSpec
569−gitThunkSpecV2 = legacyGitThunkSpec "git-v2" $ T.unlines
570− [ "# DO NOT HAND-EDIT THIS FILE"
571− , "let fetchGit = {url, rev, ref ? null, branch ? null, sha256 ? null, fetchSubmodules ? null}:"
572− , " if builtins.hasAttr \"fetchGit\" builtins"
573− , " then builtins.fetchGit ({ inherit url rev; } // (if branch == null then {} else { ref = branch; }))"
574− , " else abort \"Plain Git repositories are only supported on nix 2.0 or higher.\";"
575− , "in import (fetchGit (builtins.fromJSON (builtins.readFile ./git.json)))"
576− ]
577−
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
582− [ "# DO NOT HAND-EDIT THIS FILE"
583− , "let fetch = {url, rev, ref ? null, sha256 ? null, fetchSubmodules ? false, private ? false, ...}:"
584− , " let realUrl = let firstChar = builtins.substring 0 1 url; in"
585− , " if firstChar == \"/\" then /. + url"
586− , " else if firstChar == \".\" then ./. + url"
587− , " else url;"
588− , " in if !fetchSubmodules && private then builtins.fetchGit {"
589− , " url = realUrl; inherit rev;"
590− , " } else (import <nixpkgs> {}).fetchgit {"
591− , " url = realUrl; inherit rev sha256;"
592− , " };"
593− , "in import (fetch (builtins.fromJSON (builtins.readFile ./git.json)))"
594− ]
595−
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− ]
612−
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
379+-- | Look for authentication info from the 'hub' command
380+getHubAuth
381+ :: Text -- ^ Domain name
382+ -> IO (Maybe Auth)
383+getHubAuth domain = do
384+ hubConfig <- getXdgDirectory XdgConfig "hub"
385+ Yaml.decodeFile hubConfig >>= \case
386+ Nothing -> return Nothing
387+ Just v -> return $ flip parseMaybe v $ \v' -> do
388+ Yaml.Array domainConfigs <- v' .: domain --TODO: Determine what multiple domainConfigs means
389+ [Yaml.Object domainConfig] <- return $ toList domainConfigs
390+ token <- domainConfig .: "oauth_token"
391+ return $ OAuth $ encodeUtf8 token
392+
393+--TODO: when checking something out, make a shallow clone
659394
660395-- | Checks a cache directory to see if there is a fresh symlink
661396-- to the result of building an attribute of a thunk.
@@ -663,49 +398,42 @@ parseJsonObject p bytes = Aeson.parseEither p =<< Aeson.eitherDecode bytes
663398-- and the result is symlinked into the cache.
664399nixBuildThunkAttrWithCache
665400 :: MonadObelisk m
666− => ThunkSpec
667− -> FilePath
401+ => FilePath
668402 -- ^ Path to directory containing Thunk
669403 -> String
670404 -- ^ Attribute to build
671− -> m (Maybe FilePath)
405+ -> m FilePath
672406 -- ^ Symlink to cached or built nix output
673407-- WARNING: If the thunk uses an impure reference such as '<nixpkgs>'
674408-- the caching mechanism will fail as it merely measures the modification
675409-- time of the cache link and the expression to build.
676−nixBuildThunkAttrWithCache thunkSpec thunkDir attr = do
677− 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− }
410+nixBuildThunkAttrWithCache thunkDir attr = do
411+ --NB: Expects thunkDir to be normalised with no trailing path separator.
412+ --This should be guaranteed by the command argument parser.
413+ let cacheErrHandler e
414+ | isDoesNotExistError e = return Nothing -- expected from a cache miss
415+ | otherwise = putLog Error (T.pack $ displayException e) >> return Nothing
416+ cacheDir = thunkDir </> ".attr-cache"
417+ cachePath = cacheDir </> attr <.> "out"
418+ liftIO $ createDirectoryIfMissing False cacheDir
419+ latestChange <- liftIO $ maximum <$> mapM (getModificationTime . (thunkDir </>)) ["default.nix", "github.json"]
420+ cacheHit <- handle cacheErrHandler $ do
421+ cacheTime <- liftIO $ posixSecondsToUTCTime . realToFrac . modificationTime <$> getSymbolicLinkStatus cachePath
422+ return $ if latestChange <= cacheTime
423+ then Just cachePath
424+ else Nothing
425+ case cacheHit of
426+ Just c -> return c
427+ Nothing -> do
428+ putLog Warning $ T.pack $ mconcat [thunkDir, ": ", attr, " not cached, building ..."]
429+ _ <- nixBuild $ def
430+ { _nixBuildConfig_target = Target
431+ { _target_path = thunkDir
432+ , _target_attr = Just attr
433+ }
434+ , _nixBuildConfig_outLink = OutLink_IndirectRoot cachePath
435+ }
436+ return cachePath
709437
710438-- | Build a nix attribute, and cache the result if possible
711439nixBuildAttrWithCache
@@ -716,476 +444,212 @@ nixBuildAttrWithCache
716444 -- ^ Attribute to build
717445 -> m FilePath
718446 -- ^ 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
728− { _target_path = Just exprPath
447+nixBuildAttrWithCache exprPath attr = do
448+ readThunk exprPath >>= \case
449+ -- Only packed thunks are cached. in particular, checkouts are not
450+ Right (ThunkData_Packed _) -> nixBuildThunkAttrWithCache exprPath attr
451+ _ -> nixBuild $ def
452+ { _nixBuildConfig_target = Target
453+ { _target_path = exprPath
729454 , _target_attr = Just attr
730− , _target_expr = Nothing
731455 }
456+ , _nixBuildConfig_outLink = OutLink_None
457+ }
732458
733−-- | Safely update thunk using a custom action
734−--
735−-- A temporary working space is used to do any update. When the custom
736−-- action successfully completes, the resulting (packed) thunk is copied
737−-- back to the original location.
738−updateThunk :: MonadObelisk m => FilePath -> (FilePath -> m a) -> m a
739−updateThunk p f = withSystemTempDirectory "obelisk-thunkptr-" $ \tmpDir -> do
740− p' <- copyThunkToTmp tmpDir p
741− unpackThunk' True p'
742− result <- f p'
743− updateThunkFromTmp p'
744− return result
745− where
746− copyThunkToTmp tmpDir thunkDir = readThunk thunkDir >>= \case
747− Left err -> failWith $ "withThunkUnpacked: " <> T.pack (show err)
748− Right ThunkData_Packed{} -> do
749− let tmpThunk = tmpDir </> "thunk"
750− callProcessAndLogOutput (Notice, Error) $
751− proc cp ["-r", "-T", thunkDir, tmpThunk]
752− return tmpThunk
753− Right _ -> failWith "Thunk is not packed"
754− updateThunkFromTmp p' = do
755− _ <- packThunk' True (ThunkPackConfig False (ThunkConfig Nothing)) p'
756− callProcessAndLogOutput (Notice, Error) $
757− proc cp ["-r", "-T", p', p]
758−
759−finalMsg :: Bool -> (a -> Text) -> Maybe (a -> Text)
760−finalMsg noTrail s = if noTrail then Nothing else Just s
761−
762−-- | Check that we are not somewhere inside the thunk directory
763−checkThunkDirectory :: MonadObelisk m => FilePath -> m ()
764−checkThunkDirectory thunkDir = do
765− currentDir <- liftIO getCurrentDirectory
766− 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
778−
779−unpackThunk' :: MonadObelisk m => Bool -> FilePath -> m ()
780−unpackThunk' noTrail thunkDir = checkThunkDirectory thunkDir *> readThunk thunkDir >>= \case
781− Left err -> failWith [i|Invalid thunk at ${thunkDir}: ${err}|]
782− --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
785− 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
792− withSpinner' ("Fetching thunk " <> T.pack thunkName)
793− (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
459+unpackThunk
806460 :: MonadObelisk m
807− => GitSource -- ^ Git source to use
808− -> Ref hash -- ^ Commit hash to reset to
809− -> FilePath -- ^ Directory to clone into
461+ => FilePath
810462 -> 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"]
821−
463+unpackThunk thunkDir = readThunk thunkDir >>= \case
464+ Left err -> failWith $ "thunk unpack: " <> (T.pack $ show err)
465+ --TODO: Overwrite option that rechecks out thunk; force option to do so even if working directory is dirty
466+ Right (ThunkData_Checkout _) -> failWith "thunk unpack: thunk is already unpacked"
467+ Right (ThunkData_Packed tptr) -> case _thunkPtr_source tptr of
468+ ThunkSource_GitHub s | (thunkParent, thunkName) <- splitFileName thunkDir -> withTempDirectory thunkParent thunkName $ \tmpRepo -> do
469+ mauth <- liftIO $ getHubAuth "github.com"
470+ repoResult <- liftIO $ executeRequestMaybe mauth $ repositoryR (_gitHubSource_owner s) (_gitHubSource_repo s)
471+ githubURI <- liftIO $ either throwIO (return . repoSshUrl) repoResult >>= \case
472+ Nothing -> fail "Cannot determine clone URI for thunk source"
473+ Just c -> return $ T.unpack $ getUrl c
474+ withSpinner ("Retrieving thunk " <> T.pack thunkName <> " from GitHub") $ do
475+ callProcessAndLogOutput (Notice, Notice) $
476+ proc "hub" ["clone", "-n", githubURI, tmpRepo]
477+ let obGitDir = tmpRepo </> ".git" </> "obelisk"
478+ --If this directory already exists then something is weird and we should fail
479+ liftIO $ createDirectory obGitDir
480+ callProcessAndLogOutput (Notice, Error) $
481+ cp ["-r", "-T", thunkDir </> ".", obGitDir </> "orig-thunk"]
482+ withSpinner ("Preparing thunk in " <> T.pack thunkDir) $ do
483+ -- Checkout
484+ putLog Notice $ "Checking out " <> T.pack (show $ maybe "" untagName $ _gitHubSource_branch s)
485+ callProcessAndLogOutput (Notice, Notice) $
486+ proc "hub" $ concat
487+ [ ["-C", tmpRepo]
488+ , pure "checkout"
489+ , maybe [] (\n -> ["-B", T.unpack (untagName n)]) (_gitHubSource_branch s)
490+ , pure $ Ref.toHexString $ _thunkRev_commit $ _thunkPtr_rev tptr
491+ ]
492+ -- Set upstream branch
493+ forM_ (_gitHubSource_branch s) $ \branch ->
494+ callProcessAndLogOutput (Notice, Error) $
495+ proc "hub" ["-C", tmpRepo, "branch", "-u", "origin/" <> T.unpack (untagName branch)]
496+ callProcessAndLogOutput (Notice, Error) $
497+ proc "rm" ["-r", thunkDir]
498+ callProcessAndLogOutput (Notice, Error) $
499+ procWithPackages ["coreutils"] "mv"
500+ [ "-T"
501+ , tmpRepo
502+ , thunkDir
503+ ]
504+ ThunkSource_Git _s -> do
505+ $notImplemented
506+
507+--TODO: add force mode to pack even if changes are present
822508--TODO: add a rollback mode to pack to the original thunk
823−packThunk :: MonadObelisk m => ThunkPackConfig -> FilePath -> m ThunkPtr
824−packThunk = packThunk' False
825−
826−packThunk' :: 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
837− pure thunkPtr
838−
839−modifyThunkPtrByConfig :: ThunkConfig -> ThunkPtr -> ThunkPtr
840−modifyThunkPtrByConfig (ThunkConfig markPrivate') ptr = case markPrivate' of
841− Nothing -> ptr
842− Just markPrivate -> ptr { _thunkPtr_source = case _thunkPtr_source ptr of
843− ThunkSource_Git s -> ThunkSource_Git $ s { _gitSource_private = markPrivate }
844− ThunkSource_GitHub s -> ThunkSource_GitHub $ s { _gitHubSource_private = markPrivate }
845− }
846−
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
869− "thunk pack: thunk checkout contains unsaved modifications"
870−
871− -- Check whether there are any stashes
872− when checkClean $ do
873− stashOutput <- readGitProcess thunkDir ["stash", "list"]
874− unless (T.null stashOutput) $
875− failWith $ T.unlines $
876− [ "thunk pack: thunk checkout has stashes"
877− , "git stash list:"
878− ] ++ T.lines stashOutput
879−
880− -- Get current branch
881− (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"]
884− case b of
885− (Just "HEAD") -> failWith $ T.unlines
886− [ "thunk pack: You are in 'detached HEAD' state."
887− , "If you want to pack at the current ref \
888− \then please create a new branch with 'git checkout -b <new-branch-name>' and push this upstream."
889− ]
890− _ -> return (b, c)
891−
892− -- Get information on all branches and their (optional) designated upstream
893− -- correspondents
894− headDump :: [Text] <- T.lines <$> readGitProcess thunkDir
895− [ "for-each-ref"
896− , "--format=%(refname:short) %(upstream:short) %(upstream:remotename)"
897− , "refs/heads/"
898− ]
899−
900− (headInfo :: Map Text (Maybe (Text, Text)))
901− <- fmap Map.fromList $ forM headDump $ \line -> do
902− (branch : restOfLine) <- pure $ T.words line
903− mUpstream <- case restOfLine of
904− [] -> pure Nothing
905− [u, r] -> pure $ Just (u, r)
906− (_:_) -> failWith "git for-each-ref invalid output"
907− pure (branch, mUpstream)
908−
909− putLog Debug $ "branches: " <> T.pack (show headInfo)
910−
911− let errorMap :: Map Text ()
912− headUpstream :: Map Text (Text, Text)
913− (errorMap, headUpstream) = flip Map.mapEither headInfo $ \case
914− Nothing -> Left ()
915− Just b -> Right b
916−
917− putLog Debug $ "branches with upstream branch set: " <> T.pack (show headUpstream)
918−
919− -- Check that every branch has a remote equivalent
920− when checkClean $ do
921− let untrackedBranches = Map.keys errorMap
922− when (not $ L.null untrackedBranches) $ failWith $ T.unlines $
923− [ "thunk pack: Certain branches in the thunk have no upstream branch \
924− \set. This means we don't know to check whether all your work is \
925− \saved. The offending branches are:"
926− , ""
927− , T.unwords untrackedBranches
928− , ""
929− , "To fix this, you probably want to do:"
930− , ""
931− ] ++
932− ((\branch -> "git push -u origin " <> branch) <$> untrackedBranches) ++
933− [ ""
934− , "These will push the branches to the default remote under the same \
935− \name, and (thanks to the `-u`) remember that choice so you don't \
936− \get this error again."
937− ]
938−
939− -- 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
941− (stat :: [Text]) <- T.lines <$> readGitProcess thunkDir
942− [ "rev-list", "--left-right"
943− , T.unpack branch <> "..." <> T.unpack upstream
944− ]
945− let ahead = length $ [ () | Just ('<', _) <- T.uncons <$> stat ]
946− behind = length $ [ () | Just ('>', _) <- T.uncons <$> stat ]
947− pure (upstream, (ahead, behind))
948−
949− -- Those branches which have commits ahead of, i.e. not on, the upstream
950− -- branch. Purely being behind is fine.
951− let nonGood = Map.filter ((/= 0) . fst . snd) stats
952−
953− when (not $ Map.null nonGood) $ failWith $ T.unlines $
954− [ "thunk pack: Certain branches in the thunk have commits not yet pushed upstream:"
955− , ""
956− ] ++
957− flip map (Map.toList nonGood) (\(branch, (upstream, (ahead, behind))) -> mconcat
958− [" ", branch, " ahead: ", T.pack (show ahead), " behind: ", T.pack (show behind), " remote branch ", upstream]) ++
959− [ ""
960− , "Please push these upstream and try again. (Or just fetch, if they are somehow \
961− \pushed but this repo's remote tracking branches don't know it.)"
509+packThunk
510+ :: MonadObelisk m
511+ => FilePath
512+ -> String
513+ -> m ()
514+packThunk thunkDir upstream = readThunk thunkDir >>= \case
515+ Left err -> failWith $ T.pack $ "thunk pack: " <> show err
516+ Right (ThunkData_Packed _) -> failWith "pack: thunk is already packed"
517+ Right (ThunkData_Checkout _) -> do
518+ thunkPtr <- getThunkPtr thunkDir upstream
519+ liftIO $ callProcess "rm"
520+ [ "-rf"
521+ , thunkDir
962522 ]
963−
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."
967−
968− let remote = maybe "origin" snd $ flip Map.lookup headUpstream =<< mCurrentBranch
969−
970− [remoteUri'] <- fmap T.lines $ readGitProcess thunkDir
971− [ "config"
972− , "--get"
973− , "remote." <> T.unpack remote <> ".url"
974− ]
975−
976− remoteUri <- case parseGitUri remoteUri' of
977− Nothing -> failWith $ "Could not identify git remote: " <> remoteUri'
978− Just uri -> pure uri
979− uriThunkPtr remoteUri mPrivate mCurrentBranch mCurrentCommit
980−
981−-- | Get the latest revision available from the given source
982−getLatestRev :: MonadObelisk m => ThunkSource -> m ThunkRev
983−getLatestRev os = do
984− let gitS = thunkSourceToGitSource os
985− (_, commit) <- gitGetCommitBranch (_gitSource_url gitS) (untagName <$> _gitSource_branch gitS)
986− case os of
987− ThunkSource_GitHub s -> githubThunkRev s commit
988− ThunkSource_Git s -> gitThunkRev s commit
989−
990−-- | Convert a URI to a thunk
991−--
992−-- If the URL is a github URL, we try to just download an archive for
993−-- performance. If that doesn't work (e.g. authentication issue), we fall back
994−-- on just doing things the normal way for git repos in general, and save it as
995−-- a regular git thunk.
996−uriThunkPtr :: MonadObelisk m => GitUri -> Maybe Bool -> Maybe Text -> Maybe Text -> m ThunkPtr
997−uriThunkPtr uri mPrivate mbranch mcommit = do
998− commit <- case mcommit of
999− Nothing -> gitGetCommitBranch uri mbranch >>= return . snd
1000− (Just c) -> return c
1001− (src, rev) <- uriToThunkSource uri mPrivate mbranch >>= \case
1002− ThunkSource_GitHub s -> do
1003− rev <- runExceptT $ githubThunkRev s commit
1004− case rev of
1005− Right r -> pure (ThunkSource_GitHub s, r)
1006− Left e -> do
1007− putLog Warning "\
1008−\Failed to fetch archive from GitHub. This is probably a private repo. \
1009−\Falling back on normal fetchgit. Original failure:"
1010− errorToWarning e
1011− let s' = forgetGithub True s
1012− (,) (ThunkSource_Git s') <$> gitThunkRev s' commit
1013− ThunkSource_Git s -> (,) (ThunkSource_Git s) <$> gitThunkRev s commit
1014− pure $ ThunkPtr
1015− { _thunkPtr_rev = rev
1016− , _thunkPtr_source = src
1017− }
1018−
1019−-- | N.B. Cannot infer all fields.
1020−--
1021−-- If the thunk is a GitHub thunk and fails, we do *not* fall back like with
1022−-- `uriThunkPtr`. Unlike a plain URL, a thunk src explicitly states which method
1023−-- should be employed, and so we respect that.
1024−uriToThunkSource :: MonadObelisk m => GitUri -> Maybe Bool -> Maybe Text -> m ThunkSource
1025−uriToThunkSource (GitUri u) mPrivate
1026− | Right uriAuth <- URI.uriAuthority u
1027− , Just scheme <- URI.unRText <$> URI.uriScheme u
1028− , case scheme of
1029− "ssh" -> uriAuth == URI.Authority
1030− { URI.authUserInfo = Just $ URI.UserInfo (fromRight' $ URI.mkUsername "git") Nothing
1031− , URI.authHost = fromRight' $ URI.mkHost "github.com"
1032− , URI.authPort = Nothing
523+ withSpinner ("Packing thunk " <> T.pack thunkDir) $
524+ liftIO $ createThunk thunkDir thunkPtr
525+
526+getThunkPtr :: MonadObelisk m => FilePath -> String -> m ThunkPtr
527+getThunkPtr thunkDir upstream = do
528+ liftIO (checkGitCleanStatus thunkDir) >>= \case
529+ False -> do
530+ statusDebug <- liftIO $ fmap (T.strip . T.pack) $ readProcess "hub"
531+ [ "-C", thunkDir, "status", "--ignored" ] ""
532+ putLog Warning "cannot proceed with unsaved working copy (git status):"
533+ putLog Notice statusDebug
534+ failWith "thunk pack: thunk checkout contains unsaved modifications"
535+ True -> return ()
536+
537+ -- Check whether there are any stashes
538+ stashOutput <- liftIO $ fmap T.pack $ readProcess "hub" [ "-C", thunkDir, "stash", "list" ] ""
539+ case T.null stashOutput of
540+ False -> do
541+ failWith $ T.unlines $
542+ [ "thunk pack: thunk checkout has stashes"
543+ , "git stash list:"
544+ ] ++ T.lines stashOutput
545+ True -> return ()
546+
547+ --Check whether all local heads are pushed
548+ repoHeads <- liftIO $ lines <$> readProcess "hub"
549+ [ "-C", thunkDir
550+ , "for-each-ref", "--format=%(refname:short)", "refs/heads/"
551+ ] ""
552+ remotes <- liftIO $ lines <$> readProcess "hub" [ "-C", thunkDir, "remote" ] ""
553+ --Check that the upstream specified actually exists
554+ case L.find (== upstream) remotes of
555+ Nothing -> failWith $ T.pack $ "thunk pack: upstream " <> upstream <> " does not exist. Available upstreams are " <> L.intercalate ", " remotes
556+ Just _ -> return ()
557+ -- iterate over cartesian product
558+ forM_ repoHeads $ \hd -> do
559+ [localRev] <- liftIO $ lines <$> readProcess "hub" [ "-C", thunkDir, "rev-parse", hd ] ""
560+ forM_ remotes $ \rm -> do
561+ --TODO: The error you get if a branch isn't pushed anywhere could be made more user friendly
562+ [remoteMergeRev] <- liftIO $ lines <$> readProcess "hub"
563+ [ "-C", thunkDir
564+ , "merge-base"
565+ , localRev
566+ , "remotes/" <> rm <> "/" <> hd
567+ ] ""
568+ case remoteMergeRev == localRev of
569+ False -> failWith $ T.pack $ mconcat [ "thunk unpack: branch ", hd, " has not been pushed to ", rm ]
570+ True -> return ()
571+
572+ --We assume it's safe to pack the thunk at this point
573+ [remoteUri'] <- liftIO $ lines <$> readProcess "hub"
574+ [ "-C", thunkDir
575+ , "config", "--get", "remote." <> upstream <> ".url"
576+ ] ""
577+
578+ let uriParseFailure = "Could not identify git remote: " <> remoteUri'
579+ mRemoteUri = parseURIReference remoteUri'
580+ <|> parseSshShorthand remoteUri'
581+ case mRemoteUri of
582+ Nothing -> failWith $ T.pack uriParseFailure
583+ Just remoteUri -> liftIO $ do
584+ refs <- fmap (refsToTuples . words) . lines <$> readProcess "hub"
585+ [ "-C"
586+ , thunkDir
587+ , "show-ref"
588+ , "--head" ] ""
589+ -- safe because exactly one hash is associated with HEAD
590+ let Just currentHead = fst <$> L.find ((== "HEAD") . snd) refs
591+ remoteHeads = Map.fromList $ catMaybes $ fmap
592+ (\(x,y) -> (,) x <$> L.stripPrefix ("refs/remotes/" <> upstream <> "/") y)
593+ refs
594+ localHeads = Map.fromList $ catMaybes $ fmap
595+ (\(x,y) -> (,) x <$> L.stripPrefix "refs/heads/" y)
596+ refs
597+ currentUpstreamBranch = Map.lookup currentHead remoteHeads
598+ <|> Map.lookup currentHead localHeads
599+ if
600+ | isGithubThunk remoteUri -> githubThunkPtr remoteUri currentHead currentUpstreamBranch
601+ | otherwise -> gitThunkPtr remoteUri currentHead currentUpstreamBranch
602+ where
603+ refsToTuples [x, y] = (x, y)
604+ refsToTuples x = error $ "thunk pack: cannot parse ref " <> show x
605+ isGithubThunk u
606+ | Just uriAuth <- uriAuthority u
607+ = case uriScheme u of
608+ "ssh:" -> uriAuth == URIAuth "git@" "github.com" ""
609+ s -> s `L.elem` [ "git:", "https:", "http:" ] -- "http:" just redirects to "https:"
610+ && uriRegName uriAuth == "github.com"
611+ | otherwise = False
612+ githubThunkPtr u commit' branch' = do
613+ ["/", owner', repo'] <- return $ splitDirectories (uriPath u)
614+ let owner = N (T.pack owner')
615+ repo = N (T.pack (dropExtension repo'))
616+ commit = N (T.pack commit')
617+ branch = N . T.pack <$> branch'
618+ mauth <- getHubAuth "github.com"
619+ repoResult <- executeRequestMaybe mauth $ repositoryR owner repo
620+ repoIsPrivate <- either throwIO (return . repoPrivate) repoResult
621+ archiveResult <- executeRequestMaybe mauth $
622+ archiveForR owner repo ArchiveFormatTarball (Just (untagName commit))
623+ archiveUri <- either throwIO return archiveResult
624+ hash <- getNixSha256ForUriUnpacked archiveUri
625+ return $ ThunkPtr
626+ { _thunkPtr_rev = ThunkRev
627+ { _thunkRev_commit = commitNameToRef commit
628+ , _thunkRev_nixSha256 = hash
1033629 }
1034− s -> s `L.elem` [ "git", "https", "http" ] -- "http:" just redirects to "https:"
1035− && URI.unRText (URI.authHost uriAuth) == "github.com"
1036− , Just (_, owner :| [repoish]) <- URI.uriPath u
1037− = \mbranch -> do
1038− isPrivate <- getIsPrivate
1039− pure $ ThunkSource_GitHub $ GitHubSource
1040− { _gitHubSource_owner = N $ URI.unRText owner
1041− , _gitHubSource_repo = N $ let
1042− repoish' = URI.unRText repoish
1043− in fromMaybe repoish' $ T.stripSuffix ".git" repoish'
1044− , _gitHubSource_branch = N <$> mbranch
1045− , _gitHubSource_private = isPrivate
630+ , _thunkPtr_source = ThunkSource_GitHub $ GitHubSource
631+ { _gitHubSource_owner = owner
632+ , _gitHubSource_repo = repo
633+ , _gitHubSource_branch = branch
634+ , _gitHubSource_private = repoIsPrivate
1046635 }
1047−
1048− | otherwise = \mbranch -> do
1049− isPrivate <- getIsPrivate
1050− pure $ ThunkSource_Git $ GitSource
1051− { _gitSource_url = GitUri u
1052− , _gitSource_branch = N <$> mbranch
1053− , _gitSource_fetchSubmodules = False -- TODO: How do we determine if this should be true?
1054− , _gitSource_private = isPrivate
1055− }
1056− where
1057− getIsPrivate = maybe (guessGitRepoIsPrivate $ GitUri u) pure mPrivate
1058−
1059−guessGitRepoIsPrivate :: MonadObelisk m => GitUri -> m Bool
1060−guessGitRepoIsPrivate uri = flip fix urisToTry $ \loop -> \case
1061− [] -> pure True
1062− uriAttempt:xs -> do
1063− result <- readCreateProcessWithExitCode $
1064− isolateGitProc $
1065− gitProcNoRepo
1066− [ "ls-remote"
1067− , "--quiet"
1068− , "--exit-code"
1069− , "--symref"
1070− , T.unpack $ gitUriToText uriAttempt
1071− ]
1072− case result of
1073− (ExitSuccess, _, _) -> pure False -- Must be a public repo
1074− _ -> loop xs
1075− where
1076− urisToTry = nubOrd $
1077− -- Include the original URI if it isn't using SSH because SSH will certainly fail.
1078− [uri | fmap URI.unRText (URI.uriScheme (unGitUri uri)) /= Just "ssh"] <>
1079− [changeScheme "https" uri, changeScheme "http" uri]
1080− changeScheme scheme (GitUri u) = GitUri $ u
1081− { URI.uriScheme = URI.mkScheme scheme
1082− , URI.uriAuthority = (\x -> x { URI.authUserInfo = Nothing }) <$> URI.uriAuthority u
1083636 }
1084−
1085−-- Funny signature indicates no effects depend on the optional branch name.
1086−githubThunkRev
1087− :: forall m
1088− . MonadObelisk m
1089− => GitHubSource
1090− -> Text
1091− -> m ThunkRev
1092−githubThunkRev s commit = do
1093− owner <- forcePP $ _gitHubSource_owner s
1094− repo <- forcePP $ _gitHubSource_repo s
1095− revTarball <- URI.mkPathPiece $ commit <> ".tar.gz"
1096− let archiveUri = GitUri $ URI.URI
1097− { URI.uriScheme = Just $ fromRight' $ URI.mkScheme "https"
1098− , URI.uriAuthority = Right $ URI.Authority
1099− { URI.authUserInfo = Nothing
1100− , URI.authHost = fromRight' $ URI.mkHost "github.com"
1101− , URI.authPort = Nothing
1102− }
1103− , URI.uriPath = Just ( False
1104− , owner :| [ repo, fromRight' $ URI.mkPathPiece "archive", revTarball ]
1105− )
1106− , URI.uriQuery = []
1107− , URI.uriFragment = Nothing
1108− }
1109− hash <- getNixSha256ForUriUnpacked archiveUri
1110− putLog Debug $ "Nix sha256 is " <> hash
1111− return $ ThunkRev
1112− { _thunkRev_commit = commitNameToRef $ N commit
1113− , _thunkRev_nixSha256 = hash
1114− }
1115− where
1116− forcePP :: Name entity -> m (URI.RText 'URI.PathPiece)
1117− forcePP = URI.mkPathPiece . untagName
1118−
1119−gitThunkRev
1120− :: MonadObelisk m
1121− => GitSource
1122− -> Text
1123− -> m ThunkRev
1124−gitThunkRev s commit = do
1125− let u = _gitSource_url s
1126− protocols = ["file", "https", "ssh", "git"]
1127− scheme = maybe "file" URI.unRText $ URI.uriScheme $ (\(GitUri x) -> x) u
1128− unless (T.toLower scheme `elem` protocols) $
1129− failWith $ "obelisk currently only supports "
1130− <> T.intercalate ", " protocols <> " protocols for plain Git remotes"
1131− hash <- nixPrefetchGit u commit $ _gitSource_fetchSubmodules s
1132− putLog Informational $ "Nix sha256 is " <> hash
1133− pure $ ThunkRev
1134− { _thunkRev_commit = commitNameToRef (N commit)
1135− , _thunkRev_nixSha256 = hash
1136− }
1137−
1138−-- | Given the URI to a git remote, and an optional branch name, return the name
1139−-- of the branch along with the hash of the commit at tip of that branch.
1140−--
1141−-- If the branch name is passed in, it is returned exactly as-is. If it is not
1142−-- passed it, the default branch of the repo is used instead.
1143−
1144−gitGetCommitBranch
1145− :: MonadObelisk m => GitUri -> Maybe Text -> m (Text, CommitId)
1146−gitGetCommitBranch uri mbranch = withExitFailMessage ("Failure for git remote " <> uriMsg) $ do
1147− (_, bothMaps) <- gitLsRemote
1148− (T.unpack $ gitUriToText uri)
1149− (GitRef_Branch <$> mbranch)
1150− Nothing
1151− branch <- case mbranch of
1152− Nothing -> withExitFailMessage "Failed to find default branch" $ do
1153− b <- rethrowE $ gitLookupDefaultBranch bothMaps
1154− putLog Debug $ "Default branch for remote repo " <> uriMsg <> " is " <> b
1155− pure b
1156− Just b -> pure b
1157− commit <- rethrowE $ gitLookupCommitForRef bothMaps (GitRef_Branch branch)
1158− putLog Informational $ "Latest commit in branch " <> branch
1159− <> " from remote repo " <> uriMsg
1160− <> " is " <> commit
1161− pure (branch, commit)
1162− where
1163− rethrowE = either failWith pure
1164− uriMsg = gitUriToText uri
1165−
1166−parseGitUri :: Text -> Maybe GitUri
1167−parseGitUri x = GitUri <$> (parseFileURI x <|> parseAbsoluteURI x <|> parseSshShorthand x)
1168−
1169−parseFileURI :: Text -> Maybe URI.URI
1170−parseFileURI uri = if "/" `T.isPrefixOf` uri then parseAbsoluteURI ("file://" <> uri) else Nothing
1171−
1172−parseAbsoluteURI :: Text -> Maybe URI.URI
1173−parseAbsoluteURI uri = do
1174− parsedUri <- URI.mkURI uri
1175− guard $ URI.isPathAbsolute parsedUri
1176− pure parsedUri
1177−
1178−parseSshShorthand :: Text -> Maybe URI.URI
1179−parseSshShorthand uri = do
1180− -- This is what git does to check that the remote
1181− -- is not a local file path when parsing shorthand.
1182− -- Last referenced from here:
1183− -- https://github.com/git/git/blob/95ec6b1b3393eb6e26da40c565520a8db9796e9f/connect.c#L712
1184− let
1185− (authAndHostname, colonAndPath) = T.break (== ':') uri
1186− properUri = "ssh://" <> authAndHostname <> "/" <> T.drop 1 colonAndPath
1187− -- Shorthand is valid iff a colon is present and it occurs before the first slash
1188− -- This check is used to disambiguate a filepath containing a colon from shorthand
1189− guard $ isNothing (T.findIndex (=='/') authAndHostname)
1190− && not (T.null colonAndPath)
1191− URI.mkURI properUri
637+ gitThunkPtr u _commit' _branch' = do
638+ case uriScheme u of
639+ "https:" -> return ()
640+ "git:" -> return ()
641+ _ -> fail "thunk pack: obelisk currently only supports https and git protocols for non-GitHub remotes"
642+ $notImplemented
643+ parseSshShorthand uri' = do
644+ -- This is what git does to check that the remote
645+ -- is not a local file path when parsing shorthand.
646+ -- Last referenced from here:
647+ -- https://github.com/git/git/blob/95ec6b1b3393eb6e26da40c565520a8db9796e9f/connect.c#L712
648+ let uri = T.pack uri'
649+ (authAndHostname, colonAndPath) = T.break (== ':') uri
650+ properUri = "ssh://" <> authAndHostname <> "/" <> T.drop 1 colonAndPath
651+ -- Shorthand is valid iff a colon is present and it occurs before the first slash
652+ -- This check is used to disambiguate a filepath containing a colon from shorthand
653+ guard $ isNothing (T.findIndex (=='/') authAndHostname)
654+ && not (T.null colonAndPath)
655+ parseURI $ T.unpack properUri