Merge pull request #3 from rnhmjoj/master

Fix failing build: updated optparse

scat.cabal

@@ -10,7 +10,7 @@ name:                scat
 -- PVP summary:      +-+------- breaking API changes
 --                   | | +----- non-breaking API additions
 --                   | | | +--- code changes with no API change
-version:             1.1.0.1
+version:             1.1.0.2
 
 -- A short (one-line) description of the package.
 synopsis:            Generates unique passwords for various websites from a single password.
@@ -70,9 +70,9 @@ executable scat
   build-depends:       base >=4.5 && <5
                      , scrypt == 0.5.*
                      , bytestring
-                     , optparse-applicative >= 0.5 && <0.10
+                     , optparse-applicative >= 0.5
                      , mtl
-                     , vector == 0.10.*
+                     , vector == 0.11.*
                      , ansi-terminal >= 0.6.1
 
 test-suite scat-tests
@@ -84,5 +84,5 @@ test-suite scat-tests
                      , bytestring
                      , optparse-applicative >= 0.5
                      , mtl
-                     , vector == 0.10.*
+                     , vector == 0.11.*
                      , ansi-terminal >= 0.6.1

src/Main.hs

@@ -3,7 +3,7 @@
 -- | Password scatterer.
 module Main (main) where
 
-import Data.ByteString (ByteString, unpack)
+import Data.ByteString (ByteString)
 import qualified Data.ByteString.Char8 as C
 import System.IO
 import System.Exit

src/Scat/Builder.hs

@@ -33,8 +33,6 @@ module Scat.Builder
     ) where
 
 import Data.Char (ord, chr)
-import Data.Monoid
-import Control.Applicative
 import Control.Monad
 import Control.Arrow (second)
 import Data.Vector (Vector)

src/Scat/Options.hs

@@ -84,7 +84,7 @@ options = Options
         <> metavar "SCHEMA"
         <> value "safe"
         <> showDefault)
-    <*> optional (option
+    <*> optional (option auto
           (short 'n'
         <> long "size"
         <> help "Size parameter"

src/Scat/Schemas.hs

@@ -33,11 +33,10 @@ module Scat.Schemas
     ) where
 
 import Data.Ratio ((%))
+import Data.Monoid ((<>))
 import Data.List (intercalate, (\\))
 import Data.Vector (Vector)
 import qualified Data.Vector as V
-import Data.Monoid
-import Control.Applicative
 import Control.Monad (replicateM)
 import System.IO