hopenpgp-tools 0.7.1 → 0.7.2

raw patch · 2 files changed

+8/−5 lines, 2 filesdep +graphvizdep ~fgl

Dependencies added: graphviz

Dependency ranges changed: fgl

Files

• hokey.hs +4/−2
• hopenpgp-tools.cabal +4/−3

@@ -45,8 +45,9 @@ import Data.Data.Lens (biplate) import Data.Either (rights) import Data.Graph.Inductive.Graph (Graph(mkGraph))-import Data.Graph.Inductive.Graphviz (graphviz, Orient(..)) import Data.Graph.Inductive.PatriciaTree (Gr)+import Data.GraphViz (graphToDot, nonClusteredParams)+import Data.GraphViz.Types (printDotGraph) import qualified Data.IxSet as IxSet import Data.List (unfoldr, elemIndex, findIndex, sortBy, intercalate, nub, sort) import qualified Data.Map as Map@@ -54,6 +55,7 @@ import Data.Monoid ((<>), mconcat, Monoid(..)) import Data.Ord (comparing, Down(..)) import Data.Serialize (get)+import qualified Data.Text.Lazy.IO as TLIO import Data.Time.Clock.POSIX (getPOSIXTime, posixSecondsToUTCTime, POSIXTime) import Data.Time.Format (formatTime) import Data.Traversable (traverse)@@ -294,7 +296,7 @@ doGraph o = do     cpt <- getPOSIXTime     kr <- runResourceT $ CB.sourceHandle stdin $= conduitGet get $= conduitToTKsDropping $$ sinkKeyringMap-    putStrLn $ graphviz (buildKeyGraph ((buildMaps &&& id) (rights (map (verifyTKWith (verifySigWith (verifyAgainstKeyring kr)) (Just (posixSecondsToUTCTime cpt))) (IxSet.toList kr))))) "Keys" (8.5,11.0) (1,1) Landscape+    TLIO.putStrLn . printDotGraph $ graphToDot nonClusteredParams (buildKeyGraph ((buildMaps &&& id) (rights (map (verifyTKWith (verifySigWith (verifyAgainstKeyring kr)) (Just (posixSecondsToUTCTime cpt))) (IxSet.toList kr)))))  banner' :: Handle -> IO () banner' h = hPutStrLn h (banner "hokey" ++ "\n" ++ warranty "hokey")

@@ -1,5 +1,5 @@ name:                hopenpgp-tools-version:             0.7.1+version:             0.7.2 synopsis:            hOpenPGP-based command-line tools description:         command-line tools for performing some OpenPGP-related operations homepage:            http://floss.scru.org/hopenpgp-tools@@ -51,7 +51,8 @@                ,       cryptohash             >= 0.7.7                ,       directory                ,       errors-               ,       fgl                              < 5.5+               ,       fgl+               ,       graphviz                ,       hOpenPGP               >= 1.2                ,       ixset                ,       lens@@ -94,4 +95,4 @@ source-repository this   type:     git   location: git://git.debian.org/users/clint/hopenpgp-tools.git-  tag:      hopenpgp-tools/0.7.1+  tag:      hopenpgp-tools/0.7.2