Skip to content

Commit 9444d95

Browse files
git-elliotgit-elliot
authored
Merge pull request #245 from osociety/dev
Dev -> Main
2 parents b4fbe6e + fe23545 commit 9444d95

16 files changed

+92
-85
lines changed

‎.github/workflows/dart.yml‎

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -49,38 +49,7 @@ jobs:
4949
# package:test for this step to succeed. Note that Flutter projects will
5050
# want to change this to 'flutter test'.
5151
- name: Run tests
52-
run: dart test --coverage="./coverage"
53-
54-
- name: Install coverage tools
55-
run: dart pub global activate coverage
56-
57-
- name: Install lcov
58-
run: |
59-
if [[ "${{ runner.os }}" == "Linux" ]]; then
60-
sudo apt-get update && sudo apt-get install -y lcov
61-
elif [[ "${{ runner.os }}" == "macOS" ]]; then
62-
brew install lcov
63-
elif [[ "${{ runner.os }}" == "Windows" ]]; then
64-
choco install lcov
65-
fi
66-
shell: bash
67-
68-
- name: Add lcov to PATH on Windows
69-
if: runner.os == 'Windows'
70-
run: echo "C:\\ProgramData\\chocolatey\\lib\\lcov\\tools\\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
71-
shell: pwsh
72-
73-
- name: Format Coverage
74-
run: dart pub global run coverage:format_coverage --packages=.dart_tool/package_config.json --report-on=lib --lcov -o ./coverage/coverage.lcov -i ./coverage
75-
76-
# - name: Excluded generated files
77-
# run: lcov --remove ./coverage/coverage.lcov '*/lib/src/*.g.dart' '*/lib/src/models/drift/*' -o ./coverage/coverage.lcov
78-
79-
- name: Check Publish Warnings
80-
run: dart pub publish --dry-run
52+
run: dart test
8153

82-
- name: Upload Coverage to CodeCov
83-
uses: codecov/codecov-action@v4
84-
with:
85-
token: ${{secrets.CODECOV_TOKEN}}
86-
file: coverage/coverage.lcov
54+
- name: Check Publish Warnings
55+
run: dart pub publish --dry-run

‎.github/workflows/publish.yml‎

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -25,37 +25,10 @@ jobs:
2525
run: dart analyze --fatal-infos
2626

2727
- name: Run tests
28-
run: dart test --coverage="coverage"
29-
30-
- name: Install coverage tools
31-
run: dart pub global activate coverage
32-
33-
- name: Install lcov
34-
run: |
35-
if [[ "${{ runner.os }}" == "Linux" ]]; then
36-
sudo apt-get update && sudo apt-get install -y lcov
37-
elif [[ "${{ runner.os }}" == "macOS" ]]; then
38-
brew install lcov
39-
elif [[ "${{ runner.os }}" == "Windows" ]]; then
40-
choco install lcov
41-
fi
42-
shell: bash
43-
44-
- name: Format Coverage
45-
run: dart pub global run coverage:format_coverage --packages=.dart_tool/package_config.json --report-on=lib --lcov -o ./coverage/coverage.lcov -i ./coverage
46-
47-
- name: Excluded generated files
48-
run: lcov --remove ./coverage/coverage.lcov '*/lib/src/*.g.dart' '*/lib/src/models/drift/*' -o ./coverage/coverage.lcov
49-
28+
run: dart test
5029
- name: Check Publish Warnings
5130
run: dart pub publish --dry-run
52-
53-
- name: Upload Coverage to CodeCov
54-
uses: codecov/codecov-action@v4
55-
with:
56-
token: ${{secrets.CODECOV_TOKEN}}
57-
file: coverage/coverage.lcov
58-
31+
5932
publish:
6033
needs: 'test'
6134
permissions:

‎.github/workflows/static.yml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# Simple workflow for deploying static content to GitHub Pages
2+
name: Code Coverage
3+
4+
on:
5+
# Runs on pushes targeting the default branch
6+
push:
7+
branches: ["dev","main"]
8+
9+
# Allows you to run this workflow manually from the Actions tab
10+
workflow_dispatch:
11+
12+
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
13+
permissions:
14+
contents: read
15+
pages: write
16+
id-token: write
17+
18+
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
19+
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
20+
concurrency:
21+
group: "pages"
22+
cancel-in-progress: false
23+
24+
jobs:
25+
# Single deploy job since we're just deploying
26+
deploy:
27+
environment:
28+
name: github-pages
29+
url: ${{ steps.deployment.outputs.page_url }}
30+
runs-on: ubuntu-latest
31+
steps:
32+
- name: Checkout
33+
uses: actions/checkout@v4
34+
- name: Setup Pages
35+
uses: actions/configure-pages@v5
36+
37+
- uses: dart-lang/[email protected]
38+
39+
- name: Run tests
40+
run: dart test --coverage="./coverage"
41+
42+
- name: Install coverage tools
43+
run: dart pub global activate coverage
44+
45+
- name: Install lcov
46+
run: sudo apt-get update && sudo apt-get install -y lcov
47+
48+
- name: Format Coverage
49+
run: dart pub global run coverage:format_coverage --packages=.dart_tool/package_config.json --report-on=lib --lcov -o ./coverage/coverage.lcov -i ./coverage
50+
51+
- name: Excluded generated files
52+
run: lcov --remove ./coverage/coverage.lcov '*/lib/src/*.g.dart' '*/lib/src/models/drift/*' -o ./coverage/coverage.lcov
53+
54+
- name: Generate HTML coverage report
55+
run: genhtml -o ./coverage/report ./coverage/coverage.lcov
56+
57+
- name: Upload artifact
58+
uses: actions/upload-pages-artifact@v3
59+
with:
60+
# Upload entire repository
61+
path: './coverage/report'
62+
- name: Deploy to GitHub Pages
63+
id: deployment
64+
uses: actions/deploy-pages@v4

‎.gitignore‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
.packages
3030
.pub-cache/
3131
.pub/
32-
**/coverage/
3332
**/build/
34-
33+
**/coverage/
3534
# Downloaded files
3635
/mac-vendors-export.csv

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Change Log
22

3+
## 6.0.5
4+
Bug fixes and improvements
5+
36
## 6.0.4
47
Performance improvements
58

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Network Tools
1+
# Cross Platform Network Tools
22

3-
[![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)
3+
[![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)
44

55
Network Tools Supported
66

‎lib/src/configure_dart_native.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import 'package:network_tools/network_tools.dart' as packages_page;
55
import 'package:network_tools/src/injection.dart';
66
import 'package:network_tools/src/models/arp_data.dart';
77
import 'package:network_tools/src/models/vendor.dart';
8+
import 'package:network_tools/src/repository/repository.dart';
89
import 'package:network_tools/src/services/impls/host_scanner_service_impl.dart';
910
import 'package:network_tools/src/services/impls/mdns_scanner_service_impl.dart';
1011
import 'package:network_tools/src/services/impls/port_scanner_service_impl.dart';
11-
import 'package:network_tools/src/services/repository.dart';
1212

1313
/// Configures the network tools package for Dart native platforms.
1414
///

‎lib/src/injection.config.dart‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@ import 'package:network_tools/src/database/database_service.dart' as _i45;
1616
import 'package:network_tools/src/database/drfit_database_service.dart'
1717
as _i827;
1818
import 'package:network_tools/src/database/drift_database.dart' as _i1025;
19-
import 'package:network_tools/src/services/impls/arp_repository_impl.dart'
20-
as _i364;
21-
import 'package:network_tools/src/services/impls/vendor_repository_impl.dart'
22-
as _i315;
23-
import 'package:network_tools/src/services/repository.dart' as _i960;
19+
import 'package:network_tools/src/repository/arp_repository_impl.dart' as _i608;
20+
import 'package:network_tools/src/repository/repository.dart' as _i101;
21+
import 'package:network_tools/src/repository/vendor_repository_impl.dart'
22+
as _i429;
2423

2524
extension GetItInjectableX on _i174.GetIt {
2625
// initializes the registration of main-scope dependencies inside of GetIt
@@ -32,14 +31,14 @@ extension GetItInjectableX on _i174.GetIt {
3231
gh.factory<_i45.DatabaseService<_i1025.AppDatabase>>(
3332
() => _i827.DriftDatabaseService(),
3433
);
35-
gh.factory<_i960.Repository<_i916.Vendor>>(
36-
() => _i315.VendorRepository(
34+
gh.factory<_i101.Repository<_i916.ARPData>>(
35+
() => _i608.ARPRepository(gh<_i45.DatabaseService<_i1025.AppDatabase>>()),
36+
);
37+
gh.factory<_i101.Repository<_i916.Vendor>>(
38+
() => _i429.VendorRepository(
3739
gh<_i45.DatabaseService<_i1025.AppDatabase>>(),
3840
),
3941
);
40-
gh.factory<_i960.Repository<_i916.ARPData>>(
41-
() => _i364.ARPRepository(gh<_i45.DatabaseService<_i1025.AppDatabase>>()),
42-
);
4342
return this;
4443
}
4544
}

‎lib/src/models/active_host.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:dart_ping/dart_ping.dart';
22
import 'package:network_tools/network_tools.dart';
33
import 'package:network_tools/src/injection.dart';
44
import 'package:network_tools/src/network_tools_utils.dart';
5-
import 'package:network_tools/src/services/repository.dart';
5+
import 'package:network_tools/src/repository/repository.dart';
66
import 'package:universal_io/io.dart';
77

88
/// ActiveHost which implements comparable

‎lib/src/services/impls/arp_repository_impl.dart‎ renamed to ‎lib/src/repository/arp_repository_impl.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import 'package:network_tools/network_tools.dart';
77
import 'package:network_tools/src/database/database_service.dart';
88
import 'package:network_tools/src/database/drift_database.dart';
99
import 'package:network_tools/src/device_info/arp_table_helper.dart';
10-
import 'package:network_tools/src/services/repository.dart';
10+
import 'package:network_tools/src/repository/repository.dart';
1111

1212
@Injectable(as: Repository<ARPData>)
1313
class ARPRepository implements Repository<ARPData> {

0 commit comments

Comments
 (0)