add --force flag to precache (flutter#31278)

jonahwilliams · web-flow · commit f5672b93168a · 2019-04-18T16:04:21.000-07:00
diff --git a/packages/flutter_tools/lib/src/commands/precache.dart b/packages/flutter_tools/lib/src/commands/precache.dart
@@ -13,6 +13,8 @@ class PrecacheCommand extends FlutterCommand {
   PrecacheCommand() {
     argParser.addFlag('all-platforms', abbr: 'a', negatable: false,
         help: 'Precache artifacts for all platforms.');
+    argParser.addFlag('force', abbr: 'f', negatable: false,
+        help: 'Force downloading of artifacts.');
     argParser.addFlag('android', negatable: true, defaultsTo: true,
         help: 'Precache artifacts for Android development');
     argParser.addFlag('ios', negatable: true, defaultsTo: true,
@@ -55,10 +57,11 @@ class PrecacheCommand extends FlutterCommand {
         requiredArtifacts.add(artifact);
       }
     }
-    if (cache.isUpToDate()) {
-      printStatus('Already up-to-date.');
-    } else {
+    final bool forceUpdate = argResults['force'];
+    if (forceUpdate || !cache.isUpToDate()) {
       await cache.updateAll(requiredArtifacts);
+    } else {
+      printStatus('Already up-to-date.');
     }
     return null;
   }
diff --git a/packages/flutter_tools/test/commands/precache_test.dart b/packages/flutter_tools/test/commands/precache_test.dart
@@ -63,6 +63,23 @@ void main() {
       Cache: () => cache,
       FlutterVersion: () => flutterVersion,
     });
+
+    testUsingContext('Downloads artifacts when --force is provided', () async {
+      when(cache.isUpToDate()).thenReturn(true);
+      // Release lock between test cases.
+      Cache.releaseLockEarly();
+      final PrecacheCommand command = PrecacheCommand();
+      applyMocksToCommand(command);
+      await createTestCommandRunner(command).run(const <String>['precache', '--force']);
+      expect(artifacts, unorderedEquals(<DevelopmentArtifact>{
+       DevelopmentArtifact.universal,
+       DevelopmentArtifact.iOS,
+       DevelopmentArtifact.android,
+     }));
+    }, overrides: <Type, Generator>{
+      Cache: () => cache,
+      FlutterVersion: () => flutterVersion,
+    });
   });
 }
 

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ class PrecacheCommand extends FlutterCommand {`
`13`	`13`	`PrecacheCommand() {`
`14`	`14`	`argParser.addFlag('all-platforms', abbr: 'a', negatable: false,`
`15`	`15`	`help: 'Precache artifacts for all platforms.');`
	`16`	`+ argParser.addFlag('force', abbr: 'f', negatable: false,`
	`17`	`+ help: 'Force downloading of artifacts.');`
`16`	`18`	`argParser.addFlag('android', negatable: true, defaultsTo: true,`
`17`	`19`	`help: 'Precache artifacts for Android development');`
`18`	`20`	`argParser.addFlag('ios', negatable: true, defaultsTo: true,`
`@@ -55,10 +57,11 @@ class PrecacheCommand extends FlutterCommand {`
`55`	`57`	`requiredArtifacts.add(artifact);`
`56`	`58`	`}`
`57`	`59`	`}`
`58`		`- if (cache.isUpToDate()) {`
`59`		`- printStatus('Already up-to-date.');`
`60`		`- } else {`
	`60`	`+ final bool forceUpdate = argResults['force'];`
	`61`	`+ if (forceUpdate \|\| !cache.isUpToDate()) {`
`61`	`62`	`await cache.updateAll(requiredArtifacts);`
	`63`	`+ } else {`
	`64`	`+ printStatus('Already up-to-date.');`
`62`	`65`	`}`
`63`	`66`	`return null;`
`64`	`67`	`}`