master..e2be2c7 · typeable/hjsonpointer

git.iko.soy/typeable/hjsonpointer

on e2be2c7 help sign in

.travis.yml+52−61

since splitsnapshots

unifiedsplit

@@ -1,11 +1,9 @@

1# This Travis job script has been generated by a script via

3−# runghc make_travis_yml_2.hs 'hjsonpointer.cabal'

3+# make_travis_yml_2.hs 'hjsonpointer.cabal'

5# For more information, see https://github.com/hvr/multi-ghc-travis

6−

6+#

7−# NOTE: After generating comment out `cabal check`, it requires a description field.

8−

9language: c

7language: c

10sudo: false

8sudo: false

@@ -26,79 +24,72 @@ before_cache:

26 - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar

24 - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar

27 - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx

25 - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx

29− - rm -rfv $HOME/.cabal/packages/head.hackage

30−

31matrix:

27matrix:

32 include:

28 include:

33− - compiler: "ghc-8.0.2"

29+ - compiler: "ghc-7.10.3"

34 # env: TEST=--disable-tests BENCH=--disable-benchmarks

30 # env: TEST=--disable-tests BENCH=--disable-benchmarks

35− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}

31+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-7.10.3], sources: [hvr-ghc]}}

36− - compiler: "ghc-8.2.2"

32+ - compiler: "ghc-8.0.1"

37 # env: TEST=--disable-tests BENCH=--disable-benchmarks

33 # env: TEST=--disable-tests BENCH=--disable-benchmarks

38− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}

34+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.1], sources: [hvr-ghc]}}

39− - compiler: "ghc-8.4.1"

35+ - compiler: "ghc-8.2.1"

40 # env: TEST=--disable-tests BENCH=--disable-benchmarks

36 # env: TEST=--disable-tests BENCH=--disable-benchmarks

41− addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}}

37+ addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.1], sources: [hvr-ghc]}}

43before_install:

39before_install:

44− - HC=${CC}

40+ - HC=${CC}

45− - HCPKG=${HC/ghc/ghc-pkg}

41+ - HCPKG=${HC/ghc/ghc-pkg}

46− - unset CC

42+ - unset CC

47− - ROOTDIR=$(pwd)

48− - mkdir -p $HOME/.local/bin

49− - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"

43+ - PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH

50− - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))

44+ - PKGNAME='hjsonpointer'

51− - echo $HCNUMVER

53install:

46install:

54− - cabal --version

47+ - cabal --version

55− - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"

48+ - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"

56− - BENCH=${BENCH---enable-benchmarks}

49+ - BENCH=${BENCH---enable-benchmarks}

57− - TEST=${TEST---enable-tests}

50+ - TEST=${TEST---enable-tests}

58− - HADDOCK=${HADDOCK-true}

51+ - HADDOCK=${HADDOCK-true}

59− - INSTALLED=${INSTALLED-true}

52+ - INSTALLED=${INSTALLED-true}

60− - GHCHEAD=${GHCHEAD-false}

61− - travis_retry cabal update -v

53+ - travis_retry cabal update -v

62− - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"

54+ - sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config

63− - rm -fv cabal.project cabal.project.local

55+ - rm -fv cabal.project.local

64− - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'

65− - "printf 'packages: \".\"\\n' > cabal.project"

56+ - "echo 'packages: .' > cabal.project"

66− - cat cabal.project

67− - if [ -f "./configure.ac" ]; then

68− (cd "." && autoreconf -i);

69− fi

70− - rm -f cabal.project.freeze

57+ - rm -f cabal.project.freeze

71− - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all

58+ - cabal new-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all

72− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all

59+ - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2 all

73− - rm -rf .ghc.environment.* "."/dist

74− - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)

76# Here starts the actual work to be performed for the package under test;

61# Here starts the actual work to be performed for the package under test;

77# any command which exits with a non-zero exit code causes the build to fail.

62# any command which exits with a non-zero exit code causes the build to fail.

78script:

63script:

64+ - if [ -f configure.ac ]; then autoreconf -i; fi

65+ - rm -rf .ghc.environment.* dist/

79− # test that source-distributions can be generated

66+ - cabal sdist # test that a source-distribution can be generated

80− - (cd "." && cabal sdist)

67+ - cd dist/

81− - mv "."/dist/hjsonpointer-*.tar.gz ${DISTDIR}/

68+ - SRCTAR=(${PKGNAME}-*.tar.gz)

82− - cd ${DISTDIR} || false

69+ - SRC_BASENAME="${SRCTAR/%.tar.gz}"

83− - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;

70+ - tar -xvf "./$SRC_BASENAME.tar.gz"

71+ - cd "$SRC_BASENAME/"

72+## from here on, CWD is inside the extracted source-tarball

73+ - rm -fv cabal.project.local

84− - "printf 'packages: hjsonpointer-*/*.cabal\\n' > cabal.project"

74+ - "echo 'packages: .' > cabal.project"

85− - cat cabal.project

86− # this builds all libraries and executables (without tests/benchmarks)

75+ # this builds all libraries and executables (without tests/benchmarks)

87− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all

76+ - rm -f cabal.project.freeze

88−

77+ - cabal new-build -w ${HC} --disable-tests --disable-benchmarks all

89− # Build with installed constraints for packages in global-db

78+ # this builds all libraries and executables (including tests/benchmarks)

90− - if $INSTALLED; then echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/$[a-zA-Z0-9-]\{1,\}$ */--constraint="\1 installed" /g') all | sh; else echo "Not building with installed constraints"; fi

79+ # - rm -rf ./dist-newstyle

92− # build & run tests, build benchmarks

81+ # Build with installed constraints for packages in global-db

93− - cabal new-build -w ${HC} ${TEST} ${BENCH} all

82+ - if $INSTALLED; then

94− - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} ${BENCH} all; fi

83+ echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/$[a-zA-Z0-9-]\{1,\}$ */--constraint="\1 installed" /g') all | sh;

84+ else echo "Not building with installed constraints"; fi

96− # cabal check

86+ # build & run tests, build benchmarks

97− # - (cd hjsonpointer-* && cabal check)

87+ - cabal new-build -w ${HC} ${TEST} ${BENCH} all

88+ - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} all; fi

99− # haddock

90+ # haddock

100− - rm -rf ./dist-newstyle

91+ - rm -rf ./dist-newstyle

101− - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi

92+ - if $HADDOCK; then cabal new-haddock -w ${HC} --disable-tests --disable-benchmarks all; else echo "Skipping haddock generation";fi

102

103# REGENDATA ["hjsonpointer.cabal"]

94# REGENDATA ["hjsonpointer.cabal"]

104# EOF

95# EOF

changelog.md−9

@@ -1,12 +1,3 @@

1−# 1.5.0

2−

3−+ Drop QuickCheck dependency (thanks @mmhat !).

4−

5−# 1.4.0

6−

7−+ Enable GHC 8.4 (thanks @4e6 !).

8−+ Drop GHC 7.10.

9−

10# 1.3.0

1# 1.3.0

12+ Test with GHC 8.2. Drop GHC 7.8.

3+ Test with GHC 8.2. Drop GHC 7.8.

hjsonpointer.cabal+6−4

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

1name: hjsonpointer

2−version: 1.5.0

2+version: 1.3.0

3synopsis: JSON Pointer library

4homepage: https://github.com/seagreen/hjsonpointer

5license: MIT

@@ -10,7 +10,7 @@ category: Data

10build-type: Simple

11cabal-version: >=1.10

12-- Rerun multi-ghc-travis (executable make-travis-yml-2) after changing:

13−Tested-With: GHC == 8.0.2, GHC == 8.2.2, GHC == 8.4.1

13+Tested-With: GHC == 7.10.3, GHC == 8.0.1, GHC == 8.2.1

14extra-source-files:

15 changelog.md

16 README.md

@@ -24,10 +24,13 @@ library

24 exposed-modules:

25 JSONPointer

26 build-depends:

27− base >= 4.9 && < 5

27+ base >= 4.6 && < 4.11

28 , aeson >= 0.7

29 , hashable >= 1.2

30+ , QuickCheck >= 2.8

30 , unordered-containers >= 0.2

31 , unordered-containers >= 0.2

32+ , semigroups >= 0.18

33+ -- ^ for GHCs < 8

31 , text >= 1.2

34 , text >= 1.2

32 , vector >= 0.10

35 , vector >= 0.10

@@ -42,7 +45,6 @@ test-suite unit

42 OverloadedStrings

45 OverloadedStrings

43 ghc-options:

46 ghc-options:

44 -Wall

47 -Wall

45− -fno-warn-orphans

46 other-modules: Example

48 other-modules: Example

47 build-depends:

49 build-depends:

48 aeson

50 aeson

src/JSONPointer.hs+5−1

@@ -13,6 +13,7 @@ import Data.Text (Text)

13import qualified Data.Text as T

14import qualified Data.Vector as V

15import GHC.Generics (Generic)

16+import Test.QuickCheck

16import Text.Read (readMaybe)

17import Text.Read (readMaybe)

18--------------------------------------------------

19--------------------------------------------------

@@ -36,7 +37,7 @@ resolve (Pointer (t:ts)) v = resolveToken t v >>= resolve (Pointer ts)

37newtype Pointer

38newtype Pointer

38 = Pointer { _unPointer :: [Token] }

39 = Pointer { _unPointer :: [Token] }

39− deriving (Eq, Show, Semigroup, Monoid, Generic)

40+ deriving (Eq, Show, Semigroup, Monoid, Generic, Arbitrary)

41instance HA.Hashable Pointer

42instance HA.Hashable Pointer

@@ -62,6 +63,9 @@ newtype Token

63instance HA.Hashable Token

64instance HA.Hashable Token

66+instance Arbitrary Token where

67+ arbitrary = Token . T.pack <$> arbitrary

68+

65-- | This escapes @"/"@ (because it's the token separator character).

69-- | This escapes @"/"@ (because it's the token separator character).

66--

70--

67-- It also escapes @"~"@ (because it's the escape character).

71-- It also escapes @"~"@ (because it's the escape character).

stack.yaml+1−1

@@ -1,2 +1,2 @@

1−resolver: lts-12.10

1+resolver: nightly-2017-09-18

2pvp-bounds: upper-revision

test/Unit.hs+1−8

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

1−{-# LANGUAGE GeneralizedNewtypeDeriving #-}

2−{-# LANGUAGE StandaloneDeriving #-}

4module Main where

2module Main where

@@ -15,15 +13,10 @@ import qualified JSONPointer as JP

15import Network.HTTP.Types.URI (urlDecode)

13import Network.HTTP.Types.URI (urlDecode)

17import Test.Hspec

15import Test.Hspec

18−import Test.QuickCheck (Arbitrary(..), property)

16+import Test.QuickCheck (property)

20import qualified Example

18import qualified Example

22−deriving instance Arbitrary JP.Pointer

23−

24−instance Arbitrary JP.Token where

25− arbitrary = JP.Token . T.pack <$> arbitrary

26−

27main :: IO ()

20main :: IO ()

28main = hspec $ do

21main = hspec $ do

29 describe "example" $ do

22 describe "example" $ do