Adding 'Network' prefix back to modules

DanBurton · Feb 19, 2012 · 36e9fa5 · 36e9fa5
1 parent 470e90f
commit 36e9fa5
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 24 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → src/Network/NetSpec.hs b/src/NetSpec.hs → 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 → src/Network/NetSpec/ByteString.hs b/src/NetSpec/ByteString.hs → 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 → src/Network/NetSpec/Json.hs b/src/NetSpec/Json.hs → 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 → src/Network/NetSpec/Text.hs b/src/NetSpec/Text.hs → 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