Dev -> Main

.github/workflows/dart.yml

@@ -49,38 +49,7 @@ jobs:
       # package:test for this step to succeed. Note that Flutter projects will
       # want to change this to 'flutter test'.
       - name: Run tests
-        run: dart test --coverage="./coverage"
-
-      - name: Install coverage tools
-        run: dart pub global activate coverage
-
-      - name: Install lcov
-        run: |
-          if [[ "${{ runner.os }}" == "Linux" ]]; then
-            sudo apt-get update && sudo apt-get install -y lcov
-          elif [[ "${{ runner.os }}" == "macOS" ]]; then
-            brew install lcov
-          elif [[ "${{ runner.os }}" == "Windows" ]]; then
-            choco install lcov
-          fi
-        shell: bash
-
-      - name: Add lcov to PATH on Windows
-        if: runner.os == 'Windows'
-        run: echo "C:\\ProgramData\\chocolatey\\lib\\lcov\\tools\\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        shell: pwsh
-
-      - name: Format Coverage
-        run: dart pub global run coverage:format_coverage --packages=.dart_tool/package_config.json --report-on=lib --lcov -o ./coverage/coverage.lcov -i ./coverage
-
-      # - name: Excluded generated files
-      #   run: lcov --remove ./coverage/coverage.lcov '*/lib/src/*.g.dart' '*/lib/src/models/drift/*' -o ./coverage/coverage.lcov
-
-      - name: Check Publish Warnings
-        run: dart pub publish --dry-run
+        run: dart test
 
-      - name: Upload Coverage to CodeCov
-        uses: codecov/codecov-action@v4
-        with:
-          token: ${{secrets.CODECOV_TOKEN}}
-          file: coverage/coverage.lcov
+      - name: Check Publish Warnings
+        run: dart pub publish --dry-run

.github/workflows/publish.yml

@@ -25,37 +25,10 @@ jobs:
         run: dart analyze --fatal-infos 
 
       - name: Run tests
-        run: dart test --coverage="coverage"
-
-      - name: Install coverage tools
-        run: dart pub global activate coverage
-
-      - name: Install lcov
-        run: |
-          if [[ "${{ runner.os }}" == "Linux" ]]; then
-            sudo apt-get update && sudo apt-get install -y lcov
-          elif [[ "${{ runner.os }}" == "macOS" ]]; then
-            brew install lcov
-          elif [[ "${{ runner.os }}" == "Windows" ]]; then
-            choco install lcov
-          fi
-        shell: bash
-
-      - name: Format Coverage
-        run: dart pub global run coverage:format_coverage --packages=.dart_tool/package_config.json --report-on=lib --lcov -o ./coverage/coverage.lcov -i ./coverage
-
-      - name: Excluded generated files
-        run: lcov --remove ./coverage/coverage.lcov '*/lib/src/*.g.dart' '*/lib/src/models/drift/*' -o ./coverage/coverage.lcov
-
+        run: dart test
       - name: Check Publish Warnings
         run: dart pub publish --dry-run
-
-      - name: Upload Coverage to CodeCov
-        uses: codecov/codecov-action@v4
-        with:
-          token: ${{secrets.CODECOV_TOKEN}}
-          file: coverage/coverage.lcov
-
+
   publish:
     needs: 'test'
     permissions:

.github/workflows/static.yml

@@ -0,0 +1,64 @@
+# Simple workflow for deploying static content to GitHub Pages
+name: Code Coverage
+
+on:
+  # Runs on pushes targeting the default branch
+  push:
+    branches: ["dev","main"]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  # Single deploy job since we're just deploying
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
+
+      - uses: dart-lang/[email protected]
+
+      - name: Run tests
+        run: dart test --coverage="./coverage"
+
+      - name: Install coverage tools
+        run: dart pub global activate coverage
+
+      - name: Install lcov
+        run: sudo apt-get update && sudo apt-get install -y lcov
+
+      - name: Format Coverage
+        run: dart pub global run coverage:format_coverage --packages=.dart_tool/package_config.json --report-on=lib --lcov -o ./coverage/coverage.lcov -i ./coverage
+
+      - name: Excluded generated files
+        run: lcov --remove ./coverage/coverage.lcov '*/lib/src/*.g.dart' '*/lib/src/models/drift/*' -o ./coverage/coverage.lcov
+
+      - name: Generate HTML coverage report
+        run: genhtml -o ./coverage/report ./coverage/coverage.lcov
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          # Upload entire repository
+          path: './coverage/report'
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.gitignore

@@ -29,8 +29,7 @@
 .packages
 .pub-cache/
 .pub/
-**/coverage/
 **/build/
-
+**/coverage/
 # Downloaded files
 /mac-vendors-export.csv

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## 6.0.5
+Bug fixes and improvements
+
 ## 6.0.4
 Performance improvements
 

README.md

@@ -1,6 +1,6 @@
-# Network Tools
+# Cross Platform Network Tools
 
-[![pub package](https://img.shields.io/pub/v/network_tools.svg)](https://pub.dev/packages/network_tools) [![Dart](https://github.com/osociety/network_tools/actions/workflows/dart.yml/badge.svg)](https://github.com/osociety/network_tools/actions/workflows/dart.yml) [![codecov](https://codecov.io/gh/osociety/network_tools/graph/badge.svg?token=J9G2472GQZ)](https://codecov.io/gh/osociety/network_tools)
+[![pub package](https://img.shields.io/pub/v/network_tools.svg)](https://pub.dev/packages/network_tools) [![Dart](https://github.com/osociety/network_tools/actions/workflows/dart.yml/badge.svg)](https://github.com/osociety/network_tools/actions/workflows/dart.yml) [![Code Coverage](https://github.com/osociety/network_tools/actions/workflows/static.yml/badge.svg)](https://osociety.github.io/network_tools) [![codecov](https://codecov.io/gh/osociety/network_tools/graph/badge.svg?token=J9G2472GQZ)](https://codecov.io/gh/osociety/network_tools)
 
 Network Tools Supported
 

lib/src/configure_dart_native.dart

@@ -5,10 +5,10 @@ import 'package:network_tools/network_tools.dart' as packages_page;
 import 'package:network_tools/src/injection.dart';
 import 'package:network_tools/src/models/arp_data.dart';
 import 'package:network_tools/src/models/vendor.dart';
+import 'package:network_tools/src/repository/repository.dart';
 import 'package:network_tools/src/services/impls/host_scanner_service_impl.dart';
 import 'package:network_tools/src/services/impls/mdns_scanner_service_impl.dart';
 import 'package:network_tools/src/services/impls/port_scanner_service_impl.dart';
-import 'package:network_tools/src/services/repository.dart';
 
 /// Configures the network tools package for Dart native platforms.
 ///

lib/src/injection.config.dart

@@ -16,11 +16,10 @@ import 'package:network_tools/src/database/database_service.dart' as _i45;
 import 'package:network_tools/src/database/drfit_database_service.dart'
     as _i827;
 import 'package:network_tools/src/database/drift_database.dart' as _i1025;
-import 'package:network_tools/src/services/impls/arp_repository_impl.dart'
-    as _i364;
-import 'package:network_tools/src/services/impls/vendor_repository_impl.dart'
-    as _i315;
-import 'package:network_tools/src/services/repository.dart' as _i960;
+import 'package:network_tools/src/repository/arp_repository_impl.dart' as _i608;
+import 'package:network_tools/src/repository/repository.dart' as _i101;
+import 'package:network_tools/src/repository/vendor_repository_impl.dart'
+    as _i429;
 
 extension GetItInjectableX on _i174.GetIt {
   // initializes the registration of main-scope dependencies inside of GetIt
@@ -32,14 +31,14 @@ extension GetItInjectableX on _i174.GetIt {
     gh.factory<_i45.DatabaseService<_i1025.AppDatabase>>(
       () => _i827.DriftDatabaseService(),
     );
-    gh.factory<_i960.Repository<_i916.Vendor>>(
-      () => _i315.VendorRepository(
+    gh.factory<_i101.Repository<_i916.ARPData>>(
+      () => _i608.ARPRepository(gh<_i45.DatabaseService<_i1025.AppDatabase>>()),
+    );
+    gh.factory<_i101.Repository<_i916.Vendor>>(
+      () => _i429.VendorRepository(
         gh<_i45.DatabaseService<_i1025.AppDatabase>>(),
       ),
     );
-    gh.factory<_i960.Repository<_i916.ARPData>>(
-      () => _i364.ARPRepository(gh<_i45.DatabaseService<_i1025.AppDatabase>>()),
-    );
     return this;
   }
 }

lib/src/models/active_host.dart

@@ -2,7 +2,7 @@ import 'package:dart_ping/dart_ping.dart';
 import 'package:network_tools/network_tools.dart';
 import 'package:network_tools/src/injection.dart';
 import 'package:network_tools/src/network_tools_utils.dart';
-import 'package:network_tools/src/services/repository.dart';
+import 'package:network_tools/src/repository/repository.dart';
 import 'package:universal_io/io.dart';
 
 /// ActiveHost which implements comparable

lib/src/services/impls/arp_repository_impl.dart → lib/src/repository/arp_repository_impl.dart

@@ -7,7 +7,7 @@ import 'package:network_tools/network_tools.dart';
 import 'package:network_tools/src/database/database_service.dart';
 import 'package:network_tools/src/database/drift_database.dart';
 import 'package:network_tools/src/device_info/arp_table_helper.dart';
-import 'package:network_tools/src/services/repository.dart';
+import 'package:network_tools/src/repository/repository.dart';
 
 @Injectable(as: Repository<ARPData>)
 class ARPRepository implements Repository<ARPData> {

lib/src/services/impls/vendor_repository_impl.dart → lib/src/repository/vendor_repository_impl.dart

@@ -7,7 +7,7 @@ import 'package:network_tools/network_tools.dart';
 import 'package:network_tools/src/database/database_service.dart';
 import 'package:network_tools/src/database/drift_database.dart';
 import 'package:network_tools/src/device_info/vendor_table.dart';
-import 'package:network_tools/src/services/repository.dart';
+import 'package:network_tools/src/repository/repository.dart';
 
 @Injectable(as: Repository<Vendor>)
 class VendorRepository implements Repository<Vendor> {

lib/src/services/impls/host_scanner_service_impl.dart

@@ -6,7 +6,7 @@ import 'package:dart_ping/dart_ping.dart';
 import 'package:network_tools/network_tools.dart';
 import 'package:network_tools/src/injection.dart';
 import 'package:network_tools/src/network_tools_utils.dart';
-import 'package:network_tools/src/services/repository.dart';
+import 'package:network_tools/src/repository/repository.dart';
 import 'package:universal_io/io.dart';
 
 /// Scans for all hosts in a subnet.

pubspec.yaml

@@ -1,6 +1,6 @@
 name: network_tools
 description: Networking Tools library which can help you discover open ports, devices on subnet and many other things. 
-version: 6.0.4
+version: 6.0.5
 issue_tracker: https://github.com/osociety/network_tools/issues
 repository: https://github.com/osociety/network_tools
 example: example/main.dart

test/arp_repository_impl_test.dart

@@ -3,7 +3,7 @@
 import 'package:drift/native.dart';
 import 'package:network_tools/src/database/database_service.dart';
 import 'package:network_tools/src/database/drift_database.dart';
-import 'package:network_tools/src/services/impls/arp_repository_impl.dart';
+import 'package:network_tools/src/repository/arp_repository_impl.dart';
 import 'package:test/test.dart';
 
 // Minimal DatabaseService for testing (no implements)

test/vendor_repository_impl_test.dart

@@ -4,7 +4,7 @@ import 'package:drift/native.dart';
 import 'package:network_tools/network_tools.dart';
 import 'package:network_tools/src/database/database_service.dart';
 import 'package:network_tools/src/database/drift_database.dart';
-import 'package:network_tools/src/services/impls/vendor_repository_impl.dart';
+import 'package:network_tools/src/repository/vendor_repository_impl.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';