refactor: add module prefix (#150)

stefanjenkner · Oct 3, 2024 · a34d0b9 · a34d0b9
1 parent a10eb6e
commit a34d0b9
Show file tree

Hide file tree

Showing 17 changed files with 44 additions and 21 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -12,10 +12,20 @@ linters:
   #  - complexity
   #  - error
   #  - format
-  #  - import
+    - import
   #  - metalinter
   #  - module
     - performance
   #  - style
   #  - test
     - unused
+linters-settings:
+  depguard:
+    rules:
+      main:
+        files:
+          - $all
+        allow:
+          - $gostd
+          - github.com/go-ble/ble
+          - github.com/stefanjenkner/fdf-console-monitor
diff --git a/.idea/runConfigurations/app_help.xml b/.idea/runConfigurations/app_help.xml
diff --git a/.idea/runConfigurations/help.xml b/.idea/runConfigurations/help.xml
diff --git a/.idea/runConfigurations/test.xml b/.idea/runConfigurations/test.xml
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -16,7 +16,7 @@ repos:
   - repo: https://github.com/golangci/golangci-lint
     rev: v1.61.0
     hooks:
-      - id: golangci-lint
+      - id: golangci-lint-full
   - repo: https://github.com/DavidAnson/markdownlint-cli2
     rev: v0.14.0
     hooks:

diff --git a/cmd/app/main.go → cmd/fdf-console-monitor/main.go b/cmd/app/main.go → cmd/fdf-console-monitor/main.go
@@ -1,13 +1,14 @@
 package main
 
 import (
-	"fdf-console-monitor/internal/fitnessmachine"
-	"fdf-console-monitor/internal/serialmonitor"
 	"flag"
 	"log"
 	"os"
 	"os/signal"
 	"syscall"
+
+	"github.com/stefanjenkner/fdf-console-monitor/pkg/fitnessmachine"
+	"github.com/stefanjenkner/fdf-console-monitor/pkg/serialmonitor"
 )
 
 func main() {

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module fdf-console-monitor
+module github.com/stefanjenkner/fdf-console-monitor
 
 go 1.23.1
 

diff --git a/internal/events/dataevent.go → pkg/events/dataevent.go b/internal/events/dataevent.go → pkg/events/dataevent.go
diff --git a/internal/events/observer.go → pkg/events/observer.go b/internal/events/observer.go → pkg/events/observer.go
diff --git a/internal/events/statuschangeevent.go → pkg/events/statuschangeevent.go b/internal/events/statuschangeevent.go → pkg/events/statuschangeevent.go
diff --git a/internal/fitnessmachine/fitnessmachine.go → pkg/fitnessmachine/fitnessmachine.go b/internal/fitnessmachine/fitnessmachine.go → pkg/fitnessmachine/fitnessmachine.go
@@ -6,9 +6,9 @@ import (
 	"log"
 	"time"
 
-	"fdf-console-monitor/internal/events"
 	"github.com/go-ble/ble"
 	"github.com/go-ble/ble/examples/lib/dev"
+	"github.com/stefanjenkner/fdf-console-monitor/pkg/events"
 )
 
 type FitnessMachine struct {

diff --git a/...nal/fitnessmachine/fitnessmachine_test.go → pkg/fitnessmachine/fitnessmachine_test.go b/...nal/fitnessmachine/fitnessmachine_test.go → pkg/fitnessmachine/fitnessmachine_test.go
@@ -3,12 +3,12 @@ package fitnessmachine
 import (
 	"bytes"
 	"context"
-	"fdf-console-monitor/internal/events"
 	"reflect"
 	"testing"
 	"time"
 
 	"github.com/go-ble/ble"
+	"github.com/stefanjenkner/fdf-console-monitor/pkg/events"
 )
 
 type NotifierMock struct {

diff --git a/internal/serialmonitor/capture.go → pkg/serialmonitor/capture.go b/internal/serialmonitor/capture.go → pkg/serialmonitor/capture.go
diff --git a/internal/serialmonitor/parser.go → pkg/serialmonitor/parser.go b/internal/serialmonitor/parser.go → pkg/serialmonitor/parser.go
diff --git a/internal/serialmonitor/parser_test.go → pkg/serialmonitor/parser_test.go b/internal/serialmonitor/parser_test.go → pkg/serialmonitor/parser_test.go
diff --git a/internal/serialmonitor/serialmonitor.go → pkg/serialmonitor/serialmonitor.go b/internal/serialmonitor/serialmonitor.go → pkg/serialmonitor/serialmonitor.go
@@ -2,11 +2,11 @@ package serialmonitor
 
 import (
 	"bufio"
-	"fdf-console-monitor/internal/events"
 	"fmt"
 	"log"
 	"strings"
 
+	"github.com/stefanjenkner/fdf-console-monitor/pkg/events"
 	"go.bug.st/serial"
 )
 

diff --git a/internal/serialmonitor/serialmonitor_test.go → pkg/serialmonitor/serialmonitor_test.go b/internal/serialmonitor/serialmonitor_test.go → pkg/serialmonitor/serialmonitor_test.go
@@ -2,11 +2,11 @@ package serialmonitor
 
 import (
 	"bytes"
-	"fdf-console-monitor/internal/events"
 	"reflect"
 	"testing"
 	"time"
 
+	"github.com/stefanjenkner/fdf-console-monitor/pkg/events"
 	"go.bug.st/serial"
 )