Apply pedantic analysis options

Author: arturdm

README.md

@@ -4,7 +4,7 @@
 [![codecov](https://codecov.io/gh/arturdm/bitbucket_code_coverage/branch/master/graph/badge.svg)](https://codecov.io/gh/arturdm/bitbucket_code_coverage)
 
 Converts coverage data from LCOV and publishes to Bitbucket server with
-[plugin](https://bitbucket.org/atlassian/bitbucket-code-coverage) installed.
+[Bitbucket Server Code Coverage Plugin] installed.
 
 ## Usage
 
@@ -15,17 +15,29 @@ dev_dependencies:
   bitbucket_code_coverage: ^0.0.1
 ```
 
-Run the executable.
+Run the executable for a single coverage file.
 
 ```bash
 pub run bitbucket_code_coverage \
   --url http://localhost:7990 \
-  -t TOKEN \
-  -u USERNAME \
-  -p PASSWORD \
+  -u <username> \
+  -p <password> \
   post \
-  -c COMMIT_ID \
-  -f LCOV_FILE \
-  -d WORKING_DIRECTORY \
-  --file-pattern **/lcov.info
+  -c <commit_id> \
+  -f build/lcov.info
 ```
+
+In order to publish data from multiple coverage files use `--file-pattern` option. If you would 
+like to use [Personal Access Token] you can do so by passing it to `-t` option.
+
+```bash
+pub run bitbucket_code_coverage \
+    --url http://localhost:7990 \
+    -t <personal_access_token> \
+    post \
+    -c <commit_id> \
+    --file-pattern **/lcov.info
+```
+
+[Bitbucket Server Code Coverage Plugin]: https://bitbucket.org/atlassian/bitbucket-code-coverage
+[Personal Access Token]: https://confluence.atlassian.com/bitbucketserver/personal-access-tokens-939515499.html

analysis_options.yaml

@@ -1,61 +1,8 @@
 analyzer:
-  # Options: https://www.dartlang.org/guides/language/analysis-options
   strong-mode:
-    implicit-casts: true
-    implicit-dynamic: true
+    implicit-casts: false
+    implicit-dynamic: false
+  exclude:
+  - "**/*.g.dart"
 
-linter:
-  rules:
-  # Error Rules
-  - avoid_empty_else
-  - cancel_subscriptions
-  #    - close_sinks
-  - comment_references
-  - control_flow_in_finally
-  - empty_statements
-  - hash_and_equals
-  - invariant_booleans
-  - iterable_contains_unrelated_type
-  - list_remove_unrelated_type
-  - literal_only_boolean_expressions
-  - test_types_in_equals
-  - throw_in_finally
-  - unrelated_type_equality_checks
-  - valid_regexps
-
-  # Style Rules
-  - always_declare_return_types
-  #   - always_specify_types
-  - annotate_overrides
-  #    - avoid_as
-  - avoid_init_to_null
-  - avoid_return_types_on_setters
-  - await_only_futures
-  - camel_case_types
-  #    - cascade_invocations
-  - curly_braces_in_flow_control_structures
-  - constant_identifier_names
-  - empty_catches
-  - empty_constructor_bodies
-  - implementation_imports
-  - library_names
-  - library_prefixes
-  - non_constant_identifier_names
-  #    - one_member_abstracts
-  - only_throw_errors
-  - overridden_fields
-  - package_api_docs
-  - package_prefixed_library_names
-  - prefer_equal_for_default_values
-  - prefer_is_not_empty
-  #    - parameter_assignments
-  - prefer_final_fields
-  #    - prefer_final_locals
-  #    - public_member_api_docs
-  - slash_for_doc_comments
-  - sort_unnamed_constructors_first
-  - type_annotate_public_apis
-  - type_init_formals
-  - unawaited_futures
-  - unnecessary_brace_in_string_interps
-  - unnecessary_getters_setters
+include: package:pedantic/analysis_options.yaml

lib/bitbucket_code_coverage_command_runner.dart

@@ -10,12 +10,11 @@ class BitbucketCodeCoverageCommandRunner extends CommandRunner<Null> {
             "Converts and publishes coverage data to BitBucket server.") {
     argParser.addFlag("verbose",
         abbr: "v", negatable: false, help: "makes the output more verbose");
-    argParser.addOption("url", help: "sets the Bitbucket server url");
+    argParser.addOption("url", help: "sets the Bitbucket server url, e.g. http://localhost:7990");
     argParser.addOption("username", abbr: "u", help: "sets the username for Bitbucket server");
     argParser.addOption("password", abbr: "p", help: "sets the user password for Bitbucket server");
     argParser.addOption("token",
-        abbr: "t",
-        help: "sets the token for Bitbucket server (takes precedence over username and password)");
+        abbr: "t", help: "sets the Personal Access Token for Bitbucket server");
     addCommand(PostCommand());
   }
 

lib/client/coverage_converter/lcov/path_prefix_finder.dart

@@ -12,7 +12,7 @@ class PathPrefixFinder {
     return _parentPathsUntil(lcovDirectory, Directory(root))
         .firstWhere((FileSystemEntity entity) => existsSync(entity, sourceFilePath))
         .then((FileSystemEntity entity) => relative(entity, root))
-        .catchError((_) => "");
+        .catchError((Error _) => "");
   }
 
   String relative(FileSystemEntity entity, String root) => p.relative(entity.path, from: root);

lib/client/model/coverage_string.dart

@@ -4,11 +4,11 @@ import 'package:meta/meta.dart';
 
 @immutable
 class CoverageString {
-  final List<int> covered;
-  final List<int> partial;
-  final List<int> uncovered;
+  final Iterable<int> covered;
+  final Iterable<int> partial;
+  final Iterable<int> uncovered;
 
-  CoverageString({List<int> covered, List<int> partial, List<int> uncovered})
+  CoverageString({Iterable<int> covered, Iterable<int> partial, Iterable<int> uncovered})
       : this.covered = List<int>.unmodifiable(covered ?? <int>[]),
         this.partial = List<int>.unmodifiable(partial ?? <int>[]),
         this.uncovered = List<int>.unmodifiable(uncovered ?? <int>[]);
@@ -20,23 +20,22 @@ class CoverageString {
 
   @override
   bool operator ==(Object other) {
-    Function equal = const ListEquality<int>().equals;
+    const IterableEquality<int> equality = IterableEquality<int>();
     return identical(this, other) ||
         other is CoverageString &&
             runtimeType == other.runtimeType &&
-            equal(covered, other.covered) &&
-            equal(partial, other.partial) &&
-            equal(uncovered, other.uncovered);
+            equality.equals(covered, other.covered) &&
+            equality.equals(partial, other.partial) &&
+            equality.equals(uncovered, other.uncovered);
   }
 
   @override
   int get hashCode => covered.hashCode ^ partial.hashCode ^ uncovered.hashCode;
 
   factory CoverageString.fromString(String coverage) {
     List<String> split = coverage.split(";");
-    Map<String, List<int>> lineMap = split
-        .asMap()
-        .map((_, String value) => MapEntry<String, List<int>>(_type(value), _lineNumbers(value)));
+    Map<String, Iterable<int>> lineMap = split.asMap().map(
+        (_, String value) => MapEntry<String, Iterable<int>>(_type(value), _lineNumbers(value)));
 
     return CoverageString(covered: lineMap["C"], partial: lineMap["P"], uncovered: lineMap["U"]);
   }

lib/command/post/post_command.dart

@@ -22,21 +22,25 @@ class PostCommand extends Command<Null> {
   @override
   String get name => "post";
 
-  String get coverageFilePath => argResults["file"];
+  String get coverageFilePath => _fromArgResults("file");
 
-  String get coverageFilePattern => argResults["file-pattern"];
+  String get coverageFilePattern => _fromArgResults("file-pattern");
 
-  String get workingDirectory => argResults["working-directory"];
+  String get workingDirectory => _fromArgResults("working-directory");
 
-  String get commitId => argResults["commit-id"];
+  String get commitId => _fromArgResults("commit-id");
 
-  String get url => globalResults["url"];
+  String get url => _fromGlobalResults("url");
 
-  String get token => globalResults["token"];
+  String get token => _fromGlobalResults("token");
 
-  String get username => globalResults["username"];
+  String get username => _fromGlobalResults("username");
 
-  String get password => globalResults["password"];
+  String get password => _fromGlobalResults("password");
+
+  T _fromArgResults<T>(String name) => argResults[name] as T;
+
+  T _fromGlobalResults<T>(String name) => globalResults[name] as T;
 
   @override
   FutureOr<Null> run() async {

pubspec.yaml

@@ -1,7 +1,11 @@
 name: bitbucket_code_coverage
 version: 0.0.1
+description: >
+  Converts coverage data from LCOV and publishes to Bitbucket server with
+  https://bitbucket.org/atlassian/bitbucket-code-coverage plugin installed.
+authors:
+- Artur Stepniewski <[email protected]>
 homepage: https://github.com/arturdm/bitbucket_code_coverage
-author: Artur Stepniewski <[email protected]>
 
 environment:
   sdk: ">=2.0.0 <3.0.0"
@@ -13,16 +17,18 @@ dependencies:
   args: ^1.4.1
   collection: ^1.14.11
   glob: ^1.1.7
-  json_annotation: &json_version ^2.0.0
+  http: ^0.12.0+1
+  json_annotation: ^2.0.0
   lcov: ^4.1.0
   logging: ^0.11.3+2
+  meta: ^1.1.7
   path: ^1.6.2
 
 dev_dependencies:
   build_runner: ^1.0.0
-  json_serializable: *json_version
+  json_serializable: ^2.0.2
   mock_web_server: ^4.0.0
+  pedantic: ^1.4.0
   test: ^1.5.3
   test_coverage: ^0.2.3
   test_descriptor: ^1.0.0
-

test/integration/command/post/post_integration_test.dart

@@ -94,8 +94,8 @@ void main() {
       ])
     ]);
     await dir.create();
-    Map<String, dynamic> expectedRequestBody = {
-      "files": [
+    Map<String, Iterable<dynamic>> expectedRequestBody = {
+      "files": <Map<String, String>>[
         {"path": "second/lib/first.dart", "coverage": "${lcov_factory.expectedCoverage()}"},
         {"path": "second/lib/second.dart", "coverage": "${lcov_factory.expectedCoverage()}"},
         {"path": "first/lib/first.dart", "coverage": "${lcov_factory.expectedCoverage()}"},