packages feed

gitHUD 1.1.0 → 1.2.0

raw patch · 6 files changed

+39/−14 lines, 6 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

+ GitHUD.Config.Types: [confNoUpstreamStringColor] :: Config -> Color
+ GitHUD.Config.Types: [confNoUpstreamStringIntensity] :: Config -> ColorIntensity
- GitHUD.Config.Types: Config :: String -> String -> String -> Color -> ColorIntensity -> String -> String -> String -> String -> String -> String -> String -> Color -> ColorIntensity -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> Config
+ GitHUD.Config.Types: Config :: String -> String -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> String -> String -> String -> String -> String -> String -> String -> Color -> ColorIntensity -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> String -> Color -> ColorIntensity -> Config

Files

gitHUD.cabal view
@@ -1,5 +1,5 @@ name:                gitHUD-version:             1.1.0+version:             1.2.0 synopsis:            More efficient replacement to the great git-radar description:         Please see README.md homepage:            http://github.com/gbataille/gitHUD#readme
src/GitHUD/Config/Parse.hs view
@@ -76,14 +76,18 @@ configItemsFolder :: Config -> ConfigItem -> Config configItemsFolder conf (Item "git_repo_indicator" repoIndicator) = conf { confRepoIndicator = repoIndicator } -configItemsFolder conf (Item "no_upstream_text" noUpstreamText) =-  conf { confNoUpstreamString = noUpstreamText }-configItemsFolder conf (Item "no_upstream_indicator" noUpstreamIndicator) =-  conf { confNoUpstreamIndicator = noUpstreamIndicator }-configItemsFolder conf (Item "no_upstream_indicator_color" noUpstreamIndColor) =-  conf { confNoUpstreamIndicatorColor = colorConfigToColor noUpstreamIndColor }-configItemsFolder conf (Item "no_upstream_indicator_intensity" noUpstreamIndIntensity) =-  conf { confNoUpstreamIndicatorIntensity = intensityConfigToIntensity noUpstreamIndIntensity }+configItemsFolder conf (Item "no_upstream_text" value) =+  conf { confNoUpstreamString = value }+configItemsFolder conf (Item "no_upstream_text_color" value) =+  conf { confNoUpstreamStringColor = colorConfigToColor value }+configItemsFolder conf (Item "no_upstream_text_intensity" value) =+  conf { confNoUpstreamStringIntensity = intensityConfigToIntensity value }+configItemsFolder conf (Item "no_upstream_indicator" value) =+  conf { confNoUpstreamIndicator = value }+configItemsFolder conf (Item "no_upstream_indicator_color" value) =+  conf { confNoUpstreamIndicatorColor = colorConfigToColor value }+configItemsFolder conf (Item "no_upstream_indicator_intensity" value) =+  conf { confNoUpstreamIndicatorIntensity = intensityConfigToIntensity value }  configItemsFolder conf (Item "remote_commits_indicator" value) =   conf { confRemoteCommitsIndicator = value }
src/GitHUD/Config/Types.hs view
@@ -9,6 +9,8 @@   confRepoIndicator :: String    , confNoUpstreamString :: String+  , confNoUpstreamStringColor :: Color+  , confNoUpstreamStringIntensity :: ColorIntensity   , confNoUpstreamIndicator :: String   , confNoUpstreamIndicatorColor :: Color   , confNoUpstreamIndicatorIntensity :: ColorIntensity@@ -71,6 +73,8 @@   confRepoIndicator = "\57504"    , confNoUpstreamString = "upstream"+  , confNoUpstreamStringColor = Red+  , confNoUpstreamStringIntensity = Vivid   , confNoUpstreamIndicator = "\9889"   , confNoUpstreamIndicatorColor = Red   , confNoUpstreamIndicatorIntensity = Vivid
src/GitHUD/Terminal/Prompt.hs view
@@ -47,7 +47,10 @@   repoState <- getRepoState   config <- getConfig   when (gitRemoteTrackingBranch repoState == "") $ do-    tell $ confNoUpstreamString config+    tellStringInColor+      (confNoUpstreamStringColor config)+      (confNoUpstreamStringIntensity config)+      (confNoUpstreamString config)     tell " "     tellStringInColor       (confNoUpstreamIndicatorColor config)
test/Test/GitHUD/Config/Parse.hs view
@@ -77,6 +77,18 @@             forConfigItemKey "no_upstream_text" $               withValue "foo" +    , testCase "Key: no_upstream_text_color" $+        expectValue Green $+          toBeInField confNoUpstreamStringColor $+            forConfigItemKey "no_upstream_text_color" $+              withValue "Green"++    , testCase "Key: no_upstream_text_intensity" $+        expectValue Dull $+          toBeInField confNoUpstreamStringIntensity $+            forConfigItemKey "no_upstream_text_intensity" $+              withValue "Dull"+     , testCase "Key: no_upstream_indicator" $         expectValue "foo" $           toBeInField confNoUpstreamIndicator $
test/Test/GitHUD/Terminal/Prompt.hs view
@@ -52,6 +52,8 @@ customConfigUpstreamIndicator :: Config customConfigUpstreamIndicator = defaultConfig {   confNoUpstreamString = "foo"+  , confNoUpstreamStringColor = Cyan+  , confNoUpstreamStringIntensity = Dull   , confNoUpstreamIndicator = "bar"   , confNoUpstreamIndicatorColor = Green   , confNoUpstreamIndicatorIntensity = Dull@@ -75,12 +77,12 @@       , testCase "ZSH: with no upstream" $           testWriterWithConfig             (zeroOutputConfig ZSH) addUpstreamIndicator-          @?= "upstream %{\x1b[1;31m%}\9889%{\x1b[0m%} "+          @?= "%{\x1b[1;31m%}upstream%{\x1b[0m%} %{\x1b[1;31m%}\9889%{\x1b[0m%} "        , testCase "Other: with no upstream" $           testWriterWithConfig             (zeroOutputConfig Other) addUpstreamIndicator-          @?= "upstream \x1b[1;31m\9889\x1b[0m "+          @?= "\x1b[1;31mupstream\x1b[0m \x1b[1;31m\9889\x1b[0m "       ]     , testGroup "Custom Config"       [ testCase "ZSH: with an upstream" $@@ -99,13 +101,13 @@           testWriterWithConfig             (buildOutputConfig ZSH (zeroGitRepoState) customConfigUpstreamIndicator)             addUpstreamIndicator-          @?= "foo %{\x1b[32m%}bar%{\x1b[0m%} "+          @?= "%{\x1b[36m%}foo%{\x1b[0m%} %{\x1b[32m%}bar%{\x1b[0m%} "        , testCase "Other: with no upstream" $           testWriterWithConfig             (buildOutputConfig Other (zeroGitRepoState) customConfigUpstreamIndicator)             addUpstreamIndicator-          @?= "foo \x1b[32mbar\x1b[0m "+          @?= "\x1b[36mfoo\x1b[0m \x1b[32mbar\x1b[0m "       ]   ]