chore: update default timeout to 10 minutes

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

.drone.yml

@@ -9,47 +9,39 @@ platform:
 steps:
 - name: vet
   pull: always
-  image: golang:1.12
+  image: golang:1.13
   commands:
   - make vet
-  environment:
-    GO111MODULE: on
   volumes:
   - name: gopath
     path: /go
 
 - name: lint
   pull: always
-  image: golang:1.12
+  image: golang:1.13
   commands:
   - make lint
-  environment:
-    GO111MODULE: on
   volumes:
   - name: gopath
     path: /go
 
 - name: misspell
   pull: always
-  image: golang:1.12
+  image: golang:1.13
   commands:
   - make misspell-check
-  environment:
-    GO111MODULE: on
   volumes:
   - name: gopath
     path: /go
 
 - name: test
   pull: always
-  image: golang:1.12-alpine
+  image: golang:1.13-alpine
   commands:
   - apk add git make curl perl bash build-base zlib-dev ucl-dev
   - make ssh-server
   - make test
   - make coverage
-  environment:
-    GO111MODULE: on
   volumes:
   - name: gopath
     path: /go
@@ -76,12 +68,11 @@ platform:
 steps:
 - name: build-push
   pull: always
-  image: golang:1.12
+  image: golang:1.13
   commands:
-  - "go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-scp"
+  - go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-scp
   environment:
     CGO_ENABLED: 0
-    GO111MODULE: on
   when:
     event:
       exclude:
@@ -89,19 +80,18 @@ steps:
 
 - name: build-tag
   pull: always
-  image: golang:1.12
+  image: golang:1.13
   commands:
-  - "go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-scp"
+  - go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-scp
   environment:
     CGO_ENABLED: 0
-    GO111MODULE: on
   when:
     event:
     - tag
 
 - name: executable
   pull: always
-  image: golang:1.12
+  image: golang:1.13
   commands:
   - ./release/linux/amd64/drone-scp --help
 
@@ -140,8 +130,8 @@ steps:
 trigger:
   ref:
   - refs/heads/master
-  - "refs/pull/**"
+  - refs/pull/**
-  - "refs/tags/**"
+  - refs/tags/**
 
 depends_on:
 - testing
@@ -157,12 +147,11 @@ platform:
 steps:
 - name: build-push
   pull: always
-  image: golang:1.12
+  image: golang:1.13
   commands:
-  - "go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-scp"
+  - go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-scp
   environment:
     CGO_ENABLED: 0
-    GO111MODULE: on
   when:
     event:
       exclude:
@@ -170,19 +159,18 @@ steps:
 
 - name: build-tag
   pull: always
-  image: golang:1.12
+  image: golang:1.13
   commands:
-  - "go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-scp"
+  - go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-scp
   environment:
     CGO_ENABLED: 0
-    GO111MODULE: on
   when:
     event:
     - tag
 
 - name: executable
   pull: always
-  image: golang:1.12
+  image: golang:1.13
   commands:
   - ./release/linux/arm64/drone-scp --help
 
@@ -221,8 +209,8 @@ steps:
 trigger:
   ref:
   - refs/heads/master
-  - "refs/pull/**"
+  - refs/pull/**
-  - "refs/tags/**"
+  - refs/tags/**
 
 depends_on:
 - testing
@@ -238,12 +226,11 @@ platform:
 steps:
 - name: build-push
   pull: always
-  image: golang:1.12
+  image: golang:1.13
   commands:
-  - "go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-scp"
+  - go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-scp
   environment:
     CGO_ENABLED: 0
-    GO111MODULE: on
   when:
     event:
       exclude:
@@ -251,19 +238,18 @@ steps:
 
 - name: build-tag
   pull: always
-  image: golang:1.12
+  image: golang:1.13
   commands:
-  - "go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-scp"
+  - go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-scp
   environment:
     CGO_ENABLED: 0
-    GO111MODULE: on
   when:
     event:
     - tag
 
 - name: executable
   pull: always
-  image: golang:1.12
+  image: golang:1.13
   commands:
   - ./release/linux/arm/drone-scp --help
 
@@ -302,8 +288,8 @@ steps:
 trigger:
   ref:
   - refs/heads/master
-  - "refs/pull/**"
+  - refs/pull/**
-  - "refs/tags/**"
+  - refs/tags/**
 
 depends_on:
 - testing
@@ -319,11 +305,9 @@ platform:
 steps:
 - name: build-all-binary
   pull: always
-  image: golang:1.12
+  image: golang:1.13
   commands:
   - make release
-  environment:
-    GO111MODULE: on
   when:
     event:
     - tag
@@ -335,14 +319,14 @@ steps:
     api_key:
       from_secret: github_release_api_key
     files:
-    - "dist/release/*"
+    - dist/release/*
   when:
     event:
     - tag
 
 trigger:
   ref:
-  - "refs/tags/**"
+  - refs/tags/**
 
 depends_on:
 - testing
@@ -367,17 +351,10 @@ steps:
     username:
       from_secret: docker_username
 
-- name: microbadger
-  pull: always
-  image: plugins/webhook:1
-  settings:
-    url:
-      from_secret: microbadger_url
-
 trigger:
   ref:
   - refs/heads/master
-  - "refs/tags/**"
+  - refs/tags/**
 
 depends_on:
 - linux-amd64

DOCS.md

@@ -11,35 +11,21 @@ image: appleboy/drone-scp
 The SCP plugin copy files and artifacts to target host machine via SSH. The below pipeline configuration demonstrates simple usage:
 
 ```yaml
-pipeline:
+- name: scp files
-  scp:
+  image: appleboy/drone-scp
-    image: appleboy/drone-scp
+  settings:
-    settings:
+    host: example.com
-      host: example.com
+    username: foo
-      target: /home/deploy/web
+    password: bar
-      source: release.tar.gz
+    port: 22
-```
+    target: /var/www/deploy/${DRONE_REPO_OWNER}/${DRONE_REPO_NAME}
-
+    source: release.tar.gz
-Example configuration with custom username, password and port:
-
-```diff
-pipeline:
-  scp:
-    image: appleboy/drone-scp
-    settings:
-      host: example.com
-+     username: appleboy
-+     password: 12345678
-+     port: 4430
-      target: /home/deploy/web
-      source: release.tar.gz
 ```
 
 Example configuration with multiple source and target folder:
 
 ```diff
-pipeline:
+  - name: scp files
-  scp:
     image: appleboy/drone-scp
     settings:
       host: example.com
@@ -54,8 +40,7 @@ pipeline:
 Example configuration with multiple host:
 
 ```diff
-pipeline:
+  - name: scp files
-  scp:
     image: appleboy/drone-scp
     settings:
 -     host: example.com
@@ -69,8 +54,7 @@ pipeline:
 Example configuration with wildcard pattern of source list:
 
 ```diff
-pipeline:
+  - name: scp files
-  scp:
     image: appleboy/drone-scp
     settings:
       host:
@@ -86,9 +70,8 @@ pipeline:
 Remove target folder before copy files and artifacts to target:
 
 ```diff
-  scp:
+  - name: scp files
     image: appleboy/drone-scp
-    host: example.com
     settings:
       target: /home/deploy/web
       source: release.tar.gz
@@ -98,7 +81,7 @@ Remove target folder before copy files and artifacts to target:
 Example for remove the specified number of leading path elements:
 
 ```diff
-  scp:
+  - name: scp files
     image: appleboy/drone-scp
     settings:
       host: example.com
@@ -110,8 +93,7 @@ Example for remove the specified number of leading path elements:
 Example configuration using ｀SSHProxyCommand｀:
 
 ```diff
-pipeline:
+  - name: scp files
-  scp:
     image: appleboy/drone-scp
     settings:
       host:
@@ -129,8 +111,7 @@ pipeline:
 Example configuration using password from secrets:
 
 ```diff
-pipeline:
+  - name: scp files
-  scp:
     image: appleboy/drone-scp
     settings:
       host:
@@ -140,7 +121,7 @@ pipeline:
       port: 22
 -     password: 1234
 +     password:
-        from_secret: ssh_password
++       from_secret: ssh_password
       target: /home/deploy/web
       source:
         - release/*.tar.gz
@@ -149,24 +130,44 @@ pipeline:
 Example configuration using command timeout:
 
 ```diff
-pipeline:
+  - name: scp files
-  scp:
+    image: appleboy/drone-scp
+    settings:
+      host:
+      - example1.com
+      - example2.com
+      user: ubuntu
+      password:
+      from_secret: ssh_password
+      port: 22
+-     command_timeout: 120
++     command_timeout: 2m
+      target: /home/deploy/web
+      source:
+      - release/*.tar.gz
+```
+
+Example configuration for ignore list:
+
+```diff
+  - name: scp files
     image: appleboy/drone-scp
     settings:
       host:
         - example1.com
         - example2.com
       user: ubuntu
-      port: 22
+      password:
--     command_timeout: 120
-+     command_timeout: 2m
         from_secret: ssh_password
+      port: 22
+      command_timeout: 2m
       target: /home/deploy/web
       source:
-        - release/*.tar.gz
++       - !release/README.md
+        - release/*
 ```
 
-# Parameter Reference
+## Parameter Reference
 
 host
 : target hostname or IP
@@ -193,14 +194,23 @@ rm
 : remove target folder before copy files and artifacts
 
 timeout
-: timeout is the maximum amount of time for the TCP connection to establish
+: Timeout is the maximum amount of time for the ssh connection to establish, default is 30 seconds.
 
 command_timeout
-: timeout is the maximum amount of time for execute command
+: Command timeout is the maximum amount of time for the execute commands, default is 10 minutes.
 
 strip_components
 : remove the specified number of leading path elements
 
+tar_tmp_path
+: temporary path for tar file on the dest host
+
+tar_exec
+: alternative `tar` executable to on the dest host
+
+overwrite
+: use `--overwrite` flag with tar
+
 proxy_host
 : proxy hostname or IP
 
@@ -219,7 +229,7 @@ proxy_key
 proxy_key_path
 : key path of proxy private key
 
-# Template Reference
+## Template Reference
 
 repo.owner
 : repository owner

Makefile

@@ -8,6 +8,7 @@ DEPLOY_ACCOUNT := appleboy
 DEPLOY_IMAGE := $(EXECUTABLE)
 
 TARGETS ?= linux darwin windows
+ARCHS ?= amd64 386
 PACKAGES ?= $(shell $(GO) list ./...)
 SOURCES ?= $(shell find . -name "*.go" -type f)
 TAGS ?=
@@ -82,7 +83,7 @@ release-build:
 	@which gox > /dev/null; if [ $$? -ne 0 ]; then \
 		$(GO) get -u github.com/mitchellh/gox; \
 	fi
-	gox -os="$(TARGETS)" -tags="$(TAGS)" -ldflags="-s -w $(LDFLAGS)" -output="$(DIST)/binaries/$(EXECUTABLE)-$(VERSION)-{{.OS}}-{{.Arch}}"
+	gox -os="$(TARGETS)" -arch="$(ARCHS)" -tags="$(TAGS)" -ldflags="-s -w $(LDFLAGS)" -output="$(DIST)/binaries/$(EXECUTABLE)-$(VERSION)-{{.OS}}-{{.Arch}}"
 
 release-copy:
 	$(foreach file,$(wildcard $(DIST)/binaries/$(EXECUTABLE)-*),cp $(file) $(DIST)/release/$(notdir $(file));)

README.md

@@ -1,11 +1,11 @@
 # drone-scp
 
-[![GoDoc](https://godoc.org/github.com/appleboy/drone-scp?status.svg)](https://godoc.org/github.com/appleboy/drone-scp) 
+[![GoDoc](https://godoc.org/github.com/appleboy/drone-scp?status.svg)](https://godoc.org/github.com/appleboy/drone-scp)
 [![Build Status](https://cloud.drone.io/api/badges/appleboy/drone-scp/status.svg)](https://cloud.drone.io/appleboy/drone-scp)
-[![codecov](https://codecov.io/gh/appleboy/drone-scp/branch/master/graph/badge.svg)](https://codecov.io/gh/appleboy/drone-scp) 
+[![codecov](https://codecov.io/gh/appleboy/drone-scp/branch/master/graph/badge.svg)](https://codecov.io/gh/appleboy/drone-scp)
-[![Go Report Card](https://goreportcard.com/badge/github.com/appleboy/drone-scp)](https://goreportcard.com/report/github.com/appleboy/drone-scp) 
+[![Go Report Card](https://goreportcard.com/badge/github.com/appleboy/drone-scp)](https://goreportcard.com/report/github.com/appleboy/drone-scp)
-[![Docker Pulls](https://img.shields.io/docker/pulls/appleboy/drone-scp.svg)](https://hub.docker.com/r/appleboy/drone-scp/) 
+[![Docker Pulls](https://img.shields.io/docker/pulls/appleboy/drone-scp.svg)](https://hub.docker.com/r/appleboy/drone-scp/)
-[![](https://images.microbadger.com/badges/image/appleboy/drone-scp.svg)](https://microbadger.com/images/appleboy/drone-scp "Get your own image badge on microbadger.com")
+[![micro badger](https://images.microbadger.com/badges/image/appleboy/drone-scp.svg)](https://microbadger.com/images/appleboy/drone-scp "Get your own image badge on microbadger.com")
 
 Copy files and artifacts via SSH using a binary, docker or [Drone CI](http://docs.drone.io/).
 
@@ -18,17 +18,17 @@ Copy files and artifacts via SSH using a binary, docker or [Drone CI](http://doc
 * [x] Support load ssh key from absolute path or raw body.
 * [x] Support SSH ProxyCommand.
 
-```
+```sh
-     +--------+       +----------+      +-----------+
++--------+       +----------+      +-----------+
-     | Laptop | <-->  | Jumphost | <--> | FooServer |
+| Laptop | <-->  | Jumphost | <--> | FooServer |
-     +--------+       +----------+      +-----------+
++--------+       +----------+      +-----------+
 
-                         OR
+                   OR
 
-     +--------+       +----------+      +-----------+
++--------+       +----------+      +-----------+
-     | Laptop | <-->  | Firewall | <--> | FooServer |
+| Laptop | <-->  | Firewall | <--> | FooServer |
-     +--------+       +----------+      +-----------+
++--------+       +----------+      +-----------+
-     192.168.1.5       121.1.2.3         10.10.29.68
+192.168.1.5       121.1.2.3         10.10.29.68
 ```
 
 ## Breaking changes
@@ -36,18 +36,18 @@ Copy files and artifacts via SSH using a binary, docker or [Drone CI](http://doc
 `v1.5.0`: change command timeout flag to `Duration`. See the following setting:
 
 ```diff
-pipeline:
+  - name: scp files
-  scp:
     image: appleboy/drone-scp
     settings:
       host:
         - example1.com
         - example2.com
-      user: ubuntu
+      username: ubuntu
+      password:
+        from_secret: ssh_password
       port: 22
 -     command_timeout: 120
 +     command_timeout: 2m
-        from_secret: ssh_password
       target: /home/deploy/web
       source:
         - release/*.tar.gz
@@ -63,37 +63,30 @@ The pre-compiled binaries can be downloaded from [release page](https://github.c
 
 With `Go` installed
 
+```sh
+export GO111MODULE=on
+go get -u -v github.com/appleboy/drone-scp
 ```
-$ go get -u -v github.com/appleboy/drone-scp
-``` 
 
 or build the binary with the following command:
 
-```
+```sh
-$ export GOOS=linux
+export GOOS=linux
-$ export GOARCH=amd64
+export GOARCH=amd64
-$ export CGO_ENABLED=0
+export CGO_ENABLED=0
-$ export GO111MODULE=on
+export GO111MODULE=on
 
-$ go test -cover ./...
+go test -cover ./...
 
-$ go build -v -a -tags netgo -o release/linux/amd64/drone-scp .
+go build -v -a -tags netgo -o release/linux/amd64/drone-scp .
 ```
 
 ## Docker
 
 Build the docker image with the following commands:
 
-```
+```sh
-$ make docker
+make docker
-```
-
-Please note incorrectly building the image for the correct x64 linux and with
-CGO disabled will result in an error when running the Docker image:
-
-```
-docker: Error response from daemon: Container command
-'/bin/drone-scp' not found or does not exist..
 ```
 
 ## Usage
@@ -104,7 +97,6 @@ There are three ways to send notification.
 * [usage from docker](#usage-from-docker)
 * [usage from drone ci](#usage-from-drone-ci)
 
-<a name="usage-from-binary"></a>
 ### Usage from binary
 
 #### Using public key
@@ -139,8 +131,8 @@ eval `ssh-agent -s`
 
 Import your local public key `~/.ssh/id_rsa`
 
-```bash
+```sh
-$ ssh-add
+ssh-add
 ```
 
 You don't need to add `--password` or `--key-path` arguments.
@@ -167,10 +159,9 @@ drone-scp --host example1.com \
 + --source your_local_folder_path_2
 ```
 
-<a name="usage-from-docker"></a>
 ### Usage from docker
 
-#### Using public key
+Using public key
 
 ```bash
 docker run --rm \
@@ -185,7 +176,7 @@ docker run --rm \
   appleboy/drone-scp
 ```
 
-#### Using password
+Using password
 
 ```diff
 docker run --rm \
@@ -200,9 +191,7 @@ docker run --rm \
   appleboy/drone-scp
 ```
 
-#### Using ssh-agent
+Using ssh-agent, start your local ssh agent:
-
-Start your local ssh agent:
 
 ```bash
 eval `ssh-agent -s`
@@ -210,11 +199,11 @@ eval `ssh-agent -s`
 
 Import your local public key `~/.ssh/id_rsa`
 
-```bash
+```sh
-$ ssh-add
+ssh-add
 ```
 
-You don't need to add `SCP_PASSWORD` or `SCP_KEY_PATH ` arguments.
+You don't need to add `SCP_PASSWORD` or `SCP_KEY_PATH` arguments.
 
 ```bash
 docker run --rm \
@@ -228,7 +217,7 @@ docker run --rm \
   appleboy/drone-scp
 ```
 
-#### Send multiple source or target folder and hosts
+Send multiple source or target folder and hosts
 
 ```bash
 docker run --rm \
@@ -243,7 +232,6 @@ docker run --rm \
   appleboy/drone-scp
 ```
 
-<a name="usage-from-drone-ci"></a>
 ### Usage from drone ci
 
 Execute from the working directory:
@@ -269,6 +257,6 @@ You can get more [information](http://plugins.drone.io/appleboy/drone-scp/) abou
 
 Test the package with the following command:
 
-```
+```sh
-$ make test
+make test
 ```

go.mod

@@ -1,14 +1,14 @@
 module github.com/appleboy/drone-scp
 
-go 1.12
+go 1.13
 
 require (
-	github.com/appleboy/com v0.0.1
+	github.com/appleboy/com v0.0.2
 	github.com/appleboy/easyssh-proxy v1.2.0
 	github.com/fatih/color v1.7.0
 	github.com/joho/godotenv v1.3.0
-	github.com/mattn/go-colorable v0.1.1 // indirect
+	github.com/mattn/go-colorable v0.1.4 // indirect
-	github.com/mattn/go-isatty v0.0.6 // indirect
+	github.com/mattn/go-isatty v0.0.10 // indirect
-	github.com/stretchr/testify v1.3.0
+	github.com/stretchr/testify v1.4.0
-	github.com/urfave/cli v1.20.0
+	github.com/urfave/cli v1.22.1
 )

go.sum

@@ -1,26 +1,41 @@
-github.com/appleboy/com v0.0.1 h1:SeP6J/YlZGWRwH7jdPYXXWA+qJy4GoQfcQFPda0ERYU=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/appleboy/com v0.0.1/go.mod h1:rtwjPnHClMOJw4K5oW3ASx9BCPCJ1SDbFbzJjY4Ebqw=
+github.com/appleboy/com v0.0.2 h1:sexcPX7gp7peXMlOJMxEYcRucW7DW0XHgFZqUB6PI6g=
+github.com/appleboy/com v0.0.2/go.mod h1:jnufjIC3opMlReyPPPye+8JqNvUzLm25o7h6SOy8nv0=
 github.com/appleboy/easyssh-proxy v1.2.0 h1:KvaUGC18WkBFet+N1oofQy03jkC5HaKFn2XGxFxCTtg=
 github.com/appleboy/easyssh-proxy v1.2.0/go.mod h1:vHskChUNhxwW4dXMe2MNE/k+UBCkBagrQDm70UWZrS0=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
-github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=
+github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
-github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
+github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.6 h1:SrwhHcpV4nWrMGdNcC2kXpMfcBVYGDuTArqyhocJgvA=
+github.com/mattn/go-isatty v0.0.10 h1:qxFzApOv4WsAL965uUPIsXzAKCZxN2p9UqdhFS4ZW10=
-github.com/mattn/go-isatty v0.0.6/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
-github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY=
+github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25 h1:jsG6UpNLt9iAsb0S2AGW28DveNzzgmbXR+ENoPjUeIU=
 golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20191008105621-543471e840be h1:QAcqgptGM8IQBC9K/RC4o+O9YmqEm0diQn9QmZw/0mU=
+golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

main.go

@@ -13,16 +13,15 @@ import (
 
 // Version set at compile-time
 var (
-	Version  string
+	Version string
-	BuildNum string
 )
 
 func main() {
-
 	app := cli.NewApp()
 	app.Name = "Drone SCP"
 	app.Usage = "Copy files and artifacts via SSH."
-	app.Copyright = "Copyright (c) 2017 Bo-Yi Wu"
+	app.Copyright = "Copyright (c) 2019 Bo-Yi Wu"
+	app.Version = Version
 	app.Authors = []cli.Author{
 		{
 			Name:  "Bo-Yi Wu",
@@ -35,59 +34,60 @@ func main() {
 		cli.StringSliceFlag{
 			Name:   "host, H",
 			Usage:  "Server host",
-			EnvVar: "PLUGIN_HOST,SCP_HOST,SSH_HOST",
+			EnvVar: "PLUGIN_HOST,SCP_HOST,SSH_HOST,HOST,INPUT_HOST",
 		},
 		cli.StringFlag{
 			Name:   "port, P",
 			Value:  "22",
 			Usage:  "Server port, default to 22",
-			EnvVar: "PLUGIN_PORT,SCP_PORT,SSH_PORT",
+			EnvVar: "PLUGIN_PORT,SCP_PORT,SSH_PORT,PORT,INPUT_PORT",
 		},
 		cli.StringFlag{
 			Name:   "username, u",
 			Usage:  "Server username",
-			EnvVar: "PLUGIN_USERNAME,PLUGIN_USER,SCP_USERNAME,SSH_USERNAME",
+			EnvVar: "PLUGIN_USERNAME,PLUGIN_USER,SCP_USERNAME,SSH_USERNAME,USERNAME,INPUT_USERNAME",
 		},
 		cli.StringFlag{
 			Name:   "password, p",
 			Usage:  "Password for password-based authentication",
-			EnvVar: "PLUGIN_PASSWORD,SCP_PASSWORD,SSH_PASSWORD",
+			EnvVar: "PLUGIN_PASSWORD,SCP_PASSWORD,SSH_PASSWORD,PASSWORD,INPUT_PASSWORD",
 		},
 		cli.DurationFlag{
 			Name:   "timeout",
 			Usage:  "connection timeout",
-			EnvVar: "PLUGIN_TIMEOUT,SCP_TIMEOUT",
+			EnvVar: "PLUGIN_TIMEOUT,SCP_TIMEOUT,INPUT_TIMEOUT",
+			Value:  30 * time.Second,
 		},
 		cli.DurationFlag{
 			Name:   "command.timeout,T",
 			Usage:  "command timeout",
-			EnvVar: "PLUGIN_COMMAND_TIMEOUT,SSH_COMMAND_TIMEOUT",
+			EnvVar: "PLUGIN_COMMAND_TIMEOUT,SSH_COMMAND_TIMEOUT,INPUT_COMMAND_TIMEOUT",
-			Value:  60 * time.Second,
+			Value:  10 * time.Minute,
 		},
 		cli.StringFlag{
 			Name:   "key, k",
 			Usage:  "ssh private key",
-			EnvVar: "PLUGIN_KEY,SCP_KEY,SSH_KEY",
+			EnvVar: "PLUGIN_KEY,SCP_KEY,SSH_KEY,KEY,INPUT_KEY",
 		},
 		cli.StringFlag{
 			Name:   "key-path, i",
 			Usage:  "ssh private key path",
-			EnvVar: "PLUGIN_KEY_PATH,SCP_KEY_PATH,SSH_KEY_PATH",
+			EnvVar: "PLUGIN_KEY_PATH,SCP_KEY_PATH,SSH_KEY_PATH,INPUT_KEY_PATH",
 		},
 		cli.StringSliceFlag{
 			Name:   "target, t",
 			Usage:  "Target path on the server",
-			EnvVar: "PLUGIN_TARGET,SCP_TARGET",
+			EnvVar: "PLUGIN_TARGET,SCP_TARGET,TARGET,INPUT_TARGET",
 		},
 		cli.StringSliceFlag{
 			Name:   "source, s",
 			Usage:  "scp file list",
-			EnvVar: "PLUGIN_SOURCE,SCP_SOURCE",
+			EnvVar: "PLUGIN_SOURCE,SCP_SOURCE,SOURCE,INPUT_SOURCE",
 		},
 		cli.BoolFlag{
 			Name:   "rm, r",
 			Usage:  "remove target folder before upload data",
-			EnvVar: "PLUGIN_RM,SCP_RM",
+			EnvVar: "PLUGIN_RM,SCP_RM,RM,INPUT_RM",
 		},
 		cli.StringFlag{
 			Name:   "repo.owner",
@@ -149,55 +149,65 @@ func main() {
 		cli.StringFlag{
 			Name:   "proxy.ssh-key",
 			Usage:  "private ssh key of proxy",
-			EnvVar: "PLUGIN_PROXY_SSH_KEY,PLUGIN_PROXY_KEY,PROXY_SSH_KEY",
+			EnvVar: "PLUGIN_PROXY_SSH_KEY,PLUGIN_PROXY_KEY,PROXY_SSH_KEY,PROXY_KEY,INPUT_PROXY_SSH_KEY",
 		},
 		cli.StringFlag{
 			Name:   "proxy.key-path",
 			Usage:  "ssh private key path of proxy",
-			EnvVar: "PLUGIN_PROXY_KEY_PATH,PROXY_SSH_KEY_PATH",
+			EnvVar: "PLUGIN_PROXY_KEY_PATH,PROXY_SSH_KEY_PATH,INPUT_PROXY_SSH_KEY_PATH",
 		},
 		cli.StringFlag{
 			Name:   "proxy.username",
 			Usage:  "connect as user of proxy",
-			EnvVar: "PLUGIN_PROXY_USERNAME,PLUGIN_PROXY_USER,PROXY_SSH_USERNAME",
+			EnvVar: "PLUGIN_PROXY_USERNAME,PLUGIN_PROXY_USER,PROXY_SSH_USERNAME,PROXY_USERNAME,INPUT_PROXY_USERNAME",
 			Value:  "root",
 		},
 		cli.StringFlag{
 			Name:   "proxy.password",
 			Usage:  "user password of proxy",
-			EnvVar: "PLUGIN_PROXY_PASSWORD,PROXY_SSH_PASSWORD",
+			EnvVar: "PLUGIN_PROXY_PASSWORD,PROXY_SSH_PASSWORD,PROXY_PASSWORD,INPUT_PROXY_PASSWORD",
 		},
 		cli.StringFlag{
 			Name:   "proxy.host",
 			Usage:  "connect to host of proxy",
-			EnvVar: "PLUGIN_PROXY_HOST,PROXY_SSH_HOST",
+			EnvVar: "PLUGIN_PROXY_HOST,PROXY_SSH_HOST,PROXY_HOST,INPUT_PROXY_HOST",
 		},
 		cli.StringFlag{
 			Name:   "proxy.port",
 			Usage:  "connect to port of proxy",
-			EnvVar: "PLUGIN_PROXY_PORT,PROXY_SSH_PORT",
+			EnvVar: "PLUGIN_PROXY_PORT,PROXY_SSH_PORT,PROXY_PORT,INPUT_PROXY_PORT",
 			Value:  "22",
 		},
 		cli.DurationFlag{
 			Name:   "proxy.timeout",
 			Usage:  "proxy connection timeout",
-			EnvVar: "PLUGIN_PROXY_TIMEOUT,PROXY_SSH_TIMEOUT",
+			EnvVar: "PLUGIN_PROXY_TIMEOUT,PROXY_SSH_TIMEOUT,INPUT_PROXY_TIMEOUT",
 		},
 		cli.IntFlag{
 			Name:   "strip.components",
 			Usage:  "Remove the specified number of leading path elements.",
-			EnvVar: "PLUGIN_STRIP_COMPONENTS,TAR_STRIP_COMPONENTS",
+			EnvVar: "PLUGIN_STRIP_COMPONENTS,TAR_STRIP_COMPONENTS,INPUT_STRIP_COMPONENTS",
 		},
 		cli.StringFlag{
 			Name:   "tar.exec",
 			Usage:  "Alternative `tar` executable to on the dest host",
-			EnvVar: "PLUGIN_TAR_EXEC,SCP_TAR_EXEC",
+			EnvVar: "PLUGIN_TAR_EXEC,SCP_TAR_EXEC,INPUT_TAR_EXEC",
 			Value:  "tar",
 		},
+		cli.StringFlag{
+			Name:   "tar.tmp-path",
+			Usage:  "Temporary path for tar file on the dest host",
+			EnvVar: "PLUGIN_TAR_TMP_PATH,SCP_TAR_TMP_PATH",
+		},
 		cli.BoolFlag{
 			Name:   "debug",
 			Usage:  "remove target folder before upload data",
-			EnvVar: "PLUGIN_DEBUG,DEBUG",
+			EnvVar: "PLUGIN_DEBUG,DEBUG,INPUT_DEBUG",
+		},
+		cli.BoolFlag{
+			Name:   "overwrite",
+			Usage:  "use --overwrite flag with tar",
+			EnvVar: "PLUGIN_OVERWRITE,SCP_OVERWRITE,INPUT_OVERWRITE",
 		},
 	}
 
@@ -233,14 +243,9 @@ VERSION:
 REPOSITORY:
     Github: https://github.com/appleboy/drone-scp
 `
-	app.Version = Version
-
-	if BuildNum != "" {
-		app.Version = app.Version + "+" + BuildNum
-	}
 
 	if err := app.Run(os.Args); err != nil {
-		log.Println(err)
+		log.Fatal(err)
 	}
 }
 
@@ -279,6 +284,8 @@ func run(c *cli.Context) error {
 			Debug:           c.Bool("debug"),
 			StripComponents: c.Int("strip.components"),
 			TarExec:         c.String("tar.exec"),
+			TarTmpPath:      c.String("tar.tmp-path"),
+			Overwrite:       c.Bool("overwrite"),
 			Proxy: easyssh.DefaultConfig{
 				Key:      c.String("proxy.ssh-key"),
 				KeyPath:  c.String("proxy.key-path"),

path.go

@@ -1,4 +1,4 @@
-// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build !windows
 
 package main
 

path_windows_test.go

@@ -1,6 +1,8 @@
 package main
 
-import "testing"
+import (
+	"testing"
+)
 
 func TestGetRealPath(t *testing.T) {
 	type args struct {

pipeline.libsonnet

@@ -9,11 +9,8 @@
     steps: [
       {
         name: 'vet',
-        image: 'golang:1.12',
+        image: 'golang:1.13',
         pull: 'always',
-        environment: {
-          GO111MODULE: 'on',
-        },
         commands: [
           'make vet',
         ],
@@ -26,11 +23,8 @@
       },
       {
         name: 'lint',
-        image: 'golang:1.12',
+        image: 'golang:1.13',
         pull: 'always',
-        environment: {
-          GO111MODULE: 'on',
-        },
         commands: [
           'make lint',
         ],
@@ -43,11 +37,8 @@
       },
       {
         name: 'misspell',
-        image: 'golang:1.12',
+        image: 'golang:1.13',
         pull: 'always',
-        environment: {
-          GO111MODULE: 'on',
-        },
         commands: [
           'make misspell-check',
         ],
@@ -60,11 +51,8 @@
       },
       {
         name: 'test',
-        image: 'golang:1.12-alpine',
+        image: 'golang:1.13-alpine',
         pull: 'always',
-        environment: {
-          GO111MODULE: 'on',
-        },
         commands: [
           'apk add git make curl perl bash build-base zlib-dev ucl-dev',
           'make ssh-server',
@@ -105,11 +93,10 @@
     steps: [
       {
         name: 'build-push',
-        image: 'golang:1.12',
+        image: 'golang:1.13',
         pull: 'always',
         environment: {
           CGO_ENABLED: '0',
-          GO111MODULE: 'on',
         },
         commands: [
           'go build -v -ldflags \'-X main.build=${DRONE_BUILD_NUMBER}\' -a -o release/' + os + '/' + arch + '/' + name,
@@ -122,11 +109,10 @@
       },
       {
         name: 'build-tag',
-        image: 'golang:1.12',
+        image: 'golang:1.13',
         pull: 'always',
         environment: {
           CGO_ENABLED: '0',
-          GO111MODULE: 'on',
         },
         commands: [
           'go build -v -ldflags \'-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}\' -a -o release/' + os + '/' + arch + '/' + name,
@@ -137,7 +123,7 @@
       },
       {
         name: 'executable',
-        image: 'golang:1.12',
+        image: 'golang:1.13',
         pull: 'always',
         commands: [
           './release/' + os + '/' + arch + '/' + name + ' --help',
@@ -202,11 +188,8 @@
     steps: [
       {
         name: 'build-all-binary',
-        image: 'golang:1.12',
+        image: 'golang:1.13',
         pull: 'always',
-        environment: {
-          GO111MODULE: 'on',
-        },
         commands: [
           'make release'
         ],
@@ -256,14 +239,6 @@
           ignore_missing: true,
         },
       },
-      {
-        name: 'microbadger',
-        image: 'plugins/webhook:1',
-        pull: 'always',
-        settings: {
-          url: { 'from_secret': 'microbadger_url' },
-        },
-      },
     ],
     depends_on: depends_on,
     trigger: {

plugin.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -57,8 +58,10 @@ type (
 		Remove          bool
 		StripComponents int
 		TarExec         string
+		TarTmpPath      string
 		Proxy           easyssh.DefaultConfig
 		Debug           bool
+		Overwrite       bool
 	}
 
 	// Plugin values.
@@ -194,6 +197,32 @@ type fileList struct {
 	Source []string
 }
 
+func (p *Plugin) buildArgs(target string) []string {
+	args := []string{}
+
+	args = append(args,
+		p.Config.TarExec,
+		"-xf",
+		p.DestFile,
+	)
+
+	if p.Config.StripComponents > 0 {
+		args = append(args, "--strip-components")
+		args = append(args, strconv.Itoa(p.Config.StripComponents))
+	}
+
+	if p.Config.Overwrite {
+		args = append(args, "--overwrite")
+	}
+
+	args = append(args,
+		"-C",
+		target,
+	)
+
+	return args
+}
+
 // Exec executes the plugin.
 func (p *Plugin) Exec() error {
 	if len(p.Config.Host) == 0 {
@@ -237,8 +266,8 @@ func (p *Plugin) Exec() error {
 
 	wg := sync.WaitGroup{}
 	wg.Add(len(p.Config.Host))
-	errChannel := make(chan error, 1)
+	errChannel := make(chan error)
-	finished := make(chan bool, 1)
+	finished := make(chan struct{})
 	for _, host := range p.Config.Host {
 		go func(host string) {
 			// Create MakeConfig instance with remote username, server address and path to private key.
@@ -261,6 +290,9 @@ func (p *Plugin) Exec() error {
 				},
 			}
 
+			// upload file to the tmp path
+			p.DestFile = fmt.Sprintf("%s%s", p.Config.TarTmpPath, p.DestFile)
+
 			// Call Scp method with file you want to upload to remote server.
 			p.log(host, "scp file to server.")
 			err := ssh.Scp(tar, p.DestFile)
@@ -298,10 +330,18 @@ func (p *Plugin) Exec() error {
 
 				// untar file
 				p.log(host, "untar file", p.DestFile)
-				if p.Config.StripComponents > 0 {
+				commamd := strings.Join(p.buildArgs(target), " ")
-					_, _, _, err = ssh.Run(fmt.Sprintf("%s -xf %s --strip-components=%d -C %s", p.Config.TarExec, p.DestFile, p.Config.StripComponents, target), p.Config.CommandTimeout)
+				if p.Config.Debug {
-				} else {
+					fmt.Println("$", commamd)
-					_, _, _, err = ssh.Run(fmt.Sprintf("%s -xf %s -C %s", p.Config.TarExec, p.DestFile, target), p.Config.CommandTimeout)
+				}
+				outStr, errStr, _, err := ssh.Run(commamd, p.Config.CommandTimeout)
+
+				if outStr != "" {
+					p.log(host, "output: ", outStr)
+				}
+
+				if errStr != "" {
+					p.log(host, "error: ", errStr)
 				}
 
 				if err != nil {

plugin_test.go

@@ -5,6 +5,7 @@ import (
 	"os/exec"
 	"os/user"
 	"path/filepath"
+	"reflect"
 	"testing"
 	"time"
 
@@ -267,6 +268,7 @@ func TestIgnoreList(t *testing.T) {
 			Target:          []string{filepath.Join(u.HomeDir, "ignore")},
 			CommandTimeout:  60 * time.Second,
 			TarExec:         "tar",
+			Debug:           true,
 		},
 	}
 
@@ -456,3 +458,79 @@ func TestRemoveDestFile(t *testing.T) {
 	err = plugin.removeDestFile(ssh)
 	assert.Error(t, err)
 }
+
+func TestPlugin_buildArgs(t *testing.T) {
+	type fields struct {
+		Repo     Repo
+		Build    Build
+		Config   Config
+		DestFile string
+	}
+	type args struct {
+		target string
+	}
+	tests := []struct {
+		name   string
+		fields fields
+		args   args
+		want   []string
+	}{
+		{
+			name: "default command",
+			fields: fields{
+				Config: Config{
+					Overwrite: false,
+					TarExec:   "tar",
+				},
+				DestFile: "foo.tar",
+			},
+			args: args{
+				target: "foo",
+			},
+			want: []string{"tar", "-xf", "foo.tar", "-C", "foo"},
+		},
+		{
+			name: "strip components",
+			fields: fields{
+				Config: Config{
+					Overwrite:       false,
+					TarExec:         "tar",
+					StripComponents: 2,
+				},
+				DestFile: "foo.tar",
+			},
+			args: args{
+				target: "foo",
+			},
+			want: []string{"tar", "-xf", "foo.tar", "--strip-components", "2", "-C", "foo"},
+		},
+		{
+			name: "overwrite",
+			fields: fields{
+				Config: Config{
+					TarExec:         "tar",
+					StripComponents: 2,
+					Overwrite:       true,
+				},
+				DestFile: "foo.tar",
+			},
+			args: args{
+				target: "foo",
+			},
+			want: []string{"tar", "-xf", "foo.tar", "--strip-components", "2", "--overwrite", "-C", "foo"},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			p := &Plugin{
+				Repo:     tt.fields.Repo,
+				Build:    tt.fields.Build,
+				Config:   tt.fields.Config,
+				DestFile: tt.fields.DestFile,
+			}
+			if got := p.buildArgs(tt.args.target); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("Plugin.buildArgs() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}