X-Git-Url: http://gitweb.michael.orlitzky.com/?p=hath.git;a=blobdiff_plain;f=hath.cabal;h=8660a81b41c289100ab61bdc56b3d2932e8f7ba1;hp=4431b842b625a9f285f88933bbbae73679c319e1;hb=d1ed8de0ddf82fa939fd225295e34a656096614f;hpb=70dce336e3261027dc135faebed85ea443525974

diff --git a/hath.cabal b/hath.cabal
index 4431b84..8660a81 100644
--- a/hath.cabal
+++ b/hath.cabal
@@ -1,9 +1,16 @@
 name:           hath
-version:        0.0.1
-cabal-version:  >= 1.8
+version:        0.5.1
+cabal-version:  >= 1.10
 author:         Michael Orlitzky
 maintainer:	Michael Orlitzky <michael@orlitzky.com>
+homepage:       http://michael.orlitzky.com/code/hath.xhtml
+category:       Utils
+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:
@@ -19,7 +26,9 @@ description:
   .
     * View the result of block combination in a useful way.
   .
-  Hath has four modes to perform these functions:
+    * List them.
+  .
+  Hath has several modes to perform these functions:
   .
     [@Regexed@]
     This computes a (Perl-compatible) regular expression matching
@@ -38,32 +47,46 @@ description:
     [@Diffed@]
     Shows what would change if you used reduce. Uses diff-like
     notation.
+  .
+    [@Listed@]
+    List the IP addresses contained within the given CIDRs.
   .
   /Examples/:
   .
+  Compute a (Perl-compatible) regular expression matching
+  the input CIDR blocks. It's the default mode of operation.
+  .
+  @
+  $ 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))
+  @
+  .
   Combine two \/24s into a \/23:
   .
   @
-  $ hath reduced <<< \"10.0.0.0\/24 10.0.1.0\/24\"
+  $ echo \"10.0.0.0\/24 10.0.1.0\/24\" | hath reduced
   10.0.0.0/23
   @
   .
-  Create a perl-compatible regex to be fed to grep:
+  List the addresses in 192.168.0.240\/29:
   .
   @
-  $ grep -P `hath regexed -i cidrs.txt` mail.log
+  $ echo 192.168.0.240\/29 | hath listed
+  192.168.0.240
+  192.168.0.241
+  192.168.0.242
+  192.168.0.243
+  192.168.0.244
+  192.168.0.245
+  192.168.0.246
+  192.168.0.247
   @
+  .
+  The command-line syntax and complete set of options are documented in
+  the man page.
+
 
 executable hath
-  build-depends:
-    base                        == 4.*,
-    HUnit                       == 1.2.*,
-    QuickCheck                  == 2.6.*,
-    MissingH                    == 1.2.*,
-    split                       == 0.2.*,
-    test-framework              == 0.8.*,
-    test-framework-hunit        == 0.3.*,
-    test-framework-quickcheck2  == 0.3.*
 
   main-is:
     Main.hs
@@ -71,62 +94,60 @@ executable hath
   hs-source-dirs:
     src/
 
-  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
-    -rtsopts
-    -threaded
-    -optc-O3
-    -optc-march=native
-    -O2
+  other-modules:
+    Bit
+    Cidr
+    CommandLine
+    ExitCodes
+    IPv4Address
+    Maskable
+    Maskbits
+    Octet
+    Paths_hath
 
-  ghc-prof-options:
-    -prof
-    -auto-all
-    -caf-all
+  build-depends:
+    base                        >= 4.15,
+    cmdargs                     >= 0.10,
+    split                       >= 0.2,
+    tasty                       >= 0.8,
+    tasty-hunit                 >= 0.8,
+    tasty-quickcheck            >= 0.8.1
 
 
 test-suite testsuite
   type: exitcode-stdio-1.0
   hs-source-dirs: src test
   main-is: TestSuite.hs
+
+  other-modules:
+    Bit
+    Cidr
+    IPv4Address
+    Maskable
+    Maskbits
+    Octet
+
+  build-depends:
+    base                        >= 4.15,
+    split                       >= 0.2,
+    tasty                       >= 0.8,
+    tasty-hunit                 >= 0.8,
+    tasty-quickcheck            >= 0.8.1
+
+
+-- 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.*,
-    HUnit                       == 1.2.*,
-    QuickCheck                  == 2.6.*,
-    MissingH                    == 1.2.*,
-    split                       == 0.2.*,
-    test-framework              == 0.8.*,
-    test-framework-hunit        == 0.3.*,
-    test-framework-quickcheck2  == 0.3.*
+    base                        >= 4.15,
+    process                     >= 1.1
 
-  -- It's not entirely clear to me why I have to reproduce all of this.
-  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
-    -rtsopts
-    -threaded
-    -optc-O3
-    -optc-march=native
-    -O2
 
 source-repository head
   type: git
-  location: http://michael.orlitzky.com/git/hath.git
+  location: http://gitweb.michael.orlitzky.com/hath.git
   branch: master