review

Author: Chris Yang

.cirrus.yml

@@ -22,19 +22,17 @@ task:
   matrix:
     - name: plugin_tools_tests
       script:
-        - cd script/tool
-        - pub get
         - CIRRUS_BUILD_ID=null pub run test
     - name: publishable
       script:
+        - BRANCH_NAME="$(git rev-parse --abbrev-ref HEAD)"
         - flutter channel master
-        - export BRANCH=${BRANCH:-'$(git rev-parse --abbrev-ref HEAD)'}
-        - if [[$BRANCH != "master"]];then
-        -   echo "Running version-check on changed pacakges"
-        -   $PLUGIN_TOOLS version-check --run-on-changed-packages
-        - else
+        - if [[ "$BRANCH_NAME" -eq "master" ]]; then
         -   echo "Running version-check on all packages"
         -   $PLUGIN_TOOLS version-check
+        - else
+        -   echo "Running version-check on changed pacakges"
+        -   $PLUGIN_TOOLS version-check --run-on-changed-packages
         - fi
         - ./script/check_publish.sh
     - name: format

script/tool/lib/src/common.dart

@@ -145,7 +145,7 @@ bool isLinuxPlugin(FileSystemEntity entity, FileSystem fileSystem) {
 }
 
 /// Throws a [ToolExit] with `exitCode` and log the `errorMessage` in red.
-void PrintErrorAndExit({@required String errorMessage, int exitCode = 1}) {
+void printErrorAndExit({@required String errorMessage, int exitCode = 1}) {
   final Colorize redError = Colorize(errorMessage)..red();
   print(redError);
   throw ToolExit(exitCode);
@@ -406,7 +406,7 @@ abstract class PluginCommand extends Command<Null> {
     GitDir baseGitDir = gitDir;
     if (baseGitDir == null) {
       if (!await GitDir.isGitDir(rootDir)) {
-        PrintErrorAndExit(
+        printErrorAndExit(
             errorMessage: '$rootDir is not a valid Git repository.',
             exitCode: 2);
       }
@@ -571,12 +571,11 @@ class GitVersionFinder {
     final io.ProcessResult changedFilesCommand = await baseGitDir
         .runCommand(<String>['diff', '--name-only', '$baseSha', 'HEAD']);
     print('Determine diff with base sha: $baseSha');
-    if (changedFilesCommand.stdout.toString() == null ||
-        changedFilesCommand.stdout.toString().isEmpty) {
+    final String changedFilesStdout = changedFilesCommand.stdout.toString()  ?? '';
+    if (changedFilesStdout.isEmpty) {
       return <String>[];
     }
-    final List<String> changedFiles = changedFilesCommand.stdout
-        .toString()
+    final List<String> changedFiles = changedFilesStdout
         .split('\n')
           ..removeWhere((element) => element.isEmpty);
     return changedFiles.toList();
@@ -605,6 +604,6 @@ class GitVersionFinder {
       baseShaFromMergeBase = await baseGitDir
           .runCommand(<String>['merge-base', 'FETCH_HEAD', 'HEAD']);
     }
-    return (baseShaFromMergeBase.stdout as String).replaceAll('\n', '');
+    return (baseShaFromMergeBase.stdout as String).trim();
   }
 }

script/tool/lib/src/version_check_command.dart

@@ -109,7 +109,7 @@ class VersionCheckCommand extends PluginCommand {
   @override
   final String description =
       'Checks if the versions of the plugins have been incremented per pub specification.\n'
-      'Also checks if the version in CHANGELOG matches the version in pubspec.\n\n'
+      'Also checks if the latest version in CHANGELOG matches the version in pubspec.\n\n'
       'This command requires "pub" and "flutter" to be in your path.';
 
   @override
@@ -147,7 +147,7 @@ class VersionCheckCommand extends PluginCommand {
           final String error = '$pubspecPath incorrectly updated version.\n'
               'HEAD: $headVersion, master: $masterVersion.\n'
               'Allowed versions: $allowedNextVersions';
-          PrintErrorAndExit(errorMessage: error);
+          printErrorAndExit(errorMessage: error);
         }
 
         bool isPlatformInterface = pubspec.name.endsWith("_platform_interface");
@@ -156,7 +156,7 @@ class VersionCheckCommand extends PluginCommand {
                 NextVersionType.BREAKING_MAJOR) {
           final String error = '$pubspecPath breaking change detected.\n'
               'Breaking changes to platform interfaces are strongly discouraged.\n';
-          PrintErrorAndExit(errorMessage: error);
+          printErrorAndExit(errorMessage: error);
         }
       } on io.ProcessException {
         print('Unable to find pubspec in master for $pubspecPath.'
@@ -181,7 +181,7 @@ class VersionCheckCommand extends PluginCommand {
     final Pubspec pubspec = _tryParsePubspec(plugin);
     if (pubspec == null) {
       final String error = 'Cannot parse version from pubspec.yaml';
-      PrintErrorAndExit(errorMessage: error);
+      printErrorAndExit(errorMessage: error);
     }
     final Version fromPubspec = pubspec.version;
 
@@ -191,10 +191,7 @@ class VersionCheckCommand extends PluginCommand {
     String firstLineWithText;
     final Iterator iterator = lines.iterator;
     while (iterator.moveNext()) {
-      final String currentStriptEmptySpaces =
-          (iterator.current as String).replaceAll(' ', '');
-      if (currentStriptEmptySpaces != null &&
-          currentStriptEmptySpaces.isNotEmpty) {
+      if ((iterator.current as String).trim().isNotEmpty) {
         firstLineWithText = iterator.current;
         break;
       }
@@ -204,8 +201,8 @@ class VersionCheckCommand extends PluginCommand {
     Version fromChangeLog = Version.parse(versionString);
     if (fromChangeLog == null) {
       final String error =
-          'Cannot find version on the first line of CHANGELOG.md';
-      PrintErrorAndExit(errorMessage: error);
+          'Cannot find version on the first line of ${plugin.path}/CHANGELOG.md';
+      printErrorAndExit(errorMessage: error);
     }
 
     if (fromPubspec != fromChangeLog) {
@@ -214,7 +211,7 @@ versions for $packageName in CHANGELOG.md and pubspec.yaml do not match.
 The version in pubspec.yaml is $fromPubspec.
 The first version listed in CHANGELOG.md is $fromChangeLog.
 ''';
-      PrintErrorAndExit(errorMessage: error);
+      printErrorAndExit(errorMessage: error);
     }
     print('${packageName} passed version check');
   }
@@ -227,13 +224,13 @@ The first version listed in CHANGELOG.md is $fromChangeLog.
       if (pubspec == null) {
         final String error =
             'Failed to parse `pubspec.yaml` at ${pubspecFile.path}';
-        PrintErrorAndExit(errorMessage: error);
+        printErrorAndExit(errorMessage: error);
       }
       return pubspec;
     } on Exception catch (exception) {
       final String error =
           'Failed to parse `pubspec.yaml` at ${pubspecFile.path}: $exception}';
-      PrintErrorAndExit(errorMessage: error);
+      printErrorAndExit(errorMessage: error);
     }
     return null;
   }