rainbow 0.26.0.6 → 0.28.0.0
raw patch · 4 files changed
+33/−30 lines, 4 filesdep +microlensdep +microlens-thdep −lensdep ~basePVP ok
version bump matches the API change (PVP)
Dependencies added: microlens, microlens-th
Dependencies removed: lens
Dependency ranges changed: base
API changes (from Hackage documentation)
- Rainbow.Translate: instance Renderable ByteString
- Rainbow.Translate: instance Renderable String
- Rainbow.Translate: instance Renderable Text
- Rainbow.Types: _back :: Style a -> Color a
- Rainbow.Types: _blink :: Format -> Bool
- Rainbow.Types: _bold :: Format -> Bool
- Rainbow.Types: _color256 :: Radiant -> Color Word8
- Rainbow.Types: _color8 :: Radiant -> Color Enum8
- Rainbow.Types: _faint :: Format -> Bool
- Rainbow.Types: _fore :: Style a -> Color a
- Rainbow.Types: _format :: Style a -> Format
- Rainbow.Types: _inverse :: Format -> Bool
- Rainbow.Types: _invisible :: Format -> Bool
- Rainbow.Types: _italic :: Format -> Bool
- Rainbow.Types: _scheme :: Chunk a -> Scheme
- Rainbow.Types: _strikeout :: Format -> Bool
- Rainbow.Types: _style256 :: Scheme -> Style Word8
- Rainbow.Types: _style8 :: Scheme -> Style Enum8
- Rainbow.Types: _underline :: Format -> Bool
- Rainbow.Types: _yarn :: Chunk a -> a
- Rainbow.Types: instance Bounded Enum8
- Rainbow.Types: instance Color a1 ~ t0 => Rewrapped (Color a0) t0
- Rainbow.Types: instance Constructor C1_0Chunk
- Rainbow.Types: instance Constructor C1_0Color
- Rainbow.Types: instance Constructor C1_0Enum8
- Rainbow.Types: instance Constructor C1_0Format
- Rainbow.Types: instance Constructor C1_0Radiant
- Rainbow.Types: instance Constructor C1_0Scheme
- Rainbow.Types: instance Constructor C1_0Style
- Rainbow.Types: instance Constructor C1_1Enum8
- Rainbow.Types: instance Constructor C1_2Enum8
- Rainbow.Types: instance Constructor C1_3Enum8
- Rainbow.Types: instance Constructor C1_4Enum8
- Rainbow.Types: instance Constructor C1_5Enum8
- Rainbow.Types: instance Constructor C1_6Enum8
- Rainbow.Types: instance Constructor C1_7Enum8
- Rainbow.Types: instance Datatype D1Chunk
- Rainbow.Types: instance Datatype D1Color
- Rainbow.Types: instance Datatype D1Enum8
- Rainbow.Types: instance Datatype D1Format
- Rainbow.Types: instance Datatype D1Radiant
- Rainbow.Types: instance Datatype D1Scheme
- Rainbow.Types: instance Datatype D1Style
- Rainbow.Types: instance Enum Enum8
- Rainbow.Types: instance Eq Enum8
- Rainbow.Types: instance Eq Format
- Rainbow.Types: instance Eq Radiant
- Rainbow.Types: instance Eq Scheme
- Rainbow.Types: instance Eq a => Eq (Chunk a)
- Rainbow.Types: instance Eq a => Eq (Color a)
- Rainbow.Types: instance Eq a => Eq (Style a)
- Rainbow.Types: instance Foldable Chunk
- Rainbow.Types: instance Foldable Color
- Rainbow.Types: instance Foldable Style
- Rainbow.Types: instance Functor Chunk
- Rainbow.Types: instance Functor Color
- Rainbow.Types: instance Functor Style
- Rainbow.Types: instance Generic (Chunk a)
- Rainbow.Types: instance Generic (Color a)
- Rainbow.Types: instance Generic (Style a)
- Rainbow.Types: instance Generic Enum8
- Rainbow.Types: instance Generic Format
- Rainbow.Types: instance Generic Radiant
- Rainbow.Types: instance Generic Scheme
- Rainbow.Types: instance Monoid (Color a)
- Rainbow.Types: instance Monoid (Style a)
- Rainbow.Types: instance Monoid Format
- Rainbow.Types: instance Monoid Radiant
- Rainbow.Types: instance Monoid Scheme
- Rainbow.Types: instance Monoid a => Monoid (Chunk a)
- Rainbow.Types: instance Ord Enum8
- Rainbow.Types: instance Ord Format
- Rainbow.Types: instance Ord Radiant
- Rainbow.Types: instance Ord Scheme
- Rainbow.Types: instance Ord a => Ord (Chunk a)
- Rainbow.Types: instance Ord a => Ord (Color a)
- Rainbow.Types: instance Ord a => Ord (Style a)
- Rainbow.Types: instance Selector S1_0_0Chunk
- Rainbow.Types: instance Selector S1_0_0Format
- Rainbow.Types: instance Selector S1_0_0Radiant
- Rainbow.Types: instance Selector S1_0_0Scheme
- Rainbow.Types: instance Selector S1_0_0Style
- Rainbow.Types: instance Selector S1_0_1Chunk
- Rainbow.Types: instance Selector S1_0_1Format
- Rainbow.Types: instance Selector S1_0_1Radiant
- Rainbow.Types: instance Selector S1_0_1Scheme
- Rainbow.Types: instance Selector S1_0_1Style
- Rainbow.Types: instance Selector S1_0_2Format
- Rainbow.Types: instance Selector S1_0_2Style
- Rainbow.Types: instance Selector S1_0_3Format
- Rainbow.Types: instance Selector S1_0_4Format
- Rainbow.Types: instance Selector S1_0_5Format
- Rainbow.Types: instance Selector S1_0_6Format
- Rainbow.Types: instance Selector S1_0_7Format
- Rainbow.Types: instance Show Enum8
- Rainbow.Types: instance Show Format
- Rainbow.Types: instance Show Radiant
- Rainbow.Types: instance Show Scheme
- Rainbow.Types: instance Show a => Show (Chunk a)
- Rainbow.Types: instance Show a => Show (Color a)
- Rainbow.Types: instance Show a => Show (Style a)
- Rainbow.Types: instance Traversable Chunk
- Rainbow.Types: instance Traversable Color
- Rainbow.Types: instance Traversable Style
- Rainbow.Types: instance Typeable Chunk
- Rainbow.Types: instance Typeable Color
- Rainbow.Types: instance Typeable Enum8
- Rainbow.Types: instance Typeable Format
- Rainbow.Types: instance Typeable Radiant
- Rainbow.Types: instance Typeable Scheme
- Rainbow.Types: instance Typeable Style
- Rainbow.Types: instance Wrapped (Color a0)
+ Rainbow.Translate: instance Rainbow.Translate.Renderable Data.ByteString.Internal.ByteString
+ Rainbow.Translate: instance Rainbow.Translate.Renderable Data.ByteString.Lazy.Internal.ByteString
+ Rainbow.Translate: instance Rainbow.Translate.Renderable Data.Text.Internal.Lazy.Text
+ Rainbow.Translate: instance Rainbow.Translate.Renderable Data.Text.Internal.Text
+ Rainbow.Translate: instance Rainbow.Translate.Renderable GHC.Base.String
+ Rainbow.Types: [_back] :: Style a -> Color a
+ Rainbow.Types: [_blink] :: Format -> Bool
+ Rainbow.Types: [_bold] :: Format -> Bool
+ Rainbow.Types: [_color256] :: Radiant -> Color Word8
+ Rainbow.Types: [_color8] :: Radiant -> Color Enum8
+ Rainbow.Types: [_faint] :: Format -> Bool
+ Rainbow.Types: [_fore] :: Style a -> Color a
+ Rainbow.Types: [_format] :: Style a -> Format
+ Rainbow.Types: [_inverse] :: Format -> Bool
+ Rainbow.Types: [_invisible] :: Format -> Bool
+ Rainbow.Types: [_italic] :: Format -> Bool
+ Rainbow.Types: [_scheme] :: Chunk a -> Scheme
+ Rainbow.Types: [_strikeout] :: Format -> Bool
+ Rainbow.Types: [_style256] :: Scheme -> Style Word8
+ Rainbow.Types: [_style8] :: Scheme -> Style Enum8
+ Rainbow.Types: [_underline] :: Format -> Bool
+ Rainbow.Types: [_yarn] :: Chunk a -> a
+ Rainbow.Types: instance Data.Foldable.Foldable Rainbow.Types.Chunk
+ Rainbow.Types: instance Data.Foldable.Foldable Rainbow.Types.Color
+ Rainbow.Types: instance Data.Foldable.Foldable Rainbow.Types.Style
+ Rainbow.Types: instance Data.Traversable.Traversable Rainbow.Types.Chunk
+ Rainbow.Types: instance Data.Traversable.Traversable Rainbow.Types.Color
+ Rainbow.Types: instance Data.Traversable.Traversable Rainbow.Types.Style
+ Rainbow.Types: instance GHC.Base.Functor Rainbow.Types.Chunk
+ Rainbow.Types: instance GHC.Base.Functor Rainbow.Types.Color
+ Rainbow.Types: instance GHC.Base.Functor Rainbow.Types.Style
+ Rainbow.Types: instance GHC.Base.Monoid (Rainbow.Types.Color a)
+ Rainbow.Types: instance GHC.Base.Monoid (Rainbow.Types.Style a)
+ Rainbow.Types: instance GHC.Base.Monoid Rainbow.Types.Format
+ Rainbow.Types: instance GHC.Base.Monoid Rainbow.Types.Radiant
+ Rainbow.Types: instance GHC.Base.Monoid Rainbow.Types.Scheme
+ Rainbow.Types: instance GHC.Base.Monoid a => GHC.Base.Monoid (Rainbow.Types.Chunk a)
+ Rainbow.Types: instance GHC.Classes.Eq Rainbow.Types.Enum8
+ Rainbow.Types: instance GHC.Classes.Eq Rainbow.Types.Format
+ Rainbow.Types: instance GHC.Classes.Eq Rainbow.Types.Radiant
+ Rainbow.Types: instance GHC.Classes.Eq Rainbow.Types.Scheme
+ Rainbow.Types: instance GHC.Classes.Eq a => GHC.Classes.Eq (Rainbow.Types.Chunk a)
+ Rainbow.Types: instance GHC.Classes.Eq a => GHC.Classes.Eq (Rainbow.Types.Color a)
+ Rainbow.Types: instance GHC.Classes.Eq a => GHC.Classes.Eq (Rainbow.Types.Style a)
+ Rainbow.Types: instance GHC.Classes.Ord Rainbow.Types.Enum8
+ Rainbow.Types: instance GHC.Classes.Ord Rainbow.Types.Format
+ Rainbow.Types: instance GHC.Classes.Ord Rainbow.Types.Radiant
+ Rainbow.Types: instance GHC.Classes.Ord Rainbow.Types.Scheme
+ Rainbow.Types: instance GHC.Classes.Ord a => GHC.Classes.Ord (Rainbow.Types.Chunk a)
+ Rainbow.Types: instance GHC.Classes.Ord a => GHC.Classes.Ord (Rainbow.Types.Color a)
+ Rainbow.Types: instance GHC.Classes.Ord a => GHC.Classes.Ord (Rainbow.Types.Style a)
+ Rainbow.Types: instance GHC.Enum.Bounded Rainbow.Types.Enum8
+ Rainbow.Types: instance GHC.Enum.Enum Rainbow.Types.Enum8
+ Rainbow.Types: instance GHC.Generics.Generic (Rainbow.Types.Chunk a)
+ Rainbow.Types: instance GHC.Generics.Generic (Rainbow.Types.Color a)
+ Rainbow.Types: instance GHC.Generics.Generic (Rainbow.Types.Style a)
+ Rainbow.Types: instance GHC.Generics.Generic Rainbow.Types.Enum8
+ Rainbow.Types: instance GHC.Generics.Generic Rainbow.Types.Format
+ Rainbow.Types: instance GHC.Generics.Generic Rainbow.Types.Radiant
+ Rainbow.Types: instance GHC.Generics.Generic Rainbow.Types.Scheme
+ Rainbow.Types: instance GHC.Show.Show Rainbow.Types.Enum8
+ Rainbow.Types: instance GHC.Show.Show Rainbow.Types.Format
+ Rainbow.Types: instance GHC.Show.Show Rainbow.Types.Radiant
+ Rainbow.Types: instance GHC.Show.Show Rainbow.Types.Scheme
+ Rainbow.Types: instance GHC.Show.Show a => GHC.Show.Show (Rainbow.Types.Chunk a)
+ Rainbow.Types: instance GHC.Show.Show a => GHC.Show.Show (Rainbow.Types.Color a)
+ Rainbow.Types: instance GHC.Show.Show a => GHC.Show.Show (Rainbow.Types.Style a)
- Rainbow.Types: back :: Lens' (Style a_ab0G) (Color a_ab0G)
+ Rainbow.Types: back :: forall a_aa90. Lens' (Style a_aa90) (Color a_aa90)
- Rainbow.Types: fore :: Lens' (Style a_ab0G) (Color a_ab0G)
+ Rainbow.Types: fore :: forall a_aa90. Lens' (Style a_aa90) (Color a_aa90)
- Rainbow.Types: format :: Lens' (Style a_ab0G) Format
+ Rainbow.Types: format :: forall a_aa90. Lens' (Style a_aa90) Format
- Rainbow.Types: scheme :: Lens' (Chunk a_abys) Scheme
+ Rainbow.Types: scheme :: forall a_aaGM. Lens' (Chunk a_aaGM) Scheme
- Rainbow.Types: yarn :: Lens (Chunk a_abys) (Chunk a_abIn) a_abys a_abIn
+ Rainbow.Types: yarn :: forall a_aaGM a_aaTg. Lens (Chunk a_aaGM) (Chunk a_aaTg) a_aaGM a_aaTg
Files
- lib/Rainbow.hs +9/−6
- lib/Rainbow/Translate.hs +6/−6
- lib/Rainbow/Types.hs +5/−10
- rainbow.cabal +13/−8
lib/Rainbow.hs view
@@ -154,7 +154,7 @@ -- * Re-exports -- $reexports- , module Control.Lens.Operators+ , module Data.Function , module Data.Word , module Data.ByteString , module Data.Monoid@@ -168,11 +168,12 @@ import qualified Rainbow.Types as Y import Data.Word (Word8) import Data.ByteString (ByteString)-import Control.Lens.Operators ((&))-import Control.Lens+import Data.Function ((&))+import qualified Lens.Micro as Lens+import Lens.Micro ((.~)) import Data.Monoid (Monoid(mempty), (<>)) -formatBoth :: Setter' Y.Format Bool -> Y.Chunk a -> Y.Chunk a+formatBoth :: Lens.ASetter' Y.Format Bool -> Y.Chunk a -> Y.Chunk a formatBoth get c = c & Y.scheme . Y.style8 . Y.format . get .~ True & Y.scheme . Y.style256 . Y.format . get .~ True @@ -228,7 +229,9 @@ -- 'fore' ('blue' <> 'only256' 'red') -- @ only256 :: Y.Radiant -> Y.Radiant-only256 r = r & Y.color8 . _Wrapped .~ Nothing+only256 r = r & Y.color8 . wrapped .~ Nothing+ where+ wrapped = Lens.sets (\f (Y.Color m) -> Y.Color (f m)) black :: Y.Radiant black = Y.Radiant (Y.Color (Just Y.E0)) (Y.Color (Just 0))@@ -284,7 +287,7 @@ {- $reexports - * "Control.Lens.Operators" re-exports '&'+ * "Data.Function" re-exports '&' * "Data.Monoid" re-exports 'Monoid', '<>' and 'mempty'
lib/Rainbow/Translate.hs view
@@ -12,14 +12,14 @@ import qualified Data.Text.Encoding as X import qualified Data.Text.Lazy as XL import Data.ByteString (ByteString)-import Data.Word+import Data.Word (Word8) import Data.List (intersperse) import qualified Rainbow.Types as T-import System.Process-import Text.Read-import System.Exit-import Control.Monad-import Control.Exception+import System.Process (readProcessWithExitCode)+import Text.Read (readMaybe)+import System.Exit (ExitCode(ExitFailure))+import Control.Monad (mzero)+import Control.Exception (try, IOException) import qualified System.IO as IO
lib/Rainbow/Types.hs view
@@ -1,7 +1,5 @@ {-# LANGUAGE DeriveGeneric, DeriveDataTypeable, DeriveFunctor,- DeriveTraversable, DeriveFoldable, TemplateHaskell,- FlexibleInstances, TypeFamilies,- MultiParamTypeClasses #-}+ DeriveTraversable, DeriveFoldable, TemplateHaskell #-} -- | All the main types in Rainbow. Using this module you can specify -- that you want different formatting for 8- and 256-color terminals.@@ -12,14 +10,12 @@ -- # Imports -import Control.Lens-import Data.Foldable ()-import Data.Foldable (Foldable)-import Data.Monoid+import Lens.Micro.TH (makeLenses)+import Data.Monoid ((<>)) import Data.Traversable ()-import Data.Typeable+import Data.Typeable (Typeable) import Data.Word (Word8)-import GHC.Generics+import GHC.Generics (Generic) -- -- Colors@@ -33,7 +29,6 @@ deriving (Eq, Show, Ord, Generic, Typeable, Functor, Foldable, Traversable) -makeWrapped ''Color -- | Takes the last non-Nothing Color. 'mempty' is no color. instance Monoid (Color a) where
rainbow.cabal view
@@ -3,11 +3,11 @@ -- http://www.github.com/massysett/cartel -- -- Script name used to generate: genCabal.hs--- Generated on: 2015-07-14 18:53:54.875209 EDT--- Cartel library version: 0.14.2.6+-- Generated on: 2016-04-11 16:49:50.413706 EDT+-- Cartel library version: 0.14.2.8 name: rainbow-version: 0.26.0.6+version: 0.28.0.0 cabal-version: >= 1.18 license: BSD3 license-file: LICENSE@@ -43,7 +43,8 @@ , text >= 0.11.2.0 , bytestring >= 0.10 , process >= 1.2- , lens >= 4.7+ , microlens >= 0.4.2.1+ , microlens-th >= 0.3.0.2 hs-source-dirs: lib @@ -73,7 +74,8 @@ , text >= 0.11.2.0 , bytestring >= 0.10 , process >= 1.2- , lens >= 4.7+ , microlens >= 0.4.2.1+ , microlens-th >= 0.3.0.2 hs-source-dirs: lib @@ -96,7 +98,8 @@ , text >= 0.11.2.0 , bytestring >= 0.10 , process >= 1.2- , lens >= 4.7+ , microlens >= 0.4.2.1+ , microlens-th >= 0.3.0.2 hs-source-dirs: lib @@ -119,7 +122,8 @@ , text >= 0.11.2.0 , bytestring >= 0.10 , process >= 1.2- , lens >= 4.7+ , microlens >= 0.4.2.1+ , microlens-th >= 0.3.0.2 hs-source-dirs: lib @@ -142,7 +146,8 @@ , text >= 0.11.2.0 , bytestring >= 0.10 , process >= 1.2- , lens >= 4.7+ , microlens >= 0.4.2.1+ , microlens-th >= 0.3.0.2 hs-source-dirs: lib