Dirs passed as arguments

Author: tfogo

README.md

@@ -1,6 +1,7 @@
-<img src="spread-logo-text.svg" width="40%" >
+<img src="spread-logo-text.svg" width="50%" >
+
+A simple command to run scripts/commands in multiple directories in sequence. Spread is designed to do one thing and do it well. It is a simpler alternative to GNU Parallel.
 
-A simple command to help running scripts/commands in multiple subdirectories. Spread is designed to do one thing and do it well. It is a simpler alternative to GNU Parallel.
 
 ## Installation
 
@@ -16,12 +17,14 @@ Using go:
 $ go get github.com/tfogo/spread
 ```
 
+
 ## Usage
 
 ```
-$ spread <commands>
+$ spread [command] [directories...]
 ```
 
+
 ### Example
 
 Say we're in a directory `A` with three subdirectories which all have `README.md` files:
@@ -36,49 +39,55 @@ A
     └── README.md
 ```
 
-To append some text to each `README.md` file at once, run:
+To append some text to each `README.md` file, run:
 
 ```
 $ spread 'echo text >> README.md'
 ```
 
-The arguments to `spread` are run in each subdirectory.
+The first argument to `spread` is the command to run in each subdirectory.
 
-### Running multiple commands
 
-Spread will run commands in sequence on each subdirectory. If any command in the sequence fails, the rest of the commands will not run. Therefore, you can run commands based on the exit code of previous commands. For example, running tests:
+### Specifying directories
+
+By default `spread` will run the command in all the subdirectories of the present working directory. You can specify directories in which to run the command by adding further arguments:
 
 ```
-$ spread 'npm test' 'git push origin master'
+$ spread 'echo text >> README.md' dir1 dir2
 ```
 
-### Excluding subdirectories
 
-To exclude subdirectories, use `-x`:
+### Running multiple commands
+
+A common use is chaining  multiple commands based on the exit code of previous commands using `&&`. For example, running tests then pushing to a git remote:
 
 ```
-$ spread -x dir1 'echo text >> README.md'
+$ spread 'npm test && git push origin master'
 ```
 
-`-x` can take a glob such as `dir{1,2}`.
 
-## Reference
+### No-ops
+
+If you need to run a no-op, use an empty string, a colon, or `true` as the first argument.
 
 ```
-NAME:
-   spread - Run commands in subdirectories
+$ spread ''
+$ spread :
+$ spread true
+```
 
-USAGE:
-   spread [global options] command [command options] [arguments...]
 
-VERSION:
-   0.0.0
+### Help
 
-COMMANDS:
-   help, h  Shows a list of commands or help for one command
+To view the help, run `spread` without any arguments or pass the `--help` or `-h` flags.
 
-GLOBAL OPTIONS:
-   --exclude value, -x value  Glob of directories to exclude
-   --help, -h                 show help
-   --version, -v              print the version
-```
+
+## License (MIT)
+
+Copyright 2018 Tim Fogarty
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

spread-logo-small.svg

@@ -13,9 +13,9 @@ import (
 func main() {
   app := cli.NewApp()
   app.Name = "spread"
-  app.Usage = "Run scripts and commands in multiple directories at once. \n\nWEBSITE: \n\n   github.com/tfogo/spread\n\nDESCRIPTION:\n\n   Spread is designed to do one thing and do it well. It is a simpler alternative to GNU Parallel. Spread will run commands in sequence on each subdirectory. If any command in the sequence fails, the rest of the commands will not run. Therefore, you can run commands based on the exit code of previous commands. \n\nEXAMPLES: \n\n   spread 'npm test' 'git push origin master'"
-  app.Version = "v1.0.1"
-  app.UsageText = "spread [global options] [your commands]"
+  app.Usage = "Run scripts and commands in multiple directories. \n\nWEBSITE: \n\n   github.com/tfogo/spread\n\nDESCRIPTION: \n\n   The first argument to spread is the command that will be run. By default, spread will run the command in all the subdirectories of the present working directory. Add a list of files as arguments after the command to specify the directories in which the command should run.\n\nEXAMPLES: \n\n   spread 'npm test && git push origin master'\n   spread ls dir1 dir2 dir3"
+  app.Version = "v2.0.0"
+  app.UsageText = "spread [your command] [directories ...]"
   app.HideHelp = true
 
   app.Authors = []cli.Author{
@@ -26,11 +26,6 @@ func main() {
   }
 
   app.Flags = []cli.Flag {
-    cli.StringFlag {
-      Name: "exclude, x",
-      Value: "",
-      Usage: "glob of directories to exclude",
-    },
     cli.BoolFlag {
       Name: "help, h",
       Usage: "show help",
@@ -48,29 +43,55 @@ func action(c *cli.Context) error {
     return nil
   }
 
-  commands := c.Args()
-  exclude := c.String("exclude")
-
-  files, err := ioutil.ReadDir(".")
-  if err != nil {
-    log.Fatal(err)
+  if len(c.Args()) == 0 {
+    cli.ShowAppHelp(c)
+    return nil
   }
 
-  errors := make([]error, 0, len(files))
+  command, fileArgs := c.Args()[0], c.Args()[1:]
+  files := make([]string, 0, len(fileArgs))
 
-  for _, file := range files {
+  if len(fileArgs) == 0 {
+    dirs, err := ioutil.ReadDir(".")
+    if err != nil {
+      log.Fatal(err)
+    }
+    for _, fileInfo := range dirs {
+      file, err := filepath.Abs(fileInfo.Name())
+      if err != nil {
+        log.Fatal(err)
+      }
 
-    excluded, _ := filepath.Match(exclude, file.Name())
+      if fileInfo.IsDir() {
+        files = append(files, file)
+      }
+    }
+  } else {
+    for _, fileString := range fileArgs {
+      file, err := filepath.Abs(fileString)
+      if err != nil {
+        log.Fatal(err)
+      }
+      fileInfo, err := os.Stat(file)
+      if err != nil {
+        log.Fatal(err)
+      }
 
-    if file.IsDir() && !excluded {
-      // fmt.Println(file.Name())
-      for _, command := range commands {
-        err := runCmd(command, file)
-        if err != nil {
-          errors = append(errors, err)
-          break
-        }
+      if fileInfo.IsDir() {
+        files = append(files, file)
+      } else {
+        log.Fatal(file, " is not a directory")
       }
+
+    }
+  }
+
+  errors := make([]error, 0, len(files))
+
+  for _, file := range files {
+    err := runCmd(command, file)
+    if err != nil {
+      errors = append(errors, err)
     }
   }
 
@@ -79,13 +100,12 @@ func action(c *cli.Context) error {
   } else {
     return nil
   }
-
 }
 
-func runCmd(command string, file os.FileInfo) error {
+func runCmd(command string, file string) error {
 
   cmd := exec.Command("sh", "-c", command)
-  cmd.Dir = file.Name()
+  cmd.Dir = file
   cmd.Stdout = os.Stdout
   cmd.Stderr = os.Stderr