From 4f368923a57f7700931a67c55d8737a9f95472de Mon Sep 17 00:00:00 2001
From: Andrey Nering <andrey.nering@gmail.com>
Date: Sun, 4 Mar 2018 16:20:26 -0300
Subject: [PATCH] Upgrade own Taskfile to version 2

---
 Taskfile.yml                  | 95 ++++++++++++++++++-----------------
 testdata/vars/v2/Taskfile.yml |  2 +
 2 files changed, 51 insertions(+), 46 deletions(-)

diff --git a/Taskfile.yml b/Taskfile.yml
index 705eb0cc..03adc289 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -1,54 +1,57 @@
-# compiles current source code and make "task" executable available on
-# $GOPATH/bin/task{.exe}
-install:
-  desc: Installs Task
-  cmds:
-    - go install -v -ldflags="-w -s -X main.version={{.GIT_COMMIT}}" ./cmd/task
+version: '2'
 
-dl-deps:
-  desc: Downloads cli dependencies
-  cmds:
-    - go get -u github.com/golang/lint/golint
-    - go get -u github.com/asticode/go-astitodo/astitodo
-    - go get -u github.com/golang/dep/cmd/dep
-    - if [ "$CI" != "1" ]; then go get -u github.com/goreleaser/goreleaser; fi
+tasks:
+  # compiles current source code and make "task" executable available on
+  # $GOPATH/bin/task{.exe}
+  install:
+    desc: Installs Task
+    cmds:
+      - go install -v -ldflags="-w -s -X main.version={{.GIT_COMMIT}}" ./cmd/task
 
-update-deps:
-  desc: Updates dependencies
-  cmds:
-    - dep ensure
-    - dep ensure -update
+  dl-deps:
+    desc: Downloads cli dependencies
+    cmds:
+      - go get -u github.com/golang/lint/golint
+      - go get -u github.com/asticode/go-astitodo/astitodo
+      - go get -u github.com/golang/dep/cmd/dep
+      - if [ "$CI" != "1" ]; then go get -u github.com/goreleaser/goreleaser; fi
 
-clean:
-  desc: Cleans temp files and folders
-  cmds:
-    - rm -rf dist/
+  update-deps:
+    desc: Updates dependencies
+    cmds:
+      - dep ensure
+      - dep ensure -update
 
-lint:
-  desc: Runs golint
-  cmds:
-    - golint {{.GO_PACKAGES}}
-  silent: true
+  clean:
+    desc: Cleans temp files and folders
+    cmds:
+      - rm -rf dist/
 
-test:
-  desc: Runs test suite
-  deps: [install]
-  cmds:
-    - go test {{.GO_PACKAGES}}
+  lint:
+    desc: Runs golint
+    cmds:
+      - golint {{.GO_PACKAGES}}
+    silent: true
 
-# https://github.com/goreleaser/goreleaser
-release:
-  desc: Release Task
-  cmds:
-    - goreleaser
+  test:
+    desc: Runs test suite
+    deps: [install]
+    cmds:
+      - go test {{.GO_PACKAGES}}
 
-test-release:
-  desc: Tests release process without publishing
-  cmds:
-    - goreleaser --snapshot
+  # https://github.com/goreleaser/goreleaser
+  release:
+    desc: Release Task
+    cmds:
+      - goreleaser
 
-todo:
-  desc: Prints TODO comments present in the code
-  cmds:
-    - astitodo {{.GO_PACKAGES}}
-  silent: true
+  test-release:
+    desc: Tests release process without publishing
+    cmds:
+      - goreleaser --snapshot
+
+  todo:
+    desc: Prints TODO comments present in the code
+    cmds:
+      - astitodo {{.GO_PACKAGES}}
+    silent: true
diff --git a/testdata/vars/v2/Taskfile.yml b/testdata/vars/v2/Taskfile.yml
index f79277c2..657a464c 100644
--- a/testdata/vars/v2/Taskfile.yml
+++ b/testdata/vars/v2/Taskfile.yml
@@ -1,6 +1,8 @@
 version: '2'
+
 vars:
   NESTED2: "{{.NESTED1}}-TaskfileVars"
+
 tasks:
   default:
     deps: [hello]