X-Git-Url: http://gitweb.michael.orlitzky.com/?p=hath.git;a=blobdiff_plain;f=hath.cabal;h=8660a81b41c289100ab61bdc56b3d2932e8f7ba1;hp=ccaef8a78f704342e4f139e80afa895c5aeac20a;hb=d1ed8de0ddf82fa939fd225295e34a656096614f;hpb=a2afcdfec4ded920e133f28e069275caadc890c0 diff --git a/hath.cabal b/hath.cabal index ccaef8a..8660a81 100644 --- a/hath.cabal +++ b/hath.cabal @@ -1,16 +1,16 @@ name: hath -version: 0.2.1 -cabal-version: >= 1.8 +version: 0.5.1 +cabal-version: >= 1.10 author: Michael Orlitzky maintainer: Michael Orlitzky +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 - test/shell-net/*.test synopsis: Hath manipulates network blocks in CIDR notation. description: @@ -27,8 +27,6 @@ description: * View the result of block combination in a useful way. . * List them. - . - * Find their associated PTR records. . Hath has several modes to perform these functions: . @@ -52,10 +50,6 @@ 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/: . @@ -63,21 +57,21 @@ description: the input CIDR blocks. It's the default mode of operation. . @ - $ hath <<< \"10.0.0.0\/29 10.0.0.8\/29\" + $ 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 @ . 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 @@ -88,29 +82,6 @@ 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 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. @@ -127,85 +98,43 @@ executable hath Bit Cidr CommandLine - DNS ExitCodes IPv4Address Maskable Maskbits Octet + Paths_hath build-depends: - base >= 4.6 && < 4.8, - 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.*, + base >= 4.15, + 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 - -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 + other-modules: + Bit + Cidr + IPv4Address + Maskable + Maskbits + Octet + build-depends: - base >= 4.6 && < 4.8, - 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.*, + base >= 4.15, + 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 - - -- These won't work without shelltestrunner installed in your -- $PATH. Maybe there is some way to tell Cabal that. test-suite shelltests @@ -214,75 +143,11 @@ test-suite shelltests main-is: ShellTests.hs build-depends: - base >= 4.6 && < 4.8, - bytestring == 0.10.*, - cmdargs == 0.10.*, - dns >= 1.2, - MissingH == 1.2.*, - parallel-io == 0.3.*, - process < 1.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: - -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.6 && < 4.8, - bytestring == 0.10.*, - cmdargs == 0.10.*, - dns >= 1.2, - MissingH == 1.2.*, - parallel-io == 0.3.*, - process < 1.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: - -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 + base >= 4.15, + process >= 1.1 source-repository head type: git - location: http://michael.orlitzky.com/git/hath.git + location: http://gitweb.michael.orlitzky.com/hath.git branch: master