X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=hath.cabal;h=4d5b6b8306ad790a6ee521534c7b1129566d9cde;hb=02a793ab4325e5d04eb3ae3450aa33d01b4b4d1c;hp=b11ea39d3a69bbe57fab5f9af9d0ffffc0729fc2;hpb=18a81546e7c4ad10574918efb08b2e104e911d73;p=hath.git diff --git a/hath.cabal b/hath.cabal index b11ea39..4d5b6b8 100644 --- a/hath.cabal +++ b/hath.cabal @@ -1,5 +1,5 @@ name: hath -version: 0.0.4 +version: 0.2.2 cabal-version: >= 1.8 author: Michael Orlitzky maintainer: Michael Orlitzky @@ -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: @@ -24,7 +26,11 @@ description: . * View the result of block combination in a useful way. . - Hath has four modes to perform these functions: + * List them. + . + * Find their associated PTR records. + . + Hath has several modes to perform these functions: . [@Regexed@] This computes a (Perl-compatible) regular expression matching @@ -43,9 +49,24 @@ description: [@Diffed@] Shows what would change if you used reduce. Uses diff-like notation. + . + [@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/: . + Compute a (Perl-compatible) regular expression matching + the input CIDR blocks. It's the default mode of operation. + . + @ + $ 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)) + @ + . Combine two \/24s into a \/23: . @ @@ -53,26 +74,48 @@ description: 10.0.0.0/23 @ . - Create a perl-compatible regex to be fed to grep: + List the addresses in 192.168.0.240\/29: + . + @ + $ hath listed <<< 192.168.0.240\/29 + 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 + @ + . + Perform PTR lookups on all of 198.41.0.4\/30: . @ - $ grep -P `hath regexed -i cidrs.txt` mail.log + $ 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 DNS lookups are usually the bottleneck for this mode, but we can + perform them in parallel. Simply pass the number of threads to the + GHC runtime on the command line; for example, the following will + perform 25 lookups in parallel: + . + @ + $ 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 - 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 @@ -91,6 +134,18 @@ executable hath Maskbits Octet + build-depends: + base == 4.*, + bytestring >= 0.10, + cmdargs >= 0.10, + dns >= 1.2, + MissingH >= 1.2, + parallel-io >= 0.3, + split >= 0.2, + tasty >= 0.8, + tasty-hunit >= 0.8, + tasty-quickcheck >= 0.8.1 + ghc-options: -Wall -fwarn-hi-shadowing @@ -118,18 +173,19 @@ test-suite testsuite type: exitcode-stdio-1.0 hs-source-dirs: src test main-is: TestSuite.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.*, + bytestring >= 0.10, + cmdargs >= 0.10, + dns >= 1.2, + MissingH >= 1.2, + parallel-io >= 0.3, + 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: @@ -149,6 +205,83 @@ test-suite testsuite -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.*, + bytestring >= 0.10, + cmdargs >= 0.10, + dns >= 1.2, + MissingH >= 1.2, + parallel-io >= 0.3, + 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: + -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 + + +test-suite shelltests-net + type: exitcode-stdio-1.0 + hs-source-dirs: test + main-is: ShellTestsNet.hs + + build-depends: + base == 4.*, + bytestring >= 0.10, + cmdargs >= 0.10, + dns >= 1.2, + MissingH >= 1.2, + parallel-io >= 0.3, + 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: + -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