Merge pull request #2 from bitsydarel/release/v2.0.3

Release/v2.0.3

Author: bitsydarel

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: Dart
 on:
   push:
     branches:
-      # Push events to branches matching refs/heads/releases/10
+      # Push events to branches matching refs/heads/releases/[version]
       - 'release/**'
 
 jobs:
@@ -15,7 +15,7 @@ jobs:
     # available. See https://hub.docker.com/r/google/dart/ for the available
     # images.
     container:
-      image:  google/dart:latest
+      image: google/dart:latest
 
     steps:
       - uses: actions/checkout@v2
@@ -31,21 +31,23 @@ jobs:
       #   run: dart format --output=none --set-exit-if-changed .
 
       # Consider passing '--fatal-infos' for slightly stricter analysis.
-      - name: Analyze project source
-        run: dart analyze
+      # - name: Analyze project source
+      #  run: dart analyze
 
       # Your project will need to have tests in test/ and a dependency on
       # 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
-  
+
   release:
+    needs: [ build ]
+
     runs-on: ubuntu-latest
-    
+
     steps:
       - uses: actions/checkout@v2
-      
+
       - name: Create a Release
         id: create_release
         uses: actions/create-release@v1.1.4
@@ -58,89 +60,123 @@ jobs:
           release_name: Release ${{ github.ref }}
           # Path to file with information about the tag.
           body_path: CHANGELOG.md # optional
-    
-  
+
+
   release-linux:
-    needs: [release]
-    
+    needs: [ release ]
+
     runs-on: ubuntu-latest
-    
+
     container:
-      image:  google/dart:latest
-    
+      image: google/dart:latest
+
     steps:
       - uses: actions/checkout@v2
-      
+
       - name: Print Dart SDK version
         run: dart --version
-      
+
       - name: Install dependencies
         run: dart pub get
-      
+
       - name: Generate linux native binary
         run: dart2native bin/dbstyleguidechecker.dart -o bin/dbstyleguidechecker-linux
-      
+
+      - name: Get release
+        id: get_release
+        uses: bruceadams/get-release@v1.2.2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Upload Linux Build Artifact
         id: upload-release-asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ jobs.release.steps.create_release.outputs.upload_url }}
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
           asset_path: ./bin/dbstyleguidechecker-linux
           asset_name: dbstyleguidechecker-linux
           asset_content_type: application/octet-stream
-  
+
   release-macos:
-    needs: [release]
-    
+    needs: [ release ]
+
     runs-on: macos-latest
-    
-    container:
-      image: google/dart:latest
-      
+
     steps:
+      - uses: actions/checkout@v2
+
+      - name: Install brew dart repo
+        run: brew tap dart-lang/dart
+
+      - name: Install dart with brew
+        run: brew install dart
+
+      - name: Print Dart SDK version
+        run: dart --version
+
       - name: Install dependencies
         run: dart pub get
-      
+
       - name: Generate MacOs native binary
         run: dart2native bin/dbstyleguidechecker.dart -o bin/dbstyleguidechecker-macos
 
+      - name: Get release
+        id: get_release
+        uses: bruceadams/get-release@v1.2.2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Upload MacOs Build Artifact
         id: upload-release-asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ jobs.release.steps.create_release.outputs.upload_url }}
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
           asset_path: ./bin/dbstyleguidechecker-macos
           asset_name: dbstyleguidechecker-macos
           asset_content_type: application/octet-stream
-  
+
   release-windows:
-    needs: [release]
-    
+    needs: [ release ]
+
     runs-on: windows-latest
-    
-    container: 
-      image: google/dart:latest
-      
+
     steps:
+      - uses: actions/checkout@v2
+
+      - name: Install Dart SDK
+        uses: crazy-max/ghaction-chocolatey@v1
+        with:
+          args: install dart-sdk
+
+      - name: Update Environment variable using GITHUB path to include dart binaries
+        run: echo "C:\tools\dart-sdk\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+      - name: Print Dart SDK version
+        run: dart --version
+
       - name: Install dependencies
         run: dart pub get
-      
+
       - name: Generate Windows native binary
-        run: dart2native bin/dbstyleguidechecker.dart -o bin/dbstyleguidechecker-windows
-      
+        run: dart2native bin/dbstyleguidechecker.dart -o bin/dbstyleguidechecker-windows.exe
+
+      - name: Get release
+        id: get_release
+        uses: bruceadams/get-release@v1.2.2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Upload Windows Build Artifact
         id: upload-release-asset
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ jobs.release.steps.create_release.outputs.upload_url }}
-          asset_path: ./bin/dbstyleguidechecker-windows
-          asset_name: dbstyleguidechecker-windows
+          upload_url: ${{ steps.get_release.outputs.upload_url }}
+          asset_path: ./bin/dbstyleguidechecker-windows.exe
+          asset_name: dbstyleguidechecker-windows.exe
           asset_content_type: application/octet-stream
-
-    

CHANGELOG.md

@@ -16,6 +16,7 @@
 - Removed stack trace in error message.
 
 ## 2.0.0
+
 - Redesign of the script arguments.
 
 - An updated documentation with examples and guide for installations.
@@ -24,4 +25,12 @@
 
 ## 2.0.1
 
-- Cleaner README.md
+- Cleaner README.md
+
+## 2.0.2
+
+- dart format to improve score
+
+## 2.0.3
+
+- code cleanup and improvement

analysis_options.yaml

@@ -1,14 +1 @@
-# Defines a default set of lint rules enforced for
-# projects at Google. For details and rationale,
-# see https://github.com/dart-lang/pedantic#enabled-lints.
 include: package:flutter_code_style/analysis_options.yaml
-
-# For lint rules and documentation, see http://dart-lang.github.io/linter/lints.
-# Uncomment to specify additional rules.
-# linter:
-#   rules:
-#     - camel_case_types
-
-analyzer:
-   exclude:
-     - test/**

bin/dbstyleguidechecker.dart

@@ -34,20 +34,13 @@ Future<void> main(List<String> arguments) async {
 
   Directory.current = scriptArgument.projectDir.path;
 
-  CodeStylesViolationsReporter reporter;
-
-  try {
-    reporter = _createReporter(scriptArgument);
-  } on UnrecoverableException catch (exception) {
-    printHelpMessage(exception.reason);
-    exitCode = exception.exitCode;
-    return;
-  }
-
   CodeStyleViolationsChecker checker;
 
   try {
-    checker = createParser(scriptArgument, reporter);
+    final CodeStylesViolationsReporter reporter =
+        _createReporter(scriptArgument);
+
+    checker = _createChecker(scriptArgument, reporter);
   } on UnrecoverableException catch (exception) {
     printHelpMessage(exception.reason);
     exitCode = exception.exitCode;
@@ -64,9 +57,9 @@ Future<void> main(List<String> arguments) async {
   });
 }
 
-CodeStyleViolationsChecker createParser(
-  ScriptArgument scriptArgument,
-  CodeStylesViolationsReporter reporter,
+CodeStyleViolationsChecker _createChecker(
+  final ScriptArgument scriptArgument,
+  final CodeStylesViolationsReporter reporter,
 ) {
   switch (scriptArgument.projectType) {
     case dartProjectType:
@@ -94,7 +87,9 @@ CodeStyleViolationsChecker createParser(
   }
 }
 
-CodeStylesViolationsReporter _createReporter(ScriptArgument scriptArgument) {
+CodeStylesViolationsReporter _createReporter(
+  final ScriptArgument scriptArgument,
+) {
   switch (scriptArgument.reporterType) {
     case reporterOfTypeConsole:
       return const ConsoleCodeStyleViolationsReporter();
@@ -103,7 +98,7 @@ CodeStylesViolationsReporter _createReporter(ScriptArgument scriptArgument) {
       final File reporterOutputFile = scriptArgument.reporterOutputFile;
 
       if (reporterOutputFile == null) {
-        throw UnrecoverableException(
+        throw const UnrecoverableException(
           "Reporter of type 'file' specified "
           'but reporter output file not specified.',
           exitMissingRequiredArgument,
@@ -115,7 +110,7 @@ CodeStylesViolationsReporter _createReporter(ScriptArgument scriptArgument) {
       final VcsArgument vcs = scriptArgument.vcs;
 
       if (vcs == null) {
-        throw UnrecoverableException(
+        throw const UnrecoverableException(
           "Reporter of type 'github' specified but vcs parameter not specified",
           exitMissingRequiredArgument,
         );
@@ -129,7 +124,7 @@ CodeStylesViolationsReporter _createReporter(ScriptArgument scriptArgument) {
       );
       break;
     default:
-      throw UnrecoverableException(
+      throw const UnrecoverableException(
         'Invalid reporter type provided or not supported',
         exitInvalidArgument,
       );

lib/src/parsers/dart/dart_analyzer_violation_parser.dart

@@ -14,11 +14,11 @@ class DartAnalyzerViolationParser extends CodeStyleViolationsParser {
   static final RegExp _regexp = RegExp(
     // ignore: prefer_interpolation_to_compose_strings
     '^' + // beginning of line
-        '([\\w_\\.]+)\\|' * 3 + // first three error notes
-        '([^\\|]+)\\|' + // file path
-        '([\\w_\\.]+)\\|' * 3 + // line, column, length
+        r'([\w_\.]+)\|' * 3 + // first three error notes
+        r'([^\|]+)\|' + // file path
+        r'([\w_\.]+)\|' * 3 + // line, column, length
         '(.*?)' + // rest is the error message
-        '\$', // end of line
+        r'$', // end of line
   );
 
   @override

lib/src/utils/file_utils.dart

@@ -5,7 +5,7 @@ import 'package:dbstyleguidechecker/src/exceptions.dart';
 import 'package:path/path.dart' as path;
 
 final RegExp _diffFinder = RegExp(
-  '^@@\\s-(\\d+),\\d+\\s\\+(\\d+),\\d+\\s@@',
+  r'^@@\s-(\d+),\d+\s\+(\d+),\d+\s@@',
 );
 
 /// Get the relative path of a file from it's parent directory.