August 2017 - openSUSE Commits - openSUSE Mailing Lists

commit ghc-x509 for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-x509 for openSUSE:Factory checked in at 2017-08-31 21:01:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-x509 (Old) and /work/SRC/openSUSE:Factory/.ghc-x509.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-x509" Thu Aug 31 21:01:47 2017 rev:9 rq:513540 version:1.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-x509/ghc-x509.changes 2017-01-12 15:53:04.994828527 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-x509.new/ghc-x509.changes 2017-08-31 21:01:48.230396550 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:07:19 UTC 2017 - psimons(a)suse.com + +- Update to version 1.7.1. + +------------------------------------------------------------------- Old: ---- x509-1.6.5.tar.gz New: ---- x509-1.7.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-x509.spec ++++++ --- /var/tmp/diff_new_pack.mw8w3y/_old 2017-08-31 21:01:49.534213361 +0200 +++ /var/tmp/diff_new_pack.mw8w3y/_new 2017-08-31 21:01:49.550211113 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-x509 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global pkg_name x509 %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.6.5 +Version: 1.7.1 Release: 0 Summary: X509 reader and writer License: BSD-3-Clause ++++++ x509-1.6.5.tar.gz -> x509-1.7.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x509-1.6.5/Data/X509/Ext.hs new/x509-1.7.1/Data/X509/Ext.hs --- old/x509-1.6.5/Data/X509/Ext.hs 2016-12-03 08:26:55.000000000 +0100 +++ new/x509-1.7.1/Data/X509/Ext.hs 2017-07-21 18:29:07.000000000 +0200 @@ -8,7 +8,7 @@ -- extension processing module. -- {-# LANGUAGE FlexibleContexts #-} - +{-# LANGUAGE ScopedTypeVariables #-} module Data.X509.Ext ( Extension(..) -- * Common extension usually found in x509v3 @@ -21,6 +21,7 @@ , ExtSubjectAltName(..) , ExtAuthorityKeyId(..) , ExtCrlDistributionPoints(..) + , ExtNetscapeComment(..) , AltName(..) , DistributionPoint(..) , ReasonFlag(..) @@ -35,11 +36,15 @@ import qualified Data.ByteString.Char8 as BC import Data.ASN1.Types import Data.ASN1.Parse +import Data.ASN1.Encoding +import Data.ASN1.BinaryEncoding import Data.ASN1.BitArray +import Data.Proxy import Data.List (find) import Data.X509.ExtensionRaw import Data.X509.DistinguishedName import Control.Applicative +import Control.Monad -- | key usage flag that is found in the key usage extension field. data ExtKeyUsageFlag = @@ -65,10 +70,23 @@ -- -- each extension have a unique OID associated, and a way -- to encode and decode an ASN1 stream. +-- +-- Errata: turns out, the content is not necessarily ASN1, +-- it could be data that is only parsable by the extension +-- e.g. raw ascii string. Add method to parse and encode with +-- ByteString class Extension a where - extOID :: a -> OID - extEncode :: a -> [ASN1] - extDecode :: [ASN1] -> Either String a + extOID :: a -> OID + extHasNestedASN1 :: Proxy a -> Bool + extEncode :: a -> [ASN1] + extDecode :: [ASN1] -> Either String a + + extDecodeBs :: B.ByteString -> Either String a + extDecodeBs = (either (Left . show) Right . decodeASN1' BER) >=> extDecode + + extEncodeBs :: a -> B.ByteString + extEncodeBs = encodeASN1' DER . extEncode + -- | Get a specific extension from a lists of raw extensions extensionGet :: Extension a => Extensions -> Maybe a @@ -94,16 +112,17 @@ -- * Nothing, the OID doesn't match -- * Just Left, the OID matched, but the extension couldn't be decoded -- * Just Right, the OID matched, and the extension has been succesfully decoded -extensionDecode :: Extension a => ExtensionRaw -> Maybe (Either String a) -extensionDecode = doDecode undefined - where doDecode :: Extension a => a -> ExtensionRaw -> Maybe (Either String a) - doDecode dummy (ExtensionRaw oid _ asn1) - | extOID dummy == oid = Just (extDecode asn1) - | otherwise = Nothing +extensionDecode :: forall a . Extension a => ExtensionRaw -> Maybe (Either String a) +extensionDecode er@(ExtensionRaw oid _ content) + | extOID (undefined :: a) /= oid = Nothing + | extHasNestedASN1 (Proxy :: Proxy a) = Just (tryExtRawASN1 er >>= extDecode) + | otherwise = Just (extDecodeBs content) -- | Encode an Extension to extensionRaw -extensionEncode :: Extension a => Bool -> a -> ExtensionRaw -extensionEncode critical ext = ExtensionRaw (extOID ext) critical (extEncode ext) +extensionEncode :: forall a . Extension a => Bool -> a -> ExtensionRaw +extensionEncode critical ext + | extHasNestedASN1 (Proxy :: Proxy a) = ExtensionRaw (extOID ext) critical (encodeASN1' DER $ extEncode ext) + | otherwise = ExtensionRaw (extOID ext) critical (extEncodeBs ext) -- | Basic Constraints data ExtBasicConstraints = ExtBasicConstraints Bool (Maybe Integer) @@ -111,6 +130,7 @@ instance Extension ExtBasicConstraints where extOID = const [2,5,29,19] + extHasNestedASN1 = const True extEncode (ExtBasicConstraints b Nothing) = [Start Sequence,Boolean b,End Sequence] extEncode (ExtBasicConstraints b (Just i)) = [Start Sequence,Boolean b,IntVal i,End Sequence] @@ -127,6 +147,7 @@ instance Extension ExtKeyUsage where extOID = const [2,5,29,15] + extHasNestedASN1 = const True extEncode (ExtKeyUsage flags) = [BitString $ flagsToBits flags] extDecode [BitString bits] = Right $ ExtKeyUsage $ bitsToFlags bits extDecode _ = Left "unknown sequence" @@ -158,6 +179,7 @@ instance Extension ExtExtendedKeyUsage where extOID = const [2,5,29,37] + extHasNestedASN1 = const True extEncode (ExtExtendedKeyUsage purposes) = [Start Sequence] ++ map (OID . lookupRev) purposes ++ [End Sequence] where lookupRev (KeyUsagePurpose_Unknown oid) = oid @@ -174,6 +196,7 @@ instance Extension ExtSubjectKeyId where extOID = const [2,5,29,14] + extHasNestedASN1 = const True extEncode (ExtSubjectKeyId o) = [OctetString o] extDecode [OctetString o] = Right $ ExtSubjectKeyId o extDecode _ = Left "unknown sequence" @@ -203,6 +226,7 @@ instance Extension ExtSubjectAltName where extOID = const [2,5,29,17] + extHasNestedASN1 = const True extEncode (ExtSubjectAltName names) = encodeGeneralNames names extDecode l = runParseASN1 (ExtSubjectAltName <$> parseGeneralNames) l @@ -213,6 +237,7 @@ instance Extension ExtAuthorityKeyId where extOID _ = [2,5,29,35] + extHasNestedASN1 = const True extEncode (ExtAuthorityKeyId keyid) = [Start Sequence,Other Context 0 keyid,End Sequence] extDecode [Start Sequence,Other Context 0 keyid,End Sequence] = @@ -244,6 +269,7 @@ instance Extension ExtCrlDistributionPoints where extOID _ = [2,5,29,31] + extHasNestedASN1 = const True extEncode = error "extEncode ExtCrlDistributionPoints unimplemented" extDecode = error "extDecode ExtCrlDistributionPoints unimplemented" --extEncode (ExtCrlDistributionPoints ) @@ -311,3 +337,14 @@ flagsToBits :: Enum a => [a] -> BitArray flagsToBits flags = foldl bitArraySetBit bitArrayEmpty $ map (fromIntegral . fromEnum) flags where bitArrayEmpty = toBitArray (B.pack [0,0]) 7 + +data ExtNetscapeComment = ExtNetscapeComment B.ByteString + deriving (Show,Eq) + +instance Extension ExtNetscapeComment where + extOID _ = [2,16,840,1,113730,1,13] + extHasNestedASN1 = const False + extEncode = error "Extension: Netscape Comment do not contain nested ASN1" + extDecode = error "Extension: Netscape Comment do not contain nested ASN1" + extEncodeBs (ExtNetscapeComment b) = b + extDecodeBs = Right . ExtNetscapeComment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x509-1.6.5/Data/X509/ExtensionRaw.hs new/x509-1.7.1/Data/X509/ExtensionRaw.hs --- old/x509-1.6.5/Data/X509/ExtensionRaw.hs 2014-10-09 06:25:42.000000000 +0200 +++ new/x509-1.7.1/Data/X509/ExtensionRaw.hs 2017-07-21 11:58:08.000000000 +0200 @@ -9,6 +9,8 @@ -- module Data.X509.ExtensionRaw ( ExtensionRaw(..) + , tryExtRawASN1 + , extRawASN1 , Extensions(..) ) where @@ -17,14 +19,25 @@ import Data.ASN1.Encoding import Data.ASN1.BinaryEncoding import Data.X509.Internal +import qualified Data.ByteString as B -- | An undecoded extension data ExtensionRaw = ExtensionRaw { extRawOID :: OID -- ^ OID of this extension , extRawCritical :: Bool -- ^ if this extension is critical - , extRawASN1 :: [ASN1] -- ^ the associated ASN1 + , extRawContent :: B.ByteString -- ^ undecoded content } deriving (Show,Eq) +tryExtRawASN1 :: ExtensionRaw -> Either String [ASN1] +tryExtRawASN1 (ExtensionRaw oid _ content) = + case decodeASN1' BER content of + Left err -> Left $ "fromASN1: X509.ExtensionRaw: OID=" ++ show oid ++ ": cannot decode data: " ++ show err + Right r -> Right r + +extRawASN1 :: ExtensionRaw -> [ASN1] +extRawASN1 extRaw = either error id $ tryExtRawASN1 extRaw +{-# DEPRECATED extRawASN1 "use tryExtRawASN1 instead" #-} + -- | a Set of 'ExtensionRaw' newtype Extensions = Extensions (Maybe [ExtensionRaw]) deriving (Show,Eq) @@ -41,19 +54,12 @@ toASN1 extraw = \xs -> encodeExt extraw ++ xs fromASN1 (Start Sequence:OID oid:xs) = case xs of - Boolean b:OctetString obj:End Sequence:xs2 -> extractExt b obj xs2 - OctetString obj:End Sequence:xs2 -> extractExt False obj xs2 + Boolean b:OctetString obj:End Sequence:xs2 -> Right (ExtensionRaw oid b obj, xs2) + OctetString obj:End Sequence:xs2 -> Right (ExtensionRaw oid False obj, xs2) _ -> Left ("fromASN1: X509.ExtensionRaw: unknown format:" ++ show xs) - where - extractExt critical bs remainingStream = - case decodeASN1' BER bs of - Left err -> Left ("fromASN1: X509.ExtensionRaw: OID=" ++ show oid ++ - ": cannot decode data: " ++ show err) - Right r -> Right (ExtensionRaw oid critical r, remainingStream) fromASN1 l = Left ("fromASN1: X509.ExtensionRaw: unknown format:" ++ show l) encodeExt :: ExtensionRaw -> [ASN1] -encodeExt (ExtensionRaw oid critical asn1) = - let bs = encodeASN1' DER asn1 - in asn1Container Sequence ([OID oid] ++ (if critical then [Boolean True] else []) ++ [OctetString bs]) +encodeExt (ExtensionRaw oid critical content) = + asn1Container Sequence ([OID oid] ++ (if critical then [Boolean True] else []) ++ [OctetString content]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x509-1.6.5/x509.cabal new/x509-1.7.1/x509.cabal --- old/x509-1.6.5/x509.cabal 2016-12-03 08:34:52.000000000 +0100 +++ new/x509-1.7.1/x509.cabal 2017-07-22 08:36:57.000000000 +0200 @@ -1,5 +1,5 @@ Name: x509 -Version: 1.6.5 +version: 1.7.1 Description: X509 reader and writer License: BSD3 License-file: LICENSE @@ -11,9 +11,10 @@ Category: Data stability: experimental Homepage: http://github.com/vincenthz/hs-certificate -Cabal-Version: >=1.8 +Cabal-Version: >= 1.10 Library + Default-Language: Haskell2010 Build-Depends: base >= 3 && < 5 , bytestring , memory @@ -41,6 +42,7 @@ ghc-options: -Wall Test-Suite test-x509 + Default-Language: Haskell2010 type: exitcode-stdio-1.0 hs-source-dirs: Tests Main-is: Tests.hs

1 0

commit ghc-wuss for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-wuss for openSUSE:Factory checked in at 2017-08-31 21:01:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-wuss (Old) and /work/SRC/openSUSE:Factory/.ghc-wuss.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-wuss" Thu Aug 31 21:01:42 2017 rev:4 rq:513539 version:1.1.5 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-wuss/ghc-wuss.changes 2017-06-04 01:56:10.763136715 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-wuss.new/ghc-wuss.changes 2017-08-31 21:01:46.078698869 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:07:51 UTC 2017 - psimons(a)suse.com + +- Update to version 1.1.5. + +------------------------------------------------------------------- Old: ---- wuss-1.1.4.tar.gz New: ---- wuss-1.1.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-wuss.spec ++++++ --- /var/tmp/diff_new_pack.Orjg3D/_old 2017-08-31 21:01:47.406512307 +0200 +++ /var/tmp/diff_new_pack.Orjg3D/_new 2017-08-31 21:01:47.410511746 +0200 @@ -18,7 +18,7 @@ %global pkg_name wuss Name: ghc-%{pkg_name} -Version: 1.1.4 +Version: 1.1.5 Release: 0 Summary: Secure WebSocket (WSS) clients License: MIT ++++++ wuss-1.1.4.tar.gz -> wuss-1.1.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wuss-1.1.4/package.yaml new/wuss-1.1.5/package.yaml --- old/wuss-1.1.4/package.yaml 2017-04-17 15:21:52.000000000 +0200 +++ new/wuss-1.1.5/package.yaml 2017-07-22 14:45:16.000000000 +0200 @@ -19,10 +19,10 @@ - bytestring ==0.10.* - connection ==0.2.* - network - - websockets >=0.9 && <0.12 + - websockets >=0.9 && <0.13 exposed-modules: Wuss license: MIT maintainer: Taylor Fausak name: wuss synopsis: Secure WebSocket (WSS) clients -version: '1.1.4' +version: '1.1.5' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wuss-1.1.4/wuss.cabal new/wuss-1.1.5/wuss.cabal --- old/wuss-1.1.4/wuss.cabal 2017-04-17 15:24:12.000000000 +0200 +++ new/wuss-1.1.5/wuss.cabal 2017-07-22 14:47:56.000000000 +0200 @@ -3,7 +3,7 @@ -- see: https://github.com/sol/hpack name: wuss -version: 1.1.4 +version: 1.1.5 synopsis: Secure WebSocket (WSS) clients description: Wuss is a library that lets you easily create secure WebSocket clients over the WSS protocol. It is a small addition to <https://hackage.haskell.org/package/websockets the websockets package> and is adapted from existing solutions by <https://gist.github.com/jaspervdj/7198388 @jaspervdj>, <https://gist.github.com/mpickering/f1b7ba3190a4bb5884f3 @mpickering>, and <https://gist.github.com/elfenlaid/7b5c28065e67e4cf0767 @elfenlaid>. category: Network @@ -31,7 +31,7 @@ , bytestring ==0.10.* , connection ==0.2.* , network - , websockets >=0.9 && <0.12 + , websockets >=0.9 && <0.13 exposed-modules: Wuss other-modules:

1 0

commit ghc-wl-pprint-annotated for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-wl-pprint-annotated for openSUSE:Factory checked in at 2017-08-31 21:01:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-wl-pprint-annotated (Old) and /work/SRC/openSUSE:Factory/.ghc-wl-pprint-annotated.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-wl-pprint-annotated" Thu Aug 31 21:01:39 2017 rev:2 rq:513538 version:0.1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-wl-pprint-annotated/ghc-wl-pprint-annotated.changes 2017-04-12 18:10:02.686316981 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-wl-pprint-annotated.new/ghc-wl-pprint-annotated.changes 2017-08-31 21:01:40.831436120 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:08:06 UTC 2017 - psimons(a)suse.com + +- Update to version 0.1.0.0. + +------------------------------------------------------------------- Old: ---- wl-pprint-annotated-0.0.1.4.tar.gz New: ---- wl-pprint-annotated-0.1.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-wl-pprint-annotated.spec ++++++ --- /var/tmp/diff_new_pack.x5adIN/_old 2017-08-31 21:01:42.295230454 +0200 +++ /var/tmp/diff_new_pack.x5adIN/_new 2017-08-31 21:01:42.299229892 +0200 @@ -19,7 +19,7 @@ %global pkg_name wl-pprint-annotated %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.0.1.4 +Version: 0.1.0.0 Release: 0 Summary: Wadler/Leijen pretty printer with annotations and slightly modernized API License: BSD-3-Clause @@ -33,9 +33,8 @@ BuildRequires: ghc-text-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with tests} -BuildRequires: ghc-HUnit-devel -BuildRequires: ghc-test-framework-devel -BuildRequires: ghc-test-framework-hunit-devel +BuildRequires: ghc-tasty-devel +BuildRequires: ghc-tasty-hunit-devel %endif %description ++++++ wl-pprint-annotated-0.0.1.4.tar.gz -> wl-pprint-annotated-0.1.0.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wl-pprint-annotated-0.0.1.4/src/Text/PrettyPrint/Annotated/WL.hs new/wl-pprint-annotated-0.1.0.0/src/Text/PrettyPrint/Annotated/WL.hs --- old/wl-pprint-annotated-0.0.1.4/src/Text/PrettyPrint/Annotated/WL.hs 2017-01-28 19:40:05.000000000 +0100 +++ new/wl-pprint-annotated-0.1.0.0/src/Text/PrettyPrint/Annotated/WL.hs 2017-04-16 21:30:58.000000000 +0200 @@ -841,11 +841,15 @@ flatten (Cat x y) = Cat (flatten x) (flatten y) flatten (Nest i x) = Nest i (flatten x) flatten (Union x _) = flatten x +flatten (Annotate a x) = Annotate a (flatten x) flatten (Column f) = Column (flatten . f) flatten (Nesting f) = Nesting (flatten . f) flatten (Columns f) = Columns (flatten . f) flatten (Ribbon f) = Ribbon (flatten . f) -flatten other = other --Empty,Char,Text +flatten a@Empty{} = a +flatten a@Char{} = a +flatten a@Text{} = a +flatten a@Line{} = a ----------------------------------------------------------- -- Renderers @@ -930,7 +934,7 @@ -> SimpleDoc a) -> Float -> Int -> Doc a -> SimpleDoc a renderFits nicest rfrac w x - = best 0 0 SEmpty (Cons 0 x Nil) + = best 0 0 (\_ _ -> SEmpty) (Cons 0 x Nil) where -- r :: the ribbon width in characters r = max 0 (min w (round (fromIntegral w * rfrac))) @@ -938,7 +942,7 @@ -- best :: n = indentation of current line -- k = current column -- (ie. (k >= n) && (k - n == count of inserted characters) - best _ _ z Nil = z + best n k z Nil = z n k best n k z (Cons i d ds) = case d of Empty -> best n k z ds @@ -948,7 +952,8 @@ FlatAlt l _ -> best n k z (Cons i l ds) Cat x' y -> best n k z (Cons i x' (Cons i y ds)) Nest j x' -> let i' = i+j in seq i' (best n k z (Cons i' x' ds)) - Annotate a d' -> SPushAnn a (best n k (SPopAnn a $ best n k z ds) (Cons i d' Nil)) + Annotate a d' -> let z' n' k' = SPopAnn a $ best n' k' z ds + in SPushAnn a (best n k z' (Cons i d' Nil)) Union p q -> nicest n k w r (best n k z (Cons i p ds)) (best n k z (Cons i q ds)) Column f -> best n k z (Cons i (f k) ds) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wl-pprint-annotated-0.0.1.4/test/WLPPrintTests.hs new/wl-pprint-annotated-0.1.0.0/test/WLPPrintTests.hs --- old/wl-pprint-annotated-0.0.1.4/test/WLPPrintTests.hs 2016-11-29 02:24:55.000000000 +0100 +++ new/wl-pprint-annotated-0.1.0.0/test/WLPPrintTests.hs 2017-04-16 21:35:32.000000000 +0200 @@ -1,19 +1,18 @@ module Main where -import Test.Framework -import Test.Framework.Providers.HUnit -import Test.HUnit hiding (Test) +import Test.Tasty +import Test.Tasty.HUnit import Text.PrettyPrint.Annotated.WL main :: IO () -main = defaultMain [ +main = defaultMain $ testGroup "Tests" [ testGroup "Tests for each data constructor" conTests , testGroup "Tests for some combinators" codeTests , testGroup "Tests for the formatting algorithms" formatTests , testGroup "Tests for the code examples in the documentation" docTests ] -conTests :: [Test] +conTests :: [TestTree] conTests = [ testCase "Empty tests" emptyTests , testCase "Char tests" charTests @@ -30,15 +29,40 @@ ] ------------------------------------------------------------ +-- Helper to add annotations + +annotateAll :: Doc a -> Doc () +annotateAll = Annotate () . go + where go Empty = Empty + go (Char x) = Char x + go (Text i s) = Text i s + go Line = Line + go (FlatAlt l r) = FlatAlt (annotateAll l) (annotateAll r) + go (Cat l r) = Cat (annotateAll l) (annotateAll r) + go (Nest i d) = Nest i (annotateAll d) + go (Union l r) = Union (annotateAll l) (annotateAll r) + go (Annotate _ d) = annotateAll d + go (Column f) = Column (annotateAll . f) + go (Nesting k) = Nesting (annotateAll . k) + go (Columns k) = Columns (annotateAll . k) + go (Ribbon k) = Ribbon (annotateAll . k) + +------------------------------------------------------------ -- We test the @Doc@ constructors. assertPretty :: Int -> String -> String -> Doc a -> Assertion -assertPretty w desc str doc = assertEqual (desc ++ " (pretty)") str - $ displayS (renderPretty 1.0 w doc) "" +assertPretty w desc str doc = do + assertEqual (desc ++ " (pretty)") str + $ displayS (renderPretty 1.0 w doc) "" + assertEqual (desc ++ " (pretty, annotated)") str + $ displayS (renderPretty 1.0 w $ annotateAll doc) "" assertSmart :: Int -> String -> String -> Doc a -> Assertion -assertSmart w desc str doc = assertEqual (desc ++ " (smart)") str - $ displayS (renderSmart w doc) "" +assertSmart w desc str doc = do + assertEqual (desc ++ " (smart)") str + $ displayS (renderSmart w doc) "" + assertEqual (desc ++ " (smart, annotated)") str + $ displayS (renderSmart w $ annotateAll doc) "" assertRender :: Int -> String -> String -> Doc a -> Assertion assertRender w desc str doc = do assertPretty w desc str doc @@ -63,7 +87,7 @@ $ flatten $ flatAlt (text "x") (text "y") catTests :: Assertion -catTests = do assertRender 80 "Cat test 1" "some code" +catTests = assertRender 80 "Cat test 1" "some code" $ text "some" <> space <> text "code" nestTests :: Assertion @@ -79,25 +103,25 @@ $ text "foo" </> text "bar" columnTests :: Assertion -columnTests = do assertRender 80 "Column test 1" "foo 4" - $ text "foo" <+> (column $ \c -> pretty c) +columnTests = assertRender 80 "Column test 1" "foo 4" + $ text "foo" <+> column pretty nestingTests :: Assertion -nestingTests = do assertRender 80 "Nesting test 1" "foo 2" - $ text "foo" <+> (nest 2 $ nesting $ \n -> pretty n) +nestingTests = assertRender 80 "Nesting test 1" "foo 2" + $ text "foo" <+> nest 2 (nesting pretty) columnsTests :: Assertion -columnsTests = do assertRender 21 "Columns test 1" "foo 21" - $ text "foo" <+> (nest 2 $ columns $ \w -> pretty w) +columnsTests = assertRender 21 "Columns test 1" "foo 21" + $ text "foo" <+> nest 2 (columns pretty) ribbonTests :: Assertion -ribbonTests = do assertEqual "Ribbon test 1" "foo 40" - $ show (text "foo" <+> (ribbon $ \r -> pretty r)) +ribbonTests = assertEqual "Ribbon test 1" "foo 40" + $ show (text "foo" <+> ribbon pretty) ------------------------------------------------------------ -- We test some combinators. -codeTests :: [Test] +codeTests :: [TestTree] codeTests = [ testCase "@list@ tests" listTests , testCase "@tupled@ tests" tupledTests @@ -119,7 +143,7 @@ -- We test some corner cases of the formatting algorithms on a prototypical -- syntax for a scripting language (e.g. Python). -formatTests :: [Test] +formatTests :: [TestTree] formatTests = [ testCase "@renderPretty@ test" renderPrettyTest , testCase "@renderSmart@ test" renderSmartTest @@ -216,7 +240,7 @@ ------------------------------------------------------------ -- We test the code examples in the haddock comments. -docTests :: [Test] +docTests :: [TestTree] docTests = [ testCase "@fill@ test" fillTest , testCase "@fillBreak@ test" fillBreakTest @@ -230,7 +254,7 @@ , ("linebreak","Doc e") ] fillTest :: Assertion -fillTest = do assertRender 80 "@fill@ test 1" (concat [ +fillTest = assertRender 80 "@fill@ test 1" (concat [ "let empty :: Doc e\n" , " nest :: Int -> Doc e -> Doc e\n" , " linebreak :: Doc e" ]) @@ -239,7 +263,7 @@ fill 6 (text name) <+> text "::" <+> text tp fillBreakTest :: Assertion -fillBreakTest = do assertRender 80 "@fillBreak@ test 1" (concat [ +fillBreakTest = assertRender 80 "@fillBreak@ test 1" (concat [ "let empty :: Doc e\n" , " nest :: Int -> Doc e -> Doc e\n" , " linebreak\n" @@ -249,7 +273,7 @@ fillBreak 6 (text name) <+> (text "::" <+> text tp) hangTest :: Assertion -hangTest = do assertRender 20 "@hang@ test 1" (concat [ +hangTest = assertRender 20 "@hang@ test 1" (concat [ "the hang combinator\n" , " indents these\n" , " words !" ]) @@ -257,7 +281,7 @@ $ words "the hang combinator indents these words !" alignTest :: Assertion -alignTest = do assertRender 20 "@align@ test 1" (concat [ +alignTest = assertRender 20 "@align@ test 1" (concat [ "hi nice\n" , " world" ]) $ text "hi" <+> (text "nice" $$ text "world") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wl-pprint-annotated-0.0.1.4/wl-pprint-annotated.cabal new/wl-pprint-annotated-0.1.0.0/wl-pprint-annotated.cabal --- old/wl-pprint-annotated-0.0.1.4/wl-pprint-annotated.cabal 2017-01-28 20:32:11.000000000 +0100 +++ new/wl-pprint-annotated-0.1.0.0/wl-pprint-annotated.cabal 2017-04-16 21:52:12.000000000 +0200 @@ -1,10 +1,10 @@ --- This file has been generated from package.yaml by hpack version 0.15.0. +-- This file has been generated from package.yaml by hpack version 0.17.0. -- -- see: https://github.com/sol/hpack name: wl-pprint-annotated category: Text -version: 0.0.1.4 +version: 0.1.0.0 synopsis: Wadler/Leijen pretty printer with annotations and slightly modernized API cabal-version: >= 1.10 license: BSD3 @@ -53,9 +53,8 @@ text >= 0.11 && < 1.3, deepseq >= 1.4 && < 1.6, wl-pprint-annotated, - HUnit, - test-framework, - test-framework-hunit + tasty, + tasty-hunit if impl(ghc < 8.0) build-depends: semigroups >= 0.9 && < 1

1 0

commit ghc-wild-bind-x11 for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-wild-bind-x11 for openSUSE:Factory checked in at 2017-08-31 21:01:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-wild-bind-x11 (Old) and /work/SRC/openSUSE:Factory/.ghc-wild-bind-x11.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-wild-bind-x11" Thu Aug 31 21:01:37 2017 rev:2 rq:513537 version:0.1.0.7 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-wild-bind-x11/ghc-wild-bind-x11.changes 2017-04-12 18:10:00.726594084 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-wild-bind-x11.new/ghc-wild-bind-x11.changes 2017-08-31 21:01:38.939701913 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:07:44 UTC 2017 - psimons(a)suse.com + +- Update to version 0.1.0.7. + +------------------------------------------------------------------- Old: ---- wild-bind-x11-0.1.0.6.tar.gz New: ---- wild-bind-x11-0.1.0.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-wild-bind-x11.spec ++++++ --- /var/tmp/diff_new_pack.JLhKAU/_old 2017-08-31 21:01:40.207523782 +0200 +++ /var/tmp/diff_new_pack.JLhKAU/_new 2017-08-31 21:01:40.259516477 +0200 @@ -19,7 +19,7 @@ %global pkg_name wild-bind-x11 %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.1.0.6 +Version: 0.1.0.7 Release: 0 Summary: X11-specific implementation for WildBind License: BSD-3-Clause ++++++ wild-bind-x11-0.1.0.6.tar.gz -> wild-bind-x11-0.1.0.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wild-bind-x11-0.1.0.6/ChangeLog.md new/wild-bind-x11-0.1.0.7/ChangeLog.md --- old/wild-bind-x11-0.1.0.6/ChangeLog.md 2017-02-10 01:58:19.000000000 +0100 +++ new/wild-bind-x11-0.1.0.7/ChangeLog.md 2017-07-21 08:19:11.000000000 +0200 @@ -1,5 +1,7 @@ # Revision history for wild-bind-x11 +## 0.1.0.7 -- 2017-07-21 + ## 0.1.0.6 -- 2017-02-10 * Confirmed build with `X11-1.8`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wild-bind-x11-0.1.0.6/wild-bind-x11.cabal new/wild-bind-x11-0.1.0.7/wild-bind-x11.cabal --- old/wild-bind-x11-0.1.0.6/wild-bind-x11.cabal 2017-02-10 01:58:32.000000000 +0100 +++ new/wild-bind-x11-0.1.0.7/wild-bind-x11.cabal 2017-07-21 08:19:23.000000000 +0200 @@ -1,5 +1,5 @@ name: wild-bind-x11 -version: 0.1.0.6 +version: 0.1.0.7 author: Toshio Ito <debug.ito(a)gmail.com> maintainer: Toshio Ito <debug.ito(a)gmail.com> license: BSD3 @@ -60,9 +60,9 @@ WildBind.X11.TestUtil build-depends: base, wild-bind-x11, wild-bind, X11, - hspec >=2.1.7 && <2.5, + hspec >=2.1.7, QuickCheck >=2.6 && <3.0, - time >=1.5.0 && <1.8 + time >=1.5.0 && <1.9 source-repository head type: git

1 0

commit ghc-wikicfp-scraper for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-wikicfp-scraper for openSUSE:Factory checked in at 2017-08-31 21:01:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-wikicfp-scraper (Old) and /work/SRC/openSUSE:Factory/.ghc-wikicfp-scraper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-wikicfp-scraper" Thu Aug 31 21:01:34 2017 rev:2 rq:513536 version:0.1.0.9 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-wikicfp-scraper/ghc-wikicfp-scraper.changes 2017-04-14 13:33:49.668404609 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-wikicfp-scraper.new/ghc-wikicfp-scraper.changes 2017-08-31 21:01:36.915986250 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:06:23 UTC 2017 - psimons(a)suse.com + +- Update to version 0.1.0.9. + +------------------------------------------------------------------- Old: ---- wikicfp-scraper-0.1.0.8.tar.gz New: ---- wikicfp-scraper-0.1.0.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-wikicfp-scraper.spec ++++++ --- /var/tmp/diff_new_pack.EKDT63/_old 2017-08-31 21:01:38.127815985 +0200 +++ /var/tmp/diff_new_pack.EKDT63/_new 2017-08-31 21:01:38.143813737 +0200 @@ -19,7 +19,7 @@ %global pkg_name wikicfp-scraper %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.1.0.8 +Version: 0.1.0.9 Release: 0 Summary: Scrape WikiCFP web site License: BSD-3-Clause ++++++ wikicfp-scraper-0.1.0.8.tar.gz -> wikicfp-scraper-0.1.0.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wikicfp-scraper-0.1.0.8/ChangeLog.md new/wikicfp-scraper-0.1.0.9/ChangeLog.md --- old/wikicfp-scraper-0.1.0.8/ChangeLog.md 2017-02-06 14:07:43.000000000 +0100 +++ new/wikicfp-scraper-0.1.0.9/ChangeLog.md 2017-07-21 08:11:16.000000000 +0200 @@ -1,5 +1,10 @@ # Revision history for wikicfp-scraper +## 0.1.0.9 -- 2017-07-21 + +* Confirmed test with `time-1.8`. + + ## 0.1.0.8 -- 2017-02-06 * No API change. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wikicfp-scraper-0.1.0.8/wikicfp-scraper.cabal new/wikicfp-scraper-0.1.0.9/wikicfp-scraper.cabal --- old/wikicfp-scraper-0.1.0.8/wikicfp-scraper.cabal 2017-02-06 14:04:23.000000000 +0100 +++ new/wikicfp-scraper-0.1.0.9/wikicfp-scraper.cabal 2017-07-21 08:10:49.000000000 +0200 @@ -1,5 +1,5 @@ name: wikicfp-scraper -version: 0.1.0.8 +version: 0.1.0.9 author: Toshio Ito <debug.ito(a)gmail.com> maintainer: Toshio Ito <debug.ito(a)gmail.com> license: BSD3 @@ -27,7 +27,7 @@ bytestring >=0.10.0 && <0.11, text >=0.11.3.1 && <1.3, scalpel-core >=0.5.0 && <0.6, - time >=1.4.0 && <1.8, + time >=1.4.0 && <1.9, attoparsec >=0.10.4 && <0.14 -- executable wikicfp-scraper

1 0

commit ghc-websockets-snap for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-websockets-snap for openSUSE:Factory checked in at 2017-08-31 21:01:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-websockets-snap (Old) and /work/SRC/openSUSE:Factory/.ghc-websockets-snap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-websockets-snap" Thu Aug 31 21:01:32 2017 rev:4 rq:513535 version:0.10.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-websockets-snap/ghc-websockets-snap.changes 2017-06-04 01:59:18.000684662 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-websockets-snap.new/ghc-websockets-snap.changes 2017-08-31 21:01:33.584454337 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:03:39 UTC 2017 - psimons(a)suse.com + +- Update to version 0.10.2.3. + +------------------------------------------------------------------- Old: ---- websockets-snap-0.10.2.2.tar.gz New: ---- websockets-snap-0.10.2.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-websockets-snap.spec ++++++ --- /var/tmp/diff_new_pack.mMLe4J/_old 2017-08-31 21:01:34.984257662 +0200 +++ /var/tmp/diff_new_pack.mMLe4J/_new 2017-08-31 21:01:35.012253728 +0200 @@ -18,7 +18,7 @@ %global pkg_name websockets-snap Name: ghc-%{pkg_name} -Version: 0.10.2.2 +Version: 0.10.2.3 Release: 0 Summary: Snap integration for the websockets library License: BSD-3-Clause ++++++ websockets-snap-0.10.2.2.tar.gz -> websockets-snap-0.10.2.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/websockets-snap-0.10.2.2/CHANGELOG.md new/websockets-snap-0.10.2.3/CHANGELOG.md --- old/websockets-snap-0.10.2.2/CHANGELOG.md 2017-05-13 14:59:44.000000000 +0200 +++ new/websockets-snap-0.10.2.3/CHANGELOG.md 2017-07-22 00:23:07.000000000 +0200 @@ -1,3 +1,6 @@ +- 0.10.2.3 (2017-07-21) + * Bump websockets to 0.12.0.0 + - 0.10.2.2 * Bump io-streams to 1.4.0.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/websockets-snap-0.10.2.2/websockets-snap.cabal new/websockets-snap-0.10.2.3/websockets-snap.cabal --- old/websockets-snap-0.10.2.2/websockets-snap.cabal 2017-05-13 14:59:44.000000000 +0200 +++ new/websockets-snap-0.10.2.3/websockets-snap.cabal 2017-07-22 00:23:07.000000000 +0200 @@ -1,5 +1,5 @@ Name: websockets-snap -Version: 0.10.2.2 +Version: 0.10.2.3 Synopsis: Snap integration for the websockets library Description: Snap integration for the websockets library License: BSD3 @@ -29,7 +29,7 @@ mtl >= 2.1 && < 2.3, snap-core >= 1.0 && < 1.1, snap-server >= 1.0 && < 1.1, - websockets >= 0.9.5 && < 0.12 + websockets >= 0.9.5 && < 0.13 Source-repository head Type: git

1 0

commit ghc-web-routes-happstack for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-web-routes-happstack for openSUSE:Factory checked in at 2017-08-31 21:01:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-web-routes-happstack (Old) and /work/SRC/openSUSE:Factory/.ghc-web-routes-happstack.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-web-routes-happstack" Thu Aug 31 21:01:30 2017 rev:2 rq:513534 version:0.23.11 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-web-routes-happstack/ghc-web-routes-happstack.changes 2017-04-14 13:32:33.423179830 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-web-routes-happstack.new/ghc-web-routes-happstack.changes 2017-08-31 21:01:31.796705520 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:06:16 UTC 2017 - psimons(a)suse.com + +- Update to version 0.23.11. + +------------------------------------------------------------------- Old: ---- web-routes-happstack-0.23.10.tar.gz New: ---- web-routes-happstack-0.23.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-web-routes-happstack.spec ++++++ --- /var/tmp/diff_new_pack.sfXREW/_old 2017-08-31 21:01:32.840558856 +0200 +++ /var/tmp/diff_new_pack.sfXREW/_new 2017-08-31 21:01:32.848557733 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-web-routes-happstack # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,22 +18,20 @@ %global pkg_name web-routes-happstack Name: ghc-%{pkg_name} -Version: 0.23.10 +Version: 0.23.11 Release: 0 Summary: Adds support for using web-routes with Happstack License: BSD-3-Clause -Group: System/Libraries +Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel BuildRequires: ghc-happstack-server-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-devel BuildRequires: ghc-web-routes-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -# End cabal-rpm deps %description Added Happstack class instances for RouteT. Provides a default router for Site. @@ -53,15 +51,12 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install - %post devel %ghc_pkg_recache ++++++ web-routes-happstack-0.23.10.tar.gz -> web-routes-happstack-0.23.11.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/web-routes-happstack-0.23.10/web-routes-happstack.cabal new/web-routes-happstack-0.23.11/web-routes-happstack.cabal --- old/web-routes-happstack-0.23.10/web-routes-happstack.cabal 2015-12-18 18:09:14.000000000 +0100 +++ new/web-routes-happstack-0.23.11/web-routes-happstack.cabal 2017-07-21 20:02:10.000000000 +0200 @@ -1,5 +1,5 @@ Name: web-routes-happstack -Version: 0.23.10 +Version: 0.23.11 License: BSD3 License-File: LICENSE Author: jeremy(a)seereason.com @@ -10,12 +10,12 @@ Description: Added Happstack class instances for RouteT. Provides a default router for Site. Cabal-Version: >= 1.6 Build-type: Simple -tested-with: GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3 +tested-with: GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.1 Library Build-Depends: base >= 4 && < 5, bytestring >= 0.9 && < 0.11, - happstack-server >= 6.6 && < 7.5, + happstack-server >= 6.6 && < 7.6, text >= 0.11 && < 1.3, web-routes >= 0.27.1 && < 0.28 Exposed-Modules: Web.Routes.Happstack

1 0

commit ghc-wai-routes for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-wai-routes for openSUSE:Factory checked in at 2017-08-31 21:01:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-wai-routes (Old) and /work/SRC/openSUSE:Factory/.ghc-wai-routes.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-wai-routes" Thu Aug 31 21:01:27 2017 rev:2 rq:513532 version:0.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-wai-routes/ghc-wai-routes.changes 2017-04-12 18:09:56.471195792 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-wai-routes.new/ghc-wai-routes.changes 2017-08-31 21:01:29.521025258 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:02:25 UTC 2017 - psimons(a)suse.com + +- Update to version 0.10.0. + +------------------------------------------------------------------- Old: ---- wai-routes-0.9.10.tar.gz New: ---- wai-routes-0.10.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-wai-routes.spec ++++++ --- /var/tmp/diff_new_pack.uBaBBG/_old 2017-08-31 21:01:30.548880842 +0200 +++ /var/tmp/diff_new_pack.uBaBBG/_new 2017-08-31 21:01:30.548880842 +0200 @@ -19,7 +19,7 @@ %global pkg_name wai-routes %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.9.10 +Version: 0.10.0 Release: 0 Summary: Typesafe URLs for Wai applications License: MIT @@ -45,7 +45,6 @@ BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-text-devel BuildRequires: ghc-vault-devel -BuildRequires: ghc-wai-app-static-devel BuildRequires: ghc-wai-devel BuildRequires: ghc-wai-extra-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ wai-routes-0.9.10.tar.gz -> wai-routes-0.10.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-routes-0.9.10/README.md new/wai-routes-0.10.0/README.md --- old/wai-routes-0.9.10/README.md 2017-01-27 15:52:43.000000000 +0100 +++ new/wai-routes-0.10.0/README.md 2017-04-17 12:19:25.000000000 +0200 @@ -1,4 +1,4 @@ -[Wai-Routes](https://ajnsit.github.io/wai-routes) [![Hackage](https://img.shields.io/badge/hackage-v0.9.10-brightgreen.svg)](https://hackage.haskell.org/package/wai-routes) [![Hackage-Deps](https://img.shields.io/hackage-deps/v/wai-routes.svg)](http://packdeps.haskellers.com/feed?needle=wai-routes) [![Build Status](https://img.shields.io/travis/ajnsit/wai-routes.svg)](https://travi… [![Join the chat at https://gitter.im/ajnsit/wai-routes](https://img.shields.io/badge/gitter-jo… +[Wai-Routes](https://ajnsit.github.io/wai-routes) [![Hackage](https://img.shields.io/badge/hackage-v0.10.0-brightgreen.svg)](https://hackage.haskell.org/package/wai-routes) [![Hackage-Deps](https://img.shields.io/hackage-deps/v/wai-routes.svg)](http://packdeps.haskellers.com/feed?needle=wai-routes) [![Build Status](https://img.shields.io/travis/ajnsit/wai-routes.svg)](https://travi… [![Join the chat at https://gitter.im/ajnsit/wai-routes](https://img.shields.io/badge/gitter-jo… ==================================== Wai-routes is a micro web framework for Haskell that focuses on typesafe URLs. @@ -114,6 +114,7 @@ Changelog ========= +* 0.10.0: Allow aeson v1.2. Routing improvements. Remove wai-app-static dependency. Add nix expression. * 0.9.10: Aeson and hspec version bump. * 0.9.9 : GHC 8 compatibility. Change namespace from Network.Wai.Middleware.Routes -> Wai.Routes * 0.9.8 : Allow Data.Default-0.1.0. Allow comments in route definitions. Some other minor changes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-routes-0.9.10/src/Routes/Parse.hs new/wai-routes-0.10.0/src/Routes/Parse.hs --- old/wai-routes-0.9.10/src/Routes/Parse.hs 2017-01-26 20:48:09.000000000 +0100 +++ new/wai-routes-0.10.0/src/Routes/Parse.hs 2017-04-17 12:31:20.000000000 +0200 @@ -13,7 +13,7 @@ ) where import Language.Haskell.TH.Syntax -import Data.Char (isUpper) +import Data.Char (isUpper, isSpace) import Language.Haskell.TH.Quote import qualified System.IO as SIO import Routes.TH @@ -58,12 +58,12 @@ { quoteExp = lift . resourcesFromString } --- | Convert a multi-line string to a set of resources. See documentation for +-- | Converts a multi-line string to a set of resources. See documentation for -- the format of this string. This is a partial function which calls 'error' on -- invalid input. resourcesFromString :: String -> [ResourceTree String] resourcesFromString = - fst . parse 0 . filter (not . all (== ' ')) . lines + fst . parse 0 . filter (not . all (== ' ')) . lines . filter (/= '\r') where parse _ [] = ([], []) parse indent (thisLine:otherLines) @@ -86,7 +86,7 @@ spaces = takeWhile (== ' ') thisLine (others, remainder) = parse indent otherLines' (this, otherLines') = - case takeWhile (not . isPrefixOf "--") $ words thisLine of + case takeWhile (not . isPrefixOf "--") $ splitSpaces thisLine of (pattern:rest0) | Just (constr:rest) <- stripColonLast rest0 , Just attrs <- mapM parseAttr rest -> @@ -102,6 +102,26 @@ [] -> (id, otherLines) _ -> error $ "Invalid resource line: " ++ thisLine +-- | Splits a string by spaces, as long as the spaces are not enclosed by curly brackets (not recursive). +splitSpaces :: String -> [String] +splitSpaces "" = [] +splitSpaces str = + let (rest, piece) = parse $ dropWhile isSpace str in + piece:(splitSpaces rest) + + where + parse :: String -> ( String, String) + parse ('{':s) = fmap ('{':) $ parseBracket s + parse (c:s) | isSpace c = (s, []) + parse (c:s) = fmap (c:) $ parse s + parse "" = ("", "") + + parseBracket :: String -> ( String, String) + parseBracket ('{':_) = error $ "Invalid resource line (nested curly bracket): " ++ str + parseBracket ('}':s) = fmap ('}':) $ parse s + parseBracket (c:s) = fmap (c:) $ parseBracket s + parseBracket "" = error $ "Invalid resource line (unclosed curly bracket): " ++ str + piecesFromStringCheck :: String -> ([Piece String], Maybe String, Bool) piecesFromStringCheck s0 = (pieces, mmulti, check) @@ -181,7 +201,7 @@ parseTypeTree orig = toTypeTree pieces where - pieces = filter (not . null) $ splitOn '-' $ addDashes orig + pieces = filter (not . null) $ splitOn (\c -> c == '-' || c == ' ') $ addDashes orig addDashes [] = [] addDashes (x:xs) = front $ addDashes xs @@ -194,7 +214,7 @@ _:y -> x : splitOn c y [] -> [x] where - (x, y') = break (== c) s + (x, y') = break c s data TypeTree = TTTerm String | TTApp TypeTree TypeTree @@ -237,9 +257,9 @@ ttToType (TTList t) = ListT `AppT` ttToType t pieceFromString :: String -> Either (CheckOverlap, String) (CheckOverlap, Piece String) -pieceFromString ('#':'!':x) = Right $ (False, Dynamic x) -pieceFromString ('!':'#':x) = Right $ (False, Dynamic x) -- https://github.com/yesodweb/yesod/issues/652 -pieceFromString ('#':x) = Right $ (True, Dynamic x) +pieceFromString ('#':'!':x) = Right $ (False, dynamicPieceFromString x) +pieceFromString ('!':'#':x) = Right $ (False, dynamicPieceFromString x) -- https://github.com/yesodweb/yesod/issues/652 +pieceFromString ('#':x) = Right $ (True, dynamicPieceFromString x) pieceFromString ('*':'!':x) = Left (False, x) pieceFromString ('+':'!':x) = Left (False, x) @@ -252,3 +272,10 @@ pieceFromString ('!':x) = Right $ (False, Static x) pieceFromString x = Right $ (True, Static x) + +dynamicPieceFromString :: String -> Piece String +dynamicPieceFromString str@('{':x) = case break (== '}') x of + (s, "}") -> Dynamic s + _ -> error $ "Invalid path piece: " ++ str +dynamicPieceFromString x = Dynamic x +-- JP: Should we check if there are curly brackets or other invalid characters? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-routes-0.9.10/src/Routes/TH/ParseRoute.hs new/wai-routes-0.10.0/src/Routes/TH/ParseRoute.hs --- old/wai-routes-0.9.10/src/Routes/TH/ParseRoute.hs 2017-01-26 20:48:09.000000000 +0100 +++ new/wai-routes-0.10.0/src/Routes/TH/ParseRoute.hs 2017-04-17 12:31:20.000000000 +0200 @@ -1,4 +1,5 @@ -{-# LANGUAGE TemplateHaskell, CPP #-} +{-# LANGUAGE CPP #-} +{-# LANGUAGE TemplateHaskell #-} module Routes.TH.ParseRoute ( -- ** ParseRoute mkParseRouteInstance diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-routes-0.9.10/src/Routes/TH/RenderRoute.hs new/wai-routes-0.10.0/src/Routes/TH/RenderRoute.hs --- old/wai-routes-0.9.10/src/Routes/TH/RenderRoute.hs 2017-01-26 20:48:09.000000000 +0100 +++ new/wai-routes-0.10.0/src/Routes/TH/RenderRoute.hs 2017-04-17 12:31:20.000000000 +0200 @@ -46,7 +46,9 @@ mkRouteCon (ResourceParent name _check pieces children) = do (cons, decs) <- mkRouteCons children -#if MIN_VERSION_template_haskell(2,11,0) +#if MIN_VERSION_template_haskell(2,12,0) + dec <- DataD [] (mkName name) [] Nothing cons <$> fmap (pure . DerivClause Nothing) (mapM conT [''Show, ''Read, ''Eq]) +#elif MIN_VERSION_template_haskell(2,11,0) dec <- DataD [] (mkName name) [] Nothing cons <$> mapM conT [''Show, ''Read, ''Eq] #else let dec = DataD [] (mkName name) [] cons [''Show, ''Read, ''Eq] @@ -55,7 +57,7 @@ where con = NormalC (mkName name) $ map (\x -> (notStrict, x)) - $ concat [singles, [ConT $ mkName name]] + $ singles ++ [ConT $ mkName name] singles = concatMap toSingle pieces toSingle Static{} = [] @@ -99,7 +101,7 @@ dyns <- replicateM cnt $ newName "dyn" sub <- case resourceDispatch res of - Subsite{} -> fmap return $ newName "sub" + Subsite{} -> return <$> newName "sub" _ -> return [] let pat = ConP (mkName $ resourceName res) $ map VarP $ dyns ++ sub @@ -136,7 +138,7 @@ mkPieces _ _ [] _ = [] mkPieces toText tsp (Static s:ps) dyns = toText s : mkPieces toText tsp ps dyns mkPieces toText tsp (Dynamic{}:ps) (d:dyns) = tsp `AppE` VarE d : mkPieces toText tsp ps dyns - mkPieces _ _ ((Dynamic _) : _) [] = error "mkPieces 120" + mkPieces _ _ (Dynamic _ : _) [] = error "mkPieces 120" -- | Generate the 'RenderRoute' instance. -- @@ -153,7 +155,9 @@ mkRenderRouteInstance' cxt typ ress = do cls <- mkRenderRouteClauses ress (cons, decs) <- mkRouteCons ress -#if MIN_VERSION_template_haskell(2,11,0) +#if MIN_VERSION_template_haskell(2,12,0) + did <- DataInstD [] ''Route [typ] Nothing cons <$> fmap (pure . DerivClause Nothing) (mapM conT clazzes) +#elif MIN_VERSION_template_haskell(2,11,0) did <- DataInstD [] ''Route [typ] Nothing cons <$> mapM conT clazzes #else let did = DataInstD [] ''Route [typ] cons clazzes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-routes-0.9.10/src/Routes/TH/RouteAttrs.hs new/wai-routes-0.10.0/src/Routes/TH/RouteAttrs.hs --- old/wai-routes-0.9.10/src/Routes/TH/RouteAttrs.hs 2017-01-26 20:48:09.000000000 +0100 +++ new/wai-routes-0.10.0/src/Routes/TH/RouteAttrs.hs 2017-04-17 12:31:20.000000000 +0200 @@ -1,4 +1,5 @@ -{-# LANGUAGE TemplateHaskell, CPP #-} +{-# LANGUAGE CPP #-} +{-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE RecordWildCards #-} module Routes.TH.RouteAttrs ( mkRouteAttrsInstance @@ -9,6 +10,9 @@ import Language.Haskell.TH.Syntax import Data.Set (fromList) import Data.Text (pack) +#if __GLASGOW_HASKELL__ < 710 +import Control.Applicative ((<$>)) +#endif mkRouteAttrsInstance :: Type -> [ResourceTree a] -> Q Dec mkRouteAttrsInstance typ ress = do @@ -18,11 +22,11 @@ ] goTree :: (Pat -> Pat) -> ResourceTree a -> Q [Clause] -goTree front (ResourceLeaf res) = fmap return $ goRes front res +goTree front (ResourceLeaf res) = return <$> goRes front res goTree front (ResourceParent name _check pieces trees) = - fmap concat $ mapM (goTree front') trees + concat <$> mapM (goTree front') trees where - ignored = ((replicate toIgnore WildP ++) . return) + ignored = (replicate toIgnore WildP ++) . return toIgnore = length $ filter isDynamic pieces isDynamic Dynamic{} = True isDynamic Static{} = False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-routes-0.9.10/src/Routes/TH/Types.hs new/wai-routes-0.10.0/src/Routes/TH/Types.hs --- old/wai-routes-0.9.10/src/Routes/TH/Types.hs 2017-01-26 20:48:09.000000000 +0100 +++ new/wai-routes-0.10.0/src/Routes/TH/Types.hs 2017-02-09 06:14:50.000000000 +0100 @@ -53,11 +53,11 @@ deriving Show instance Functor Piece where - fmap _ (Static s) = (Static s) + fmap _ (Static s) = Static s fmap f (Dynamic t) = Dynamic (f t) instance Lift t => Lift (Piece t) where - lift (Static s) = [|Static $(lift s)|] + lift (Static s) = [|Static $(lift s)|] lift (Dynamic t) = [|Dynamic $(lift t)|] data Dispatch typ = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-routes-0.9.10/src/Wai/Routes.hs new/wai-routes-0.10.0/src/Wai/Routes.hs --- old/wai-routes-0.9.10/src/Wai/Routes.hs 2017-01-26 20:48:09.000000000 +0100 +++ new/wai-routes-0.10.0/src/Wai/Routes.hs 2017-02-08 08:22:17.000000000 +0100 @@ -109,15 +109,10 @@ -- * Bare Handlers , Env(..) - , RequestData -- | An abstract representation of the request data. You can get the wai request object by using `waiReq` - , waiReq -- | Extract the wai `Request` object from `RequestData` - , nextApp -- | Extract the next Application in the stack , currentRoute -- | Extract the current `Route` from `RequestData` - , runNext -- | Run the next application in the stack , module Network.HTTP.Types.Status , module Network.Wai.Middleware.RequestLogger - , module Network.Wai.Application.Static ) where @@ -126,4 +121,3 @@ import Routes.Handler import Network.HTTP.Types.Status import Network.Wai.Middleware.RequestLogger -import Network.Wai.Application.Static diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-routes-0.9.10/test/HelloSpec.hs new/wai-routes-0.10.0/test/HelloSpec.hs --- old/wai-routes-0.9.10/test/HelloSpec.hs 2017-01-26 20:48:09.000000000 +0100 +++ new/wai-routes-0.10.0/test/HelloSpec.hs 2017-04-17 11:59:36.000000000 +0200 @@ -20,11 +20,12 @@ data SubRoute = SubRoute Text -class MasterContract master where +class RenderRoute master => MasterContract master where getMasterName :: master -> Text mkRouteSub "SubRoute" "MasterContract" [parseRoutes| -/ SubHomeR GET +/ SubHomeR GET +/route SubRouteR GET |] getSubHomeR :: MasterContract master => HandlerS SubRoute master @@ -33,6 +34,11 @@ m <- master plain $ T.concat ["subsite-", s, "-", getMasterName m] +getSubRouteR :: MasterContract master => HandlerS SubRoute master +getSubRouteR = runHandlerM $ do + showRouteS <- showRouteSub + plain $ T.concat ["this route as sub:", showRouteS SubRouteR, ", this route as master:", showRoute SubRouteR] + getSubRoute :: master -> Text -> SubRoute getSubRoute = const SubRoute @@ -92,7 +98,10 @@ application = return $ waiApp $ do handler handleInfoRequest route MyRoute - catchall $ staticApp $ defaultFileServerSettings "test/static" + handler $ runHandlerM $ do + Just (DefaultRoute (route,_)) <- maybeRoute + plain $ T.pack $ show route + -- catchall $ plain "This will never be reached" ---- THE TESTS ---- @@ -123,6 +132,10 @@ it "can access the subsite correctly" $ get "/subsite" `shouldRespondWith` "subsite-default-MyRoute" {matchStatus = 200, matchHeaders = ["Content-Type" <:> "text/plain; charset=utf-8"]} + describe "GET /subsite/route" $ + it "can handle routing across subsite correctly" $ + get "/subsite/route" `shouldRespondWith` "this route as sub:/subsite/route, this route as master:/route" {matchStatus = 200, matchHeaders = ["Content-Type" <:> "text/plain; charset=utf-8"]} + describe "GET /nested" $ it "can access nested routes root correctly" $ get "/nested" `shouldRespondWith` "Nested ROOT" {matchStatus = 200, matchHeaders = ["Content-Type" <:> "text/plain; charset=utf-8"]} @@ -139,6 +152,6 @@ it "can pass route arguments to the nested subsite correctly" $ get "/nested/nested2/nested3/helloworld/argsub" `shouldRespondWith` "subsite-helloworld-MyRoute" {matchStatus = 200, matchHeaders = ["Content-Type" <:> "text/plain; charset=utf-8"]} - describe "GET /lambda.png" $ - it "returns a file correctly" $ - get "/lambda.png" `shouldRespondWith` 200 {matchHeaders = ["Content-Type" <:> "image/png"]} + describe "GET /does/not/exist" $ + it "handles catch all routes correctly" $ + get "/does/not/exist" `shouldRespondWith` "[\"does\",\"not\",\"exist\"]" {matchStatus = 200, matchHeaders = ["Content-Type" <:> "text/plain; charset=utf-8"]} Binary files old/wai-routes-0.9.10/test/static/lambda.png and new/wai-routes-0.10.0/test/static/lambda.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-routes-0.9.10/wai-routes.cabal new/wai-routes-0.10.0/wai-routes.cabal --- old/wai-routes-0.9.10/wai-routes.cabal 2017-01-27 15:51:13.000000000 +0100 +++ new/wai-routes-0.10.0/wai-routes.cabal 2017-04-17 12:19:04.000000000 +0200 @@ -1,5 +1,5 @@ name : wai-routes -version : 0.9.10 +version : 0.10.0 cabal-version : >=1.18 build-type : Simple license : MIT @@ -13,7 +13,6 @@ author : Anupam Jain data-dir : "" extra-source-files : README.md - , test/static/lambda.png source-repository head type : git @@ -21,18 +20,17 @@ source-repository this type : git - location : http://github.com/ajnsit/wai-routes/tree/v0.9.10 - tag : v0.9.10 + location : http://github.com/ajnsit/wai-routes/tree/v0.10.0 + tag : v0.10.0 library build-depends : base >= 4.7 && < 4.10 , wai >= 3.0 && < 3.3 , wai-extra >= 3.0 && < 3.1 - , wai-app-static >= 3.0 && < 3.2 , text >= 1.2 && < 1.3 , template-haskell >= 2.9 && < 2.12 , mtl >= 2.1 && < 2.3 - , aeson >= 0.8 && < 1.2 + , aeson >= 0.8 && < 1.3 , containers >= 0.5 && < 0.6 , random >= 1.1 && < 1.2 , path-pieces >= 0.2 && < 0.3 @@ -78,7 +76,7 @@ build-depends : base >= 4.7 && < 4.10 , wai >= 3.0 && < 3.3 - , aeson >= 0.8 && < 1.2 + , aeson >= 0.8 && < 1.3 , hspec >= 2.1 && < 2.5 , hspec-wai >= 0.6 && < 0.9 , hspec-wai-json >= 0.6 && < 0.9

1 0

commit ghc-wai-middleware-prometheus for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-wai-middleware-prometheus for openSUSE:Factory checked in at 2017-08-31 21:01:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-wai-middleware-prometheus (Old) and /work/SRC/openSUSE:Factory/.ghc-wai-middleware-prometheus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-wai-middleware-prometheus" Thu Aug 31 21:01:24 2017 rev:3 rq:513531 version:0.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-wai-middleware-prometheus/ghc-wai-middleware-prometheus.changes 2017-06-04 01:56:00.420597890 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-wai-middleware-prometheus.new/ghc-wai-middleware-prometheus.changes 2017-08-31 21:01:27.573298918 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:06:28 UTC 2017 - psimons(a)suse.com + +- Update to version 0.2.0. + +------------------------------------------------------------------- Old: ---- wai-middleware-prometheus-0.1.1.tar.gz New: ---- wai-middleware-prometheus-0.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-wai-middleware-prometheus.spec ++++++ --- /var/tmp/diff_new_pack.OXGvh0/_old 2017-08-31 21:01:28.797126967 +0200 +++ /var/tmp/diff_new_pack.OXGvh0/_new 2017-08-31 21:01:28.813124720 +0200 @@ -19,7 +19,7 @@ %global pkg_name wai-middleware-prometheus %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.1.1 +Version: 0.2.0 Release: 0 Summary: WAI middlware for exposing http://prometheus.io metrics License: Apache-2.0 @@ -28,12 +28,12 @@ Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… BuildRequires: ghc-Cabal-devel BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-clock-devel BuildRequires: ghc-data-default-devel BuildRequires: ghc-http-types-devel BuildRequires: ghc-prometheus-client-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-text-devel -BuildRequires: ghc-time-devel BuildRequires: ghc-wai-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with tests} ++++++ wai-middleware-prometheus-0.1.1.tar.gz -> wai-middleware-prometheus-0.2.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-middleware-prometheus-0.1.1/src/Network/Wai/Middleware/Prometheus.hs new/wai-middleware-prometheus-0.2.0/src/Network/Wai/Middleware/Prometheus.hs --- old/wai-middleware-prometheus-0.1.1/src/Network/Wai/Middleware/Prometheus.hs 2017-04-30 00:58:18.000000000 +0200 +++ new/wai-middleware-prometheus-0.2.0/src/Network/Wai/Middleware/Prometheus.hs 2017-07-02 23:55:13.000000000 +0200 @@ -11,15 +11,16 @@ , metricsApp ) where -import Data.Time.Clock (UTCTime, diffUTCTime, getCurrentTime) import qualified Data.ByteString.Builder as BS import qualified Data.ByteString.Char8 as BS import qualified Data.Default as Default import Data.Maybe (fromMaybe) +import Data.Ratio ((%)) import qualified Data.Text as T import qualified Network.HTTP.Types as HTTP import qualified Network.Wai as Wai import qualified Prometheus as Prom +import System.Clock (Clock(..), TimeSpec, diffTimeSpec, getTime, toNanoSecs) -- | Settings that control the behavior of the Prometheus middleware. @@ -48,11 +49,11 @@ {-# NOINLINE requestLatency #-} -- XXX: https://prometheus.io/docs/practices/naming/ says this should be -- _seconds, not _microseconds. -requestLatency :: Prom.Metric (Prom.Vector Prom.Label3 Prom.Summary) +requestLatency :: Prom.Metric (Prom.Vector Prom.Label3 Prom.Histogram) requestLatency = Prom.unsafeRegisterIO $ Prom.vector ("handler", "method", "status_code") - $ Prom.summary info Prom.defaultQuantiles - where info = Prom.Info "http_request_duration_microseconds" - "The HTTP request latencies in microseconds." + $ Prom.histogram info Prom.defaultBuckets + where info = Prom.Info "http_request_duration_seconds" + "The HTTP request latencies in seconds." -- | Instrument a WAI app with the default WAI metrics. -- @@ -63,12 +64,12 @@ -> Wai.Application -- ^ The app to instrument -> Wai.Application -- ^ The instrumented app instrumentApp handler app req respond = do - start <- getCurrentTime + start <- getTime Monotonic app req $ \res -> do - end <- getCurrentTime + end <- getTime Monotonic let method = Just $ BS.unpack (Wai.requestMethod req) let status = Just $ show (HTTP.statusCode (Wai.responseStatus res)) - observeMicroSeconds handler method status start end + observeSeconds handler method status start end respond res -- | Instrument an IO action with timing metrics. This function can be used if @@ -82,15 +83,15 @@ -> IO a -- ^ The IO action to instrument -> IO a -- ^ The instrumented app instrumentIO label io = do - start <- getCurrentTime + start <- getTime Monotonic result <- io - end <- getCurrentTime - observeMicroSeconds label Nothing Nothing start end + end <- getTime Monotonic + observeSeconds label Nothing Nothing start end return result -observeMicroSeconds :: String -> Maybe String -> Maybe String -> UTCTime -> UTCTime -> IO () -observeMicroSeconds handler method status start end = do - let latency = fromRational $ toRational (end `diffUTCTime` start) * 1000000 +observeSeconds :: String -> Maybe String -> Maybe String -> TimeSpec -> TimeSpec -> IO () +observeSeconds handler method status start end = do + let latency = fromRational $ toRational (toNanoSecs (end `diffTimeSpec` start) % 1000000000) Prom.withLabel (handler, fromMaybe "" method, fromMaybe "" status) (Prom.observe latency) requestLatency diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wai-middleware-prometheus-0.1.1/wai-middleware-prometheus.cabal new/wai-middleware-prometheus-0.2.0/wai-middleware-prometheus.cabal --- old/wai-middleware-prometheus-0.1.1/wai-middleware-prometheus.cabal 2017-04-30 23:30:12.000000000 +0200 +++ new/wai-middleware-prometheus-0.2.0/wai-middleware-prometheus.cabal 2017-07-03 00:06:02.000000000 +0200 @@ -1,5 +1,5 @@ name: wai-middleware-prometheus -version: 0.1.1 +version: 0.2.0 synopsis: WAI middlware for exposing http://prometheus.io metrics. description: @@ -26,11 +26,11 @@ build-depends: base >=4.7 && <5 , bytestring >=0.9 + , clock , data-default , http-types , prometheus-client , text >=0.11 - , time , wai >=3.0 ghc-options: -Wall

1 0

commit ghc-vty for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '17

31 Aug '17

Hello community, here is the log from the commit of package ghc-vty for openSUSE:Factory checked in at 2017-08-31 21:01:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-vty (Old) and /work/SRC/openSUSE:Factory/.ghc-vty.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-vty" Thu Aug 31 21:01:21 2017 rev:5 rq:513530 version:5.16 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-vty/ghc-vty.changes 2017-06-22 10:39:42.675389770 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-vty.new/ghc-vty.changes 2017-08-31 21:01:23.409883887 +0200 @@ -1,0 +2,5 @@ +Thu Jul 27 14:06:21 UTC 2017 - psimons(a)suse.com + +- Update to version 5.16. + +------------------------------------------------------------------- Old: ---- vty-5.15.1.tar.gz vty.cabal New: ---- vty-5.16.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-vty.spec ++++++ --- /var/tmp/diff_new_pack.w71i72/_old 2017-08-31 21:01:24.533725985 +0200 +++ /var/tmp/diff_new_pack.w71i72/_new 2017-08-31 21:01:24.561722052 +0200 @@ -19,14 +19,13 @@ %global pkg_name vty %bcond_with tests Name: ghc-%{pkg_name} -Version: 5.15.1 +Version: 5.16 Release: 0 Summary: A simple terminal UI library License: BSD-3-Clause Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal… BuildRequires: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-blaze-builder-devel @@ -94,7 +93,6 @@ %prep %setup -q -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ vty-5.15.1.tar.gz -> vty-5.16.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vty-5.15.1/CHANGELOG.md new/vty-5.16/CHANGELOG.md --- old/vty-5.15.1/CHANGELOG.md 2017-05-20 17:41:54.000000000 +0200 +++ new/vty-5.16/CHANGELOG.md 2017-07-21 04:27:57.000000000 +0200 @@ -1,3 +1,13 @@ +5.16 +API changes: + - Added support for mouse wheel events while in mouse mode. The Button + type got two new constructors as a result: BScrollUp and BScrollDown. + Thanks to doublescale(a)tutanota.com for this contribution! + +Bug fixes: + - charFill now clamps negative arguments to zero (thanks Eric + Mertens!) + 5.15.1 Package changes: - Documentation files are now marked accordingly (thanks Michal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vty-5.15.1/src/Graphics/Vty/Image.hs new/vty-5.16/src/Graphics/Vty/Image.hs --- old/vty-5.15.1/src/Graphics/Vty/Image.hs 2017-05-20 17:41:54.000000000 +0200 +++ new/vty-5.16/src/Graphics/Vty/Image.hs 2017-07-21 04:27:57.000000000 +0200 @@ -171,6 +171,9 @@ utf8Bytestring' a bs = text' a (T.decodeUtf8 bs) -- | Make an image filling a region with the specified character. +-- +-- If either the width or height are less than or equal to 0, then +-- the result is the empty image. charFill :: Integral d => Attr -- ^ The attribute to use. @@ -181,14 +184,17 @@ -> d -- ^ The region height. -> Image -charFill _a _c 0 _h = EmptyImage -charFill _a _c _w 0 = EmptyImage -charFill a c w h = - vertCat $ replicate (fromIntegral h) $ HorizText a txt displayWidth charWidth - where - txt = TL.replicate (fromIntegral w) (TL.singleton c) - displayWidth = safeWcwidth c * (fromIntegral w) - charWidth = fromIntegral w +charFill a c w h + | w <= 0 || h <= 0 = EmptyImage + | otherwise = vertCat + $ replicate (fromIntegral h) + $ HorizText a txt displayWidth charWidth + where + txt = TL.replicate charWidth (TL.singleton c) + displayWidth = safeWcwidth c * charWidth + + charWidth :: Num a => a + charWidth = fromIntegral w -- | The empty image. Useful for fold combinators. These occupy no space -- and do not affect display attributes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vty-5.15.1/src/Graphics/Vty/Input/Events.hs new/vty-5.16/src/Graphics/Vty/Input/Events.hs --- old/vty-5.15.1/src/Graphics/Vty/Input/Events.hs 2017-05-20 17:41:54.000000000 +0200 +++ new/vty-5.16/src/Graphics/Vty/Input/Events.hs 2017-07-21 04:27:57.000000000 +0200 @@ -28,7 +28,7 @@ deriving (Eq,Show,Read,Ord,Generic) -- | Mouse buttons. -data Button = BLeft | BMiddle | BRight +data Button = BLeft | BMiddle | BRight | BScrollUp | BScrollDown deriving (Eq,Show,Read,Ord,Generic) -- | Events. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vty-5.15.1/src/Graphics/Vty/Input/Mouse.hs new/vty-5.16/src/Graphics/Vty/Input/Mouse.hs --- old/vty-5.15.1/src/Graphics/Vty/Input/Mouse.hs 2017-05-20 17:41:54.000000000 +0200 +++ new/vty-5.16/src/Graphics/Vty/Input/Mouse.hs 2017-07-21 04:27:57.000000000 +0200 @@ -67,7 +67,7 @@ -- These bits indicate the buttons involved: buttonMask :: Int -buttonMask = 3 +buttonMask = 67 leftButton :: Int leftButton = 0 @@ -78,6 +78,12 @@ rightButton :: Int rightButton = 2 +scrollUp :: Int +scrollUp = 64 + +scrollDown :: Int +scrollDown = 65 + hasBitSet :: Int -> Int -> Bool hasBitSet val bit = val .&. bit > 0 @@ -100,6 +106,8 @@ let buttonMap = [ (leftButton, BLeft) , (middleButton, BMiddle) , (rightButton, BRight) + , (scrollUp, BScrollUp) + , (scrollDown, BScrollDown) ] in case lookup (mods .&. buttonMask) buttonMap of Nothing -> failParse diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vty-5.15.1/vty.cabal new/vty-5.16/vty.cabal --- old/vty-5.15.1/vty.cabal 2017-05-20 17:41:54.000000000 +0200 +++ new/vty-5.16/vty.cabal 2017-07-21 04:27:57.000000000 +0200 @@ -1,5 +1,5 @@ name: vty -version: 5.15.1 +version: 5.16 license: BSD3 license-file: LICENSE author: AUTHORS @@ -38,7 +38,7 @@ library default-language: Haskell2010 - build-depends: base >= 4.6 && < 5, + build-depends: base >= 4.8 && < 5, blaze-builder >= 0.3.3.2 && < 0.5, bytestring, containers, @@ -125,7 +125,7 @@ ghc-options: -threaded build-depends: vty, - base >= 4.6 && < 5, + base >= 4.8 && < 5, containers, microlens, microlens-mtl, @@ -140,7 +140,7 @@ ghc-options: -threaded build-depends: vty, - base >= 4.6 && < 5, + base >= 4.8 && < 5, containers, microlens, microlens-mtl, @@ -156,7 +156,7 @@ Cabal >= 1.20, QuickCheck >= 2.7, random >= 1.0 && < 1.2, - base >= 4.6 && < 5, + base >= 4.8 && < 5, bytestring, containers, deepseq >= 1.1 && < 1.5, @@ -188,7 +188,7 @@ Cabal >= 1.20, QuickCheck >= 2.7, random >= 1.0 && < 1.2, - base >= 4.6 && < 5, + base >= 4.8 && < 5, bytestring, containers, deepseq >= 1.1 && < 1.5, @@ -221,7 +221,7 @@ Cabal >= 1.20, QuickCheck >= 2.7, random >= 1.0 && < 1.2, - base >= 4.6 && < 5, + base >= 4.8 && < 5, bytestring, containers, deepseq >= 1.1 && < 1.5, @@ -254,7 +254,7 @@ Cabal >= 1.20, QuickCheck >= 2.7, random >= 1.0 && < 1.2, - base >= 4.6 && < 5, + base >= 4.8 && < 5, bytestring, containers, deepseq >= 1.1 && < 1.5, @@ -280,7 +280,7 @@ Cabal >= 1.20, QuickCheck >= 2.7, random >= 1.0 && < 1.2, - base >= 4.6 && < 5, + base >= 4.8 && < 5, bytestring, containers, deepseq >= 1.1 && < 1.5, @@ -307,7 +307,7 @@ Cabal >= 1.20, QuickCheck >= 2.7, random >= 1.0 && < 1.2, - base >= 4.6 && < 5, + base >= 4.8 && < 5, blaze-builder >= 0.3.3.2 && < 0.5, bytestring, containers, @@ -337,7 +337,7 @@ Cabal >= 1.20, QuickCheck >= 2.7, random >= 1.0 && < 1.2, - base >= 4.6 && < 5, + base >= 4.8 && < 5, bytestring, containers, deepseq >= 1.1 && < 1.5, @@ -365,7 +365,7 @@ Cabal >= 1.20, QuickCheck >= 2.7, random >= 1.0 && < 1.2, - base >= 4.6 && < 5, + base >= 4.8 && < 5, bytestring, containers, deepseq >= 1.1 && < 1.5, @@ -392,7 +392,7 @@ Cabal >= 1.20, QuickCheck >= 2.7, random >= 1.0 && < 1.2, - base >= 4.6 && < 5, + base >= 4.8 && < 5, bytestring, containers, deepseq >= 1.1 && < 1.5, @@ -420,7 +420,7 @@ Cabal >= 1.20, QuickCheck >= 2.7, random >= 1.0 && < 1.2, - base >= 4.6 && < 5, + base >= 4.8 && < 5, bytestring, containers, deepseq >= 1.1 && < 1.5, @@ -452,7 +452,7 @@ Cabal >= 1.20, QuickCheck >= 2.7, random >= 1.0 && < 1.2, - base >= 4.6 && < 5, + base >= 4.8 && < 5, bytestring, containers, deepseq >= 1.1 && < 1.5, @@ -484,7 +484,7 @@ Cabal >= 1.20, QuickCheck >= 2.7, random >= 1.0 && < 1.2, - base >= 4.6 && < 5, + base >= 4.8 && < 5, bytestring, containers, deepseq >= 1.1 && < 1.5, @@ -516,7 +516,7 @@ Cabal >= 1.20, QuickCheck >= 2.7, random >= 1.0 && < 1.2, - base >= 4.6 && < 5, + base >= 4.8 && < 5, bytestring, containers, deepseq >= 1.1 && < 1.5, @@ -542,7 +542,7 @@ Cabal >= 1.20, QuickCheck >= 2.7, random >= 1.0 && < 1.2, - base >= 4.6 && < 5, + base >= 4.8 && < 5, bytestring, containers, deepseq >= 1.1 && < 1.5, @@ -570,7 +570,7 @@ test-framework == 0.8.*, test-framework-smallcheck == 0.2.*, random >= 1.0 && < 1.2, - base >= 4.6 && < 5, + base >= 4.8 && < 5, bytestring, containers, deepseq >= 1.1 && < 1.5, @@ -606,7 +606,7 @@ test-framework-smallcheck == 0.2.*, test-framework-hunit, random >= 1.0 && < 1.2, - base >= 4.6 && < 5, + base >= 4.8 && < 5, bytestring, containers, deepseq >= 1.1 && < 1.5,

1 0