X-Git-Url: http://gitweb.michael.orlitzky.com/?p=hath.git;a=blobdiff_plain;f=hath.cabal;h=6e9d036995667652a33e52f81b05d63cb11a3225;hp=48db071634c5a31763ef2d78cad6e69a0042067b;hb=a1a1484ae97e3543496c32f326ac0952ac7f7103;hpb=c8cda71c4a73a4995669c0aaa9dce904bd2dcbd6

diff --git a/hath.cabal b/hath.cabal
index 48db071..6e9d036 100644
--- a/hath.cabal
+++ b/hath.cabal
@@ -1,14 +1,16 @@
 name:           hath
-version:        0.0.4
+version:        0.4.2
 cabal-version:  >= 1.8
 author:         Michael Orlitzky
 maintainer:	Michael Orlitzky <michael@orlitzky.com>
+homepage:       http://michael.orlitzky.com/code/hath.xhtml
 category:       Utils
-license:        GPL-3
+license:        AGPL-3
 license-file:   doc/LICENSE
 build-type:     Simple
 extra-source-files:
   doc/man1/hath.1
+  test/shell/*.test
 synopsis:
   Hath manipulates network blocks in CIDR notation.
 description:
@@ -23,6 +25,8 @@ description:
       consecutive \/24s, they might combine into a larger \/23.
   .
     * View the result of block combination in a useful way.
+  .
+    * List them.
   .
   Hath has several modes to perform these functions:
   .
@@ -46,30 +50,28 @@ description:
   .
     [@Listed@]
     List the IP addresses contained within the given CIDRs.
-  .
-    [@Reversed@]
-    Perform reverse DNS (PTR) lookups on the IP addresses contained
-    within the given CIDRs.
   .
   /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
+  $ echo \"10.0.0.0\/29 10.0.0.8\/29\" | hath
+  ((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
+  $ echo \"10.0.0.0\/24 10.0.1.0\/24\" | hath reduced
+  10.0.0.0/23
   @
   .
   List the addresses in 192.168.0.240\/29:
   .
   @
-  $ hath listed <<< \"192.168.0.240\/29\"
+  $ echo 192.168.0.240\/29 | hath listed
   192.168.0.240
   192.168.0.241
   192.168.0.242
@@ -80,29 +82,11 @@ description:
   192.168.0.247
   @
   .
-  Perform PTR lookups on all of 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.
-  198.41.0.7:
-  @
+  The command-line syntax and complete set of options are documented in
+  the man page.
+
 
 executable hath
-  build-depends:
-    base                        >= 4.6.0,
-    bytestring                  == 0.10.*,
-    dns                         == 0.3.*,
-    HUnit                       == 1.2.*,
-    QuickCheck                  == 2.6.*,
-    MissingH                    == 1.2.*,
-    parallel-io                 == 0.3.*,
-    split                       == 0.2.*,
-    test-framework              == 0.8.*,
-    test-framework-hunit        == 0.3.*,
-    test-framework-quickcheck2  == 0.3.*
 
   main-is:
     Main.hs
@@ -114,52 +98,76 @@ executable hath
     Bit
     Cidr
     CommandLine
-    DNS
     ExitCodes
     IPv4Address
     Maskable
     Maskbits
     Octet
 
+  build-depends:
+    base                        >= 4.9 && < 5,
+    cmdargs                     >= 0.10,
+    split                       >= 0.2,
+    tasty                       >= 0.8,
+    tasty-hunit                 >= 0.8,
+    tasty-quickcheck            >= 0.8.1
+
   ghc-options:
-    -Wall
-    -fwarn-hi-shadowing
-    -fwarn-missing-signatures
-    -fwarn-name-shadowing
-    -fwarn-orphans
-    -fwarn-type-defaults
-    -fwarn-tabs
-    -fwarn-incomplete-record-updates
-    -fwarn-monomorphism-restriction
-    -fwarn-unused-do-bind
+    -Weverything
+    -Wno-implicit-prelude
+    -Wno-safe
+    -Wno-unsafe
+    -Wno-all-missed-specialisations
     -rtsopts
     -threaded
     -optc-O3
     -optc-march=native
     -O2
 
-  ghc-prof-options:
-    -prof
-    -auto-all
-    -caf-all
-
 
 test-suite testsuite
   type: exitcode-stdio-1.0
   hs-source-dirs: src test
   main-is: TestSuite.hs
+
+  build-depends:
+    base                        == 4.*,
+    cmdargs                     >= 0.10,
+    split                       >= 0.2,
+    tasty                       >= 0.8,
+    tasty-hunit                 >= 0.8,
+    tasty-quickcheck            >= 0.8.1
+
+
+  -- It's not entirely clear to me why I have to reproduce all of this.
+  ghc-options:
+    -Weverything
+    -Wno-implicit-prelude
+    -Wno-safe
+    -Wno-unsafe
+    -Wno-all-missed-specialisations
+    -rtsopts
+    -threaded
+    -optc-O3
+    -optc-march=native
+    -O2
+
+
+-- These won't work without shelltestrunner installed in your
+-- $PATH. Maybe there is some way to tell Cabal that.
+test-suite shelltests
+  type: exitcode-stdio-1.0
+  hs-source-dirs: test
+  main-is: ShellTests.hs
+
   build-depends:
-    base                        >= 4.6.0,
-    bytestring                  == 0.10.*,
-    dns                         == 0.3.*,
-    HUnit                       == 1.2.*,
-    QuickCheck                  == 2.6.*,
-    MissingH                    == 1.2.*,
-    parallel-io                 == 0.3.*,
-    split                       == 0.2.*,
-    test-framework              == 0.8.*,
-    test-framework-hunit        == 0.3.*,
-    test-framework-quickcheck2  == 0.3.*
+    base                        == 4.*,
+    cmdargs                     >= 0.10,
+    process                     >= 1.1,
+    split                       >= 0.2,
+    tasty                       >= 0.8,
+    tasty-hunit                 >= 0.8,
+    tasty-quickcheck            >= 0.8.1
 
   -- It's not entirely clear to me why I have to reproduce all of this.
   ghc-options:
@@ -181,5 +189,5 @@ test-suite testsuite
 
 source-repository head
   type: git
-  location: http://michael.orlitzky.com/git/hath.git
+  location: http://gitweb.michael.orlitzky.com/hath.git
   branch: master