Skip to content

Commit ea9c188

Browse files
ole108ole108
committed
Clean up
1 parent 84b6f5d commit ea9c188

File tree

6 files changed

+17
-57
lines changed

6 files changed

+17
-57
lines changed

‎deps/deps.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
// Check checks the dependencies of the given package and reports offending
1313
// imports.
14-
func Check(pkg *pkgs.Package, rootPkg string, cfg config.Config, depMap *data.DependencyMap) []error {
14+
func Check(pkg *pkgs.Package, rootPkg string, cfg config.Config) []error {
1515
relPkg, strictRelPkg := pkgs.RelativePackageName(pkg, rootPkg)
1616
checkSpecial := checkStandard
1717
pkgImps := data.PkgImports{}
@@ -38,11 +38,7 @@ func Check(pkg *pkgs.Package, rootPkg string, cfg config.Config, depMap *data.De
3838
}
3939
}
4040

41-
unqPkg := pkgs.UniquePackageName(relPkg, strictRelPkg)
4241
errs := checkPkg(pkg, relPkg, strictRelPkg, rootPkg, cfg, checkSpecial, &pkgImps)
43-
if !pkgs.IsTestPackage(pkg) && len(pkgImps.Imports) > 0 {
44-
(*depMap)[unqPkg] = pkgImps
45-
}
4642
return errs
4743
}
4844

‎deps/deps_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"path/filepath"
55
"testing"
66

7-
"github.com/flowdev/spaghetti-cutter/data"
87
"github.com/flowdev/spaghetti-cutter/deps"
98
"github.com/flowdev/spaghetti-cutter/parse"
109
"github.com/flowdev/spaghetti-cutter/x/config"
@@ -111,12 +110,11 @@ func TestCheck(t *testing.T) {
111110
}
112111

113112
var errs []string
114-
depMap := make(data.DependencyMap, 256)
115113
rootPkg := parse.RootPkg(packs)
116114
t.Logf("root package: %s", rootPkg)
117115
pkgInfos := pkgs.UniquePackages(packs)
118116
for _, pkgInfo := range pkgInfos {
119-
errs = addErrors(errs, deps.Check(pkgInfo.Pkg, rootPkg, cfg, &depMap))
117+
errs = addErrors(errs, deps.Check(pkgInfo.Pkg, rootPkg, cfg))
120118
}
121119
if len(errs) != spec.expectedErrors {
122120
t.Errorf("Expected %d errors but got %d: %q", spec.expectedErrors, len(errs), errs)

‎dirtree.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
spaghetti-cutter - Package spaghetti-cutter ...
22
├── data - Package data ...
33
├── deps - Package deps ...
4-
├── doc - Package doc ...
54
├── parse - Package parse ...
65
├── size - Package size computes the size/complexity of a package and checks it against a given maximum.
7-
├── stat - Package stat ...
8-
├── tree - Package tree contains the logic for creating a directory tree with information about the Go packages in it.
96
└── x -
107
├── config - Package config ...
118
├── dirs - Package dirs ...

‎main.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"os"
88
"path/filepath"
99

10-
"github.com/flowdev/spaghetti-cutter/data"
1110
"github.com/flowdev/spaghetti-cutter/deps"
1211
"github.com/flowdev/spaghetti-cutter/parse"
1312
"github.com/flowdev/spaghetti-cutter/size"
@@ -76,14 +75,13 @@ func cut(args []string) int {
7675
return 6
7776
}
7877

79-
var errs []error
80-
depMap := make(data.DependencyMap, 256)
81-
8278
rootPkg := parse.RootPkg(packs)
8379
log.Printf("INFO - root package: %s", rootPkg)
8480
pkgInfos := pkgs.UniquePackages(packs)
81+
82+
var errs []error
8583
for _, pkgInfo := range pkgInfos {
86-
errs = addErrors(errs, deps.Check(pkgInfo.Pkg, rootPkg, cfg, &depMap))
84+
errs = addErrors(errs, deps.Check(pkgInfo.Pkg, rootPkg, cfg))
8785
errs = addErrors(errs, size.Check(pkgInfo.Pkg, rootPkg, cfg.Size))
8886
}
8987

‎package_dependencies.md

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,25 @@
11
# Dependency Table For: github.com/flowdev/spaghetti-cutter
22

3-
| | d a t a - T | d e p s - S | d o c - S | p a r s e - S | s i z e - S | s t a t - S | t r e e - S | x / c o n f i g - T | x / d i r s - T | x / p k g s - T |
4-
| :- | :- | :- | :- | :- | :- | :- | :- | :- | :- | :- |
5-
| **/** | **T** | **S** | **S** | **S** | **S** | **S** | **S** | **T** | **T** | **T** |
6-
| deps | T | | | | | | | T | | T |
7-
| doc | T | | | | | | | | | |
8-
| parse | | | | | | | | | | T |
9-
| size | | | | | | | | | | T |
10-
| stat | T | | | | | | | | | |
11-
| tree | | | | | | | | | | T |
12-
| _x/config_ | _T_ | | | | | | | | | |
3+
| | d a t a - T | d e p s - S | p a r s e - S | s i z e - S | x / c o n f i g - T | x / d i r s - T | x / p k g s - T |
4+
| :- | :- | :- | :- | :- | :- | :- | :- |
5+
| **/** | | **S** | **S** | **S** | **T** | **T** | **T** |
6+
| deps | T | | | | T | | T |
7+
| parse | | | | | | | T |
8+
| size | | | | | | | T |
9+
| _x/config_ | _T_ | | | | | | |
1310

1411
### Legend
1512

1613
* Rows - Importing packages
17-
* columns - Imported packages
14+
* Columns - Imported packages
1815

1916

2017
#### Meaning Of Row And Row Header Formatting
2118

2219
* **Bold** - God package (can use all packages)
2320
* `Code` - Database package (can only use tool and other database packages)
2421
* _Italic_ - Tool package (foundational, no dependencies)
25-
* no formatting - Standard package (can only use tool and database packages)
22+
* No formatting - Standard package (can only use tool and database packages)
2623

2724

2825
#### Meaning Of Letters In Table Columns

‎package_statistics.md

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
| package | type | direct deps | all deps | users | max score | min score |
44
| :- | :-: | -: | -: | -: | -: | -: |
5-
| [/](#root-package) | [ \[G\] ](#legend) | [9](#direct-dependencies-imports-of-root-package) | [9](#all-including-transitive-dependencies-imports-of-root-package) | 0 | 0 | 0 |
5+
| [/](#root-package) | [ \[G\] ](#legend) | [6](#direct-dependencies-imports-of-root-package) | [7](#all-including-transitive-dependencies-imports-of-root-package) | 0 | 0 | 0 |
66
| [deps](#package-deps) | [ \[S\] ](#legend) | [3](#direct-dependencies-imports-of-package-deps) | [3](#all-including-transitive-dependencies-imports-of-package-deps) | [1](#packages-using-importing-package-deps) | 0 | 0 |
7-
| [doc](#package-doc) | [ \[S\] ](#legend) | [1](#direct-dependencies-imports-of-package-doc) | [1](#all-including-transitive-dependencies-imports-of-package-doc) | [1](#packages-using-importing-package-doc) | 0 | 0 |
87
| [parse](#package-parse) | [ \[S\] ](#legend) | [1](#direct-dependencies-imports-of-package-parse) | [1](#all-including-transitive-dependencies-imports-of-package-parse) | [1](#packages-using-importing-package-parse) | 0 | 0 |
98
| [size](#package-size) | [ \[S\] ](#legend) | [1](#direct-dependencies-imports-of-package-size) | [1](#all-including-transitive-dependencies-imports-of-package-size) | [1](#packages-using-importing-package-size) | 0 | 0 |
10-
| [stat](#package-stat) | [ \[S\] ](#legend) | [1](#direct-dependencies-imports-of-package-stat) | [1](#all-including-transitive-dependencies-imports-of-package-stat) | [1](#packages-using-importing-package-stat) | 0 | 0 |
119
| [x/config](#package-xconfig) | [ \[T\] ](#legend) | [1](#direct-dependencies-imports-of-package-xconfig) | [1](#all-including-transitive-dependencies-imports-of-package-xconfig) | [2](#packages-using-importing-package-xconfig) | 0 | 0 |
1210

1311
### Legend
@@ -29,10 +27,10 @@
2927

3028

3129
#### Direct Dependencies (Imports) Of Root Package
32-
`data`, [deps](#package-deps), [doc](#package-doc), [parse](#package-parse), [size](#package-size), [stat](#package-stat), [x/config](#package-xconfig), `x/dirs`, `x/pkgs`
30+
[deps](#package-deps), [parse](#package-parse), [size](#package-size), [x/config](#package-xconfig), `x/dirs`, `x/pkgs`
3331

3432
#### All (Including Transitive) Dependencies (Imports) Of Root Package
35-
`data`, [deps](#package-deps), [doc](#package-doc), [parse](#package-parse), [size](#package-size), [stat](#package-stat), [x/config](#package-xconfig), `x/dirs`, `x/pkgs`
33+
`data`, [deps](#package-deps), [parse](#package-parse), [size](#package-size), [x/config](#package-xconfig), `x/dirs`, `x/pkgs`
3634

3735
### Package deps
3836

@@ -46,18 +44,6 @@
4644
#### Packages Using (Importing) Package deps
4745
[root](#root-package)
4846

49-
### Package doc
50-
51-
52-
#### Direct Dependencies (Imports) Of Package doc
53-
`data`
54-
55-
#### All (Including Transitive) Dependencies (Imports) Of Package doc
56-
`data`
57-
58-
#### Packages Using (Importing) Package doc
59-
[root](#root-package)
60-
6147
### Package parse
6248

6349

@@ -82,18 +68,6 @@
8268
#### Packages Using (Importing) Package size
8369
[root](#root-package)
8470

85-
### Package stat
86-
87-
88-
#### Direct Dependencies (Imports) Of Package stat
89-
`data`
90-
91-
#### All (Including Transitive) Dependencies (Imports) Of Package stat
92-
`data`
93-
94-
#### Packages Using (Importing) Package stat
95-
[root](#root-package)
96-
9771
### Package x/config
9872

9973

0 commit comments

Comments
 (0)