keystore 0.8.0.1 → 0.8.0.2

raw patch · 5 files changed

+34/−2 lines, 5 filesdep ~aesondep ~optparse-applicative

Dependency ranges changed: aeson, optparse-applicative

Files

keystore.cabal +1/−1
src/Data/KeyStore/CLI/Command.hs +1/−0
src/Data/KeyStore/Types.hs +19/−0
src/Data/KeyStore/Types/NameAndSafeguard.hs +0/−1
src/Data/KeyStore/Types/PasswordStoreModel.hs +13/−0

keystore.cabal view

@@ -1,5 +1,5 @@ Name:                   keystore-Version:                0.8.0.1+Version:                0.8.0.2 Synopsis:               Managing stores of secret things Homepage:               http://github.com/cdornan/keystore Author:                 Chris Dornan

src/Data/KeyStore/CLI/Command.hs view

@@ -15,6 +15,7 @@ import           Data.KeyStore.KS.Opt import           Data.KeyStore.Types import           Data.KeyStore.IO.IC+import           Data.Monoid import           Data.String import           Text.Regex import qualified Data.Text              as T

src/Data/KeyStore/Types.hs view

@@ -38,6 +38,7 @@ import           Data.KeyStore.Types.NameAndSafeguard import           Data.KeyStore.Types.E import           Data.Aeson+import           Data.Aeson.Encoding import qualified Data.Map                       as Map import           Data.Monoid import qualified Data.Text                      as T@@ -49,6 +50,7 @@ import           Data.API.JSON import qualified Data.ByteString                as B import qualified Data.HashMap.Strict            as HM+import qualified Data.Text                      as T import qualified Data.Vector                    as V import           Text.Regex import qualified Crypto.PBKDF.ByteString        as P@@ -294,6 +296,23 @@      same b b' = comparing xf b b' == EQ +instance ToJSONKey Safeguard where+  toJSONKey = ToJSONKeyText f g+    where+      f = T.pack . printSafeguard+      g = text . T.pack . printSafeguard++instance ToJSONKey Name where+  toJSONKey = ToJSONKeyText f g+    where+      f = T.pack . _name+      g = text . T.pack . _name++instance ToJSONKey TriggerID where+  toJSONKey = ToJSONKeyText f g+    where+      f = _TriggerID+      g = text . _TriggerID  $(generateAPITools keystoreSchema                    [ enumTool

src/Data/KeyStore/Types/NameAndSafeguard.hs view

@@ -85,4 +85,3 @@  sg_sym_chs :: Set.Set Char sg_sym_chs = Set.fromList ".-_:'=#$%"-

src/Data/KeyStore/Types/PasswordStoreModel.hs view

@@ -19,6 +19,8 @@ module Data.KeyStore.Types.PasswordStoreModel where  import           Data.KeyStore.Types.PasswordStoreSchema+import           Data.Aeson+import           Data.Aeson.Encoding import qualified Data.Map                                 as Map import           Data.API.Tools import           Data.API.JSON@@ -50,6 +52,17 @@ prj_snmap :: SessionMap -> REP__SessionMap prj_snmap mp = REP__SessionMap [ SessionPasswordAssoc snm ssn | (snm,ssn)<-Map.toList mp ] +instance ToJSONKey SessionName where+  toJSONKey = ToJSONKeyText f g+    where+      f = _SessionName+      g = text . _SessionName++instance ToJSONKey PasswordName where+  toJSONKey = ToJSONKeyText f g+    where+      f = _PasswordName+      g = text . _PasswordName  $(generateAPITools passwordStoreSchema                    [ enumTool