Skip to content

Commit 0c5188a

Browse files
author
mfarah
committed
Added prechecking script, fixed lint errors
1 parent 9869a41 commit 0c5188a

File tree

3 files changed

+31
-30
lines changed

3 files changed

+31
-30
lines changed

precheckin.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
gofmt -w .
2+
golint
3+
go test

yaml.go

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,55 +20,54 @@ func main() {
2020
Name: "read",
2121
Aliases: []string{"r"},
2222
Usage: "read <filename> <path>\n\te.g.: yaml read sample.json a.b.c\n\t(default) reads a property from a given yaml file",
23-
Action: read_property,
23+
Action: readProperty,
2424
},
2525
}
26-
app.Action = read_property
26+
app.Action = readProperty
2727
app.Run(os.Args)
2828
}
2929

30-
func read_property(c *cli.Context) {
31-
var parsed_data map[interface{}]interface{}
32-
read_yaml(c, &parsed_data)
30+
func readProperty(c *cli.Context) {
31+
var parsedData map[interface{}]interface{}
32+
readYaml(c, &parsedData)
3333

3434
var path = c.Args()[1]
3535
var paths = strings.Split(path, ".")
3636

37-
fmt.Println(read_map(parsed_data, paths[0], paths[1:len(paths)]))
37+
fmt.Println(readMap(parsedData, paths[0], paths[1:len(paths)]))
3838
}
3939

40-
func read_yaml(c *cli.Context, parsed_data *map[interface{}]interface{}) {
40+
func readYaml(c *cli.Context, parsedData *map[interface{}]interface{}) {
4141
if len(c.Args()) == 0 {
4242
log.Fatalf("Must provide filename")
4343
}
44-
var raw_data = read_file(c.Args()[0])
44+
var rawData = readFile(c.Args()[0])
4545

4646
if len(c.Args()) == 1 {
47-
fmt.Println(string(raw_data[:]))
47+
fmt.Println(string(rawData[:]))
4848
os.Exit(0)
4949
}
5050

51-
err := yaml.Unmarshal([]byte(raw_data), &parsed_data)
51+
err := yaml.Unmarshal([]byte(rawData), &parsedData)
5252
if err != nil {
5353
log.Fatalf("error: %v", err)
5454
}
5555
}
5656

57-
func read_file(filename string) []byte {
58-
var raw_data, read_error = ioutil.ReadFile(filename)
59-
if read_error != nil {
60-
log.Fatalf("error: %v", read_error)
57+
func readFile(filename string) []byte {
58+
var rawData, readError = ioutil.ReadFile(filename)
59+
if readError != nil {
60+
log.Fatalf("error: %v", readError)
6161
}
62-
return raw_data
62+
return rawData
6363
}
6464

65-
func read_map(context map[interface{}]interface{}, head string, tail []string) interface{} {
65+
func readMap(context map[interface{}]interface{}, head string, tail []string) interface{} {
6666
value := context[head]
6767
if len(tail) > 0 {
6868
return recurse(value, tail[0], tail[1:len(tail)])
69-
} else {
70-
return value
7169
}
70+
return value
7271
}
7372

7473
func recurse(value interface{}, head string, tail []string) interface{} {
@@ -78,17 +77,16 @@ func recurse(value interface{}, head string, tail []string) interface{} {
7877
if err != nil {
7978
log.Fatalf("Error accessing array: %v", err)
8079
}
81-
return read_array(value.([]interface{}), index, tail)
80+
return readArray(value.([]interface{}), index, tail)
8281
default:
83-
return read_map(value.(map[interface{}]interface{}), head, tail)
82+
return readMap(value.(map[interface{}]interface{}), head, tail)
8483
}
8584
}
8685

87-
func read_array(array []interface{}, head int64, tail []string) interface{} {
86+
func readArray(array []interface{}, head int64, tail []string) interface{} {
8887
value := array[head]
8988
if len(tail) > 0 {
9089
return recurse(value, tail[0], tail[1:len(tail)])
91-
} else {
92-
return value
9390
}
91+
return value
9492
}

yaml_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ import (
77
"testing"
88
)
99

10-
var raw_data = `
10+
var rawData = `
1111
a: Easy!
1212
b:
1313
c: 2
1414
d: [3, 4]
1515
`
1616

17-
var parsed_data map[interface{}]interface{}
17+
var parsedData map[interface{}]interface{}
1818

1919
func TestMain(m *testing.M) {
20-
err := yaml.Unmarshal([]byte(raw_data), &parsed_data)
20+
err := yaml.Unmarshal([]byte(rawData), &parsedData)
2121
if err != nil {
2222
fmt.Println("Error parsing yaml: %v", err)
2323
os.Exit(1)
@@ -26,15 +26,15 @@ func TestMain(m *testing.M) {
2626
os.Exit(m.Run())
2727
}
2828

29-
func TestRead_map_simple(t *testing.T) {
30-
result := read_map(parsed_data, "b", []string{"c"})
29+
func TestReadMap_simple(t *testing.T) {
30+
result := readMap(parsedData, "b", []string{"c"})
3131
if result != 2 {
3232
t.Error("Excpted 2 but got ", result)
3333
}
3434
}
3535

36-
func TestRead_map_array(t *testing.T) {
37-
result := read_map(parsed_data, "b", []string{"d", "1"})
36+
func TestReadMap_array(t *testing.T) {
37+
result := readMap(parsedData, "b", []string{"d", "1"})
3838
if result != 4 {
3939
t.Error("Excpted 4 but got ", result)
4040
}

0 commit comments

Comments
 (0)