f57325c · obelisk · git.iko.soy

git.iko.soy/obelisk

add 'ob repl [dir]' command, equivalent to 'ghcid-[dir]'

commitf57325c33e240e04858a6caa9efec42f70a6bb5e authorhsloan <ishaqsloan@gmail.com> dateThu 4 Jan 2018, 19:37 (9 years ago) parent0d31bc3

3 files changed+40−8

compare with master

unifiedsplit

.gitignore+2 command/src/Obelisk/Command.hs+23−3 command/src/Obelisk/Command/Project.hs+15−5

.gitignore+2

@@ -6,3 +6,5 @@ result

66TAGS

77tags

88ctags

10+command/dist-newstyle

command/src/Obelisk/Command.hs+23−3

@@ -1,10 +1,18 @@

11{-# LANGUAGE LambdaCase #-}

2+{-# LANGUAGE OverloadedStrings #-}

23module Obelisk.Command where

5+import Data.Monoid ((<>))

6+import Data.String (fromString)

7+import qualified Data.Text as Text

48import Options.Applicative

59import System.Environment

610import System.IO

711import System.Posix.Process

12+import System.Process

13+

14+import GitHub.Data.Name

15+import GitHub.Data.GitData

816

917import Obelisk.Command.Project

1018import Obelisk.Command.Thunk

@@ -34,15 +42,17 @@ argsInfo = info (args <**> helper) $ mconcat

3442 ]

3543

3644data ObCommand

37− = ObCommand_Init

45+ = ObCommand_Init (Name Branch)

3846 | ObCommand_Dev

3947 | ObCommand_Thunk ThunkCommand

48+ | ObCommand_Repl FilePath

4049

4150obCommand :: Parser ObCommand

4251obCommand = hsubparser $ mconcat

43− [ command "init" $ info (pure ObCommand_Init) $ progDesc "Initialize an Obelisk project"

52+ [ command "init" $ info (ObCommand_Init <$> (strArgument (value "master"))) $ progDesc "Initialize an Obelisk project"

4453 , command "dev" $ info (pure ObCommand_Dev) $ progDesc "Run the current project in development mode"

4554 , command "thunk" $ info (ObCommand_Thunk <$> thunkCommand) $ progDesc "Manipulate thunk directories"

55+ , command "repl" $ info (ObCommand_Repl <$> (strArgument (action "directory"))) $ progDesc "Open a cabal repl"

4656 ]

4757

4858data ThunkCommand

@@ -53,6 +63,15 @@ thunkCommand = hsubparser $ mconcat

5363 [ command "update" $ info (ThunkCommand_Update <$> some (strArgument (action "directory"))) $ progDesc "Update a thunk to the latest revision available"

5464 ]

5565

66+-- TODO modify the nix-shell arguments to recognize when the common dir's files have changed as well.

67+runRepl :: FilePath -> IO ()

68+runRepl dir = callProcess "nix-shell"

69+ [ "-A"

70+ , "shells.ghc"

71+ , "--run"

72+ , "\'cd " <> dir <> "; ghcid -W -c\"cabal new-repl exe:" <> dir <> "\""

73+ ]

74+

5675parserPrefs :: ParserPrefs

5776parserPrefs = defaultPrefs

5877 { prefShowHelpOnEmpty = True

@@ -83,9 +102,10 @@ main = do

83102

84103ob :: ObCommand -> IO ()

85104ob = \case

86− ObCommand_Init -> initProject "."

105+ ObCommand_Init branch -> initProject "." branch

87106 ObCommand_Dev -> putStrLn "Dev!"

88107 ObCommand_Thunk tc -> case tc of

89108 ThunkCommand_Update thunks -> mapM_ updateThunkToLatest thunks

109+ ObCommand_Repl component -> runRepl component

90110

91111--TODO: Clean up all the magic strings throughout this codebase

command/src/Obelisk/Command/Project.hs+15−5

@@ -18,6 +18,9 @@ import System.FilePath

1818import System.IO

1919import System.Posix (FileStatus, getFileStatus , deviceID, fileID, getRealUserID , fileOwner, fileMode)

2020

21+import GitHub.Data.Name (Name)

22+import GitHub.Data.GitData (Branch)

23+

2124import Obelisk.Command.Thunk

2225

2326--TODO: Make this module resilient to random exceptions

@@ -25,19 +28,26 @@ import Obelisk.Command.Thunk

2528--TODO: Don't hardcode this

2629-- | Source for the Obelisk project

2730obeliskSource :: ThunkSource

28−obeliskSource = ThunkSource_GitHub $ GitHubSource

31+obeliskSource = obeliskSourceWithBranch "master"

32+

33+-- | Source for obelisk developer targeting a specific obelisk branch

34+obeliskSourceWithBranch :: Name Branch -> ThunkSource

35+obeliskSourceWithBranch branch = ThunkSource_GitHub $ GitHubSource

2936 { _gitHubSource_owner = "obsidiansystems"

3037 , _gitHubSource_repo = "obelisk"

31− , _gitHubSource_branch = Just "master"

38+ , _gitHubSource_branch = Just branch

3239 , _gitHubSource_private = True

3340 }

3441

35−initProject :: FilePath -> IO ()

36−initProject target = do

42+-- TODO pass an optional argument

43+initProject :: FilePath -> Name Branch -> IO ()

44+initProject target branch = do

3745 let obDir = target </> ".obelisk"

3846 implDir = obDir </> "impl"

3947 createDirectory obDir

40− createThunkWithLatest implDir obeliskSource

48+ case branch of

49+ "" -> createThunkWithLatest implDir obeliskSource

50+ _ -> createThunkWithLatest implDir $ obeliskSourceWithBranch branch

4151 _ <- nixBuildThunkAttrWithCache implDir "command"

4252 return ()

4353