minions 0.1.0.0 → 0.2.0.0

raw patch · 2 files changed

+12/−15 lines, 2 files

Files

• minions.cabal +1/−1
• minions.hs +11/−14

@@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/  name:                minions-version:             0.1.0.0+version:             0.2.0.0 synopsis:            A fast parallel ssh tool -- description:          homepage:            http://github.com/jhickner/minions

@@ -85,9 +85,8 @@ printShortResult :: Result -> IO () printShortResult Result{..} =     case resPayload of-      Left s  -> putColorLn Vivid Red $ resHost ++ t ++ rstrip s-      Right s -> putStrLn $ resHost ++ t ++ rstrip s-    where t = printf " (%.1fs): " (realToFrac resTime :: Double) +      Left s  -> putColorLn Vivid Red $ resHost ++ ": " ++ rstrip s+      Right s -> putStrLn $ resHost ++ ": " ++ rstrip s   ----------------@@ -96,22 +95,18 @@  data Options = Options     { oHelp    :: Bool-    , oHosts   :: FilePath     , oTimeout :: Int     , oHandler :: Result -> IO ()     }  defaultOptions :: Options-defaultOptions = Options False "" (10 * 1000000) printResult+defaultOptions = Options False (10 * 1000000) printResult  options :: [OptDescr (Options -> Options)] options =     [ Option [] ["help"]       (NoArg (\opts -> opts { oHelp = True }))       "display this help"-    , Option "h" ["hosts"]-      (ReqArg (\f opts -> opts { oHosts = f }) "FILE")-      "FILE containing ssh host names (one per line)"     , Option "t" ["timeout"]        (ReqArg (\f opts -> opts { oTimeout = (read f :: Int) * 1000000 })          "SECONDS")@@ -132,13 +127,15 @@ showError msg = hPutStrLn stderr (msg ++ header) >> exitFailure  header :: String-header = usageInfo "Usage: minions [-hst] command" options+header = usageInfo "Usage: minions [-st] host_file command" options  main :: IO () main = do-    (Options{..}, cmd) <- parseArgs+    (Options{..}, args) <- parseArgs     when oHelp (putStrLn header >> exitSuccess)-    when (oHosts == "") (showError "Please specify a hostname file with -h\n")-    when (null cmd) (showError "Please specify a command to run\n")-    hosts <- (filter ((not . null) . strip) . lines) `fmap` readFile oHosts-    runTasks (mkTasks hosts cmd) oTimeout oHandler +    if length args < 2+      then showError "Please specify a hostname file and a command\n"+      else do+        let (file:cmd) = args+        hosts <- (filter ((not . null) . strip) . lines) `fmap` readFile file+        runTasks (mkTasks hosts cmd) oTimeout oHandler