Skip to content

Commit 6214552

Browse files
bradrydzewskibradrydzewski
committed
Merge remote-tracking branch 'origin/master'
2 parents f28ca2f + 1308deb commit 6214552

34 files changed

+87
-81
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Command line client for the Drone continuous integration server. Please see the official documentation at http://docs.drone.io/cli-installation/
1+
Command line client for the Drone continuous integration server. Please see the official documentation at https://docs.drone.io/cli/install/

‎drone/autoscale/autoscale_version.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"os"
55
"text/template"
66

7-
"github.com/urfave/cli"
8-
97
"github.com/drone/drone-cli/drone/internal"
8+
"github.com/drone/funcmap"
9+
"github.com/urfave/cli"
1010
)
1111

1212
var autoscaleVersionCmd = cli.Command{
@@ -33,7 +33,7 @@ func autoscaleVersion(c *cli.Context) error {
3333
return err
3434
}
3535

36-
tmpl, err := template.New("_").Parse(c.String("format") + "\n")
36+
tmpl, err := template.New("_").Funcs(funcmap.Funcs).Parse(c.String("format") + "\n")
3737
if err != nil {
3838
return err
3939
}

‎drone/build/build_info.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"text/template"
77

88
"github.com/drone/drone-cli/drone/internal"
9+
"github.com/drone/funcmap"
910
"github.com/urfave/cli"
1011
)
1112

@@ -56,7 +57,7 @@ func buildInfo(c *cli.Context) error {
5657
return err
5758
}
5859

59-
tmpl, err := template.New("_").Parse(c.String("format"))
60+
tmpl, err := template.New("_").Funcs(funcmap.Funcs).Parse(c.String("format"))
6061
if err != nil {
6162
return err
6263
}

‎drone/build/build_last.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"text/template"
66

77
"github.com/drone/drone-cli/drone/internal"
8+
"github.com/drone/funcmap"
89
"github.com/urfave/cli"
910
)
1011

@@ -44,7 +45,7 @@ func buildLast(c *cli.Context) error {
4445
return err
4546
}
4647

47-
tmpl, err := template.New("_").Parse(c.String("format"))
48+
tmpl, err := template.New("_").Funcs(funcmap.Funcs).Parse(c.String("format"))
4849
if err != nil {
4950
return err
5051
}

‎drone/build/build_list.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66

77
"github.com/drone/drone-cli/drone/internal"
88
"github.com/drone/drone-go/drone"
9+
"github.com/drone/funcmap"
910
"github.com/urfave/cli"
1011
)
1112

@@ -62,7 +63,7 @@ func buildList(c *cli.Context) error {
6263
return err
6364
}
6465

65-
tmpl, err := template.New("_").Parse(c.String("format") + "\n")
66+
tmpl, err := template.New("_").Funcs(funcmap.Funcs).Parse(c.String("format") + "\n")
6667
if err != nil {
6768
return err
6869
}

‎drone/build/build_promote.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"text/template"
77

88
"github.com/drone/drone-cli/drone/internal"
9+
"github.com/drone/funcmap"
910
"github.com/urfave/cli"
1011
)
1112

@@ -50,7 +51,7 @@ func buildPromote(c *cli.Context) (err error) {
5051
return err
5152
}
5253

53-
tmpl, err := template.New("_").Parse(c.String("format"))
54+
tmpl, err := template.New("_").Funcs(funcmap.Funcs).Parse(c.String("format"))
5455
if err != nil {
5556
return err
5657
}

‎drone/build/build_start.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"text/template"
88

99
"github.com/drone/drone-cli/drone/internal"
10+
"github.com/drone/funcmap"
1011
"github.com/urfave/cli"
1112
)
1213

@@ -66,7 +67,7 @@ func buildStart(c *cli.Context) (err error) {
6667
return err
6768
}
6869

69-
tmpl, err := template.New("_").Parse(c.String("format"))
70+
tmpl, err := template.New("_").Funcs(funcmap.Funcs).Parse(c.String("format"))
7071
if err != nil {
7172
return err
7273
}

‎drone/cron/cron_info.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66

77
"github.com/drone/drone-cli/drone/internal"
8-
8+
"github.com/drone/funcmap"
99
"github.com/urfave/cli"
1010
)
1111

@@ -39,7 +39,7 @@ func cronInfo(c *cli.Context) error {
3939
return err
4040
}
4141
format := c.String("format")
42-
tmpl, err := template.New("_").Funcs(funcs).Parse(format)
42+
tmpl, err := template.New("_").Funcs(funcmap.Funcs).Parse(format)
4343
if err != nil {
4444
return err
4545
}

‎drone/cron/cron_list.go‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ package cron
33
import (
44
"html/template"
55
"os"
6-
"time"
7-
8-
"github.com/urfave/cli"
96

107
"github.com/drone/drone-cli/drone/internal"
8+
"github.com/drone/funcmap"
9+
"github.com/urfave/cli"
1110
)
1211

1312
var cronListCmd = cli.Command{
@@ -40,7 +39,7 @@ func cronList(c *cli.Context) error {
4039
return err
4140
}
4241
format := c.String("format") + "\n"
43-
tmpl, err := template.New("_").Funcs(funcs).Parse(format)
42+
tmpl, err := template.New("_").Funcs(funcmap.Funcs).Parse(format)
4443
if err != nil {
4544
return err
4645
}
@@ -53,18 +52,8 @@ func cronList(c *cli.Context) error {
5352
// template for build list information
5453
var tmplCronList = "\x1b[33m{{ .Name }} \x1b[0m" + `
5554
Expr: {{ .Expr }}
56-
Next: {{ fromUnix .Next }}
55+
Next: {{ .Next | time }}
5756
{{- if .Disabled }}
5857
Disabled: true
5958
{{- end }}
6059
`
61-
62-
var funcs = map[string]interface{}{
63-
"fromUnix": func(v interface{}) string {
64-
i, ok := v.(int64)
65-
if !ok {
66-
return ""
67-
}
68-
return time.Unix(i, 0).String()
69-
},
70-
}

‎drone/exec/_backup/exec.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,10 @@ var Command = cli.Command{
6969
Usage: "privileged plugins",
7070
Value: &cli.StringSlice{
7171
"plugins/docker",
72-
"plugins/gcr",
72+
"plugins/acr",
7373
"plugins/ecr",
74+
"plugins/gcr",
75+
"plugins/heroku",
7476
},
7577
},
7678

0 commit comments

Comments
 (0)