From a5f31a42806c9a3499cddac930d353e26f0b3acb Mon Sep 17 00:00:00 2001
From: Andrey Nering <andrey.nering@gmail.com>
Date: Sun, 5 Aug 2018 11:28:02 -0300
Subject: [PATCH] Dry run small code style changes

---
 cmd/task/task.go             | 6 +++---
 task.go                      | 4 ++--
 task_test.go                 | 7 ++++---
 testdata/dry/Taskfile.yml    | 6 ++++++
 testdata/dryrun/Taskfile.yml | 3 ---
 5 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 testdata/dry/Taskfile.yml
 delete mode 100644 testdata/dryrun/Taskfile.yml

diff --git a/cmd/task/task.go b/cmd/task/task.go
index 18a4e2bd..74c54697 100644
--- a/cmd/task/task.go
+++ b/cmd/task/task.go
@@ -55,7 +55,7 @@ func main() {
 		watch       bool
 		verbose     bool
 		silent      bool
-		dryRun      bool
+		dry         bool
 		dir         string
 	)
 
@@ -67,7 +67,7 @@ func main() {
 	pflag.BoolVarP(&watch, "watch", "w", false, "enables watch of the given task")
 	pflag.BoolVarP(&verbose, "verbose", "v", false, "enables verbose mode")
 	pflag.BoolVarP(&silent, "silent", "s", false, "disables echoing")
-	pflag.BoolVar(&dryRun, "dry", false, "compiles and prints tasks in the order that they would be run, without executing them")
+	pflag.BoolVar(&dry, "dry", false, "compiles and prints tasks in the order that they would be run, without executing them")
 	pflag.StringVarP(&dir, "dir", "d", "", "sets directory of execution")
 	pflag.Parse()
 
@@ -93,7 +93,7 @@ func main() {
 		Verbose: verbose,
 		Silent:  silent,
 		Dir:     dir,
-		DryRun:  dryRun,
+		Dry:     dry,
 
 		Context: getSignalContext(),
 
diff --git a/task.go b/task.go
index 019faeea..6f5dd434 100644
--- a/task.go
+++ b/task.go
@@ -35,7 +35,7 @@ type Executor struct {
 	Watch    bool
 	Verbose  bool
 	Silent   bool
-	DryRun   bool
+	Dry      bool
 
 	Context context.Context
 
@@ -212,7 +212,7 @@ func (e *Executor) runCommand(ctx context.Context, t *taskfile.Task, call taskfi
 			e.Logger.Errf(cmd.Cmd)
 		}
 
-		if e.DryRun {
+		if e.Dry {
 			return nil
 		}
 
diff --git a/task_test.go b/task_test.go
index cac097b0..24d8c00e 100644
--- a/task_test.go
+++ b/task_test.go
@@ -433,8 +433,8 @@ func TestExpand(t *testing.T) {
 	assert.Equal(t, home, strings.TrimSpace(buff.String()))
 }
 
-func TestDryRun(t *testing.T) {
-	const dir = "testdata/dryrun"
+func TestDry(t *testing.T) {
+	const dir = "testdata/dry"
 
 	file := filepath.Join(dir, "file.txt")
 	_ = os.Remove(file)
@@ -445,11 +445,12 @@ func TestDryRun(t *testing.T) {
 		Dir:    dir,
 		Stdout: &buff,
 		Stderr: &buff,
-		DryRun: true,
+		Dry:    true,
 	}
 	assert.NoError(t, e.Setup())
 	assert.NoError(t, e.Run(taskfile.Call{Task: "build"}))
 
+	assert.Equal(t, "touch file.txt", strings.TrimSpace(buff.String()))
 	if _, err := os.Stat(file); err == nil {
 		t.Errorf("File should not exist %s", file)
 	}
diff --git a/testdata/dry/Taskfile.yml b/testdata/dry/Taskfile.yml
new file mode 100644
index 00000000..b4e932ed
--- /dev/null
+++ b/testdata/dry/Taskfile.yml
@@ -0,0 +1,6 @@
+version: '2'
+
+tasks:
+  build:
+    cmds:
+      - touch file.txt
diff --git a/testdata/dryrun/Taskfile.yml b/testdata/dryrun/Taskfile.yml
deleted file mode 100644
index 62c6dde7..00000000
--- a/testdata/dryrun/Taskfile.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-build:
-  cmds:
-    - touch file.txt
\ No newline at end of file