master...32fe535 · servant

git.iko.soy/servant

on 32fe535 help sign in

.travis.yml+1

since splitsnapshots

unifiedsplit

@@ -6,6 +6,7 @@ env:

6 - STACK_YAML=stack-ghc-7.8.4.yaml

7 - STACK_YAML=stack.yaml

8 - STACK_YAML=stack-ghc-8.0.1.yaml

9+ - STACK_YAML=stack-ghc-8.0.2.yaml

10addons:

11addons:

11 apt:

12 apt:

servant/Setup.lhs+32−15

@@ -1,5 +1,19 @@

1\begin{code}

2{-# LANGUAGE CPP #-}

3+{-# LANGUAGE OverloadedStrings #-}

4+module Main (main) where

6+#ifndef MIN_VERSION_cabal_doctest

7+#define MIN_VERSION_cabal_doctest(x,y,z) 0

8+#endif

10+

11+#if MIN_VERSION_cabal_doctest(1,0,0)

12+import Distribution.Extra.Doctest ( defaultMainWithDoctests )

13+#else

14+

15+-- Otherwise we provide a shim

16+

3#ifndef MIN_VERSION_Cabal

17#ifndef MIN_VERSION_Cabal

4#define MIN_VERSION_Cabal(x,y,z) 0

18#define MIN_VERSION_Cabal(x,y,z) 0

5#endif

19#endif

@@ -9,10 +23,10 @@

9#if MIN_VERSION_Cabal(1,24,0)

23#if MIN_VERSION_Cabal(1,24,0)

10#define InstalledPackageId UnitId

24#define InstalledPackageId UnitId

11#endif

25#endif

12−module Main (main) where

14import Control.Monad ( when )

27import Control.Monad ( when )

15import Data.List ( nub )

28import Data.List ( nub )

29+import Data.String ( fromString )

16import Distribution.Package ( InstalledPackageId )

30import Distribution.Package ( InstalledPackageId )

17import Distribution.Package ( PackageId, Package (..), packageVersion )

31import Distribution.Package ( PackageId, Package (..), packageVersion )

18import Distribution.PackageDescription ( PackageDescription(), TestSuite(..) , Library (..), BuildInfo (..))

32import Distribution.PackageDescription ( PackageDescription(), TestSuite(..) , Library (..), BuildInfo (..))

@@ -42,15 +56,8 @@ makeAbsolute p | isAbsolute p = return p

42 return $ cwd </> p

56 return $ cwd </> p

43#endif

57#endif

45−main :: IO ()

46−main = defaultMainWithHooks simpleUserHooks

47− { buildHook = \pkg lbi hooks flags -> do

48− generateBuildModule flags pkg lbi

49− buildHook simpleUserHooks pkg lbi hooks flags

50− }

51−

52−generateBuildModule :: BuildFlags -> PackageDescription -> LocalBuildInfo -> IO ()

59+generateBuildModule :: String -> BuildFlags -> PackageDescription -> LocalBuildInfo -> IO ()

53−generateBuildModule flags pkg lbi = do

60+generateBuildModule testsuiteName flags pkg lbi = do

54 let verbosity = fromFlag (buildVerbosity flags)

61 let verbosity = fromFlag (buildVerbosity flags)

55 let distPref = fromFlag (buildDistPref flags)

62 let distPref = fromFlag (buildDistPref flags)

@@ -74,7 +81,7 @@ generateBuildModule flags pkg lbi = do

74#endif

81#endif

76 -- Lib sources and includes

83 -- Lib sources and includes

77− iArgs <- mapM (fmap ("-i"++) . makeAbsolute) $ "test" : libAutogenDir : hsSourceDirs libBI

84+ iArgs <- mapM (fmap ("-i"++) . makeAbsolute) $ libAutogenDir : hsSourceDirs libBI

78 includeArgs <- mapM (fmap ("-I"++) . makeAbsolute) $ includeDirs libBI

85 includeArgs <- mapM (fmap ("-I"++) . makeAbsolute) $ includeDirs libBI

80 -- CPP includes, i.e. include cabal_macros.h

87 -- CPP includes, i.e. include cabal_macros.h

@@ -82,9 +89,7 @@ generateBuildModule flags pkg lbi = do

82 [ "-include", libAutogenDir ++ "/cabal_macros.h" ]

89 [ "-include", libAutogenDir ++ "/cabal_macros.h" ]

83 ++ cppOptions libBI

90 ++ cppOptions libBI

85− -- Actually we need to check whether testName suite == "doctests"

86− -- pending https://github.com/haskell/cabal/pull/4229 getting into GHC HEAD tree

87− withTestLBI pkg lbi $ \suite suitecfg -> when (testName suite == "doctests") $ do

92+ withTestLBI pkg lbi $ \suite suitecfg -> when (testName suite == fromString testsuiteName) $ do

89 -- get and create autogen dir

94 -- get and create autogen dir

90#if MIN_VERSION_Cabal(1,25,0)

95#if MIN_VERSION_Cabal(1,25,0)

@@ -106,7 +111,7 @@ generateBuildModule flags pkg lbi = do

106 , "flags = " ++ show (iArgs ++ includeArgs ++ dbFlags ++ cppFlags)

111 , "flags = " ++ show (iArgs ++ includeArgs ++ dbFlags ++ cppFlags)

107 , ""

112 , ""

108 , "module_sources :: [String]"

113 , "module_sources :: [String]"

109− , "module_sources = " ++ show ("Servant.Utils.LinksSpec" : map display module_sources)

114+ , "module_sources = " ++ show (map display module_sources)

110 ]

115 ]

111 where

116 where

112 -- we do this check in Setup, as then doctests don't need to depend on Cabal

117 -- we do this check in Setup, as then doctests don't need to depend on Cabal

@@ -162,4 +167,16 @@ generateBuildModule flags pkg lbi = do

162testDeps :: ComponentLocalBuildInfo -> ComponentLocalBuildInfo -> [(InstalledPackageId, PackageId)]

167testDeps :: ComponentLocalBuildInfo -> ComponentLocalBuildInfo -> [(InstalledPackageId, PackageId)]

163testDeps xs ys = nub $ componentPackageDeps xs ++ componentPackageDeps ys

168testDeps xs ys = nub $ componentPackageDeps xs ++ componentPackageDeps ys

164

169

170+defaultMainWithDoctests :: String -> IO ()

171+defaultMainWithDoctests testSuiteName = defaultMainWithHooks simpleUserHooks

172+ { buildHook = \pkg lbi hooks flags -> do

173+ generateBuildModule testSuiteName flags pkg lbi

174+ buildHook simpleUserHooks pkg lbi hooks flags

175+ }

176+

177+#endif

178+

179+main :: IO ()

180+main = defaultMainWithDoctests "doctests"

181+

165\end{code}

182\end{code}

servant/servant.cabal+2−3

@@ -27,7 +27,7 @@ source-repository head

28custom-setup

29 setup-depends:

30− Cabal >=1.14, base, filepath, directory

30+ Cabal >=1.14, base, cabal-doctest

32library

33 exposed-modules:

@@ -134,7 +134,7 @@ test-suite spec

134test-suite doctests

135 build-depends: base

136 , servant

137− , doctest

137+ , doctest >=0.11.0 && <0.12

138 , filemanip

139 , directory

140 , filepath

@@ -144,5 +144,4 @@ test-suite doctests

144 buildable: True

145 default-language: Haskell2010

146 ghc-options: -Wall -threaded

147− build-tools: hsc2hs

148 include-dirs: include

147 include-dirs: include

servant/test/Servant/Utils/LinksSpec.hs+1−1

@@ -83,7 +83,7 @@ spec = describe "Servant.Utils.Links" $ do

83--

84-- >>> apiLink (Proxy :: Proxy WrongContentType)

85-- ...

86−-- ...Could not deduce...

86+-- ...error:

87-- ...

88--

89-- >>> apiLink (Proxy :: Proxy WrongMethod)

servant/test/doctests.hsnew file+39

@@ -0,0 +1,39 @@

1+-----------------------------------------------------------------------------

2+-- |

3+-- Module : Main (doctests)

5+-- License : BSD-style (see the file LICENSE)

6+-- Maintainer : Edward Kmett <ekmett@gmail.com>

7+-- Stability : provisional

8+-- Portability : portable

9+--

10+-- This module provides doctests for a project based on the actual versions

11+-- of the packages it was built with. It requires a corresponding Setup.lhs

12+-- to be added to the project

13+-----------------------------------------------------------------------------

14+module Main where

15+

16+import Build_doctests (flags, pkgs, module_sources)

17+import Data.Foldable (traverse_)

18+import Data.List (isPrefixOf, isSuffixOf)

19+import Test.DocTest

20+

21+main :: IO ()

22+main = do

23+ traverse_ putStrLn args

24+ doctest args

25+ where

26+ args =

27+ "-XOverloadedStrings" :

28+ "-XFlexibleInstances" :

29+ "-XMultiParamTypeClasses" :

30+ flags ++ flags' ++ pkgs ++

31+ "Servant.Utils.LinksSpec" :

32+ module_sources

33+

34+ -- HACK: find -i.../src, and change it ot -i.../test

35+ flags'

36+ = map (\x -> take (length x - 4) x ++ "/test")

37+ . filter (\x -> "-i" `isPrefixOf` x && "/src" `isSuffixOf` x)

38+ $ flags

39+

servant/test/doctests.hscdeleted−59

@@ -1,59 +0,0 @@

1−{-# LANGUAGE CPP #-}

2−{-# LANGUAGE ForeignFunctionInterface #-}

3−-----------------------------------------------------------------------------

4−-- |

5−-- Module : Main (doctests)

7−-- License : BSD-style (see the file LICENSE)

8−-- Maintainer : Edward Kmett <ekmett@gmail.com>

9−-- Stability : provisional

10−-- Portability : portable

11−--

12−-- This module provides doctests for a project based on the actual versions

13−-- of the packages it was built with. It requires a corresponding Setup.lhs

14−-- to be added to the project

15−-----------------------------------------------------------------------------

16−module Main where

17−

18−import Build_doctests (flags, pkgs, module_sources)

19−import Data.Foldable (traverse_)

20−import Test.DocTest

21−

22−##if defined(mingw32_HOST_OS)

23−##if defined(i386_HOST_ARCH)

24−##define USE_CP

25−import Control.Applicative

26−import Control.Exception

27−import Foreign.C.Types

28−foreign import stdcall "windows.h SetConsoleCP" c_SetConsoleCP :: CUInt -> IO Bool

29−foreign import stdcall "windows.h GetConsoleCP" c_GetConsoleCP :: IO CUInt

30−##elif defined(x86_64_HOST_ARCH)

31−##define USE_CP

32−import Control.Applicative

33−import Control.Exception

34−import Foreign.C.Types

35−foreign import ccall "windows.h SetConsoleCP" c_SetConsoleCP :: CUInt -> IO Bool

36−foreign import ccall "windows.h GetConsoleCP" c_GetConsoleCP :: IO CUInt

37−##endif

38−##endif

39−

40−-- | Run in a modified codepage where we can print UTF-8 values on Windows.

41−withUnicode :: IO a -> IO a

42−##ifdef USE_CP

43−withUnicode m = do

44− cp <- c_GetConsoleCP

45− (c_SetConsoleCP 65001 >> m) `finally` c_SetConsoleCP cp

46−##else

47−withUnicode m = m

48−##endif

49−

50−main :: IO ()

51−main = withUnicode $ do

52− traverse_ putStrLn args

53− doctest args

54− where

55− args =

56− "-XOverloadedStrings" :

57− "-XFlexibleInstances" :

58− "-XMultiParamTypeClasses" :

59− flags ++ pkgs ++ module_sources

stack-ghc-8.0.2.yamlnew file+9

@@ -0,0 +1,9 @@

1+resolver: nightly-2017-02-11

2+packages:

3+- servant/

4+- servant-client/

5+- servant-docs/

6+- servant-foreign/

7+- servant-server/

8+- doc/tutorial

9+extra-deps: []