develop...0698ce8 · typeable/pagerduty

.travis.yml+30−4

since splitsnapshots

unifiedsplit

@@ -1,4 +1,30 @@

1−language: haskell

1+sudo: false

2−ghc: 7.8.4

2+

3−install: []

3+cache:

4−script: [make all]

4+ apt: true

5+ directories:

6+ - ~/.stack

7+

8+branches:

9+ only:

10+ - master

11+ - develop

12+

13+before_install:

14+ - export PATH=/opt/ghc/$GHCVER/bin:$PATH

15+ - export PATH=~/.local/bin:$PATH

16+ - ./script/travis-lifecycle-before_install

17+

18+install:

19+ - ./script/travis-lifecycle-install

20+

21+script:

22+ - ./script/travis-lifecycle-script

23+

24+matrix:

25+ fast_finish: true

26+ include:

27+ - env: GHCVER=7.10.2

28+ addons: { apt: { packages: [ghc-7.10.2], sources: [hvr-ghc] } }

29+ - env: GHCVER=7.8.4

30+ addons: { apt: { packages: [ghc-7.8.4], sources: [hvr-ghc] } }

pagerduty.cabal+3−3

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

1name: pagerduty

2−version: 0.0.3.2

2+version: 0.0.3.3

3synopsis: Client library for PagerDuty Integration and REST APIs.

4homepage: http://github.com/brendanhay/pagerduty

5license: OtherLicense

@@ -71,8 +71,8 @@ library

71 , Network.PagerDuty.Types

72

73 build-depends:

74− aeson >= 0.8

74+ aeson >= 0.8 && < 0.10

75− , base >= 4.5 && < 5

75+ , base >= 4.7 && < 5

76 , bifunctors >= 4.1

77 , bytestring >= 0.9

78 , bytestring-conversion >= 0.2.1

script/generate-pagesdeleted−25

@@ -1,25 +0,0 @@

1−#!/usr/bin/env bash

2−

3−set -e

4−set -x

5−set -o errexit

6−

7−branch=$(git symbolic-ref -q HEAD)

8−branch=${branch##refs/heads/}

9−branch=${branch:-HEAD}

10−

11−cabal configure --disable-tests

12−

13−DOCDIR=`mktemp -d -t pages.XXXXXX`

14−cabal haddock --haddock-option=-o$DOCDIR

15−

16−HEAD=`git rev-parse HEAD`

17−

18−git checkout gh-pages

19−

20−mv $DOCDIR/* .

21−

22−git add *.html *.js *.css *.gif *.png

23−git commit -m "Generated documentation from $HEAD on $branch"

24−git push origin gh-pages

25−git checkout $branch

script/travis-lifecycle-before_installnew file+16

@@ -0,0 +1,16 @@

1+#!/usr/bin/env bash

2+

3+set -e

4+

5+dir=~/.local/bin

6+remote=https://github.com/commercialhaskell/stack/releases/download/v0.1.3.1/stack-0.1.3.1-x86_64-linux.gz

7+local=$dir/stack

8+

9+mkdir -p $dir

10+

11+curl -L $remote | gunzip > $local

12+

13+chmod a+x $local

14+

15+ghc --version

16+stack --version

script/travis-lifecycle-installnew file+13

@@ -0,0 +1,13 @@

1+#!/usr/bin/env bash

2+

3+set -e

4+

5+GHCVER=${GHCVER?"GHCVER needs to be set."}

6+

7+path=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)

8+

9+$path/travis-timeout \

10+ stack --no-terminal --skip-ghc-check --stack-yaml stack-$GHCVER.yaml setup

11+

12+$path/travis-timeout \

13+ stack --no-terminal --skip-ghc-check --stack-yaml stack-$GHCVER.yaml test pagerduty --only-snapshot

script/travis-lifecycle-scriptnew file+9

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

1+#!/usr/bin/env bash

2+

3+set -e

4+

5+GHCVER=${GHCVER?"GHCVER needs to be set."}

6+

7+path=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)

8+

9+stack --no-terminal --skip-ghc-check --stack-yaml stack-$GHCVER.yaml test pagerduty

script/travis-timeoutnew file+15

@@ -0,0 +1,15 @@

1+#!/usr/bin/env bash

2+

3+$* &

4+pidA=$!

5+minutes=0

6+

7+while true; do sleep 60; ((minutes++)); echo -e "\033[0;32m$minutes minute(s) elapsed running '$*'\033[0m."; done &

8+pidB=$!

9+wait $pidA

10+resA=$?

11+

12+echo -e "\033[0;32m'$*' exited with status ${resA}.\033[0m"

13+kill -9 $pidB

14+

15+exit $resA

script/upload-documentationdeleted−37

@@ -1,37 +0,0 @@

1−#!/usr/bin/env bash

2−

3−set -e

4−

5−package=${PWD##*/}

6−

7−echo "Package: ${package}"

8−read -p "Version: " version

9−read -p "Hackage user: " user

10−read -sp "Hackage password (not echoed): " password

11−

12−echo

13−echo "BUILDING"

14−echo

15−

16−cabal configure

17−cabal build

18−cabal haddock \

19− --hyperlink-source \

20− --html-location='/package/$pkg-$version/docs' \

21− --contents-location='/package/$pkg'

22−

23−echo

24−echo "ARCHIVING"

25−echo

26−

27−cd dist/doc/html

28−DDIR="${package}-${version}-docs"

29−cp -r "${package}" "${DDIR}" && gtar -c -v -z -Hustar -f "${DDIR}.tar.gz" "${DDIR}"

30−

31−echo

32−echo "UPLOADING"

33−echo

34−

35−curl -X PUT -H 'Content-Type: application/x-tar' \

36− -H 'Content-Encoding: gzip' --data-binary "@${DDIR}.tar.gz" \

37− "http://${user}:${password}@hackage.haskell.org/package/${package}-${version}/docs"

src/Network/PagerDuty/Internal/Options.hs+3−3

@@ -14,9 +14,9 @@ module Network.PagerDuty.Internal.Options

14 , underscored

15 ) where

16

17−import Data.Aeson.Types

17+import Data.Aeson.Types

18−import Data.Char

18+import Data.Char

19−import Data.List

19+import Data.List

20

21dropped :: Int -> Options -> Options

22dropped n o = o

src/Network/PagerDuty/Internal/Query.hs+8−7

@@ -1,5 +1,6 @@

1{-# LANGUAGE ConstraintKinds #-}

2{-# LANGUAGE DefaultSignatures #-}

3+{-# LANGUAGE FlexibleContexts #-}

3{-# LANGUAGE GADTs #-}

4{-# LANGUAGE GADTs #-}

4{-# LANGUAGE OverloadedStrings #-}

5{-# LANGUAGE OverloadedStrings #-}

5{-# LANGUAGE ScopedTypeVariables #-}

6{-# LANGUAGE ScopedTypeVariables #-}

@@ -23,14 +24,14 @@ module Network.PagerDuty.Internal.Query

23

24

24import Data.Aeson.Types

25import Data.Aeson.Types

25import Data.Bifunctor

26import Data.Bifunctor

26−import Data.ByteString (ByteString)

27+import Data.ByteString (ByteString)

27−import qualified Data.ByteString.Char8 as BS

28+import qualified Data.ByteString.Char8 as BS

28import Data.ByteString.Conversion

29import Data.ByteString.Conversion

29−import Data.Function (on)

30+import Data.Function (on)

30−import Data.List (groupBy)

31+import Data.List (groupBy)

31−import Data.Monoid ((<>))

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

32−import Data.Text (Text)

33+import Data.Text (Text)

33−import qualified Data.Text.Encoding as Text

34+import qualified Data.Text.Encoding as Text

34import Generics.SOP

35import Generics.SOP

35import Network.HTTP.Types

36import Network.HTTP.Types

36import Network.PagerDuty.Internal.Options

37import Network.PagerDuty.Internal.Options

src/Network/PagerDuty/Internal/TH.hs+5−5

@@ -40,15 +40,15 @@ module Network.PagerDuty.Internal.TH

40

41import Control.Applicative

42import Control.Lens

43−import qualified Data.Aeson.TH as Aeson

43+import qualified Data.Aeson.TH as Aeson

44import Data.Aeson.Types

45−import Data.ByteString (ByteString)

45+import Data.ByteString (ByteString)

46−import qualified Data.Text.Encoding as Text

46+import qualified Data.Text.Encoding as Text

47import Generics.SOP.TH

48import Language.Haskell.TH

49import Network.HTTP.Types.QueryLike

50−import Network.PagerDuty.Internal.Query

51import Network.PagerDuty.Internal.Options

50import Network.PagerDuty.Internal.Options

51+import Network.PagerDuty.Internal.Query

52

53jsonRequest :: Name -> Q [Dec]

54jsonRequest n = concat <$> sequence

@@ -61,7 +61,7 @@ queryRequest :: Name -> Q [Dec]

61queryRequest n = concat <$> sequence

62 [ deriveGeneric n

63 , makeLenses n

64− , [d|instance ToJSON $(conT n) where toJSON = const (toJSON (object []))|]

64+ , [d|instance ToJSON $(conT n) where toJSON = const emptyObject|]

65 , [d|instance QueryLike $(conT n) where toQuery = gquery|]

66 ]

67

src/Network/PagerDuty/Internal/Types.hs+4−4

@@ -27,7 +27,7 @@

27module Network.PagerDuty.Internal.Types where

28

29import Control.Applicative

30−import Control.Lens hiding ((.=))

30+import Control.Lens hiding ((.=), Empty)

31import Control.Monad.IO.Class

32import Data.Aeson hiding (Error)

33import Data.Aeson.Types (Parser)

@@ -43,7 +43,7 @@ import Data.String

43import Data.Text (Text)

44import qualified Data.Text as Text

45import qualified Data.Text.Encoding as Text

46−import Data.Time

46+import Data.Time (UTCTime, TimeZone, formatTime, utc, timeZoneName)

47import GHC.TypeLits

48import Network.HTTP.Client (Manager)

49import Network.HTTP.Types

@@ -133,8 +133,8 @@ data Security = Basic | Token

133 deriving (Eq, Show)

134

135data Auth (a :: Security) where

136− AuthBasic :: ByteString -> ByteString -> Auth Basic

136+ AuthBasic :: ByteString -> ByteString -> Auth 'Basic

137− AuthToken :: ByteString -> Auth Token

137+ AuthToken :: ByteString -> Auth 'Token

138

139deriving instance Eq (Auth a)

140deriving instance Show (Auth a)

src/Network/PagerDuty/REST/Alerts.hs+6−6

@@ -43,12 +43,12 @@ module Network.PagerDuty.REST.Alerts

43 , alertAddress

44 ) where

45

46−import Control.Lens

46+import Control.Lens hiding (Empty)

47−import Data.Aeson.Lens

47+import Data.Aeson.Lens

48−import Data.Time

48+import Data.Time

49+import Network.PagerDuty.Internal.TH

50+import Network.PagerDuty.Internal.Types

49−import Network.PagerDuty.REST.Users (User)

51+import Network.PagerDuty.REST.Users (User)

50−import Network.PagerDuty.Internal.TH

51−import Network.PagerDuty.Internal.Types

52

53alerts :: Path

54alerts = "alerts"

src/Network/PagerDuty/REST/EscalationPolicies.hs+13−13

@@ -1,8 +1,8 @@

1+{-# LANGUAGE DataKinds #-}

1−{-# LANGUAGE ExtendedDefaultRules #-}

2+{-# LANGUAGE ExtendedDefaultRules #-}

2−{-# LANGUAGE DataKinds #-}

3−{-# LANGUAGE OverloadedStrings #-}

3+{-# LANGUAGE OverloadedStrings #-}

4−{-# LANGUAGE TemplateHaskell #-}

4+{-# LANGUAGE TemplateHaskell #-}

5−{-# LANGUAGE TypeFamilies #-}

5+{-# LANGUAGE TypeFamilies #-}

6

7{-# OPTIONS_GHC -fno-warn-type-defaults #-}

8

@@ -60,15 +60,15 @@ module Network.PagerDuty.REST.EscalationPolicies

60 , pServices

61 ) where

62

63−import Control.Lens

63+import Control.Lens hiding (Empty)

64−import Data.Aeson.Lens

64+import Data.Aeson.Lens

65−import Data.Text (Text)

65+import Data.Text (Text)

66−import Network.HTTP.Types

66+import Network.HTTP.Types

67+import Network.PagerDuty.Internal.TH

68+import Network.PagerDuty.Internal.Types

67−import Network.PagerDuty.REST.Services (Service)

69+import Network.PagerDuty.REST.Services (Service)

68−import Network.PagerDuty.Internal.TH

69−import Network.PagerDuty.Internal.Types

70

71−import Network.PagerDuty.REST.EscalationPolicies.EscalationRules

71+import Network.PagerDuty.REST.EscalationPolicies.EscalationRules

72

73default (Path)

74

src/Network/PagerDuty/REST/EscalationPolicies/EscalationRules.hs+9−9

@@ -1,7 +1,7 @@

1−{-# LANGUAGE ExtendedDefaultRules #-}

1+{-# LANGUAGE ExtendedDefaultRules #-}

2−{-# LANGUAGE FlexibleInstances #-}

2+{-# LANGUAGE FlexibleInstances #-}

3−{-# LANGUAGE OverloadedStrings #-}

3+{-# LANGUAGE OverloadedStrings #-}

4−{-# LANGUAGE TemplateHaskell #-}

4+{-# LANGUAGE TemplateHaskell #-}

5

6{-# OPTIONS_GHC -fno-warn-type-defaults #-}

7

@@ -64,15 +64,15 @@ module Network.PagerDuty.REST.EscalationPolicies.EscalationRules

64 , rTargets

65 ) where

66

67−import Control.Applicative ((<$>))

67+import Control.Applicative ((<$>))

68−import Control.Lens hiding ((.=))

68+import Control.Lens hiding ((.=))

69import Data.Aeson

70−import qualified Data.HashMap.Strict as Map

70+import qualified Data.HashMap.Strict as Map

71−import Data.Text (Text)

71+import Data.Text (Text)

72import Network.HTTP.Types

73−import Network.PagerDuty.REST.Users

74import Network.PagerDuty.Internal.TH

73import Network.PagerDuty.Internal.TH

75import Network.PagerDuty.Internal.Types

74import Network.PagerDuty.Internal.Types

75+import Network.PagerDuty.REST.Users

76

77default (Path)

78

src/Network/PagerDuty/REST/Incidents.hs+4−3

@@ -130,9 +130,10 @@ module Network.PagerDuty.REST.Incidents

130 ) where

131

132import Control.Applicative hiding (empty)

133−import Control.Lens

133+import Control.Lens hiding (Empty)

134import Data.Aeson

135−import Data.ByteString.Conversion (ToByteString(..), toByteString')

135+import Data.ByteString.Conversion (ToByteString (..),

136+ toByteString')

136import Data.Default.Class

137import Data.Default.Class

137import Data.Maybe

138import Data.Maybe

138import Data.Monoid hiding (All)

139import Data.Monoid hiding (All)

@@ -566,7 +567,7 @@ updateIncidents r = auth updateIncidentsBasic & query .~ [("requester_id", r)]

566

567

567-- | A version of 'updateIncidents' which uses HTTP Basic authentication and

568-- | A version of 'updateIncidents' which uses HTTP Basic authentication and

568-- doesn't require a 'RequesterId'.

569-- doesn't require a 'RequesterId'.

569−updateIncidentsBasic :: Request UpdateIncidents Basic [UpdatedIncidents]

570+updateIncidentsBasic :: Request UpdateIncidents 'Basic [UpdatedIncidents]

570updateIncidentsBasic =

571updateIncidentsBasic =

571 mk UpdateIncidents

572 mk UpdateIncidents

572 { _uiIncidents' = []

573 { _uiIncidents' = []

src/Network/PagerDuty/REST/Incidents/Notes.hs+11−11

@@ -1,6 +1,6 @@

1−{-# LANGUAGE ExtendedDefaultRules #-}

1+{-# LANGUAGE ExtendedDefaultRules #-}

2−{-# LANGUAGE OverloadedStrings #-}

2+{-# LANGUAGE OverloadedStrings #-}

3−{-# LANGUAGE TemplateHaskell #-}

3+{-# LANGUAGE TemplateHaskell #-}

4

5{-# OPTIONS_GHC -fno-warn-type-defaults #-}

6

@@ -36,14 +36,14 @@ module Network.PagerDuty.REST.Incidents.Notes

36 , nContent

37 ) where

38

39−import Control.Lens hiding ((.=))

39+import Control.Lens hiding ((.=))

40−import Data.Aeson

40+import Data.Aeson

41−import Data.Text (Text)

41+import Data.Text (Text)

42−import Data.Time

42+import Data.Time

43−import Network.HTTP.Types

43+import Network.HTTP.Types

44+import Network.PagerDuty.Internal.TH

45+import Network.PagerDuty.Internal.Types

44−import Network.PagerDuty.REST.Users

46+import Network.PagerDuty.REST.Users

45−import Network.PagerDuty.Internal.TH

46−import Network.PagerDuty.Internal.Types

47

48default (Path)

49

src/Network/PagerDuty/REST/LogEntries.hs+5−5

@@ -112,18 +112,18 @@ module Network.PagerDuty.REST.LogEntries

112 ) where

113

114import Control.Applicative

115−import Control.Lens

115+import Control.Lens hiding (Empty)

116import Data.Aeson

117import Data.Aeson.Lens

118import Data.Default.Class

119−import qualified Data.HashMap.Strict as Map

119+import qualified Data.HashMap.Strict as Map

120−import Data.Text (Text)

120+import Data.Text (Text)

121−import qualified Data.Text as Text

121+import qualified Data.Text as Text

122import Data.Time

123import Network.HTTP.Types

124−import Network.PagerDuty.REST.Users (User)

125import Network.PagerDuty.Internal.TH

124import Network.PagerDuty.Internal.TH

126import Network.PagerDuty.Internal.Types

125import Network.PagerDuty.Internal.Types

126+import Network.PagerDuty.REST.Users (User)

127

128logs :: Path

129logs = "log_entries"

src/Network/PagerDuty/REST/MaintenanceWindows.hs+9−9

@@ -74,14 +74,14 @@ module Network.PagerDuty.REST.MaintenanceWindows

74 , mwServices

75 ) where

76

77−import Control.Lens

77+import Control.Lens hiding (Empty)

78−import Data.Monoid

78+import Data.Monoid

79−import Data.Text (Text)

79+import Data.Text (Text)

80−import Data.Time

80+import Data.Time

81−import Network.HTTP.Types

81+import Network.HTTP.Types

82+import Network.PagerDuty.Internal.TH

83+import Network.PagerDuty.Internal.Types

82−import Network.PagerDuty.REST.Users (User)

84+import Network.PagerDuty.REST.Users (User)

83−import Network.PagerDuty.Internal.TH

84−import Network.PagerDuty.Internal.Types

85

86windows :: Path

87windows = "maintenance_windows"

@@ -214,7 +214,7 @@ createWindow r s e xs =

214createWindowBasic :: UTCTime -- ^ 'cwStartTime'

215 -> UTCTime -- ^ 'cwEndTime'

216 -> [ServiceId] -- ^ 'cwServiceIds'

217− -> Request CreateWindow Basic MaintenanceWindow

217+ -> Request CreateWindow 'Basic MaintenanceWindow

218createWindowBasic s e xs =

219 mk CreateWindow

220 { _cwRequesterId' = Nothing

src/Network/PagerDuty/REST/Reports.hs+10−10

@@ -1,8 +1,8 @@

1−{-# LANGUAGE DataKinds #-}

1+{-# LANGUAGE DataKinds #-}

2−{-# LANGUAGE ExtendedDefaultRules #-}

2+{-# LANGUAGE ExtendedDefaultRules #-}

3−{-# LANGUAGE OverloadedStrings #-}

3+{-# LANGUAGE OverloadedStrings #-}

4−{-# LANGUAGE TemplateHaskell #-}

4+{-# LANGUAGE TemplateHaskell #-}

5−{-# LANGUAGE TypeFamilies #-}

5+{-# LANGUAGE TypeFamilies #-}

6

7{-# OPTIONS_GHC -fno-warn-type-defaults #-}

8

@@ -58,11 +58,11 @@ module Network.PagerDuty.REST.Reports

58 , irNumberOfIncidents

59 ) where

60

61−import Control.Lens

61+import Control.Lens hiding (Empty)

62−import Data.Aeson.Lens

62+import Data.Aeson.Lens

63−import Data.Time

63+import Data.Time

64−import Network.PagerDuty.Internal.TH

64+import Network.PagerDuty.Internal.TH

65−import Network.PagerDuty.Internal.Types

65+import Network.PagerDuty.Internal.Types

66

67default (Path)

68

src/Network/PagerDuty/REST/Schedules.hs+13−13

@@ -1,8 +1,8 @@

1−{-# LANGUAGE DataKinds #-}

1+{-# LANGUAGE DataKinds #-}

2−{-# LANGUAGE ExtendedDefaultRules #-}

2+{-# LANGUAGE ExtendedDefaultRules #-}

3−{-# LANGUAGE OverloadedStrings #-}

3+{-# LANGUAGE OverloadedStrings #-}

4−{-# LANGUAGE TemplateHaskell #-}

4+{-# LANGUAGE TemplateHaskell #-}

5−{-# LANGUAGE TypeFamilies #-}

5+{-# LANGUAGE TypeFamilies #-}

6

7{-# OPTIONS_GHC -fno-warn-type-defaults #-}

8

@@ -110,14 +110,14 @@ module Network.PagerDuty.REST.Schedules

110 , sFinalSchedule

111 ) where

112

113−import Control.Lens hiding ((.=))

113+import Control.Lens hiding (Empty, (.=))

114−import Data.Aeson

114+import Data.Aeson

115−import Data.Text (Text)

115+import Data.Text (Text)

116−import Data.Time

116+import Data.Time

117−import Network.HTTP.Types

117+import Network.HTTP.Types

118+import Network.PagerDuty.Internal.TH

119+import Network.PagerDuty.Internal.Types

118−import Network.PagerDuty.REST.Users (User)

120+import Network.PagerDuty.REST.Users (User)

119−import Network.PagerDuty.Internal.TH

120−import Network.PagerDuty.Internal.Types

121

122default (Path)

123

src/Network/PagerDuty/REST/Schedules/Overrides.hs+11−11

@@ -1,8 +1,8 @@

1−{-# LANGUAGE DataKinds #-}

1+{-# LANGUAGE DataKinds #-}

2−{-# LANGUAGE ExtendedDefaultRules #-}

2+{-# LANGUAGE ExtendedDefaultRules #-}

3−{-# LANGUAGE OverloadedStrings #-}

3+{-# LANGUAGE OverloadedStrings #-}

4−{-# LANGUAGE TemplateHaskell #-}

4+{-# LANGUAGE TemplateHaskell #-}

5−{-# LANGUAGE TypeFamilies #-}

5+{-# LANGUAGE TypeFamilies #-}

6

7{-# OPTIONS_GHC -fno-warn-type-defaults #-}

8

@@ -50,12 +50,12 @@ module Network.PagerDuty.REST.Schedules.Overrides

50 , oUser

51 ) where

52

53−import Control.Lens

53+import Control.Lens

54−import Data.Time

54+import Data.Time

55−import Network.HTTP.Types

55+import Network.HTTP.Types

56+import Network.PagerDuty.Internal.TH

57+import Network.PagerDuty.Internal.Types

56−import Network.PagerDuty.REST.Users

58+import Network.PagerDuty.REST.Users

57−import Network.PagerDuty.Internal.TH

58−import Network.PagerDuty.Internal.Types

59

60overrides :: ScheduleId -> Path

61overrides i = "schedules" % i % "overrides"

src/Network/PagerDuty/REST/Services.hs+15−15

@@ -1,8 +1,8 @@

1−{-# LANGUAGE DataKinds #-}

1+{-# LANGUAGE DataKinds #-}

2−{-# LANGUAGE ExtendedDefaultRules #-}

2+{-# LANGUAGE ExtendedDefaultRules #-}

3−{-# LANGUAGE OverloadedStrings #-}

3+{-# LANGUAGE OverloadedStrings #-}

4−{-# LANGUAGE TemplateHaskell #-}

4+{-# LANGUAGE TemplateHaskell #-}

5−{-# LANGUAGE TypeFamilies #-}

5+{-# LANGUAGE TypeFamilies #-}

6

7{-# OPTIONS_GHC -fno-warn-type-defaults #-}

8

@@ -106,14 +106,14 @@ module Network.PagerDuty.REST.Services

106 , svcSeverityFilter

107 ) where

108

109−import Control.Lens

109+import Control.Lens hiding (Empty)

110−import Data.Aeson.Lens

110+import Data.Aeson.Lens

111−import Data.Text (Text)

111+import Data.Text (Text)

112−import Data.Time

112+import Data.Time

113−import Network.HTTP.Types

113+import Network.HTTP.Types

114+import Network.PagerDuty.Internal.TH

115+import Network.PagerDuty.Internal.Types

114−import Network.PagerDuty.REST.Services.EmailFilters

116+import Network.PagerDuty.REST.Services.EmailFilters

115−import Network.PagerDuty.Internal.TH

116−import Network.PagerDuty.Internal.Types

117

118default (Path)

119

@@ -483,7 +483,7 @@ enableService r i =

483

484-- | A version of 'enableService' which uses HTTP Basic authentication and

485-- doesn't require a 'RequesterId'.

486−enableServiceBasic :: ServiceId -> Request Empty Basic Empty

486+enableServiceBasic :: ServiceId -> Request Empty 'Basic Empty

487enableServiceBasic i = empty & meth .~ PUT & path .~ services % i % "enable"

488

489-- | Disable a service. Once a service is disabled, it will not be able to

@@ -498,7 +498,7 @@ disableService r i =

498

499-- | A version of 'disableService' which uses HTTP Basic authentication and

500-- doesn't require a 'RequesterId'.

501−disableServiceBasic :: ServiceId -> Request Empty Basic Empty

501+disableServiceBasic :: ServiceId -> Request Empty 'Basic Empty

502disableServiceBasic i = empty & meth .~ PUT & path .~ services % i % "disable"

503

504-- | Regenerate a new service key for an existing service.

src/Network/PagerDuty/REST/Services/EmailFilters.hs+13−13

@@ -1,6 +1,6 @@

1−{-# LANGUAGE ExtendedDefaultRules #-}

1+{-# LANGUAGE ExtendedDefaultRules #-}

2−{-# LANGUAGE OverloadedStrings #-}

2+{-# LANGUAGE OverloadedStrings #-}

3−{-# LANGUAGE TemplateHaskell #-}

3+{-# LANGUAGE TemplateHaskell #-}

4

5{-# OPTIONS_GHC -fno-warn-type-defaults #-}

6

@@ -39,15 +39,15 @@ module Network.PagerDuty.REST.Services.EmailFilters

39 , efId

40 ) where

41

42−import Control.Applicative hiding (empty)

42+import Control.Applicative hiding (empty)

43−import Control.Lens hiding ((.=))

43+import Control.Lens hiding ((.=))

44−import Data.Aeson

44+import Data.Aeson

45−import Data.Default.Class

45+import Data.Default.Class

46−import Data.Monoid

46+import Data.Monoid

47−import Data.Text (Text)

47+import Data.Text (Text)

48−import Network.HTTP.Types

48+import Network.HTTP.Types

49−import Network.PagerDuty.Internal.TH

49+import Network.PagerDuty.Internal.TH

50−import Network.PagerDuty.Internal.Types

50+import Network.PagerDuty.Internal.Types

51

52default (Path)

53

@@ -65,7 +65,7 @@ deriveNullaryWith hyphenated ''MatchMode

65-- FIXME: Tighten up this type! Make the regex required for match/no-match and

66-- encode the conditional invariants.

67data EmailFilterInfo = EmailFilterInfo

68− { _efSubjectMode' :: Maybe MatchMode

68+ { _efSubjectMode' :: Maybe MatchMode

69 , _efSubjectRegex' :: Maybe Text

70 , _efBodyMode' :: Maybe MatchMode

71 , _efBodyRegex' :: Maybe Text

src/Network/PagerDuty/REST/Users.hs+17−16

@@ -1,10 +1,11 @@

1−{-# LANGUAGE DataKinds #-}

1+{-# LANGUAGE DataKinds #-}

2−{-# LANGUAGE ExtendedDefaultRules #-}

2+{-# LANGUAGE ExtendedDefaultRules #-}

3−{-# LANGUAGE OverloadedStrings #-}

3+{-# LANGUAGE OverloadedStrings #-}

4−{-# LANGUAGE TemplateHaskell #-}

4+{-# LANGUAGE TemplateHaskell #-}

5−{-# LANGUAGE TypeFamilies #-}

5+{-# LANGUAGE TypeFamilies #-}

6

7{-# OPTIONS_GHC -fno-warn-type-defaults #-}

8+{-# OPTIONS_GHC -ddump-splices #-}

8

9

9-- Module : Network.PagerDuty.REST.Users

10-- Module : Network.PagerDuty.REST.Users

@@ -81,16 +82,16 @@ module Network.PagerDuty.REST.Users

81 , uJobTitle

82 , uJobTitle

82 ) where

83 ) where

83

84

84−import Control.Applicative hiding (empty)

85+import Control.Applicative hiding (empty)

85−import Control.Lens hiding ((.=))

86+import Control.Lens hiding (Empty, (.=))

86−import Data.Aeson

87+import Data.Aeson

87−import Data.Default.Class

88+import Data.Default.Class

88−import Data.Monoid

89+import Data.Monoid

89−import Data.Text (Text)

90+import Data.Text (Text)

90−import Data.Time

91+import Data.Time

91−import Network.HTTP.Types

92+import Network.HTTP.Types

92−import Network.PagerDuty.Internal.TH

93+import Network.PagerDuty.Internal.TH

93−import Network.PagerDuty.Internal.Types

94+import Network.PagerDuty.Internal.Types

94

95

95default (Path)

96default (Path)

96

97

@@ -315,7 +316,7 @@ createUser r n e = auth (createUserBasic n e) & query .~ [("requester_id", r)]

315-- doesn't require a 'RequesterId'.

316-- doesn't require a 'RequesterId'.

316createUserBasic :: Text -- ^ 'cuName'

317createUserBasic :: Text -- ^ 'cuName'

317 -> Address -- ^ 'cuEmail'

318 -> Address -- ^ 'cuEmail'

318− -> Request CreateUser Basic User

319+ -> Request CreateUser 'Basic User

319createUserBasic n e =

320createUserBasic n e =

320 mk CreateUser

321 mk CreateUser

321 { _cuName' = n

322 { _cuName' = n

src/Network/PagerDuty/REST/Users/ContactMethods.hs+9−9

@@ -1,6 +1,6 @@

1−{-# LANGUAGE ExtendedDefaultRules #-}

1+{-# LANGUAGE ExtendedDefaultRules #-}

2−{-# LANGUAGE OverloadedStrings #-}

2+{-# LANGUAGE OverloadedStrings #-}

3−{-# LANGUAGE TemplateHaskell #-}

3+{-# LANGUAGE TemplateHaskell #-}

4

5{-# OPTIONS_GHC -fno-warn-type-defaults #-}

6

@@ -56,12 +56,12 @@ module Network.PagerDuty.REST.Users.ContactMethods

56 , Contact

57 ) where

58

59−import Control.Lens

59+import Control.Lens

60−import Data.Aeson.Lens

60+import Data.Aeson.Lens

61−import Data.Text (Text)

61+import Data.Text (Text)

62−import Network.HTTP.Types

62+import Network.HTTP.Types

63−import Network.PagerDuty.Internal.TH

63+import Network.PagerDuty.Internal.TH

64−import Network.PagerDuty.Internal.Types

64+import Network.PagerDuty.Internal.Types

65

66default (Path)

67

src/Network/PagerDuty/REST/Users/NotificationRules.hs+9−9

@@ -1,6 +1,6 @@

1−{-# LANGUAGE ExtendedDefaultRules #-}

1+{-# LANGUAGE ExtendedDefaultRules #-}

2−{-# LANGUAGE OverloadedStrings #-}

2+{-# LANGUAGE OverloadedStrings #-}

3−{-# LANGUAGE TemplateHaskell #-}

3+{-# LANGUAGE TemplateHaskell #-}

4

5{-# OPTIONS_GHC -fno-warn-type-defaults #-}

6

@@ -51,12 +51,12 @@ module Network.PagerDuty.REST.Users.NotificationRules

51 , rContactMethod

52 ) where

53

54−import Control.Lens

54+import Control.Lens

55−import Data.Aeson.Lens

55+import Data.Aeson.Lens

56−import Network.HTTP.Types

56+import Network.HTTP.Types

57+import Network.PagerDuty.Internal.TH

58+import Network.PagerDuty.Internal.Types

57−import Network.PagerDuty.REST.Users.ContactMethods

59+import Network.PagerDuty.REST.Users.ContactMethods

58−import Network.PagerDuty.Internal.TH

59−import Network.PagerDuty.Internal.Types

60

61default (Path)

62

src/Network/PagerDuty/REST/Webhooks.hs+3−2

@@ -35,13 +35,14 @@ module Network.PagerDuty.REST.Webhooks

35import Control.Applicative hiding (empty)

36import Control.Lens

37import Data.Aeson

38−import Data.ByteString.Conversion (ToByteString(..), toByteString')

38+import Data.ByteString.Conversion (ToByteString (..),

39+ toByteString')

39import Data.Text (Text)

40import Data.Text (Text)

40import qualified Data.Text.Encoding as Text

41import qualified Data.Text.Encoding as Text

41import Data.Time

42import Data.Time

42−import Network.PagerDuty.REST.Incidents

43import Network.PagerDuty.Internal.TH

44import Network.PagerDuty.Internal.Types

45+import Network.PagerDuty.REST.Incidents

45

46

46data WebhookType

47data WebhookType

47 = WTrigger

48 = WTrigger

stack-7.10.2.yamlnew file+5

@@ -0,0 +1,5 @@

1+resolver: nightly-2015-10-24

2+flags: {}

3+extra-deps: []

4+packages:

5+ - '.'

stack-7.8.4.yamlnew file+5

@@ -0,0 +1,5 @@

1+resolver: lts-2.21

2+flags: {}

3+extra-deps: []

4+packages:

5+ - '.'

stack.yamlmode 100644 → 120000+1−5

@@ -1,5 +0,0 @@

1−flags: {}

2−packages:

3−- '.'

4−extra-deps: []

5−resolver: nightly-2015-06-17

@@ -0,0 +1 @@

1+stack-7.10.2.yaml