firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor all the commands to be Commands from the Args package. Also use CommandRunner for the top-level command.

Browse Source
This commit is contained in:
Ian Fischer 2015-09-24 11:13:20 -07:00
parent a49120c667
commit cae053c353
11 changed files with 221 additions and 357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
packages/flutter_tools/bin/sky_tools.dart
View File

@ -2,140 +2,90 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import 'dart:io'; import 'dart:async';
import 'package:args/args.dart'; import 'package:args/args.dart';
import 'package:args/command_runner.dart';
import 'package:logging/logging.dart'; import 'package:logging/logging.dart';
import 'package:sky_tools/src/application_package.dart';
import 'package:sky_tools/src/build.dart'; import 'package:sky_tools/src/build.dart';
import 'package:sky_tools/src/cache.dart'; import 'package:sky_tools/src/cache.dart';
import 'package:sky_tools/src/common.dart';
import 'package:sky_tools/src/init.dart'; import 'package:sky_tools/src/init.dart';
import 'package:sky_tools/src/install.dart'; import 'package:sky_tools/src/install.dart';
import 'package:sky_tools/src/run_mojo.dart'; import 'package:sky_tools/src/run_mojo.dart';
import 'package:sky_tools/src/application_package.dart';
void main(List<String> args) { class FlutterCommandRunner extends CommandRunner {
Logger.root.level = Level.WARNING; FlutterCommandRunner() : super('flutter', 'Manage your flutter app development.') {
Logger.root.onRecord.listen((LogRecord rec) { argParser.addFlag('verbose',
print('${rec.level.name}: ${rec.message}');
if (rec.error != null) {
print(rec.error);
}
if (rec.stackTrace != null) {
print(rec.stackTrace);
}
});
Map<String, CommandHandler> handlers = {};
ArgParser parser = new ArgParser();
parser.addSeparator('basic options:');
parser.addFlag('help',
abbr: 'h', negatable: false, help: 'Display this help message.');
parser.addFlag('verbose',
abbr: 'v', abbr: 'v',
negatable: false, negatable: false,
help: 'Noisy logging, including all shell commands executed.'); help: 'Noisy logging, including all shell commands executed.');
parser.addFlag('very-verbose', argParser.addFlag('very-verbose',
negatable: false, negatable: false,
help: 'Very noisy logging, including the output of all ' help: 'Very noisy logging, including the output of all '
'shell commands executed.'); 'shell commands executed.');
parser.addSeparator('build selection options:'); argParser.addSeparator('Global build selection options:');
parser.addFlag('debug', argParser.addFlag('debug',
negatable: false, negatable: false,
help: help:
'Set this if you are building Sky locally and want to use the debug build products. ' 'Set this if you are building Sky locally and want to use the debug build products. '
'When set, attempts to automaticaly determine sky-src-path if sky-src-path is ' 'When set, attempts to automaticaly determine sky-src-path if sky-src-path is '
'not set. Not normally required.'); 'not set. Not normally required.');
parser.addFlag('release', argParser.addFlag('release',
negatable: false, negatable: false,
help: help:
'Set this if you are building Sky locally and want to use the release build products. ' 'Set this if you are building Sky locally and want to use the release build products. '
'When set, attempts to automaticaly determine sky-src-path if sky-src-path is ' 'When set, attempts to automaticaly determine sky-src-path if sky-src-path is '
'not set. Note that release is not compatible with the listen command ' 'not set. Note that release is not compatible with the listen command '
'on iOS devices and simulators. Not normally required.'); 'on iOS devices and simulators. Not normally required.');
parser.addOption('sky-src-path', argParser.addOption('sky-src-path',
help: 'Path to your Sky src directory, if you are building Sky locally. ' help: 'Path to your Sky src directory, if you are building Sky locally. '
'Ignored if neither debug nor release is set. Not normally required.'); 'Ignored if neither debug nor release is set. Not normally required.');
parser.addOption('android-debug-build-path', argParser.addOption('android-debug-build-path',
help: help:
'Path to your Android Debug out directory, if you are building Sky locally. ' 'Path to your Android Debug out directory, if you are building Sky locally. '
'This path is relative to sky-src-path. Not normally required.', 'This path is relative to sky-src-path. Not normally required.',
defaultsTo: 'out/android_Debug/'); defaultsTo: 'out/android_Debug/');
parser.addOption('android-release-build-path', argParser.addOption('android-release-build-path',
help: help:
'Path to your Android Release out directory, if you are building Sky locally. ' 'Path to your Android Release out directory, if you are building Sky locally. '
'This path is relative to sky-src-path. Not normally required.', 'This path is relative to sky-src-path. Not normally required.',
defaultsTo: 'out/android_Release/'); defaultsTo: 'out/android_Release/');
parser.addOption('ios-debug-build-path', argParser.addOption('ios-debug-build-path',
help: help:
'Path to your iOS Debug out directory, if you are building Sky locally. ' 'Path to your iOS Debug out directory, if you are building Sky locally. '
'This path is relative to sky-src-path. Not normally required.', 'This path is relative to sky-src-path. Not normally required.',
defaultsTo: 'out/ios_Debug/'); defaultsTo: 'out/ios_Debug/');
parser.addOption('ios-release-build-path', argParser.addOption('ios-release-build-path',
help: help:
'Path to your iOS Release out directory, if you are building Sky locally. ' 'Path to your iOS Release out directory, if you are building Sky locally. '
'This path is relative to sky-src-path. Not normally required.', 'This path is relative to sky-src-path. Not normally required.',
defaultsTo: 'out/ios_Release/'); defaultsTo: 'out/ios_Release/');
parser.addOption('ios-sim-debug-build-path', argParser.addOption('ios-sim-debug-build-path',
help: help:
'Path to your iOS Simulator Debug out directory, if you are building Sky locally. ' 'Path to your iOS Simulator Debug out directory, if you are building Sky locally. '
'This path is relative to sky-src-path. Not normally required.', 'This path is relative to sky-src-path. Not normally required.',
defaultsTo: 'out/ios_sim_Debug/'); defaultsTo: 'out/ios_sim_Debug/');
parser.addOption('ios-sim-release-build-path', argParser.addOption('ios-sim-release-build-path',
help: help:
'Path to your iOS Simulator Release out directory, if you are building Sky locally. ' 'Path to your iOS Simulator Release out directory, if you are building Sky locally. '
'This path is relative to sky-src-path. Not normally required.', 'This path is relative to sky-src-path. Not normally required.',
defaultsTo: 'out/ios_sim_Release/'); defaultsTo: 'out/ios_sim_Release/');
parser.addSeparator('commands:');
for (CommandHandler handler in [
new BuildCommandHandler(),
new CacheCommandHandler(),
new InitCommandHandler(),
new InstallCommandHandler(),
new RunMojoCommandHandler(),
]) {
parser.addCommand(handler.name, handler.parser);
handlers[handler.name] = handler;
} }
ArgResults results; Future<int> runCommand(ArgResults topLevelResults) async {
if (topLevelResults['verbose']) {
try {
results = parser.parse(args);
} catch (e) {
_printUsage(parser, handlers, e is FormatException ? e.message : '${e}');
exit(1);
}
if (results['verbose']) {
Logger.root.level = Level.INFO; Logger.root.level = Level.INFO;
} }
if (results['very-verbose']) { if (topLevelResults['very-verbose']) {
Logger.root.level = Level.FINE; Logger.root.level = Level.FINE;
} }
_setupPaths(results); _setupPaths(topLevelResults);
if (results['help']) { return super.runCommand(topLevelResults);
_printUsage(parser, handlers);
} else if (results.command != null) {
handlers[results.command.name]
.processArgResults(results.command)
.then((int code) => exit(code))
.catchError((e, stack) {
print('Error running ' + results.command.name + ': $e');
print(stack);
exit(2);
});
} else {
_printUsage(parser, handlers, 'No command specified.');
exit(1);
}
} }
void _setupPaths(ArgResults results) { void _setupPaths(ArgResults results) {
@ -171,16 +121,25 @@ void _setupPaths(ArgResults results) {
BuildPlatform.iOSSimulator, results['ios-sim-release-build-path']); BuildPlatform.iOSSimulator, results['ios-sim-release-build-path']);
} }
} }
}
void _printUsage(ArgParser parser, Map<String, CommandHandler> handlers, void main(List<String> args) {
[String message]) { Logger.root.level = Level.WARNING;
if (message != null) { Logger.root.onRecord.listen((LogRecord rec) {
print('${message}\n'); print('${rec.level.name}: ${rec.message}');
if (rec.error != null) {
print(rec.error);
}
if (rec.stackTrace != null) {
print(rec.stackTrace);
} }
print('usage: sky_tools <command> [arguments]');
print('');
print(parser.usage);
handlers.forEach((String command, CommandHandler handler) {
print(' ${command.padRight(10)} ${handler.description}');
}); });
new FlutterCommandRunner()
..addCommand(new BuildCommand())
..addCommand(new CacheCommand())
..addCommand(new InitCommand())
..addCommand(new InstallCommand())
..addCommand(new RunMojoCommand())
..run(args);
} }

49
packages/flutter_tools/lib/src/build.dart
View File

@ -8,11 +8,10 @@ import 'dart:async';
import 'dart:io'; import 'dart:io';
import 'package:archive/archive.dart'; import 'package:archive/archive.dart';
import 'package:args/args.dart'; import 'package:args/command_runner.dart';
import 'package:yaml/yaml.dart'; import 'package:yaml/yaml.dart';
import 'artifacts.dart'; import 'artifacts.dart';
import 'common.dart';
const String _kSnapshotKey = 'snapshot_blob.bin'; const String _kSnapshotKey = 'snapshot_blob.bin';
const List<String> _kDensities = const ['drawable-xxhdpi']; const List<String> _kDensities = const ['drawable-xxhdpi'];
@ -127,41 +126,33 @@ Future<ArchiveFile> _createSnapshotFile(String snapshotPath) async {
return new ArchiveFile(_kSnapshotKey, content.length, content); return new ArchiveFile(_kSnapshotKey, content.length, content);
} }
class BuildCommandHandler extends CommandHandler { class BuildCommand extends Command {
BuildCommandHandler() : super('build', 'Create a Flutter app.'); final name = 'build';
final description = 'Create a Flutter app.';
ArgParser get parser { BuildCommand() {
ArgParser parser = new ArgParser(); argParser.addOption('asset-base', defaultsTo: 'packages/material_design_icons/icons');
parser.addFlag('help', abbr: 'h', negatable: false); argParser.addOption('compiler');
parser.addOption('asset-base', defaultsTo: 'packages/material_design_icons/icons'); argParser.addOption('main', defaultsTo: 'lib/main.dart');
parser.addOption('compiler'); argParser.addOption('manifest');
parser.addOption('main', defaultsTo: 'lib/main.dart'); argParser.addOption('output-file', abbr: 'o', defaultsTo: 'app.flx');
parser.addOption('manifest'); argParser.addOption('package-root', defaultsTo: 'packages');
parser.addOption('output-file', abbr: 'o', defaultsTo: 'app.flx'); argParser.addOption('snapshot', defaultsTo: 'snapshot_blob.bin');
parser.addOption('package-root', defaultsTo: 'packages');
parser.addOption('snapshot', defaultsTo: 'snapshot_blob.bin');
return parser;
} }
@override @override
Future<int> processArgResults(ArgResults results) async { Future<int> run() async {
if (results['help']) { String manifestPath = argResults['manifest'];
print(parser.usage);
return 0;
}
String manifestPath = results['manifest'];
Map manifestDescriptor = await _loadManifest(manifestPath); Map manifestDescriptor = await _loadManifest(manifestPath);
Iterable<_Asset> assets = _parseAssets(manifestDescriptor, manifestPath); Iterable<_Asset> assets = _parseAssets(manifestDescriptor, manifestPath);
Iterable<_MaterialAsset> materialAssets = _parseMaterialAssets(manifestDescriptor); Iterable<_MaterialAsset> materialAssets = _parseMaterialAssets(manifestDescriptor);
Archive archive = new Archive(); Archive archive = new Archive();
String snapshotPath = results['snapshot']; String snapshotPath = argResults['snapshot'];
await _compileSnapshot( await _compileSnapshot(
compilerPath: results['compiler'], compilerPath: argResults['compiler'],
mainPath: results['main'], mainPath: argResults['main'],
packageRoot: results['package-root'], packageRoot: argResults['package-root'],
snapshotPath: snapshotPath); snapshotPath: snapshotPath);
archive.addFile(await _createSnapshotFile(snapshotPath)); archive.addFile(await _createSnapshotFile(snapshotPath));
@ -169,12 +160,12 @@ class BuildCommandHandler extends CommandHandler {
archive.addFile(await _createFile(asset.key, asset.base)); archive.addFile(await _createFile(asset.key, asset.base));
for (_MaterialAsset asset in materialAssets) { for (_MaterialAsset asset in materialAssets) {
ArchiveFile file = await _createFile(asset.key, results['asset-base']); ArchiveFile file = await _createFile(asset.key, argResults['asset-base']);
if (file != null) if (file != null)
archive.addFile(file); archive.addFile(file);
} }
File outputFile = new File(results['output-file']); File outputFile = new File(argResults['output-file']);
await outputFile.writeAsString('#!mojo mojo:sky_viewer\n'); await outputFile.writeAsString('#!mojo mojo:sky_viewer\n');
await outputFile.writeAsBytes(new ZipEncoder().encode(archive), mode: FileMode.APPEND); await outputFile.writeAsBytes(new ZipEncoder().encode(archive), mode: FileMode.APPEND);
return 0; return 0;

75
packages/flutter_tools/lib/src/cache.dart
View File

@ -6,63 +6,48 @@ library sky_tools.cache;
import 'dart:async'; import 'dart:async';
import 'package:args/args.dart'; import 'package:args/command_runner.dart';
import 'package:logging/logging.dart'; import 'package:logging/logging.dart';
import 'artifacts.dart'; import 'artifacts.dart';
import 'common.dart';
final Logger _logging = new Logger('sky_tools.cache'); final Logger _logging = new Logger('sky_tools.cache');
class CacheCommandHandler extends CommandHandler { class CacheCommand extends Command {
CacheCommandHandler() : super('cache', 'Manages sky_tools\' cache of binary artifacts.'); final name = 'cache';
final description = 'Manages sky_tools\' cache of binary artifacts.';
ArgParser get parser { CacheCommand() {
ArgParser parser = new ArgParser(); addSubcommand(new _ClearCommand());
parser.addFlag('help', abbr: 'h', negatable: false); addSubcommand(new _PopulateCommand());
parser.addOption('package-root', defaultsTo: 'packages'); }
ArgParser clearParser = parser.addCommand('clear');
clearParser.addFlag('help', abbr: 'h', negatable: false);
ArgParser populateParser = parser.addCommand('populate');
populateParser.addFlag('help', abbr: 'h', negatable: false);
return parser;
} }
Future<int> _clear(String packageRoot, ArgResults results) async { class _ClearCommand extends Command {
if (results['help']) { final name = 'clear';
print('Clears all artifacts from the cache.'); final description = 'Clears all artifacts from the cache.';
print(parser.usage); _ClearCommand() {
return 0; argParser.addOption('package-root', defaultsTo: 'packages');
}
ArtifactStore artifacts = new ArtifactStore(packageRoot);
await artifacts.clear();
return 0;
}
Future<int> _populate(String packageRoot, ArgResults results) async {
if (results['help']) {
print('Populates the cache with all known artifacts.');
print(parser.usage);
return 0;
}
ArtifactStore artifacts = new ArtifactStore(packageRoot);
await artifacts.populate();
return 0;
} }
@override @override
Future<int> processArgResults(ArgResults results) async { Future<int> run() async {
if (results['help'] || results.command == null) { ArtifactStore artifacts = new ArtifactStore(argResults['package-root']);
print(parser.usage); await artifacts.populate();
return 0; return 0;
} }
if (results.command.name == 'clear') { }
return _clear(results['package-root'], results.command);
} else if (results.command.name == 'populate') { class _PopulateCommand extends Command {
return _populate(results['package-root'], results.command); final name = 'populate';
} else { final description = 'Populates the cache with all known artifacts.';
_logging.severe('Unknown cache command \"${results.command.name}\"'); _PopulateCommand() {
return 2; argParser.addOption('package-root', defaultsTo: 'packages');
} }
@override
Future<int> run() async {
ArtifactStore artifacts = new ArtifactStore(argResults['package-root']);
await artifacts.populate();
return 0;
} }
} }

31
packages/flutter_tools/lib/src/common.dart
View File

@ -1,31 +0,0 @@
// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:async';
import 'package:args/args.dart';
abstract class CommandHandler {
final String name;
final String description;
CommandHandler(this.name, this.description);
ArgParser get parser;
/// Returns 0 for no errors or warnings executing command, 1 for warnings, 2
/// for errors.
Future<int> processArgResults(ArgResults results);
void printUsage([String message]) {
if (message != null) {
print('${message}\n');
}
print('usage: sky_tools ${name} [arguments]');
print('');
print(parser.usage);
}
String toString() => name;
}

2
packages/flutter_tools/lib/src/device.dart
View File

@ -9,8 +9,8 @@ import 'dart:io';
import 'package:logging/logging.dart'; import 'package:logging/logging.dart';
import 'package:path/path.dart' as path; import 'package:path/path.dart' as path;
import 'process_wrapper.dart';
import 'application_package.dart'; import 'application_package.dart';
import 'process_wrapper.dart';
final Logger _logging = new Logger('sky_tools.device'); final Logger _logging = new Logger('sky_tools.device');

37
packages/flutter_tools/lib/src/init.dart
View File

@ -7,41 +7,30 @@ library sky_tools.init;
import 'dart:async'; import 'dart:async';
import 'dart:io'; import 'dart:io';
import 'package:args/args.dart'; import 'package:args/command_runner.dart';
import 'package:mustache4dart/mustache4dart.dart' as mustache; import 'package:mustache4dart/mustache4dart.dart' as mustache;
import 'package:path/path.dart' as p; import 'package:path/path.dart' as p;
import 'common.dart'; class InitCommand extends Command {
final name = 'init';
class InitCommandHandler extends CommandHandler { final description = 'Create a new sky project.';
InitCommandHandler() : super('init', 'Create a new sky project.'); InitCommand() {
argParser.addOption('out', abbr: 'o', help: 'The output directory.');
ArgParser get parser { argParser.addFlag('pub',
// TODO: Add a --template option for template selection when we have more than one.
ArgParser parser = new ArgParser();
parser.addFlag('help',
abbr: 'h', negatable: false, help: 'Display this help message.');
parser.addOption('out', abbr: 'o', help: 'The output directory.');
parser.addFlag('pub',
defaultsTo: true, defaultsTo: true,
help: 'Whether to run pub after the project has been created.'); help: 'Whether to run pub after the project has been created.');
return parser;
} }
@override @override
Future<int> processArgResults(ArgResults results) async { Future<int> run() async {
if (results['help']) { if (!argResults.wasParsed('out')) {
printUsage(); print('No option specified for the output directory.');
return 0; print(argParser.getUsage());
}
if (!results.wasParsed('out')) {
printUsage('No option specified for the output directory.');
return 2; return 2;
} }
// TODO: Confirm overwrite of an existing directory with the user. // TODO: Confirm overwrite of an existing directory with the user.
Directory out = new Directory(results['out']); Directory out = new Directory(argResults['out']);
new SkySimpleTemplate().generateInto(out); new SkySimpleTemplate().generateInto(out);
@ -58,7 +47,7 @@ Or if the Sky APK is not already on your device, run:
'''; ''';
if (results['pub']) { if (argResults['pub']) {
print("Running pub get..."); print("Running pub get...");
Process process = Process process =
await Process.start('pub', ['get'], workingDirectory: out.path); await Process.start('pub', ['get'], workingDirectory: out.path);

25
packages/flutter_tools/lib/src/install.dart
View File

@ -6,32 +6,19 @@ library sky_tools.install;
import 'dart:async'; import 'dart:async';
import 'package:args/args.dart'; import 'package:args/command_runner.dart';
import 'application_package.dart'; import 'application_package.dart';
import 'common.dart';
import 'device.dart'; import 'device.dart';
class InstallCommandHandler extends CommandHandler { class InstallCommand extends Command {
final name = 'install';
final description = 'Install your Flutter app on attached devices.';
AndroidDevice android = null; AndroidDevice android = null;
InstallCommandHandler([this.android]) InstallCommand([this.android]);
: super('install', 'Install your Sky app on attached devices.');
@override @override
ArgParser get parser { Future<int> run() async {
ArgParser parser = new ArgParser();
parser.addFlag('help',
abbr: 'h', negatable: false, help: 'Display this help message.');
return parser;
}
@override
Future<int> processArgResults(ArgResults results) async {
if (results['help']) {
printUsage();
return 0;
}
bool installedSomewhere = false; bool installedSomewhere = false;
Map<BuildPlatform, ApplicationPackage> packages = Map<BuildPlatform, ApplicationPackage> packages =

39
packages/flutter_tools/lib/src/run_mojo.dart
View File

@ -8,26 +8,23 @@ import 'dart:async';
import 'dart:io'; import 'dart:io';
import 'package:args/args.dart'; import 'package:args/args.dart';
import 'package:args/command_runner.dart';
import 'package:logging/logging.dart'; import 'package:logging/logging.dart';
import 'package:path/path.dart' as path; import 'package:path/path.dart' as path;
import 'artifacts.dart'; import 'artifacts.dart';
import 'common.dart';
import 'process.dart'; import 'process.dart';
final Logger _logging = new Logger('sky_tools.run_mojo'); final Logger _logging = new Logger('sky_tools.run_mojo');
class RunMojoCommandHandler extends CommandHandler { class RunMojoCommand extends Command {
RunMojoCommandHandler() : super('run_mojo', 'Run a Flutter app in mojo.'); final name = 'run_mojo';
final description = 'Run a Flutter app in mojo.';
ArgParser get parser { RunMojoCommand() {
ArgParser parser = new ArgParser(); argParser.addFlag('android', negatable: false, help: 'Run on an Android device');
parser.addFlag('android', negatable: false, help: 'Run on an Android device'); argParser.addOption('app', defaultsTo: 'app.flx');
parser.addFlag('help', abbr: 'h', negatable: false); argParser.addOption('mojo-path', help: 'Path to directory containing mojo_shell and services');
parser.addOption('app', defaultsTo: 'app.flx'); argParser.addOption('package-root', defaultsTo: 'packages');
parser.addOption('mojo-path', help: 'Path to directory containing mojo_shell and services');
parser.addOption('package-root', defaultsTo: 'packages');
return parser;
} }
Future<String> _makePathAbsolute(String relativePath) async { Future<String> _makePathAbsolute(String relativePath) async {
@ -71,22 +68,18 @@ class RunMojoCommandHandler extends CommandHandler {
} }
@override @override
Future<int> processArgResults(ArgResults results) async { Future<int> run() async {
if (results['help']) { if (argResults['mojo-path'] == null) {
print(parser.usage);
return 0;
}
if (results['mojo-path'] == null) {
_logging.severe('Must specify --mojo-path to mojo_run'); _logging.severe('Must specify --mojo-path to mojo_run');
return 1; return 1;
} }
String packageRoot = results['package-root']; String packageRoot = argResults['package-root'];
ArtifactStore artifacts = new ArtifactStore(packageRoot); ArtifactStore artifacts = new ArtifactStore(packageRoot);
String appPath = await _makePathAbsolute(results['app']); String appPath = await _makePathAbsolute(argResults['app']);
if (results['android']) { if (argResults['android']) {
return _runAndroid(results, appPath, artifacts); return _runAndroid(argResults, appPath, artifacts);
} else { } else {
return _runLinux(results, appPath, artifacts); return _runLinux(argResults, appPath, artifacts);
} }
} }
} }

19
packages/flutter_tools/test/init_test.dart
View File

@ -4,13 +4,11 @@
import 'dart:io'; import 'dart:io';
import 'package:mockito/mockito.dart'; import 'package:args/command_runner.dart';
import 'package:path/path.dart' as p; import 'package:path/path.dart' as p;
import 'package:sky_tools/src/init.dart'; import 'package:sky_tools/src/init.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import 'src/common.dart';
main() => defineTests(); main() => defineTests();
defineTests() { defineTests() {
@ -27,14 +25,13 @@ defineTests() {
// Verify that we create a project that is well-formed. // Verify that we create a project that is well-formed.
test('init sky-simple', () async { test('init sky-simple', () async {
InitCommandHandler handler = new InitCommandHandler(); InitCommand command = new InitCommand();
MockArgResults results = new MockArgResults(); CommandRunner runner = new CommandRunner('test_flutter', '')
when(results['help']).thenReturn(false); ..addCommand(command);
when(results['pub']).thenReturn(true); await runner.run(['init', '--out', temp.path])
when(results.wasParsed('out')).thenReturn(true); .then((int code) => expect(code, equals(0)));
when(results['out']).thenReturn(temp.path);
await handler.processArgResults(results); String path = p.join(temp.path, 'lib', 'main.dart');
String path = p.join(temp.path, 'lib/main.dart');
expect(new File(path).existsSync(), true); expect(new File(path).existsSync(), true);
ProcessResult exec = Process.runSync( ProcessResult exec = Process.runSync(
'dartanalyzer', ['--fatal-warnings', path], 'dartanalyzer', ['--fatal-warnings', path],

12
packages/flutter_tools/test/install_test.dart
View File

@ -4,9 +4,10 @@
library install_test; library install_test;
import 'package:args/command_runner.dart';
import 'package:mockito/mockito.dart'; import 'package:mockito/mockito.dart';
import 'package:sky_tools/src/install.dart';
import 'package:sky_tools/src/application_package.dart'; import 'package:sky_tools/src/application_package.dart';
import 'package:sky_tools/src/install.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import 'src/common.dart'; import 'src/common.dart';
@ -23,12 +24,11 @@ defineTests() {
MockAndroidDevice android = new MockAndroidDevice(); MockAndroidDevice android = new MockAndroidDevice();
when(android.isConnected()).thenReturn(true); when(android.isConnected()).thenReturn(true);
when(android.installApp(any)).thenReturn(true); when(android.installApp(any)).thenReturn(true);
InstallCommandHandler handler = new InstallCommandHandler(android); InstallCommand command = new InstallCommand(android);
MockArgResults results = new MockArgResults(); CommandRunner runner = new CommandRunner('test_flutter', '')
when(results['help']).thenReturn(false); ..addCommand(command);
handler runner.run(['install'])
.processArgResults(results)
.then((int code) => expect(code, equals(0))); .then((int code) => expect(code, equals(0)));
}); });
}); });

6
packages/flutter_tools/test/src/common.dart
View File

@ -2,15 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import 'package:args/args.dart';
import 'package:mockito/mockito.dart'; import 'package:mockito/mockito.dart';
import 'package:sky_tools/src/device.dart'; import 'package:sky_tools/src/device.dart';
class MockArgResults extends Mock implements ArgResults {
@override
dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
}
class MockAndroidDevice extends Mock implements AndroidDevice { class MockAndroidDevice extends Mock implements AndroidDevice {
@override @override
dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation); dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);