Update the Morse code application from ch14

Author: dwayne

ch14/morse/LICENSE

@@ -1,4 +1,4 @@
-Copyright Author name here (c) 2016
+Copyright Dwayne Crooks (c) 2017
 
 All rights reserved.
 
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are met:
       disclaimer in the documentation and/or other materials provided
       with the distribution.
 
-    * Neither the name of Author name here nor the names of other
+    * Neither the name of Dwayne Crooks nor the names of other
       contributors may be used to endorse or promote products derived
       from this software without specific prior written permission.
 

ch14/morse/src/Main.hs renamed to ch14/morse/app/Main.hs

@@ -2,12 +2,33 @@ module Main where
 
 import Control.Monad (forever, when)
 import Data.List (intercalate)
--- import Data.Traversable (traverse)
+import Data.Traversable (traverse)
 import Morse (stringToMorse, morseToChar)
 import System.Environment (getArgs)
 import System.Exit (exitFailure, exitSuccess)
 import System.IO (hGetLine, hIsEOF, stdin)
 
+
+main :: IO ()
+main = do
+  mode <- getArgs
+  case mode of
+    [arg] ->
+      case arg of
+        "from" -> convertFromMorse
+        "to" -> convertToMorse
+        _ -> argError
+    _ -> argError
+  where
+    argError = do
+      putStrLn "Please specify the\
+                \ first argument\
+                \ as being 'from' or\
+                \ 'to' morse,\
+                \ such as: morse to"
+      exitFailure
+
+
 convertToMorse :: IO ()
 convertToMorse = forever $ do
   weAreDone <- hIsEOF stdin
@@ -20,11 +41,12 @@ convertToMorse = forever $ do
     convertLine line = do
       let morse = stringToMorse line
       case morse of
-        (Just str) -> putStrLn $ intercalate " " str
+        Just str -> putStrLn $ intercalate " " str
         Nothing -> do
           putStrLn $ "ERROR: " ++ line
           exitFailure
 
+
 convertFromMorse :: IO ()
 convertFromMorse = forever $ do
   weAreDone <- hIsEOF stdin
@@ -38,32 +60,7 @@ convertFromMorse = forever $ do
       let decoded :: Maybe String
           decoded = traverse morseToChar (words line)
       case decoded of
-        (Just s) -> putStrLn s
+        Just s -> putStrLn s
         Nothing -> do
           putStrLn $ "ERROR: " ++ line
           exitFailure
-
-main :: IO ()
-main = do
-  mode <- getArgs
-  case mode of
-    [arg] ->
-      case arg of
-        "from" -> convertFromMorse
-        "to" -> convertToMorse
-        _ -> argError
-    _ -> argError
-
-  where
-    argError = do
-      putStrLn "Please specify the first argument as being \
-        \'from' or 'to' morse, such as: morse to"
-      exitFailure
-
--- Test cases
--- echo "hi" | stack exec morse to
--- .... ..
--- echo ".... .." | stack exec morse from
--- hi
--- echo ".... . .-.. .-.. ---" | stack exec morse from
--- hello

ch14/morse/morse.cabal

@@ -1,43 +1,48 @@
 name:                morse
 version:             0.1.0.0
-synopsis:            Morse code
-description:         Please see README.md
-homepage:            https://github.com/dwayne/morse
+-- synopsis:
+-- description:
+homepage:            https://github.com/dwayne/morse#readme
 license:             BSD3
 license-file:        LICENSE
 author:              Dwayne Crooks
 maintainer:          me@dwaynecrooks.com
-copyright:           2016 Dwayne Crooks
+copyright:           2017 Dwayne Crooks
 category:            Text
 build-type:          Simple
+extra-source-files:  README.md
 cabal-version:       >=1.10
 
-executable morse
+library
   hs-source-dirs:      src
-  main-is:             Main.hs
+  exposed-modules:     Morse
   ghc-options:         -Wall -fwarn-tabs
-  default-language:    Haskell2010
   build-depends:       base >= 4.7 && < 5
                      , containers
-                     , morse
                      , QuickCheck
+  default-language:    Haskell2010
 
-library
-  hs-source-dirs:     src
-  exposed-modules:    Morse
-  ghc-options:        -Wall -fwarn-tabs
-  default-language:   Haskell2010
-  build-depends:      base >= 4.7 && < 5
-                    , containers
-                    , QuickCheck
+executable morse
+  hs-source-dirs:      app
+  main-is:             Main.hs
+  ghc-options:         -threaded -rtsopts -with-rtsopts=-N -Wall -fwarn-tabs
+  build-depends:       base
+                     , containers
+                     , morse
+                     , QuickCheck
+  default-language:    Haskell2010
 
 test-suite tests
-  hs-source-dirs:     tests
-  ghc-options:        -Wall -fno-warn-orphans
-  type:               exitcode-stdio-1.0
-  main-is:            tests.hs
-  default-language:   Haskell2010
-  build-depends:      base >= 4.7 && < 5
-                    , containers
-                    , morse
-                    , QuickCheck
+  type:                exitcode-stdio-1.0
+  hs-source-dirs:      tests
+  main-is:             tests.hs
+  build-depends:       base
+                     , containers
+                     , morse
+                     , QuickCheck
+  ghc-options:         -threaded -rtsopts -with-rtsopts=-N -Wall -fno-warn-orphans
+  default-language:    Haskell2010
+
+source-repository head
+  type:     git
+  location: https://github.com/dwayne/morse

ch14/morse/src/Morse.hs

@@ -9,9 +9,11 @@ module Morse
 
 import qualified Data.Map as M
 
+
 type Morse = String
 
-letterToMorse :: (M.Map Char Morse)
+
+letterToMorse :: M.Map Char Morse
 letterToMorse = M.fromList
   [ ('a', ".-")
   , ('b', "-...")
@@ -51,14 +53,22 @@ letterToMorse = M.fromList
   , ('0', "-----")
   ]
 
+
 morseToLetter :: M.Map Morse Char
-morseToLetter = M.foldWithKey (flip M.insert) M.empty letterToMorse
+morseToLetter =
+  M.foldWithKey (flip M.insert) M.empty letterToMorse
+
 
 charToMorse :: Char -> Maybe Morse
-charToMorse c = M.lookup c letterToMorse
+charToMorse c =
+  M.lookup c letterToMorse
+
 
 stringToMorse :: String -> Maybe [Morse]
-stringToMorse s = sequence $ fmap charToMorse s
+stringToMorse s =
+  sequence $ fmap charToMorse s
+
 
 morseToChar :: Morse -> Maybe Char
-morseToChar m = M.lookup m morseToLetter
+morseToChar m =
+  M.lookup m morseToLetter

ch14/morse/stack.yaml

@@ -1,25 +1,25 @@
 # This file was automatically generated by 'stack init'
-# 
+#
 # Some commonly used options have been documented as comments in this file.
 # For advanced use and comprehensive documentation of the format, please see:
 # http://docs.haskellstack.org/en/stable/yaml_configuration/
 
 # Resolver to choose a 'specific' stackage snapshot or a compiler version.
 # A snapshot resolver dictates the compiler version and the set of packages
 # to be used for project dependencies. For example:
-# 
+#
 # resolver: lts-3.5
 # resolver: nightly-2015-09-21
 # resolver: ghc-7.10.2
 # resolver: ghcjs-0.1.0_ghc-7.10.2
 # resolver:
 #  name: custom-snapshot
 #  location: "./custom-snapshot.yaml"
-resolver: lts-5.15
+resolver: lts-8.2
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.
-# 
+#
 # packages:
 # - some-directory
 # - https://example.com/foo/bar/baz-0.0.2.tar.gz
@@ -31,7 +31,7 @@ resolver: lts-5.15
 #  subdirs:
 #  - auto-update
 #  - wai
-# 
+#
 # A package marked 'extra-dep: true' will only be built if demanded by a
 # non-dependency (i.e. a user package), and its test suites and benchmarks
 # will not be run. This is useful for tweaking upstream packages.
@@ -49,18 +49,18 @@ extra-package-dbs: []
 
 # Control whether we use the GHC we find on the path
 # system-ghc: true
-# 
+#
 # Require a specific version of stack, using version ranges
 # require-stack-version: -any # Default
-# require-stack-version: ">=1.1"
-# 
+# require-stack-version: ">=1.3"
+#
 # Override the architecture used by stack, especially useful on Windows
 # arch: i386
 # arch: x86_64
-# 
+#
 # Extra directories used by stack for building
 # extra-include-dirs: [/path/to/dir]
 # extra-lib-dirs: [/path/to/dir]
-# 
+#
 # Allow a newer minor version of GHC than the snapshot specifies
 # compiler-check: newer-minor

ch14/morse/tests/tests.hs

@@ -4,22 +4,27 @@ import qualified Data.Map as M
 import Morse
 import Test.QuickCheck
 
+
+main :: IO ()
+main = quickCheck prop_thereAndBackAgain
+
+
+prop_thereAndBackAgain :: Property
+prop_thereAndBackAgain =
+  forAll charGen (\c -> ((charToMorse c) >>= morseToChar) == Just c)
+
+
 allowedChars :: [Char]
 allowedChars = M.keys letterToMorse
 
+
 allowedMorse :: [Morse]
 allowedMorse = M.elems letterToMorse
 
+
 charGen :: Gen Char
 charGen = elements allowedChars
 
+
 morseGen :: Gen Morse
 morseGen = elements allowedMorse
-
-prop_thereAndBackAgain :: Property
-prop_thereAndBackAgain =
-  forAll charGen
-  (\c -> ((charToMorse c) >>= morseToChar) == Just c)
-
-main :: IO ()
-main = quickCheck prop_thereAndBackAgain