refactor(swag): flat package instead of multi package

jameselsey · Aug 2, 2017 · eb7f3ca · eb7f3ca
1 parent 4309752
commit eb7f3ca
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 26 deletions.
diff --git a/main.go → cmd/main.go b/main.go → cmd/main.go
diff --git a/example/simple/docs/docs.go b/example/simple/docs/docs.go
@@ -1,6 +1,6 @@
 // GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
 // This file was generated by swaggo/swag at
-// 2017-07-20 00:19:59.756080528 +0800 CST
+// 2017-08-03 00:44:10.090091728 +0800 CST
 
 package docs
 

diff --git a/gen/gen.go b/gen/gen.go
@@ -18,8 +18,7 @@ func New() *Gen {
 	return &Gen{}
 }
 
-func (g *Gen) Build(searchDir, mainApiFile string) {
-	//TODO: not use log.Println
+func (g *Gen) Build(searchDir, mainApiFile string) error {
 	log.Println("Generate swagger docs....")
 	p := parser.New()
 	p.ParseApi(searchDir, mainApiFile)
@@ -40,6 +39,7 @@ func (g *Gen) Build(searchDir, mainApiFile string) {
 	})
 
 	log.Printf("create docs.go at  %+v", docs.Name())
+	return nil
 }
 
 var packageTemplate = template.Must(template.New("").Parse(`// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT

diff --git a/parser/operation.go → operation.go b/parser/operation.go → operation.go
@@ -1,4 +1,4 @@
-package parser
+package swag
 
 import (
 	"fmt"

diff --git a/parser/operation_test.go → operation_test.go b/parser/operation_test.go → operation_test.go
@@ -1,4 +1,4 @@
-package parser
+package swag
 
 import (
 	"encoding/json"

diff --git a/parser/parser.go → parser.go b/parser/parser.go → parser.go
@@ -1,4 +1,4 @@
-package parser
+package swag
 
 import (
 	"go/ast"

diff --git a/parser/parser_test.go → parser_test.go b/parser/parser_test.go → parser_test.go
@@ -1,4 +1,4 @@
-package parser
+package swag
 
 import (
 	"encoding/json"
@@ -54,18 +54,18 @@ func TestParser_ParseGeneralApiInfoFailed(t *testing.T) {
 }
 
 func TestGetAllGoFileInfo(t *testing.T) {
-	searchDir := "../example/simple"
+	searchDir := "example/simple"
 
 	p := New()
 	p.getAllGoFileInfo(searchDir)
 
-	assert.NotEmpty(t, p.files["../example/simple/main.go"])
-	assert.NotEmpty(t, p.files["../example/simple/web/handler.go"])
+	assert.NotEmpty(t, p.files["example/simple/main.go"])
+	assert.NotEmpty(t, p.files["example/simple/web/handler.go"])
 	assert.Equal(t, 4, len(p.files))
 }
 
 func TestParser_ParseType(t *testing.T) {
-	searchDir := "../example/simple/"
+	searchDir := "example/simple/"
 
 	p := New()
 	p.getAllGoFileInfo(searchDir)
@@ -251,7 +251,7 @@ func TestParseSimpleApi(t *testing.T) {
         }
     }
 }`
-	searchDir := "../example/simple"
+	searchDir := "example/simple"
 	mainApiFile := "main.go"
 	p := New()
 	p.ParseApi(searchDir, mainApiFile)
@@ -261,7 +261,7 @@ func TestParseSimpleApi(t *testing.T) {
 }
 
 func TestParsePetApi(t *testing.T) {
-	searchDir := "../example/pet"
+	searchDir := "example/pet"
 	mainApiFile := "main.go"
 	p := New()
 	p.ParseApi(searchDir, mainApiFile)

diff --git a/parser/property.go → property.go b/parser/property.go → property.go
@@ -1,4 +1,4 @@
-package parser
+package swag
 
 import (
 	"go/ast"

diff --git a/test.sh b/test.sh
diff --git a/parser/testdata/main.go → testdata/main.go b/parser/testdata/main.go → testdata/main.go