Hello community,
here is the log from the commit of package ghc-yaml for openSUSE:Factory
checked in at 2015-08-05 06:50:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-yaml (Old)
and /work/SRC/openSUSE:Factory/.ghc-yaml.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-yaml"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-yaml/ghc-yaml.changes 2015-05-21
08:33:36.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-yaml.new/ghc-yaml.changes 2015-08-05
06:50:55.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Jul 27 07:52:19 UTC 2015 - mimi...@gmail.com
+
+- update to 0.8.12
+* Proper handling of String "+123"
+
+-------------------------------------------------------------------
Old:
----
yaml-0.8.11.tar.gz
New:
----
yaml-0.8.12.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-yaml.spec ++++++
--- /var/tmp/diff_new_pack.0aWOVG/_old 2015-08-05 06:50:55.000000000 +0200
+++ /var/tmp/diff_new_pack.0aWOVG/_new 2015-08-05 06:50:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package ghc
+# spec file for package ghc-yaml
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
@@ -17,8 +17,8 @@
%global pkg_name yaml
-Name: ghc-%{pkg_name}
-Version: 0.8.11
+Name: ghc-yaml
+Version: 0.8.12
Release: 0
Summary: Support for parsing and rendering YAML documents
License: BSD-3-Clause
++++++ yaml-0.8.11.tar.gz -> yaml-0.8.12.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yaml-0.8.11/ChangeLog.md new/yaml-0.8.12/ChangeLog.md
--- old/yaml-0.8.11/ChangeLog.md 2015-04-19 08:52:46.000000000 +0200
+++ new/yaml-0.8.12/ChangeLog.md 2015-07-20 15:49:55.000000000 +0200
@@ -1,3 +1,7 @@
+## 0.8.12
+
+* Proper handling of `String "+123"`
[#64](https://github.com/snoyberg/yaml/issues/64)
+
## 0.8.11
* Function to print prettier parse exceptions
[#59](https://github.com/snoyberg/yaml/pull/59)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yaml-0.8.11/Data/Yaml.hs new/yaml-0.8.12/Data/Yaml.hs
--- old/yaml-0.8.11/Data/Yaml.hs 2015-04-19 08:52:46.000000000 +0200
+++ new/yaml-0.8.12/Data/Yaml.hs 2015-07-20 15:49:55.000000000 +0200
@@ -158,6 +158,7 @@
|| c == 'E'
|| c == '.'
|| c == '-'
+ || c == '+'
decode :: FromJSON a
=> ByteString
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yaml-0.8.11/test/Data/Yaml/IncludeSpec.hs
new/yaml-0.8.12/test/Data/Yaml/IncludeSpec.hs
--- old/yaml-0.8.11/test/Data/Yaml/IncludeSpec.hs 2015-04-19
08:52:46.000000000 +0200
+++ new/yaml-0.8.12/test/Data/Yaml/IncludeSpec.hs 2015-07-20
15:49:55.000000000 +0200
@@ -2,7 +2,7 @@
module Data.Yaml.IncludeSpec (main, spec) where
import Test.Hspec
-import Test.Hspec.Expectations.Contrib
+import Data.Either.Compat
import Data.Aeson
import Data.Aeson.QQ
import Data.Yaml (ParseException)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yaml-0.8.11/test/Data/YamlSpec.hs
new/yaml-0.8.12/test/Data/YamlSpec.hs
--- old/yaml-0.8.11/test/Data/YamlSpec.hs 2015-04-19 08:52:46.000000000
+0200
+++ new/yaml-0.8.12/test/Data/YamlSpec.hs 2015-07-20 15:49:55.000000000
+0200
@@ -15,11 +15,11 @@
import qualified Control.Monad.Trans.Resource as C
import qualified Data.Conduit.List as CL
-import System.Directory
import Control.Monad
import Control.Exception (try, SomeException)
import Test.Hspec
-import Test.Hspec.Expectations.Contrib
+import Data.Either.Compat
+import Test.Mockery.Directory
import qualified Data.Yaml as D
import Data.Yaml (object, array, (.=))
@@ -140,6 +140,9 @@
it "aliases in keys #49" caseIssue49
+ it "serialization of +123 #64" $ do
+ D.decode (D.encode ("+123" :: String)) `shouldBe` Just ("+123" ::
String)
+
specialStrings :: [T.Text]
specialStrings =
@@ -237,26 +240,17 @@
yamlString = "foo: bar\nbaz:\n - bin1\n - bin2\n"
yamlBS = B8.pack yamlString
-removeFile' :: FilePath -> IO ()
-removeFile' fp = do
- x <- doesFileExist fp
- when x $ removeFile fp
-
caseEncodeDecodeFile :: Assertion
-caseEncodeDecodeFile = do
- removeFile' tmpPath
+caseEncodeDecodeFile = withFile "" $ \tmpPath -> do
eList <- C.runResourceT $ Y.decodeFile filePath C.$$ CL.consume
C.runResourceT $ CL.sourceList eList C.$$ Y.encodeFile tmpPath
eList2 <- C.runResourceT $ Y.decodeFile filePath C.$$ CL.consume
map MyEvent eList @=? map MyEvent eList2
where
filePath = "test/largest-string.yaml"
- tmpPath = "tmp.yaml"
caseInterleave :: Assertion
-caseInterleave = do
- removeFile' tmpPath
- removeFile' tmpPath2
+caseInterleave = withFile "" $ \tmpPath -> withFile "" $ \tmpPath2 -> do
() <- C.runResourceT $ Y.decodeFile filePath C.$$ Y.encodeFile tmpPath
() <- C.runResourceT $ Y.decodeFile tmpPath C.$$ Y.encodeFile tmpPath2
f1 <- readFile tmpPath
@@ -264,8 +258,6 @@
f1 @=? f2
where
filePath = "test/largest-string.yaml"
- tmpPath = "tmp.yaml"
- tmpPath2 = "tmp2.yaml"
caseDecodeInvalidDocument :: Assertion
caseDecodeInvalidDocument = do
@@ -308,8 +300,7 @@
out @?= Just sample
caseEncodeDecodeFileData :: Assertion
-caseEncodeDecodeFileData = do
- let fp = "tmp.yaml"
+caseEncodeDecodeFileData = withFile "" $ \fp -> do
D.encodeFile fp sample
out <- D.decodeFile fp
out @?= Just sample
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yaml-0.8.11/yaml.cabal new/yaml-0.8.12/yaml.cabal
--- old/yaml-0.8.11/yaml.cabal 2015-04-19 08:52:46.000000000 +0200
+++ new/yaml-0.8.12/yaml.cabal 2015-07-20 15:49:55.000000000 +0200
@@ -1,5 +1,5 @@
name: yaml
-version: 0.8.11
+version: 0.8.12
license: BSD3
license-file: LICENSE
author: Michael Snoyman <mich...@snoyman.com>, Anton Ageev
<ant...@gmail.com>,Kirill Simonov
@@ -114,9 +114,7 @@
Data.Yaml.IncludeSpec
cpp-options: -DTEST
build-depends: hspec >= 1.3
- , hspec-expectations
, HUnit
- , directory
, base >= 4 && < 5
, transformers >= 0.1
, bytestring >= 0.9.1.4
@@ -128,6 +126,8 @@
, vector
, resourcet
, aeson-qq
+ , mockery
+ , base-compat
ghc-options: -Wall
source-repository head
