Skip to content

Commit bfd247a

Browse files
ickerioickerio
committed
Renamed util to parsers
1 parent 7c59fd5 commit bfd247a

File tree

6 files changed

+70
-11
lines changed

6 files changed

+70
-11
lines changed

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ go 1.13
44

55
require (
66
github.com/bramvdbogaerde/go-scp v0.0.0-20191005185035-c96fe084709e
7-
github.com/jlaffaye/ftp v0.0.0-20191025175106-a59fe673c9b2
7+
github.com/jlaffaye/ftp v0.0.0-20191025175106-a59fe673c9b2 // indirect
88
github.com/pkg/sftp v1.10.1
99
github.com/urfave/cli/v2 v2.0.0
1010
github.com/vultr/govultr v0.1.7
1111
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586
1212
gopkg.in/yaml.v2 v2.2.7
13-
honnef.co/go/tools v0.0.1-2019.2.3
13+
honnef.co/go/tools v0.0.1-2019.2.3 // indirect
1414
)

‎go.sum

+7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ github.com/bramvdbogaerde/go-scp v0.0.0-20191005185035-c96fe084709e/go.mod h1:ai
55
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
66
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
77
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
8+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
89
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
910
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
1011
github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=
@@ -18,13 +19,16 @@ github.com/jlaffaye/ftp v0.0.0-20191025175106-a59fe673c9b2/go.mod h1:PwUeyujmhaG
1819
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
1920
github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
2021
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
22+
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
2123
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
2224
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
25+
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
2326
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
2427
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
2528
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
2629
github.com/pkg/sftp v1.10.1 h1:VasscCm72135zRysgrJDKsntdmPN+OuU3+nnHYA9wyc=
2730
github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
31+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
2832
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
2933
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
3034
github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
@@ -33,6 +37,7 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5I
3337
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
3438
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
3539
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
40+
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
3641
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
3742
github.com/urfave/cli v1.22.2 h1:gsqYFH8bb9ekPA12kRo0hfjngWQjkJPlN9R0N78BoUo=
3843
github.com/urfave/cli/v2 v2.0.0 h1:+HU9SCbu8GnEUFtIBfuUNXN39ofWViIEJIp6SURMpCg=
@@ -50,11 +55,13 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
5055
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
5156
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
5257
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
58+
golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI=
5359
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
5460
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
5561
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac h1:MQEvx39qSf8vyrx3XRaOe+j1UDIzKwkYOVObRgGPVqI=
5662
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
5763
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
64+
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
5865
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
5966
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
6067
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

‎mima.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/ickerio/mima/printer"
1010
"github.com/ickerio/mima/providers"
11-
"github.com/ickerio/mima/util"
11+
"github.com/ickerio/mima/parsers"
1212
"github.com/urfave/cli/v2"
1313
)
1414

@@ -34,7 +34,7 @@ func main() {
3434
Aliases: []string{"i"},
3535
Usage: "Displays info on the server",
3636
Action: func(c *cli.Context) error {
37-
conf, err := util.GetConfig(c.String("config"))
37+
conf, err := parsers.GetConfig(c.String("config"))
3838
if err != nil {
3939
return err
4040
}
@@ -59,7 +59,7 @@ func main() {
5959
Name: "start",
6060
Usage: "Starts the given server if not already online",
6161
Action: func(c *cli.Context) error {
62-
conf, err := util.GetConfig(c.String("config"))
62+
conf, err := parsers.GetConfig(c.String("config"))
6363
if err != nil {
6464
return err
6565
}
@@ -83,7 +83,7 @@ func main() {
8383
Name: "stop",
8484
Usage: "Stop the given server if currently online",
8585
Action: func(c *cli.Context) error {
86-
conf, err := util.GetConfig(c.String("config"))
86+
conf, err := parsers.GetConfig(c.String("config"))
8787
if err != nil {
8888
return err
8989
}
@@ -162,7 +162,7 @@ func main() {
162162
Name: "test",
163163
Usage: "Test things!",
164164
Action: func(c *cli.Context) error {
165-
conf, err := util.GetConfig(c.String("config"))
165+
conf, err := parsers.GetConfig(c.String("config"))
166166
if err != nil {
167167
return err
168168
}

‎util/config.go ‎parsers/config.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package util
1+
package parsers
22

33
import (
44
"errors"
@@ -28,7 +28,7 @@ func GetConfig(fileName string) (Config, error) {
2828

2929
f, err := os.Open(fileName)
3030
if err != nil {
31-
return cfg, errors.New("Could not find config file")
31+
return Config{}, errors.New("Could not find config file")
3232
}
3333

3434
decoder := yaml.NewDecoder(f)

‎parsers/service.go

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
package parsers
2+
3+
import (
4+
"errors"
5+
"fmt"
6+
"os"
7+
)
8+
9+
type Command interface {
10+
Run() error
11+
}
12+
13+
type Execute struct {
14+
data string
15+
}
16+
17+
func (e Execute) Run() error {
18+
return nil
19+
}
20+
21+
type GetFile struct {
22+
source string
23+
destination string
24+
}
25+
26+
func (g GetFile) Run() error {
27+
return nil
28+
}
29+
30+
type PutFile struct {
31+
source string
32+
destination string
33+
}
34+
35+
func (p PutFile) Run() error {
36+
return nil
37+
}
38+
39+
type Service struct {
40+
commands []Command
41+
}
42+
43+
func GetService(fileName string) (Service, error) {
44+
f, err := os.Open(fileName)
45+
if err != nil {
46+
return Service{}, errors.New("Could not find config file")
47+
}
48+
49+
fmt.Println(f)
50+
51+
return Service{}, nil
52+
}

‎providers/provider.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package providers
33
import (
44
"errors"
55

6-
"github.com/ickerio/mima/util"
6+
"github.com/ickerio/mima/pasers"
77
"github.com/vultr/govultr"
88
)
99

@@ -68,7 +68,7 @@ func GetNoAuth(service string) (Provider, error) {
6868
}
6969

7070
// GetFromConfig returns a provider from the config and user input
71-
func GetFromConfig(conf util.Config, name string) (Provider, error) {
71+
func GetFromConfig(conf parsers.Config, name string) (Provider, error) {
7272
for i := range conf.Servers {
7373
if conf.Servers[i].Name == name {
7474
switch conf.Servers[i].Provider {

0 commit comments

Comments
 (0)