k1LoW · k1LoW · Nov 29, 2023 · Nov 29, 2023
diff --git a/.github/workflows/parallel.yml b/.github/workflows/parallel.yml
@@ -22,14 +22,14 @@ jobs:
         with:
           go-version-file: go.mod
 
-      - name: Run tests pkg/coverage
-        run: go test ./pkg/coverage/... -coverprofile=coverage_coverage.out -covermode=count
+      - name: Run tests coverage
+        run: go test ./coverage/... -coverprofile=coverage_coverage.out -covermode=count
 
-      - name: Run tests pkg/ratio
-        run: go test ./pkg/ratio/... -coverprofile=coverage_ratio.out -covermode=count
+      - name: Run tests ratio
+        run: go test ./ratio/... -coverprofile=coverage_ratio.out -covermode=count
 
-      - name: Run tests pkg/badge
-        run: go test ./pkg/badge/... -coverprofile=coverage_badge.out -covermode=count
+      - name: Run tests badge
+        run: go test ./badge/... -coverprofile=coverage_badge.out -covermode=count
 
       - uses: actions/upload-artifact@v2
         with:
@@ -54,7 +54,7 @@ jobs:
           go-version-file: go.mod
 
       - name: Run tests other
-        run: go test $(go list ./... | grep -v pkg) -coverprofile=coverage_other.out -covermode=count
+        run: go test $(go list ./... | grep -v coverage | grep -v ratio | grep -v badge) -coverprofile=coverage_other.out -covermode=count
 
       - uses: actions/upload-artifact@v2
         with:

diff --git a/pkg/badge/NotoSans-Medium.ttf → badge/NotoSans-Medium.ttf b/pkg/badge/NotoSans-Medium.ttf → badge/NotoSans-Medium.ttf
diff --git a/pkg/badge/README.md → badge/README.md b/pkg/badge/README.md → badge/README.md
diff --git a/pkg/badge/badge.go → badge/badge.go b/pkg/badge/badge.go → badge/badge.go
diff --git a/pkg/badge/badge.svg.tmpl → badge/badge.svg.tmpl b/pkg/badge/badge.svg.tmpl → badge/badge.svg.tmpl
diff --git a/pkg/badge/badge_test.go → badge/badge_test.go b/pkg/badge/badge_test.go → badge/badge_test.go
diff --git a/pkg/badge/cmd/badgen/main.go → badge/cmd/badgen/main.go b/pkg/badge/cmd/badgen/main.go → badge/cmd/badgen/main.go
@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 package main
 
-import "github.com/k1LoW/octocov/pkg/badge/cmd"
+import "github.com/k1LoW/octocov/badge/cmd"
 
 func main() {
 	cmd.Execute()

diff --git a/pkg/badge/cmd/root.go → badge/cmd/root.go b/pkg/badge/cmd/root.go → badge/cmd/root.go
@@ -24,7 +24,7 @@ package cmd
 import (
 	"os"
 
-	"github.com/k1LoW/octocov/pkg/badge"
+	"github.com/k1LoW/octocov/badge"
 	"github.com/spf13/cobra"
 )
 

diff --git a/pkg/badge/testdata/a.golden → badge/testdata/a.golden b/pkg/badge/testdata/a.golden → badge/testdata/a.golden
diff --git a/pkg/badge/testdata/add_icon.golden → badge/testdata/add_icon.golden b/pkg/badge/testdata/add_icon.golden → badge/testdata/add_icon.golden
diff --git a/pkg/badge/testdata/b.golden → badge/testdata/b.golden b/pkg/badge/testdata/b.golden → badge/testdata/b.golden
diff --git a/pkg/badge/testdata/c.golden → badge/testdata/c.golden b/pkg/badge/testdata/c.golden → badge/testdata/c.golden
diff --git a/pkg/badge/testdata/icon.svg → badge/testdata/icon.svg b/pkg/badge/testdata/icon.svg → badge/testdata/icon.svg
diff --git a/central/central.go b/central/central.go
@@ -19,7 +19,7 @@ import (
 	"github.com/k1LoW/octocov/datastore/local"
 	"github.com/k1LoW/octocov/gh"
 	"github.com/k1LoW/octocov/internal"
-	"github.com/k1LoW/octocov/pkg/badge"
+	"github.com/k1LoW/octocov/badge"
 	"github.com/k1LoW/octocov/report"
 )
 

diff --git a/cmd/badge.go b/cmd/badge.go
@@ -31,7 +31,7 @@ import (
 
 	"github.com/k1LoW/octocov/config"
 	"github.com/k1LoW/octocov/internal"
-	"github.com/k1LoW/octocov/pkg/badge"
+	"github.com/k1LoW/octocov/badge"
 	"github.com/k1LoW/octocov/report"
 	"github.com/spf13/cobra"
 )

diff --git a/cmd/init.go b/cmd/init.go
@@ -29,7 +29,7 @@ import (
 	"path/filepath"
 
 	"github.com/k1LoW/octocov/config"
-	"github.com/k1LoW/octocov/pkg/pplang"
+	"github.com/k1LoW/octocov/pplang"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/root.go b/cmd/root.go
@@ -38,7 +38,7 @@ import (
 	"github.com/k1LoW/octocov/datastore"
 	"github.com/k1LoW/octocov/gh"
 	"github.com/k1LoW/octocov/internal"
-	"github.com/k1LoW/octocov/pkg/badge"
+	"github.com/k1LoW/octocov/badge"
 	"github.com/k1LoW/octocov/report"
 	"github.com/k1LoW/octocov/version"
 	"github.com/spf13/cobra"

diff --git a/cmd/view.go b/cmd/view.go
@@ -27,7 +27,7 @@ import (
 	"path/filepath"
 
 	"github.com/k1LoW/octocov/config"
-	"github.com/k1LoW/octocov/pkg/coverage"
+	"github.com/k1LoW/octocov/coverage"
 	"github.com/k1LoW/octocov/report"
 	"github.com/spf13/cobra"
 )

diff --git a/pkg/coverage/clover.go → coverage/clover.go b/pkg/coverage/clover.go → coverage/clover.go
diff --git a/pkg/coverage/clover_test.go → coverage/clover_test.go b/pkg/coverage/clover_test.go → coverage/clover_test.go
diff --git a/pkg/coverage/cobertura.go → coverage/cobertura.go b/pkg/coverage/cobertura.go → coverage/cobertura.go
diff --git a/pkg/coverage/cobertura_test.go → coverage/cobertura_test.go b/pkg/coverage/cobertura_test.go → coverage/cobertura_test.go
diff --git a/pkg/coverage/coverage.go → coverage/coverage.go b/pkg/coverage/coverage.go → coverage/coverage.go
diff --git a/pkg/coverage/coverage_test.go → coverage/coverage_test.go b/pkg/coverage/coverage_test.go → coverage/coverage_test.go
diff --git a/pkg/coverage/diff.go → coverage/diff.go b/pkg/coverage/diff.go → coverage/diff.go
diff --git a/pkg/coverage/gocover.go → coverage/gocover.go b/pkg/coverage/gocover.go → coverage/gocover.go
diff --git a/pkg/coverage/gocover_test.go → coverage/gocover_test.go b/pkg/coverage/gocover_test.go → coverage/gocover_test.go
diff --git a/pkg/coverage/jacoco.go → coverage/jacoco.go b/pkg/coverage/jacoco.go → coverage/jacoco.go
diff --git a/pkg/coverage/jacoco_test.go → coverage/jacoco_test.go b/pkg/coverage/jacoco_test.go → coverage/jacoco_test.go
diff --git a/pkg/coverage/lcov.go → coverage/lcov.go b/pkg/coverage/lcov.go → coverage/lcov.go
diff --git a/pkg/coverage/lcov_test.go → coverage/lcov_test.go b/pkg/coverage/lcov_test.go → coverage/lcov_test.go
diff --git a/pkg/coverage/merge.go → coverage/merge.go b/pkg/coverage/merge.go → coverage/merge.go
diff --git a/pkg/coverage/merge_test.go → coverage/merge_test.go b/pkg/coverage/merge_test.go → coverage/merge_test.go
diff --git a/pkg/coverage/printer.go → coverage/printer.go b/pkg/coverage/printer.go → coverage/printer.go
diff --git a/pkg/coverage/printer_test.go → coverage/printer_test.go b/pkg/coverage/printer_test.go → coverage/printer_test.go
diff --git a/pkg/coverage/simplecov.go → coverage/simplecov.go b/pkg/coverage/simplecov.go → coverage/simplecov.go
diff --git a/pkg/coverage/simplecov_test.go → coverage/simplecov_test.go b/pkg/coverage/simplecov_test.go → coverage/simplecov_test.go
diff --git a/pkg/coverage/testdata/clover/coverage.xml → coverage/testdata/clover/coverage.xml b/pkg/coverage/testdata/clover/coverage.xml → coverage/testdata/clover/coverage.xml
diff --git a/...rage/testdata/clover/coverage_package.xml → ...rage/testdata/clover/coverage_package.xml b/...rage/testdata/clover/coverage_package.xml → ...rage/testdata/clover/coverage_package.xml
diff --git a/pkg/coverage/testdata/cobertura/coverage.xml → coverage/testdata/cobertura/coverage.xml b/pkg/coverage/testdata/cobertura/coverage.xml → coverage/testdata/cobertura/coverage.xml
diff --git a/pkg/coverage/testdata/gocover/coverage.out → coverage/testdata/gocover/coverage.out b/pkg/coverage/testdata/gocover/coverage.out → coverage/testdata/gocover/coverage.out
diff --git a/...rage/testdata/jacoco/jacocoTestReport.xml → ...rage/testdata/jacoco/jacocoTestReport.xml b/...rage/testdata/jacoco/jacocoTestReport.xml → ...rage/testdata/jacoco/jacocoTestReport.xml
diff --git a/pkg/coverage/testdata/lcov/lcov.info → coverage/testdata/lcov/lcov.info b/pkg/coverage/testdata/lcov/lcov.info → coverage/testdata/lcov/lcov.info
diff --git a/...estdata/simplecov/.resultset.another.json → ...estdata/simplecov/.resultset.another.json b/...estdata/simplecov/.resultset.another.json → ...estdata/simplecov/.resultset.another.json
diff --git a/...verage/testdata/simplecov/.resultset.json → coverage/testdata/simplecov/.resultset.json b/...verage/testdata/simplecov/.resultset.json → coverage/testdata/simplecov/.resultset.json
diff --git a/...stdata/simplecov/.resultset.parallel.json → ...stdata/simplecov/.resultset.parallel.json b/...stdata/simplecov/.resultset.parallel.json → ...stdata/simplecov/.resultset.parallel.json
diff --git a/...erage/testdata/simplecov/.resultset2.json → coverage/testdata/simplecov/.resultset2.json b/...erage/testdata/simplecov/.resultset2.json → coverage/testdata/simplecov/.resultset2.json
diff --git a/docs/term.svg b/docs/term.svg
diff --git a/pkg/pplang/README.md → pplang/README.md b/pkg/pplang/README.md → pplang/README.md
diff --git a/pkg/pplang/pplang.go → pplang/pplang.go b/pkg/pplang/pplang.go → pplang/pplang.go
diff --git a/pkg/pplang/pplang_test.go → pplang/pplang_test.go b/pkg/pplang/pplang_test.go → pplang/pplang_test.go
@@ -18,7 +18,7 @@ func TestDetect(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	dir, err := filepath.Abs(filepath.Dir(filepath.Dir(wd)))
+	dir, err := filepath.Abs(filepath.Dir(wd))
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/pkg/pplang/testdata/gitconfig.txtar → pplang/testdata/gitconfig.txtar b/pkg/pplang/testdata/gitconfig.txtar → pplang/testdata/gitconfig.txtar
diff --git a/pkg/pplang/testdata/go.txtar → pplang/testdata/go.txtar b/pkg/pplang/testdata/go.txtar → pplang/testdata/go.txtar
diff --git a/pkg/pplang/testdata/none.txtar → pplang/testdata/none.txtar b/pkg/pplang/testdata/none.txtar → pplang/testdata/none.txtar
diff --git a/pkg/ratio/copy_from_gocloc.go → ratio/copy_from_gocloc.go b/pkg/ratio/copy_from_gocloc.go → ratio/copy_from_gocloc.go
diff --git a/pkg/ratio/merge.go → ratio/merge.go b/pkg/ratio/merge.go → ratio/merge.go
diff --git a/pkg/ratio/merge_test.go → ratio/merge_test.go b/pkg/ratio/merge_test.go → ratio/merge_test.go
diff --git a/pkg/ratio/ratio.go → ratio/ratio.go b/pkg/ratio/ratio.go → ratio/ratio.go
diff --git a/pkg/ratio/ratio_test.go → ratio/ratio_test.go b/pkg/ratio/ratio_test.go → ratio/ratio_test.go
@@ -103,15 +103,15 @@ func TestPathMatch(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		want := "pkg/ratio/ratio_test.go"
+		want := "ratio/ratio_test.go"
 		ok := false
 		for _, f := range got.CodeFiles {
 			if f.Path == want {
 				ok = true
 			}
 		}
 		if ok {
-			t.Error("pkg/ratio/ratio_test.go should not be contained")
+			t.Error("ratio/ratio_test.go should not be contained")
 		}
 	}
 
@@ -124,15 +124,15 @@ func TestPathMatch(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
-		want := "pkg/ratio/ratio_test.go"
+		want := "ratio/ratio_test.go"
 		ok := false
 		for _, f := range got.CodeFiles {
 			if f.Path == want {
 				ok = true
 			}
 		}
 		if !ok {
-			t.Error("pkg/ratio/ratio_test.go should be contained")
+			t.Error("ratio/ratio_test.go should be contained")
 		}
 	}
 }
@@ -162,7 +162,7 @@ func testdataDir(t *testing.T) string {
 	if err != nil {
 		t.Fatal(err)
 	}
-	dir, err := filepath.Abs(filepath.Join(filepath.Dir(filepath.Dir(wd)), "testdata"))
+	dir, err := filepath.Abs(filepath.Join(filepath.Dir(wd), "testdata"))
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/report/diff_report.go b/report/diff_report.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/k1LoW/octocov/gh"
-	"github.com/k1LoW/octocov/pkg/coverage"
-	"github.com/k1LoW/octocov/pkg/ratio"
+	"github.com/k1LoW/octocov/coverage"
+	"github.com/k1LoW/octocov/ratio"
 	"github.com/olekukonko/tablewriter"
 )
 

diff --git a/report/report.go b/report/report.go
@@ -17,8 +17,8 @@ import (
 	"github.com/goccy/go-json"
 	"github.com/hashicorp/go-multierror"
 	"github.com/k1LoW/octocov/gh"
-	"github.com/k1LoW/octocov/pkg/coverage"
-	"github.com/k1LoW/octocov/pkg/ratio"
+	"github.com/k1LoW/octocov/coverage"
+	"github.com/k1LoW/octocov/ratio"
 	"github.com/olekukonko/tablewriter"
 	"github.com/samber/lo"
 )

diff --git a/report/report_test.go b/report/report_test.go
@@ -13,9 +13,9 @@ import (
 	"github.com/goccy/go-json"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
+	"github.com/k1LoW/octocov/coverage"
 	"github.com/k1LoW/octocov/gh"
-	"github.com/k1LoW/octocov/pkg/coverage"
-	"github.com/k1LoW/octocov/pkg/ratio"
+	"github.com/k1LoW/octocov/ratio"
 )
 
 func TestNew(t *testing.T) {
@@ -530,7 +530,7 @@ func coverageTestdataDir(t *testing.T) string {
 	if err != nil {
 		t.Fatal(err)
 	}
-	dir, err := filepath.Abs(filepath.Join(filepath.Dir(wd), "pkg", "coverage", "testdata"))
+	dir, err := filepath.Abs(filepath.Join(filepath.Dir(wd), "coverage", "testdata"))
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/testdata/octocov_parallel_tests.yml b/testdata/octocov_parallel_tests.yml
@@ -8,9 +8,9 @@ coverage:
     - ../coverage_other.out
 testExecutionTime:
   steps:
-    - Run tests pkg/coverage
-    - Run tests pkg/ratio
-    - Run tests pkg/badge
+    - Run tests coverage
+    - Run tests ratio
+    - Run tests badge
     - Run tests other
 comment:
   if: false