cf6756b · typeable/pagerduty

git.iko.soy/typeable/pagerduty

Renamspacing internal modules

commitcf6756bddc40b2e51885da02c98312fff076f0df authorBrendan Hay <brendan.g.hay@gmail.com> dateThu 23 Oct 2014, 20:25 (12 years ago) parent163eb08

25 files changed+73−100

compare with develop

unifiedsplit

pagerduty.cabal+18−17

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

11name: pagerduty

2−version: 0.1.0

2+version: 0.0.0

33synopsis: Pager Duty API Client

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

55license: OtherLicense

66license-file: LICENSE

7−author: Brendan Hay, Kim Altintop

8−maintainer: Brendan Hay <brendan.g.hay@gmail.com>, Kim Altintop <kim.altintop@gmail.com>

7+author: Brendan Hay

8+maintainer: Brendan Hay <brendan.g.hay@gmail.com>

10−category: Network, Monitoring

10+category: Network, Monitoring, Alerting

1111build-type: Simple

1212cabal-version: >= 1.10

1313

@@ -16,6 +16,8 @@ description:

1616 .

1717 * Integration API - <http://developer.pagerduty.com/documentation/integration>

1818 * REST API - <http://developer.pagerduty.com/documentation/rest>

19+ .

20+ /Warning:/ This is a /highly/ experimental preview release, caveat emptor!

1921

2022extra-source-files:

2123 README.md

@@ -52,34 +54,33 @@ library

5254 , Network.PagerDuty.REST.Webhooks

5355

5456 other-modules:

55− Network.PagerDuty.IO

56− , Network.PagerDuty.Options

57− , Network.PagerDuty.Query

58− , Network.PagerDuty.TH

59− , Network.PagerDuty.Types

57+ Network.PagerDuty.Internal.IO

58+ , Network.PagerDuty.Internal.Options

59+ , Network.PagerDuty.Internal.Query

60+ , Network.PagerDuty.Internal.TH

61+ , Network.PagerDuty.Internal.Types

6062

6163 build-depends:

6264 aeson > 0.7 && <= 0.8

6365 , base >= 4.5 && < 5.0

64− , bifunctors

66+ , bifunctors >= 4

6567 , bytestring >= 0.9

6668 , bytestring-conversion >= 0.2.1

6769 , conduit >= 0.5.5

68− , data-default-class

70+ , data-default-class >= 0.1

6971 , exceptions >= 0.6

72+ , generics-sop >= 1.0.2

7073 , http-client >= 0.3.6

7174 , http-types >= 0.8

7275 , lens >= 4.0

7376 , lens-aeson >= 1.0

7477 , mmorph >= 1.0

78+ , monad-control >= 0.3.2

7579 , mtl >= 2.2.1

76− , old-locale

80+ , old-locale >= 1.0.0.5

81+ , template-haskell >= 2.2

7782 , text >= 1.1

7883 , time == 1.4.*

7984 , transformers >= 0.4.1

85+ , transformers-base >= 0.4.1

8086 , unordered-containers >= 0.2.3

81−

82− , generics-sop

83− , monad-control

84− , template-haskell

85− , transformers-base

src/Control/Monad/Trans/PagerDuty.hs+1−1

@@ -57,7 +57,7 @@ import Network.HTTP.Client (Manager)

5757import Network.PagerDuty.Integration (Event, Response)

5858import qualified Network.PagerDuty.Integration as Int

5959import qualified Network.PagerDuty.REST as REST

60−import Network.PagerDuty.Types

60+import Network.PagerDuty.Internal.Types

6161

6262data Env (s :: Security) = Env

6363 { _envDomain :: SubDomain

src/Network/PagerDuty/Integration.hs+3−3

@@ -79,9 +79,9 @@ import Data.Monoid

7979import Data.Text (Text)

8080import Network.HTTP.Client (Manager)

8181import qualified Network.HTTP.Client as Client

82−import Network.PagerDuty.IO

83−import Network.PagerDuty.TH

84−import Network.PagerDuty.Types

82+import Network.PagerDuty.Internal.IO

83+import Network.PagerDuty.Internal.TH

84+import Network.PagerDuty.Internal.Types

8585

8686data Response = Response

8787 { _rsStatus :: Text

src/Network/PagerDuty/IO.hs → src/Network/PagerDuty/Internal/IO.hsrenamed+3−3

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

11{-# LANGUAGE OverloadedStrings #-}

3−-- Module : Network.PagerDuty.IO

3+-- Module : Network.PagerDuty.Internal.IO

55-- License : This Source Code Form is subject to the terms of

66-- the Mozilla Public License, v. 2.0.

@@ -10,7 +10,7 @@

1010-- Stability : experimental

1111-- Portability : non-portable (GHC extensions)

1212

13−module Network.PagerDuty.IO where

13+module Network.PagerDuty.Internal.IO where

1414

1515import Control.Monad

1616import Control.Monad.IO.Class

@@ -19,7 +19,7 @@ import qualified Data.ByteString.Lazy as LBS

1919import Network.HTTP.Client (Manager, httpLbs)

2020import qualified Network.HTTP.Client as Client

2121import Network.HTTP.Types

22−import Network.PagerDuty.Types

22+import Network.PagerDuty.Internal.Types

2323

2424request :: (MonadIO m, ToJSON a, FromJSON b)

2525 => Manager

src/Network/PagerDuty/Options.hs → src/Network/PagerDuty/Internal/Options.hsrenamed+2−2

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

1−-- Module : Network.PagerDuty.Options

1+-- Module : Network.PagerDuty.Internal.Options

33-- License : This Source Code Form is subject to the terms of

44-- the Mozilla Public License, v. 2.0.

@@ -8,7 +8,7 @@

88-- Stability : experimental

99-- Portability : non-portable (GHC extensions)

1010

11−module Network.PagerDuty.Options

11+module Network.PagerDuty.Internal.Options

1212 ( dropped

1313 , hyphenated

1414 , underscored

src/Network/PagerDuty/Query.hs → src/Network/PagerDuty/Internal/Query.hsrenamed+3−3

@@ -5,7 +5,7 @@

55{-# LANGUAGE ScopedTypeVariables #-}

66{-# LANGUAGE TupleSections #-}

8−-- Module : Network.PagerDuty.Query

8+-- Module : Network.PagerDuty.Internal.Query

1010-- License : This Source Code Form is subject to the terms of

1111-- the Mozilla Public License, v. 2.0.

@@ -15,7 +15,7 @@

1515-- Stability : experimental

1616-- Portability : non-portable (GHC extensions)

1717

18−module Network.PagerDuty.Query

18+module Network.PagerDuty.Internal.Query

1919 ( QueryValues (..)

2020 , gquery

2121 , gqueryWith

@@ -33,7 +33,7 @@ import Data.Text (Text)

3333import qualified Data.Text.Encoding as Text

3434import Generics.SOP

3535import Network.HTTP.Types

36−import Network.PagerDuty.Options

36+import Network.PagerDuty.Internal.Options

3737

3838class QueryValues a where

3939 queryValues :: a -> [ByteString]

src/Network/PagerDuty/TH.hs → src/Network/PagerDuty/Internal/TH.hsrenamed+4−4

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

11{-# LANGUAGE TemplateHaskell #-}

3−-- Module : Network.PagerDuty.TH

3+-- Module : Network.PagerDuty.Internal.TH

55-- License : This Source Code Form is subject to the terms of

66-- the Mozilla Public License, v. 2.0.

@@ -10,7 +10,7 @@

1010-- Stability : experimental

1111-- Portability : non-portable (GHC extensions)

1212

13−module Network.PagerDuty.TH

13+module Network.PagerDuty.Internal.TH

1414 (

1515 -- * Requests

1616 jsonRequest

@@ -47,8 +47,8 @@ import qualified Data.Text.Encoding as Text

4747import Generics.SOP.TH

4848import Language.Haskell.TH

4949import Network.HTTP.Types.QueryLike

50−import Network.PagerDuty.Query

51−import Network.PagerDuty.Options

50+import Network.PagerDuty.Internal.Query

51+import Network.PagerDuty.Internal.Options

5252

5353jsonRequest :: Name -> Q [Dec]

5454jsonRequest n = concat <$> sequence

src/Network/PagerDuty/Types.hs → src/Network/PagerDuty/Internal/Types.hsrenamed+4−32

@@ -12,7 +12,7 @@

1212{-# LANGUAGE TupleSections #-}

1313{-# LANGUAGE ViewPatterns #-}

1414

15−-- Module : Network.PagerDuty.Types

15+-- Module : Network.PagerDuty.Internal.Types

1717-- License : This Source Code Form is subject to the terms of

1818-- the Mozilla Public License, v. 2.0.

@@ -22,35 +22,7 @@

2222-- Stability : experimental

2323-- Portability : non-portable (GHC extensions)

2424

25−module Network.PagerDuty.Types where

26− -- (

27− -- -- * Requests

28− -- Auth (..)

29− -- , Cred (..)

30− -- , Domain (..)

31−

32− -- , Request (..)

33− -- , Request'

34−

35− -- , Paginate (..)

36−

37− -- -- * Errors

38− -- , Code (..)

39− -- , message

40− -- , RestError (..)

41− -- , Error (..)

42−

43− -- -- * Primitives

44− -- , Key (..)

45− -- , ServiceKey

46− -- , IncidentKey

47−

48− -- , Id (..)

49− -- , ServiceId

50− -- , RequesterId

51−

52− -- , Empty (..)

53− -- ) where

25+module Network.PagerDuty.Internal.Types where

5426

5527import Control.Applicative

5628import Control.Lens hiding ((.=))

@@ -72,8 +44,8 @@ import Data.Time

7244import GHC.TypeLits

7345import Network.HTTP.Types

7446import Network.HTTP.Types.QueryLike

75−import Network.PagerDuty.Query

76−import Network.PagerDuty.TH

47+import Network.PagerDuty.Internal.Query

48+import Network.PagerDuty.Internal.TH

7749import System.Locale

7850

7951-- FIXME: Verify IncidentId/IncidentKey .. *Id/*Key are actually different or needed

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

@@ -30,8 +30,8 @@ import Data.Monoid

3030import Network.HTTP.Client (Manager)

3131import qualified Network.HTTP.Client as Client

3232import Network.HTTP.Types

33−import Network.PagerDuty.IO

34−import Network.PagerDuty.Types

33+import Network.PagerDuty.Internal.IO

34+import Network.PagerDuty.Internal.Types

3535

3636-- Make the type names consistent, for example:

3737-- Suffix with *Details or *Info for results

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

@@ -47,8 +47,8 @@ import Control.Lens

4747import Data.Aeson.Lens

4848import Data.Time

4949import Network.PagerDuty.REST.Users (User)

50−import Network.PagerDuty.TH

51−import Network.PagerDuty.Types

50+import Network.PagerDuty.Internal.TH

51+import Network.PagerDuty.Internal.Types

5252

5353alerts :: Path

5454alerts = "alerts"

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

@@ -65,8 +65,8 @@ import Data.Aeson.Lens

6565import Data.Text (Text)

6666import Network.HTTP.Types

6767import Network.PagerDuty.REST.Services (Service)

68−import Network.PagerDuty.TH

69−import Network.PagerDuty.Types

68+import Network.PagerDuty.Internal.TH

69+import Network.PagerDuty.Internal.Types

7070

7171import Network.PagerDuty.REST.EscalationPolicies.EscalationRules

7272

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

@@ -71,8 +71,8 @@ import qualified Data.HashMap.Strict as Map

7171import Data.Text (Text)

7272import Network.HTTP.Types

7373import Network.PagerDuty.REST.Users

74−import Network.PagerDuty.TH

75−import Network.PagerDuty.Types

74+import Network.PagerDuty.Internal.TH

75+import Network.PagerDuty.Internal.Types

7676

7777default (Path)

7878

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

@@ -139,9 +139,9 @@ import Data.Text (Text)

139139import qualified Data.Text.Encoding as Text

140140import Data.Time

141141import Network.HTTP.Types

142−import Network.PagerDuty.Query

143−import Network.PagerDuty.TH

144−import Network.PagerDuty.Types

142+import Network.PagerDuty.Internal.Query

143+import Network.PagerDuty.Internal.TH

144+import Network.PagerDuty.Internal.Types

145145

146146default (Path)

147147

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

@@ -42,8 +42,8 @@ import Data.Text (Text)

4242import Data.Time

4343import Network.HTTP.Types

4444import Network.PagerDuty.REST.Users

45−import Network.PagerDuty.TH

46−import Network.PagerDuty.Types

45+import Network.PagerDuty.Internal.TH

46+import Network.PagerDuty.Internal.Types

4747

4848default (Path)

4949

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

@@ -122,8 +122,8 @@ import qualified Data.Text as Text

122122import Data.Time

123123import Network.HTTP.Types

124124import Network.PagerDuty.REST.Users (User)

125−import Network.PagerDuty.TH

126−import Network.PagerDuty.Types

125+import Network.PagerDuty.Internal.TH

126+import Network.PagerDuty.Internal.Types

127127

128128logs :: Path

129129logs = "log_entries"

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

@@ -80,8 +80,8 @@ import Data.Text (Text)

8080import Data.Time

8181import Network.HTTP.Types

8282import Network.PagerDuty.REST.Users (User)

83−import Network.PagerDuty.TH

84−import Network.PagerDuty.Types

83+import Network.PagerDuty.Internal.TH

84+import Network.PagerDuty.Internal.Types

8585

8686windows :: Path

8787windows = "maintenance_windows"

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

@@ -61,8 +61,8 @@ module Network.PagerDuty.REST.Reports

6161import Control.Lens

6262import Data.Aeson.Lens

6363import Data.Time

64−import Network.PagerDuty.TH

65−import Network.PagerDuty.Types

64+import Network.PagerDuty.Internal.TH

65+import Network.PagerDuty.Internal.Types

6666

6767default (Path)

6868

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

@@ -116,8 +116,8 @@ import Data.Text (Text)

116116import Data.Time

117117import Network.HTTP.Types

118118import Network.PagerDuty.REST.Users (User)

119−import Network.PagerDuty.TH

120−import Network.PagerDuty.Types

119+import Network.PagerDuty.Internal.TH

120+import Network.PagerDuty.Internal.Types

121121

122122default (Path)

123123

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

@@ -54,8 +54,8 @@ import Control.Lens

5454import Data.Time

5555import Network.HTTP.Types

5656import Network.PagerDuty.REST.Users

57−import Network.PagerDuty.TH

58−import Network.PagerDuty.Types

57+import Network.PagerDuty.Internal.TH

58+import Network.PagerDuty.Internal.Types

5959

6060overrides :: ScheduleId -> Path

6161overrides i = "schedules" % i % "overrides"

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

@@ -112,8 +112,8 @@ import Data.Text (Text)

112112import Data.Time

113113import Network.HTTP.Types

114114import Network.PagerDuty.REST.Services.EmailFilters

115−import Network.PagerDuty.TH

116−import Network.PagerDuty.Types

115+import Network.PagerDuty.Internal.TH

116+import Network.PagerDuty.Internal.Types

117117

118118default (Path)

119119

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

@@ -46,8 +46,8 @@ import Data.Default.Class

4646import Data.Monoid

4747import Data.Text (Text)

4848import Network.HTTP.Types

49−import Network.PagerDuty.TH

50−import Network.PagerDuty.Types

49+import Network.PagerDuty.Internal.TH

50+import Network.PagerDuty.Internal.Types

5151

5252default (Path)

5353

src/Network/PagerDuty/REST/Users.hs+2−2

@@ -89,8 +89,8 @@ import Data.Monoid

8989import Data.Text (Text)

9090import Data.Time

9191import Network.HTTP.Types

92−import Network.PagerDuty.TH

93−import Network.PagerDuty.Types

92+import Network.PagerDuty.Internal.TH

93+import Network.PagerDuty.Internal.Types

9494

9595default (Path)

9696

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

@@ -60,8 +60,8 @@ import Control.Lens

6060import Data.Aeson.Lens

6161import Data.Text (Text)

6262import Network.HTTP.Types

63−import Network.PagerDuty.TH

64−import Network.PagerDuty.Types

63+import Network.PagerDuty.Internal.TH

64+import Network.PagerDuty.Internal.Types

6565

6666default (Path)

6767

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

@@ -55,8 +55,8 @@ import Control.Lens

5555import Data.Aeson.Lens

5656import Network.HTTP.Types

5757import Network.PagerDuty.REST.Users.ContactMethods

58−import Network.PagerDuty.TH

59−import Network.PagerDuty.Types

58+import Network.PagerDuty.Internal.TH

59+import Network.PagerDuty.Internal.Types

6060

6161default (Path)

6262

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

@@ -40,8 +40,8 @@ import Data.Text (Text)

4040import qualified Data.Text.Encoding as Text

4141import Data.Time

4242import Network.PagerDuty.REST.Incidents

43−import Network.PagerDuty.TH

44−import Network.PagerDuty.Types

43+import Network.PagerDuty.Internal.TH

44+import Network.PagerDuty.Internal.Types

4545

4646data WebhookType

4747 = WTrigger