X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=hath.cabal;h=9f2d972dcdaefd217b10ecca5f97eb5c90143bc5;hb=eee156f562f9c1c1194a67cef12f146304d88ce9;hp=723c644cc56bdd5ce492591ca83aea0be64c0f37;hpb=a2fe46950a637e64fb5056fce091bf398b983a79;p=hath.git

diff --git a/hath.cabal b/hath.cabal
index 723c644..9f2d972 100644
--- a/hath.cabal
+++ b/hath.cabal
@@ -1,5 +1,5 @@
 name:           hath
-version:        0.0.6
+version:        0.1.3
 cabal-version:  >= 1.8
 author:         Michael Orlitzky
 maintainer:	Michael Orlitzky <michael@orlitzky.com>
@@ -9,6 +9,8 @@ license-file:   doc/LICENSE
 build-type:     Simple
 extra-source-files:
   doc/man1/hath.1
+  test/shell/*.test
+  test/shell-net/*.test
 synopsis:
   Hath manipulates network blocks in CIDR notation.
 description:
@@ -57,23 +59,25 @@ description:
   .
   /Examples/:
   .
-  Combine two \/24s into a \/23:
+  Compute a (Perl-compatible) regular expression matching
+  the input CIDR blocks. It's the default mode of operation.
   .
   @
-  $ hath reduced <<< \"10.0.0.0\/24 10.0.1.0\/24\"
-  10.0.0.0/23
+  $ hath <<< \"10.0.0.0\/29 10.0.0.8\/29\"
+  ((10)\.(0)\.(0)\.(15|14|13|12|11|10|9|8|7|6|5|4|3|2|1|0))
   @
   .
-  Create a perl-compatible regex to be fed to grep:
+  Combine two \/24s into a \/23:
   .
   @
-  $ grep -P `hath regexed -i cidrs.txt` mail.log
+  $ hath reduced <<< \"10.0.0.0\/24 10.0.1.0\/24\"
+  10.0.0.0/23
   @
   .
   List the addresses in 192.168.0.240\/29:
   .
   @
-  $ hath listed <<< \"192.168.0.240\/29\"
+  $ hath listed <<< 192.168.0.240\/29
   192.168.0.240
   192.168.0.241
   192.168.0.242
@@ -87,7 +91,7 @@ description:
   Perform PTR lookups on all of 198.41.0.4\/30:
   .
   @
-  hath reversed <<< \"198.41.0.4\/30\"
+  $ hath reversed <<< 198.41.0.4\/30
   198.41.0.4: a.root-servers.net.
   198.41.0.5:
   198.41.0.6: rs.internic.net.
@@ -100,12 +104,16 @@ description:
   perform 25 lookups in parallel:
   .
   @
-  hath reversed +RTS -N25 <<< \"198.41.0.4\/24\"
+  $ hath reversed +RTS -N25 <<< 198.41.0.4\/24
   198.41.0.4: a.root-servers.net.
   198.41.0.5:
   198.41.0.6: rs.internic.net.
   ...
   @
+  .
+  The command-line syntax and complete set of options are documented in
+  the man page.
+
 
 executable hath
 
@@ -130,15 +138,14 @@ executable hath
     base                        >= 4.6 && < 4.7,
     bytestring                  == 0.10.*,
     cmdargs                     == 0.10.*,
-    dns                         == 1.*,
-    HUnit                       == 1.2.*,
-    QuickCheck                  == 2.6.*,
+    dns                         >= 1.2,
     MissingH                    == 1.2.*,
     parallel-io                 == 0.3.*,
+    QuickCheck                  == 2.7.*,
     split                       == 0.2.*,
-    test-framework              == 0.8.*,
-    test-framework-hunit        == 0.3.*,
-    test-framework-quickcheck2  == 0.3.*
+    tasty                       == 0.8.*,
+    tasty-hunit                 == 0.8.*,
+    tasty-quickcheck            == 0.8.*
 
   ghc-options:
     -Wall
@@ -172,15 +179,15 @@ test-suite testsuite
     base                        >= 4.6 && < 4.7,
     bytestring                  == 0.10.*,
     cmdargs                     == 0.10.*,
-    dns                         == 1.*,
-    HUnit                       == 1.2.*,
-    QuickCheck                  == 2.6.*,
+    dns                         >= 1.2,
     MissingH                    == 1.2.*,
     parallel-io                 == 0.3.*,
+    QuickCheck                  == 2.7.*,
     split                       == 0.2.*,
-    test-framework              == 0.8.*,
-    test-framework-hunit        == 0.3.*,
-    test-framework-quickcheck2  == 0.3.*
+    tasty                       == 0.8.*,
+    tasty-hunit                 == 0.8.*,
+    tasty-quickcheck            == 0.8.*
+
 
   -- It's not entirely clear to me why I have to reproduce all of this.
   ghc-options:
@@ -212,16 +219,15 @@ test-suite shelltests
     base                        >= 4.6 && < 4.7,
     bytestring                  == 0.10.*,
     cmdargs                     == 0.10.*,
-    dns                         == 1.*,
-    HUnit                       == 1.2.*,
-    QuickCheck                  == 2.6.*,
+    dns                         >= 1.2,
     MissingH                    == 1.2.*,
     parallel-io                 == 0.3.*,
     process                     == 1.1.*,
+    QuickCheck                  == 2.7.*,
     split                       == 0.2.*,
-    test-framework              == 0.8.*,
-    test-framework-hunit        == 0.3.*,
-    test-framework-quickcheck2  == 0.3.*
+    tasty                       == 0.8.*,
+    tasty-hunit                 == 0.8.*,
+    tasty-quickcheck            == 0.8.*
 
   -- It's not entirely clear to me why I have to reproduce all of this.
   ghc-options:
@@ -251,16 +257,15 @@ test-suite shelltests-net
     base                        >= 4.6 && < 4.7,
     bytestring                  == 0.10.*,
     cmdargs                     == 0.10.*,
-    dns                         == 1.*,
-    HUnit                       == 1.2.*,
-    QuickCheck                  == 2.6.*,
+    dns                         >= 1.2,
     MissingH                    == 1.2.*,
     parallel-io                 == 0.3.*,
     process                     == 1.1.*,
+    QuickCheck                  == 2.7.*,
     split                       == 0.2.*,
-    test-framework              == 0.8.*,
-    test-framework-hunit        == 0.3.*,
-    test-framework-quickcheck2  == 0.3.*
+    tasty                       == 0.8.*,
+    tasty-hunit                 == 0.8.*,
+    tasty-quickcheck            == 0.8.*
 
   -- It's not entirely clear to me why I have to reproduce all of this.
   ghc-options: