From 36e9fa54d1b400772c6d4d10e053d910f6753f9a Mon Sep 17 00:00:00 2001 From: Dan Burton Date: Sun, 19 Feb 2012 14:59:52 -0700 Subject: [PATCH] Adding 'Network' prefix back to modules --- README.md | 8 +++++--- examples/BlackjackClient.hs | 4 ++-- examples/BlackjackData.hs | 2 +- examples/BlackjackServer.hs | 4 ++-- examples/Chat.hs | 4 ++-- examples/Echo.hs | 4 ++-- examples/Relay.hs | 4 ++-- examples/Telnet.hs | 5 +++-- netspec.cabal | 9 ++++++--- src/{ => Network}/NetSpec.hs | 2 +- src/{ => Network}/NetSpec/ByteString.hs | 2 +- src/{ => Network}/NetSpec/Json.hs | 4 ++-- src/{ => Network}/NetSpec/Text.hs | 2 +- 13 files changed, 30 insertions(+), 24 deletions(-) rename src/{ => Network}/NetSpec.hs (99%) rename src/{ => Network}/NetSpec/ByteString.hs (98%) rename src/{ => Network}/NetSpec/Json.hs (97%) rename src/{ => Network}/NetSpec/Text.hs (98%) diff --git a/README.md b/README.md index 7e98a8a..a2287e1 100644 --- a/README.md +++ b/README.md @@ -34,21 +34,23 @@ but at the same time tries to use a sensible implementation that can easily work with other programming languages and systems. {-# LANGUAGE OverloadedStrings #-} - import NetSpec.ByteString + import Network.NetSpec.ByteString -- or -- {-# LANGUAGE OverloadedStrings #-} - import NetSpec.Text + import Network.NetSpec.Text -- or -- {-# LANGUAGE TemplateHaskell #-} - import NetSpec.Json + import Network.NetSpec.Json You select whether you are a server or a client based on which kind of spec you run. + import Network.NetSpec + main = runSpec ServerSpec { ... } -- or -- diff --git a/examples/BlackjackClient.hs b/examples/BlackjackClient.hs index fbb4cc5..0f8241a 100644 --- a/examples/BlackjackClient.hs +++ b/examples/BlackjackClient.hs @@ -1,7 +1,7 @@ import BlackjackData -import NetSpec -import NetSpec.Json +import Network.NetSpec +import Network.NetSpec.Json import Control.Monad (void) import Data.List (intercalate) diff --git a/examples/BlackjackData.hs b/examples/BlackjackData.hs index 14c7d08..499e112 100644 --- a/examples/BlackjackData.hs +++ b/examples/BlackjackData.hs @@ -2,7 +2,7 @@ module BlackjackData where -import NetSpec.Json +import Network.NetSpec.Json data Suit = Heart diff --git a/examples/BlackjackServer.hs b/examples/BlackjackServer.hs index c4ec855..f1bb321 100644 --- a/examples/BlackjackServer.hs +++ b/examples/BlackjackServer.hs @@ -1,7 +1,7 @@ import BlackjackData -import NetSpec -import NetSpec.Json +import Network.NetSpec +import Network.NetSpec.Json import Control.Monad -- cabal install random-shuffle diff --git a/examples/Chat.hs b/examples/Chat.hs index e8bad72..f9c3724 100644 --- a/examples/Chat.hs +++ b/examples/Chat.hs @@ -1,7 +1,7 @@ {-# LANGUAGE OverloadedStrings #-} -import NetSpec -import NetSpec.Text +import Network.NetSpec +import Network.NetSpec.Text -- Notice the restrictions NetSpec places on how you can communicate. -- Working within NetSpec isn't well-suited for all situations; diff --git a/examples/Echo.hs b/examples/Echo.hs index e3e9869..e11112d 100644 --- a/examples/Echo.hs +++ b/examples/Echo.hs @@ -1,7 +1,7 @@ {-# LANGUAGE OverloadedStrings #-} -import NetSpec -import NetSpec.Text +import Network.NetSpec +import Network.NetSpec.Text main :: IO () main = runSpec ServerSpec diff --git a/examples/Relay.hs b/examples/Relay.hs index 478fdd1..5208982 100644 --- a/examples/Relay.hs +++ b/examples/Relay.hs @@ -1,7 +1,7 @@ {-# LANGUAGE OverloadedStrings #-} -import NetSpec -import NetSpec.Text +import Network.NetSpec +import Network.NetSpec.Text main :: IO () main = runSpec ServerSpec { diff --git a/examples/Telnet.hs b/examples/Telnet.hs index 0f2894e..706aac5 100644 --- a/examples/Telnet.hs +++ b/examples/Telnet.hs @@ -1,7 +1,8 @@ -- no need for OverloadedStrings -import NetSpec -import NetSpec.Text +import Network.NetSpec +import Network.NetSpec.Text + import System.Environment (getArgs) import Data.Text as T import Data.Text.IO as TIO diff --git a/netspec.cabal b/netspec.cabal index 58f775e..84281e3 100644 --- a/netspec.cabal +++ b/netspec.cabal @@ -1,5 +1,5 @@ name: netspec -version: 0.1.0.0 +version: 0.2.0.0 synopsis: Simplify static Networking tasks homepage: http://github.com/DanBurton/netspec @@ -24,7 +24,10 @@ cabal-version: >=1.8 library exposed-modules: - NetSpec, NetSpec.Json, NetSpec.Text, NetSpec.ByteString + Network.NetSpec, + Network.NetSpec.Json, + Network.NetSpec.Text, + Network.NetSpec.ByteString build-depends: base >= 4 && < 4.6, aeson == 0.6.*, @@ -44,4 +47,4 @@ source-repository head source-repository this type: git location: git://github.com/DanBurton/netspec.git - tag: netspec-0.1.0.0 + tag: netspec-0.2.0.0 diff --git a/src/NetSpec.hs b/src/Network/NetSpec.hs similarity index 99% rename from src/NetSpec.hs rename to src/Network/NetSpec.hs index 82b02d9..26eb10c 100644 --- a/src/NetSpec.hs +++ b/src/Network/NetSpec.hs @@ -1,5 +1,5 @@ -- | Simplify static Networking tasks. -module NetSpec ( +module Network.NetSpec ( -- * Types and Constructors NetSpec (..) , SpecState (..) diff --git a/src/NetSpec/ByteString.hs b/src/Network/NetSpec/ByteString.hs similarity index 98% rename from src/NetSpec/ByteString.hs rename to src/Network/NetSpec/ByteString.hs index 65a6c37..caf7dbe 100644 --- a/src/NetSpec/ByteString.hs +++ b/src/Network/NetSpec/ByteString.hs @@ -4,7 +4,7 @@ -- For this module, a message is prefixed by a -- 64-bit little-endian signed integer, indicating the length in bytes -- of the remaining message. -module NetSpec.ByteString ( +module Network.NetSpec.ByteString ( -- * Receiving receive -- * Sending diff --git a/src/NetSpec/Json.hs b/src/Network/NetSpec/Json.hs similarity index 97% rename from src/NetSpec/Json.hs rename to src/Network/NetSpec/Json.hs index 5372fa7..622bae7 100644 --- a/src/NetSpec/Json.hs +++ b/src/Network/NetSpec/Json.hs @@ -4,7 +4,7 @@ -- For this module, a message is prefixed by a -- 64-bit little-endian signed integer, indicating the length in bytes -- of the remaining message, which is encoded in JSON format. -module NetSpec.Json ( +module Network.NetSpec.Json ( -- * Receiving receive -- * Sending @@ -28,7 +28,7 @@ import Data.Aeson.TH (deriveJSON) import Data.Foldable as F (Foldable, mapM_) import Language.Haskell.TH (Name, Q, Dec) -import qualified NetSpec.ByteString as B (send, receive) +import qualified Network.NetSpec.ByteString as B (send, receive) -- | Derives 'A.ToJSON' and 'A.FromJSON' instances -- for your data types. These are necessary in order to diff --git a/src/NetSpec/Text.hs b/src/Network/NetSpec/Text.hs similarity index 98% rename from src/NetSpec/Text.hs rename to src/Network/NetSpec/Text.hs index c936426..0d941be 100644 --- a/src/NetSpec/Text.hs +++ b/src/Network/NetSpec/Text.hs @@ -3,7 +3,7 @@ -- | Use 'X.Text' to send and receive messages. -- For this module, a message is a single line; -- the newline character acts as the end-of-message flag. -module NetSpec.Text ( +module Network.NetSpec.Text ( -- * Receiving receive -- * Sending