Merge pull request #85 from flutter/command_dir

Move Command subclasses into commands directory

packages/flutter_tools/bin/sky_tools.dart

@@ -9,17 +9,17 @@ import 'package:args/command_runner.dart';
 import 'package:logging/logging.dart';
 import 'package:sky_tools/src/application_package.dart';
 import 'package:sky_tools/src/artifacts.dart';
-import 'package:sky_tools/src/build.dart';
-import 'package:sky_tools/src/cache.dart';
-import 'package:sky_tools/src/init.dart';
-import 'package:sky_tools/src/install.dart';
-import 'package:sky_tools/src/list.dart';
-import 'package:sky_tools/src/listen.dart';
-import 'package:sky_tools/src/logs.dart';
-import 'package:sky_tools/src/run_mojo.dart';
-import 'package:sky_tools/src/start.dart';
-import 'package:sky_tools/src/stop.dart';
-import 'package:sky_tools/src/trace.dart';
+import 'package:sky_tools/src/commands/build.dart';
+import 'package:sky_tools/src/commands/cache.dart';
+import 'package:sky_tools/src/commands/init.dart';
+import 'package:sky_tools/src/commands/install.dart';
+import 'package:sky_tools/src/commands/list.dart';
+import 'package:sky_tools/src/commands/listen.dart';
+import 'package:sky_tools/src/commands/logs.dart';
+import 'package:sky_tools/src/commands/run_mojo.dart';
+import 'package:sky_tools/src/commands/start.dart';
+import 'package:sky_tools/src/commands/stop.dart';
+import 'package:sky_tools/src/commands/trace.dart';
 
 class FlutterCommandRunner extends CommandRunner {
   FlutterCommandRunner()

packages/flutter_tools/lib/src/build.dart → packages/flutter_tools/lib/src/commands/build.dart

@@ -11,7 +11,7 @@ import 'package:archive/archive.dart';
 import 'package:args/command_runner.dart';
 import 'package:yaml/yaml.dart';
 
-import 'artifacts.dart';
+import '../artifacts.dart';
 
 const String _kSnapshotKey = 'snapshot_blob.bin';
 const List<String> _kDensities = const ['drawable-xxhdpi'];

packages/flutter_tools/lib/src/cache.dart → packages/flutter_tools/lib/src/commands/cache.dart

@@ -9,7 +9,7 @@ import 'dart:async';
 import 'package:args/command_runner.dart';
 import 'package:logging/logging.dart';
 
-import 'artifacts.dart';
+import '../artifacts.dart';
 
 final Logger _logging = new Logger('sky_tools.cache');
 

packages/flutter_tools/lib/src/install.dart → packages/flutter_tools/lib/src/commands/install.dart

@@ -8,8 +8,8 @@ import 'dart:async';
 
 import 'package:args/command_runner.dart';
 
-import 'application_package.dart';
-import 'device.dart';
+import '../application_package.dart';
+import '../device.dart';
 
 class InstallCommand extends Command {
   final name = 'install';

packages/flutter_tools/lib/src/list.dart → packages/flutter_tools/lib/src/commands/list.dart

@@ -8,7 +8,8 @@ import 'dart:async';
 
 import 'package:args/command_runner.dart';
 import 'package:logging/logging.dart';
-import 'package:sky_tools/src/device.dart';
+
+import '../device.dart';
 
 final Logger _logging = new Logger('sky_tools.list');
 

packages/flutter_tools/lib/src/listen.dart → packages/flutter_tools/lib/src/commands/listen.dart

@@ -9,9 +9,10 @@ import 'dart:io';
 
 import 'package:args/command_runner.dart';
 import 'package:logging/logging.dart';
-import 'package:sky_tools/src/application_package.dart';
-import 'package:sky_tools/src/device.dart';
-import 'package:sky_tools/src/process.dart';
+
+import '../application_package.dart';
+import '../device.dart';
+import '../process.dart';
 
 final Logger _logging = new Logger('sky_tools.listen');
 

packages/flutter_tools/lib/src/logs.dart → packages/flutter_tools/lib/src/commands/logs.dart

@@ -8,7 +8,8 @@ import 'dart:async';
 
 import 'package:args/command_runner.dart';
 import 'package:logging/logging.dart';
-import 'package:sky_tools/src/device.dart';
+
+import '../device.dart';
 
 final Logger _logging = new Logger('sky_tools.logs');
 

packages/flutter_tools/lib/src/run_mojo.dart → packages/flutter_tools/lib/src/commands/run_mojo.dart

@@ -11,8 +11,8 @@ import 'package:args/command_runner.dart';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart' as path;
 
-import 'artifacts.dart';
-import 'process.dart';
+import '../artifacts.dart';
+import '../process.dart';
 
 final Logger _logging = new Logger('sky_tools.run_mojo');
 

packages/flutter_tools/lib/src/start.dart → packages/flutter_tools/lib/src/commands/start.dart

@@ -9,10 +9,11 @@ import 'dart:async';
 import 'package:args/command_runner.dart';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart' as path;
-import 'package:sky_tools/src/application_package.dart';
-import 'package:sky_tools/src/device.dart';
-import 'package:sky_tools/src/install.dart';
-import 'package:sky_tools/src/stop.dart';
+
+import '../application_package.dart';
+import '../device.dart';
+import 'install.dart';
+import 'stop.dart';
 
 final Logger _logging = new Logger('sky_tools.start');
 

packages/flutter_tools/lib/src/stop.dart → packages/flutter_tools/lib/src/commands/stop.dart

@@ -8,8 +8,9 @@ import 'dart:async';
 
 import 'package:args/command_runner.dart';
 import 'package:logging/logging.dart';
-import 'package:sky_tools/src/application_package.dart';
-import 'package:sky_tools/src/device.dart';
+
+import '../application_package.dart';
+import '../device.dart';
 
 final Logger _logging = new Logger('sky_tools.stop');
 

packages/flutter_tools/lib/src/trace.dart → packages/flutter_tools/lib/src/commands/trace.dart

@@ -8,8 +8,9 @@ import 'dart:async';
 
 import 'package:args/command_runner.dart';
 import 'package:logging/logging.dart';
-import 'package:sky_tools/src/application_package.dart';
-import 'package:sky_tools/src/device.dart';
+
+import '../application_package.dart';
+import '../device.dart';
 
 final Logger _logging = new Logger('sky_tools.trace');
 

packages/flutter_tools/test/init_test.dart

@@ -10,7 +10,7 @@ import 'dart:io';
 
 import 'package:args/command_runner.dart';
 import 'package:path/path.dart' as p;
-import 'package:sky_tools/src/init.dart';
+import 'package:sky_tools/src/commands/init.dart';
 import 'package:test/test.dart';
 
 main() => defineTests();

packages/flutter_tools/test/install_test.dart

@@ -6,7 +6,7 @@ library install_test;
 
 import 'package:args/command_runner.dart';
 import 'package:mockito/mockito.dart';
-import 'package:sky_tools/src/install.dart';
+import 'package:sky_tools/src/commands/install.dart';
 import 'package:test/test.dart';
 
 import 'src/common.dart';

packages/flutter_tools/test/list_test.dart

@@ -6,7 +6,7 @@ library list_test;
 
 import 'package:args/command_runner.dart';
 import 'package:mockito/mockito.dart';
-import 'package:sky_tools/src/list.dart';
+import 'package:sky_tools/src/commands/list.dart';
 import 'package:test/test.dart';
 
 import 'src/common.dart';

packages/flutter_tools/test/listen_test.dart

@@ -6,7 +6,7 @@ library listen_test;
 
 import 'package:args/command_runner.dart';
 import 'package:mockito/mockito.dart';
-import 'package:sky_tools/src/listen.dart';
+import 'package:sky_tools/src/commands/listen.dart';
 import 'package:test/test.dart';
 
 import 'src/common.dart';

packages/flutter_tools/test/logs_test.dart

@@ -6,7 +6,7 @@ library logs_test;
 
 import 'package:args/command_runner.dart';
 import 'package:mockito/mockito.dart';
-import 'package:sky_tools/src/logs.dart';
+import 'package:sky_tools/src/commands/logs.dart';
 import 'package:test/test.dart';
 
 import 'src/common.dart';

packages/flutter_tools/test/start_test.dart

@@ -6,7 +6,7 @@ library start_test;
 
 import 'package:args/command_runner.dart';
 import 'package:mockito/mockito.dart';
-import 'package:sky_tools/src/start.dart';
+import 'package:sky_tools/src/commands/start.dart';
 import 'package:test/test.dart';
 
 import 'src/common.dart';

packages/flutter_tools/test/stop_test.dart

@@ -6,7 +6,7 @@ library stop_test;
 
 import 'package:args/command_runner.dart';
 import 'package:mockito/mockito.dart';
-import 'package:sky_tools/src/stop.dart';
+import 'package:sky_tools/src/commands/stop.dart';
 import 'package:test/test.dart';
 
 import 'src/common.dart';

packages/flutter_tools/test/trace_test.dart

@@ -6,7 +6,7 @@ library trace_test;
 
 import 'package:args/command_runner.dart';
 import 'package:mockito/mockito.dart';
-import 'package:sky_tools/src/trace.dart';
+import 'package:sky_tools/src/commands/trace.dart';
 import 'package:test/test.dart';
 
 import 'src/common.dart';