Add some default commands to handle flags when no arguments are set.

ahoy.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+ "errors"
  "flag"
  "fmt"
  "github.com/codegangsta/cli"
@@ -257,11 +258,36 @@ func BashComplete(c *cli.Context) {
  }
 }
 
-func setupApp(args []string) *cli.App {
- initFlags(args)
- //log.Println(sourcefile)
+// This is the application wide default action, for when no arguments are passed.
+func NoArgsAction(c *cli.Context) {
+ if c.Bool("help") {
+ cli.ShowAppHelp(c)
+ }
+}
+
+// This runs before every command so arguments must be passed.
+func BeforeCommand(c *cli.Context) error {
+ args := c.Args()
+ if c.Bool("version") {
+ fmt.Println(version)
+ return errors.New("don't continue with commands")
+ }
+ if c.Bool("help") {
+ if len(args) > 0 {
+ cli.ShowCommandHelp(c, args.First())
+ return errors.New("don't continue with commands")
+ }
+ }
+ //fmt.Printf("%+v\n", args)
+ return nil
+}
+
+func setupApp(localArgs []string) *cli.App {
+ initFlags(localArgs)
  // cli stuff
  app = cli.NewApp()
+ app.Action = NoArgsAction
+ app.Before = BeforeCommand
  app.Name = "ahoy"
  app.Version = version
  app.Usage = "Creates a configurable cli app for running commands."

tests/flags.bats

@@ -3,7 +3,7 @@
 @test "get the version of ahoy with --version" {
  run ./ahoy -f testdata/simple.ahoy.yml --version
  [ $status -eq 0 ]
- [ "$result" == "2.0.0-alpha-23-g0479480" ]
+ [ $(expr "$output" : "[0-9.]\.[0-9.]\.[0-9.]") -ne 0 ]
 }
 
 @test "get help instead of running a command with --help" {

tests/no-ahoy-file.bats

@@ -8,6 +8,17 @@ teardown() {
  mv tmp.ahoy.yml .ahoy.yml
 }
 
+@test "run ahoy withough a command and without a .ahoy.yml file" {
+ result="$(./ahoy)"
+ echo "$result"
+ [ "$result" -eq 4 ]
+}
+
+@test "run an ahoy command without a .ahoy.yml file" {
+ result="$(./ahoy something)"
+ [ "$result" -eq 4 ]
+}
+
 @test "run ahoy init without a .ahoy.yml file" {
  result="$(./ahoy init)"
  [ "$result" -eq 4 ]