Make separate binaries for Elm 0.16 and Elm 0.17

Author: avh4

README.md

@@ -96,7 +96,7 @@ cd elm-format
 cabal sandbox init
 cabal install --only-dependencies --enable-tests
 cabal build
-./dist/build/elm-format/elm-format --help
+./dist/build/elm-format-0.17/elm-format-0.17 --help
 ```
 
 ### Running tests

elm-format.cabal

@@ -1,4 +1,4 @@
-Name: elm-format-0.17
+Name: elm-format
 Version: 0.3.0-alpha
 
 Synopsis:
@@ -28,7 +28,7 @@ source-repository head
     type:     git
     location: git://github.com/avh4/elm-format.git
 
-Executable elm-format
+Executable elm-format-0.17
 
     ghc-options:
         -threaded -O2 -W
@@ -38,7 +38,41 @@ Executable elm-format
         parser/src
 
     Main-is:
-        Main.hs
+        Main0_17.hs
+
+    Build-depends:
+        aeson >= 0.7 && < 0.9,
+        ansi-terminal >= 0.6.2.1 && < 0.7,
+        ansi-wl-pprint,
+        base >= 4.2 && < 5,
+        binary >= 0.7.0.0 && < 0.8,
+        bytestring >= 0.9 && < 0.11,
+        containers >= 0.3 && < 0.6,
+        directory >= 1.0 && < 2.0,
+        edit-distance >= 0.2 && < 0.3,
+        filepath >= 1 && < 2.0,
+        filemanip >= 0.1 && < 1.0,
+        indents >= 0.3 && < 0.4,
+        mtl >= 2.2 && < 3,
+        optparse-applicative >=0.11 && <0.12,
+        parsec >= 3.1.1 && < 3.5,
+        pretty >= 1.0 && < 2.0,
+        process,
+        regex-applicative >= 0.3.3 && < 0.4,
+        split >= 0.2.2 && < 0.3,
+        text
+
+Executable elm-format-0.16
+
+    ghc-options:
+        -threaded -O2 -W
+
+    hs-source-dirs:
+        src
+        parser/src
+
+    Main-is:
+        Main0_16.hs
 
     Build-depends:
         aeson >= 0.7 && < 0.9,

src/Main.hs renamed to src/ElmFormat.hs

@@ -1,5 +1,5 @@
 {-# OPTIONS_GHC -Wall #-}
-module Main where
+module ElmFormat where
 
 import Elm.Utils ((|>))
 import System.Exit (exitFailure, exitSuccess)
@@ -140,10 +140,10 @@ handleFilesInput inputFiles outputFile autoYes validateOnly elmVersion =
                     else
                         return Nothing
 
-main :: IO ()
-main =
+main :: ElmVersion -> IO ()
+main defaultVersion =
     do
-        config <- Flags.parse
+        config <- Flags.parse defaultVersion
         let inputFiles = (Flags._input config)
         let isStdin = (Flags._stdin config)
         let outputFile = (Flags._output config)
@@ -156,7 +156,7 @@ main =
 
         -- when we don't have any input, stdin or otherwise
         when (noInputSource) $
-            Flags.showHelpText
+            Flags.showHelpText defaultVersion
             >> exitFailure
 
         when (twoInputSources) $

src/ElmVersion.hs

@@ -7,6 +7,11 @@ data ElmVersion
   | Elm_0_17
 
 
+instance Show ElmVersion where
+    show Elm_0_16 = "0.16"
+    show Elm_0_17 = "0.17"
+
+
 parse :: String -> Either String ElmVersion
 parse versionString =
   case versionString of

src/Flags.hs

@@ -22,44 +22,55 @@ data Config = Config
     }
 
 
+
 -- PARSE ARGUMENTS
 
-parse :: IO Config
-parse =
-    Opt.customExecParser preferences parser
+
+parse :: ElmVersion -> IO Config
+parse defaultVersion =
+    Opt.customExecParser preferences (parser defaultVersion)
+
 
 preferences :: Opt.ParserPrefs
 preferences =
     Opt.prefs (mempty <> Opt.showHelpOnError)
 
-parser :: Opt.ParserInfo Config
-parser =
-    Opt.info (Opt.helper <*> flags) helpInfo
 
-showHelpText :: IO ()
-showHelpText = Opt.handleParseResult . Opt.Failure $
-  Opt.parserFailure preferences parser Opt.ShowHelpText mempty
+parser :: ElmVersion -> Opt.ParserInfo Config
+parser defaultVersion =
+    Opt.info
+        (Opt.helper <*> flags defaultVersion)
+        (helpInfo defaultVersion)
+
+
+showHelpText :: ElmVersion -> IO ()
+showHelpText defaultVersion = Opt.handleParseResult . Opt.Failure $
+    Opt.parserFailure
+        preferences
+        (parser defaultVersion)
+        Opt.ShowHelpText
+        mempty
 
 
 
 -- COMMANDS
 
-flags :: Opt.Parser Config
-flags =
+flags :: ElmVersion -> Opt.Parser Config
+flags defaultVersion =
     Config
       <$> Opt.many input
       <*> output
       <*> yes
       <*> validate
       <*> stdin
-      <*> elmVersion
+      <*> elmVersion defaultVersion
 
 
 
 -- HELP
 
-helpInfo :: Opt.InfoMod Config
-helpInfo =
+helpInfo :: ElmVersion -> Opt.InfoMod Config
+helpInfo defaultVersion =
     mconcat
         [ Opt.fullDesc
         , Opt.header top
@@ -68,7 +79,10 @@ helpInfo =
         ]
   where
     top =
-        "elm-format " ++ showVersion This.version ++ " \n"
+        concat
+            [ "elm-format-" ++ show defaultVersion ++ " "
+            , showVersion This.version ++ "\n"
+            ]
 
     examples =
         linesToDoc
@@ -131,13 +145,20 @@ stdin =
         ]
 
 
-elmVersion :: Opt.Parser ElmVersion
-elmVersion =
-  fmap (Maybe.fromMaybe Elm_0_17)$
+elmVersion :: ElmVersion -> Opt.Parser ElmVersion
+elmVersion defaultVersion =
+  fmap (Maybe.fromMaybe defaultVersion)$
   Opt.optional $
   Opt.option (Opt.eitherReader ElmVersion.parse) $
     mconcat
       [ Opt.long "elm-version"
       , Opt.metavar "VERSION"
-      , Opt.help "The Elm version of the source files being formatted.  Valid values: 0.16, 0.17.  Default: 0.17"
+      , Opt.help $
+          concat
+            [ "The Elm version of the source files being formatted.  "
+            , "Valid values: "
+            , show ElmVersion.Elm_0_16 ++ ", "
+            , show ElmVersion.Elm_0_17 ++ ".  "
+            , "Default: " ++ show defaultVersion
+            ]
       ]

src/Main0_16.hs

@@ -0,0 +1,10 @@
+{-# OPTIONS_GHC -Wall #-}
+module Main where
+
+import ElmVersion
+import qualified ElmFormat
+
+
+main :: IO ()
+main =
+    ElmFormat.main Elm_0_16

src/Main0_17.hs

@@ -0,0 +1,10 @@
+{-# OPTIONS_GHC -Wall #-}
+module Main where
+
+import ElmVersion
+import qualified ElmFormat
+
+
+main :: IO ()
+main =
+    ElmFormat.main Elm_0_17

tests/run-tests.sh

@@ -6,7 +6,7 @@
 
 cabal build || exit 1
 
-ELM_FORMAT="./dist/build/elm-format/elm-format"
+ELM_FORMAT="./dist/build/elm-format-0.17/elm-format-0.17"
 if which md5 > /dev/null; then
 	MD5="md5"
 else