Refactor.

nut/base.go

@@ -62,6 +62,7 @@ func init() {
 	WorkspaceDir = filepath.Join(SrcDir, "..")
 	NutDir = filepath.Join(WorkspaceDir, "nut")
 
+	// detect home dir
 	u, err := user.Current()
 	if err == nil {
 		_, err = os.Stat(u.HomeDir)
@@ -71,6 +72,7 @@ func init() {
 		return
 	}
 
+	// load config if file exists
 	path := filepath.Join(u.HomeDir, ConfigFileName)
 	b, err := ioutil.ReadFile(path)
 	if err == nil {
@@ -81,6 +83,7 @@ func init() {
 		Config = ConfigFile{}
 	}
 
+	// write config if file exists
 	if !os.IsNotExist(err) {
 		b, err = json.MarshalIndent(Config, "", "  ")
 		if err == nil {
@@ -91,6 +94,7 @@ func init() {
 		}
 	}
 
+	// for development
 	env := os.Getenv("GONUTS_IO_SERVER")
 	if env != "" {
 		u, err := url.Parse(env)
@@ -111,18 +115,7 @@ func FatalIfErr(err error) {
 	}
 }
 
-// TODO common functions there are mess for now
-
-// Read spec file.
-func ReadSpec(fileName string) (spec *Spec) {
-	f, err := os.Open(fileName)
-	PanicIfErr(err)
-	defer f.Close()
-	spec = new(Spec)
-	_, err = spec.ReadFrom(f)
-	PanicIfErr(err)
-	return
-}
+// TODO common functions below are mess for now
 
 // Read nut file.
 func ReadNut(fileName string) (b []byte, nf *NutFile) {

nut/check.go

@@ -49,7 +49,9 @@ func runCheck(cmd *Command) {
 		parts := strings.Split(arg, ".")
 		switch parts[len(parts)-1] {
 		case "json":
-			spec := ReadSpec(arg)
+			spec := new(Spec)
+			err := spec.ReadFile(arg)
+			FatalIfErr(err)
 			pack, err := build.ImportDir(".", 0)
 			FatalIfErr(err)
 			errors = spec.Check()

nut/generate.go

@@ -49,11 +49,12 @@ func runGenerate(cmd *Command) {
 	var spec *Spec
 
 	// read spec
+	spec = new(Spec)
 	if _, err = os.Stat(SpecFileName); os.IsNotExist(err) {
 		action = "generated"
-		spec = new(Spec)
 	} else {
-		spec = ReadSpec(SpecFileName)
+		err = spec.ReadFile(SpecFileName)
+		FatalIfErr(err)
 	}
 
 	// read package

nut/pack.go

@@ -64,7 +64,9 @@ func runPack(cmd *Command) {
 	}
 
 	var fileName string
-	spec := ReadSpec(SpecFileName)
+	spec := new(Spec)
+	err = spec.ReadFile(SpecFileName)
+	FatalIfErr(err)
 	nut := Nut{Spec: *spec, Package: *pack}
 	if packO == "" {
 		fileName = nut.FileName()