Add --romefile CLI option to all commands

Rome.cabal

@@ -1,5 +1,5 @@
 name:                Rome
-version:             0.17.0.48
+version:             0.17.1.49
 synopsis:            A cache for Carthage
 description:         Please see README.md
 homepage:            https://github.com/blender/Rome

Rome.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name           = 'Rome'
-  s.version        = '0.17.0.48'
+  s.version        = '0.17.1.49'
   s.summary        = 'A cache tool for Carthage'
   s.homepage       = 'https://github.com/blender/Rome'
   s.source         = { :http => "#{s.homepage}/releases/download/v#{s.version}/rome.zip" }

app/Main.hs

@@ -10,7 +10,7 @@ import           System.Exit
 
 
 romeVersion :: RomeVersion
-romeVersion = (0, 17, 0, 48)
+romeVersion = (0, 17, 1, 49)
 
 
 

src/CommandParsers.hs

@@ -20,7 +20,7 @@ import           Types.Commands
 -- verifyParser :: Parser VerifyFlag
 -- verifyParser = VerifyFlag <$> Opts.switch ( Opts.long "verify" <> Opts.help "Verify that the framework has the same hash as specified in the Cartfile.resolved.")
 
-cachePrefixParser :: Parser String
+cachePrefixParser :: Opts.Parser String
 cachePrefixParser = Opts.strOption
   (  Opts.value ""
   <> Opts.metavar "PREFIX"
@@ -29,13 +29,13 @@ cachePrefixParser = Opts.strOption
        "A prefix appended to the top level directories inside the caches. Usefull to separate artifacts between Swift versions."
   )
 
-skipLocalCacheParser :: Parser SkipLocalCacheFlag
+skipLocalCacheParser :: Opts.Parser SkipLocalCacheFlag
 skipLocalCacheParser = SkipLocalCacheFlag <$> Opts.switch
   (  Opts.long "skip-local-cache"
   <> Opts.help "Ignore the local cache when performing the operation."
   )
 
-noIgnoreParser :: Parser NoIgnoreFlag
+noIgnoreParser :: Opts.Parser NoIgnoreFlag
 noIgnoreParser = NoIgnoreFlag <$> Opts.switch
   (  Opts.long "no-ignore"
   <> Opts.help
@@ -139,10 +139,18 @@ romeUtilsSubcommandParser =  Opts.subparser
       `withInfo` "Migrates a Romefile from INI to YAML."
       )
 
-
 utilsParser :: Opts.Parser RomeCommand
 utilsParser = Utils <$> utilsPayloadParser
 
+parseRomefilePath :: Opts.Parser String
+parseRomefilePath = Opts.strOption
+  (  Opts.value canonicalRomefileName
+  <> Opts.metavar "PATH"
+  <> Opts.long "romefile"
+  <> Opts.help
+       "The path to the Romemefile to use. Defaults the Romefile in then current directory."
+  )
+
 parseRomeCommand :: Opts.Parser RomeCommand
 parseRomeCommand =
   Opts.subparser
@@ -168,7 +176,7 @@ parseRomeCommand =
          )
 
 parseRomeOptions :: Opts.Parser RomeOptions
-parseRomeOptions = RomeOptions <$> parseRomeCommand <*> Opts.switch
+parseRomeOptions = RomeOptions <$> parseRomeCommand <*> parseRomefilePath <*> Opts.switch
   (Opts.short 'v' <> help "Show verbose output")
 
 withInfo :: Opts.Parser a -> String -> Opts.ParserInfo a

src/Configuration.hs

@@ -22,13 +22,13 @@ getCartfileEntires = do
     Left e -> throwError $ "Carfile.resolved parse error: " ++ show e
     Right cartfileEntries -> return cartfileEntries
 
-getRomefileEntries :: RomeMonad Romefile
-getRomefileEntries = 
-  let fromYaml = ExceptT $ left prettyPrintParseException <$> decodeFileEither romefileName
-      fromIni = ExceptT $ parseRomefile <$> T.readFile romefileName 
+getRomefileEntries :: FilePath -> RomeMonad Romefile
+getRomefileEntries absoluteRomefilePath = 
+  let fromYaml = ExceptT $ left prettyPrintParseException <$> decodeFileEither absoluteRomefilePath
+      fromIni = ExceptT $ parseRomefile <$> T.readFile absoluteRomefilePath 
       in
         withExceptT toErr $ fromYaml <|> fromIni
-  where toErr e = "Error while parsing " <> romefileName <> ": " <> e
+  where toErr e = "Error while parsing " <> absoluteRomefilePath <> ": " <> e
 
 getS3ConfigFile :: MonadIO m => m FilePath
 getS3ConfigFile = (</> awsConfigFilePath) `liftM` liftIO getHomeDirectory

src/Data/Romefile.hs

@@ -9,7 +9,7 @@
 
 module Data.Romefile
     ( parseRomefile
-    , romefileName
+    , canonicalRomefileName
     , RomefileEntry (..)
     , Framework (..)
     , ProjectName (..)
@@ -188,9 +188,9 @@ bucket = lens _bucket (\cInfo n -> cInfo { _bucket = n })
 localCacheDir :: Lens' RomeCacheInfo (Maybe FilePath)
 localCacheDir = lens _localCacheDir (\cInfo n -> cInfo { _localCacheDir = n })
 
--- |The name of the Romefile
-romefileName :: String
-romefileName = "Romefile"
+-- |The canonical name of the Romefile
+canonicalRomefileName :: String
+canonicalRomefileName = "Romefile"
 
 -- |The delimiter of the CACHE section a Romefile
 cacheSectionDelimiter :: T.Text

src/Lib.hs

@@ -96,22 +96,24 @@ runRomeWithOptions
   :: RomeOptions -- ^ The `RomeOptions` to run Rome with.
   -> RomeVersion
   -> RomeMonad ()
-runRomeWithOptions (RomeOptions options verbose) romeVersion = case options of
-  Utils utilsPayload -> runUtilsCommand options verbose romeVersion
-  otherCommad        -> runUDCCommand options verbose romeVersion
-
-runUtilsCommand :: RomeCommand -> Bool -> RomeVersion -> RomeMonad ()
-runUtilsCommand command verbose romeVersion = do
+runRomeWithOptions (RomeOptions options romefilePath verbose) romeVersion = do
+  absoluteRomefilePath <- liftIO $ absolutizePath romefilePath
+  case options of
+    Utils utilsPayload -> runUtilsCommand options absoluteRomefilePath verbose romeVersion
+    otherCommad        -> runUDCCommand options absoluteRomefilePath verbose romeVersion
+
+runUtilsCommand :: RomeCommand -> FilePath -> Bool -> RomeVersion -> RomeMonad ()
+runUtilsCommand command absoluteRomefilePath verbose romeVersion =
   case command of
     Utils _ -> do
-      romeFileEntries <- getRomefileEntries
-      lift $ encodeFile romefileName romeFileEntries
+      romeFileEntries <- getRomefileEntries absoluteRomefilePath
+      lift $ encodeFile absoluteRomefilePath romeFileEntries
     _ -> throwError "Error: Programming Error. Only Utils command supported."
 
-runUDCCommand :: RomeCommand -> Bool -> RomeVersion -> RomeMonad ()
-runUDCCommand command verbose romeVersion = do
+runUDCCommand :: RomeCommand -> FilePath -> Bool -> RomeVersion -> RomeMonad ()
+runUDCCommand command absoluteRomefilePath verbose romeVersion = do
   cartfileEntries <- getCartfileEntires
-  romeFile        <- getRomefileEntries
+  romeFile        <- getRomefileEntries absoluteRomefilePath
 
   let ignoreMapEntries     = _ignoreMapEntries romeFile
   let repositoryMapEntries = _repositoryMapEntries romeFile

src/Types/Commands.hs

@@ -53,6 +53,7 @@ data ListMode = All
                deriving (Show, Eq)
 
 data RomeOptions = RomeOptions { romeCommand :: RomeCommand
+                               , romefilePath :: FilePath 
                                , verbose     :: Bool
                                }
                                deriving (Show, Eq)