Merge pull request #293 from abarth/rm_sky_tools

Rename sky_tools to flutter_tools

bin/flutter

@@ -7,7 +7,7 @@ export FLUTTER_ROOT=$(dirname $(dirname "${BASH_SOURCE[0]}"))
 FLUTTER_TOOLS_DIR="$FLUTTER_ROOT/packages/flutter_tools"
 SNAPSHOT_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.snapshot"
 STAMP_PATH="$FLUTTER_ROOT/bin/cache/flutter_tools.stamp"
-SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/sky_tools.dart"
+SCRIPT_PATH="$FLUTTER_TOOLS_DIR/bin/flutter_tools.dart"
 
 # TODO(abarth): We shouldn't require dart to be on the user's path.
 DART=dart

packages/flutter_tools/bin/build_sky_apk.dart

@@ -94,7 +94,7 @@ main(List<String> argv) async {
   ArgResults args = parser.parse(argv);
 
   if (args['help']) {
-    print('usage: pub run sky_tools:build_sky_apk <options>');
+    print('usage: build_sky_apk <options>');
     print('');
     print(parser.usage);
     return;

packages/flutter_tools/bin/sky_tools.dart → packages/flutter_tools/bin/flutter_tools.dart

@@ -2,6 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:sky_tools/executable.dart' as executable;
+import 'package:flutter_tools/executable.dart' as executable;
 
 main(List<String> args) => executable.main(args);

packages/flutter_tools/lib/src/application_package.dart

@@ -10,7 +10,7 @@ import 'package:path/path.dart' as path;
 import 'artifacts.dart';
 import 'build_configuration.dart';
 
-final Logger _logging = new Logger('sky_tools.application_package');
+final Logger _logging = new Logger('flutter_tools.application_package');
 
 abstract class ApplicationPackage {
   /// Path to the actual apk or bundle.

packages/flutter_tools/lib/src/artifacts.dart

@@ -12,7 +12,7 @@ import 'build_configuration.dart';
 import 'os_utils.dart';
 import 'process.dart';
 
-final Logger _logging = new Logger('sky_tools.artifacts');
+final Logger _logging = new Logger('flutter_tools.artifacts');
 
 const String _kShellCategory = 'shell';
 const String _kViewerCategory = 'viewer';

packages/flutter_tools/lib/src/build_configuration.dart

@@ -7,7 +7,7 @@ import 'dart:io';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart' as path;
 
-final Logger _logging = new Logger('sky_tools.build_configuration');
+final Logger _logging = new Logger('flutter_tools.build_configuration');
 
 enum BuildType {
   prebuilt,

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

@@ -9,11 +9,11 @@ import 'package:logging/logging.dart';
 
 import '../artifacts.dart';
 
-final Logger _logging = new Logger('sky_tools.cache');
+final Logger _logging = new Logger('flutter_tools.cache');
 
 class CacheCommand extends Command {
   final String name = 'cache';
-  final String description = 'Manages sky_tools\' cache of binary artifacts.';
+  final String description = 'Manages Flutter\'s cache of binary artifacts.';
   CacheCommand() {
     addSubcommand(new _ClearCommand());
     addSubcommand(new _PopulateCommand());

packages/flutter_tools/lib/src/commands/daemon.dart

@@ -20,7 +20,7 @@ const String domain = 'domain';
 /// A domain @command annotation.
 const String command = 'command';
 
-final Logger _logging = new Logger('sky_tools.daemon');
+final Logger _logging = new Logger('flutter_tools.daemon');
 
 // TODO: Create a `device` domain in order to list devices and fire events when
 // devices are added or removed.

packages/flutter_tools/lib/src/commands/flutter_command_runner.dart

@@ -14,12 +14,12 @@ import '../artifacts.dart';
 import '../build_configuration.dart';
 import '../process.dart';
 
-final Logger _logging = new Logger('sky_tools.flutter_command_runner');
+final Logger _logging = new Logger('flutter_tools.flutter_command_runner');
 
 const String kFlutterRootEnvironmentVariableName = 'FLUTTER_ROOT'; // should point to //flutter/ (root of flutter/flutter repo)
 const String kFlutterEngineEnvironmentVariableName = 'FLUTTER_ENGINE'; // should point to //engine/src/ (root of flutter/engine repo)
 const String kSnapshotFileName = 'flutter_tools.snapshot'; // in //flutter/bin/cache/
-const String kFlutterToolsScriptFileName = 'sky_tools.dart'; // in //flutter/packages/flutter_tools/bin/
+const String kFlutterToolsScriptFileName = 'flutter_tools.dart'; // in //flutter/packages/flutter_tools/bin/
 const String kFlutterEnginePackageName = 'sky_engine';
 
 class FlutterCommandRunner extends CommandRunner {

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

@@ -9,7 +9,7 @@ import 'package:logging/logging.dart';
 import '../device.dart';
 import 'flutter_command.dart';
 
-final Logger _logging = new Logger('sky_tools.list');
+final Logger _logging = new Logger('flutter_tools.list');
 
 class ListCommand extends FlutterCommand {
   final String name = 'list';

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

@@ -13,7 +13,7 @@ import '../process.dart';
 import 'build.dart';
 import 'flutter_command.dart';
 
-final Logger _logging = new Logger('sky_tools.listen');
+final Logger _logging = new Logger('flutter_tools.listen');
 
 class ListenCommand extends FlutterCommand {
   final String name = 'listen';

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

@@ -9,7 +9,7 @@ import 'package:logging/logging.dart';
 import '../device.dart';
 import 'flutter_command.dart';
 
-final Logger _logging = new Logger('sky_tools.logs');
+final Logger _logging = new Logger('flutter_tools.logs');
 
 class LogsCommand extends FlutterCommand {
   final String name = 'logs';

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

@@ -13,7 +13,7 @@ import '../artifacts.dart';
 import '../build_configuration.dart';
 import '../process.dart';
 
-final Logger _logging = new Logger('sky_tools.run_mojo');
+final Logger _logging = new Logger('flutter_tools.run_mojo');
 
 class RunMojoCommand extends Command {
   final String name = 'run_mojo';

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

@@ -15,7 +15,7 @@ import 'flutter_command.dart';
 import 'install.dart';
 import 'stop.dart';
 
-final Logger _logging = new Logger('sky_tools.start');
+final Logger _logging = new Logger('flutter_tools.start');
 
 class StartCommand extends FlutterCommand {
   final String name = 'start';

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

@@ -10,7 +10,7 @@ import '../application_package.dart';
 import '../device.dart';
 import 'flutter_command.dart';
 
-final Logger _logging = new Logger('sky_tools.stop');
+final Logger _logging = new Logger('flutter_tools.stop');
 
 class StopCommand extends FlutterCommand {
   final String name = 'stop';

packages/flutter_tools/lib/src/commands/test.dart

@@ -15,7 +15,7 @@ import '../process.dart';
 import '../test/loader.dart' as loader;
 import 'flutter_command.dart';
 
-final Logger _logging = new Logger('sky_tools.test');
+final Logger _logging = new Logger('flutter_tools.test');
 
 class TestCommand extends FlutterCommand {
   String get name => 'test';

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

@@ -10,7 +10,7 @@ import '../application_package.dart';
 import '../device.dart';
 import 'flutter_command.dart';
 
-final Logger _logging = new Logger('sky_tools.trace');
+final Logger _logging = new Logger('flutter_tools.trace');
 
 class TraceCommand extends FlutterCommand {
   final String name = 'trace';

packages/flutter_tools/lib/src/device.dart

@@ -13,7 +13,7 @@ import 'application_package.dart';
 import 'build_configuration.dart';
 import 'process.dart';
 
-final Logger _logging = new Logger('sky_tools.device');
+final Logger _logging = new Logger('flutter_tools.device');
 
 abstract class Device {
   final String id;

packages/flutter_tools/lib/src/os_utils.dart

@@ -8,7 +8,7 @@ import 'package:logging/logging.dart';
 
 final OperatingSystemUtils osUtils = new OperatingSystemUtils._();
 
-final Logger _logging = new Logger('sky_tools.os');
+final Logger _logging = new Logger('flutter_tools.os');
 
 abstract class OperatingSystemUtils {
   factory OperatingSystemUtils._() {

packages/flutter_tools/lib/src/process.dart

@@ -8,7 +8,7 @@ import 'dart:io';
 
 import 'package:logging/logging.dart';
 
-final Logger _logging = new Logger('sky_tools.process');
+final Logger _logging = new Logger('flutter_tools.process');
 
 /// This runs the command and streams stdout/stderr from the child process to
 /// this process' stdout/stderr.

packages/flutter_tools/lib/src/test/loader.dart

@@ -7,8 +7,8 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:path/path.dart' as p;
-import 'package:sky_tools/src/test/json_socket.dart';
-import 'package:sky_tools/src/test/remote_test.dart';
+import 'package:flutter_tools/src/test/json_socket.dart';
+import 'package:flutter_tools/src/test/remote_test.dart';
 import 'package:stack_trace/stack_trace.dart';
 import 'package:test/src/backend/group.dart';
 import 'package:test/src/backend/metadata.dart';
@@ -79,7 +79,7 @@ Future<RunnerSuite> _loadVMFile(String path,
 import 'dart:convert';
 
 import 'package:test/src/backend/metadata.dart';
-import 'package:sky_tools/src/test/remote_listener.dart';
+import 'package:flutter_tools/src/test/remote_listener.dart';
 
 import '${p.toUri(p.absolute(path))}' as test;
 

packages/flutter_tools/lib/src/test/remote_test.dart

@@ -15,7 +15,7 @@ import 'package:test/src/backend/test.dart';
 import 'package:test/src/backend/test_platform.dart';
 import 'package:test/src/util/remote_exception.dart';
 
-import 'package:sky_tools/src/test/json_socket.dart';
+import 'package:flutter_tools/src/test/json_socket.dart';
 
 class RemoteTest extends Test {
   RemoteTest(this.name, this.metadata, this._socket, this._index);

packages/flutter_tools/pubspec.yaml

-name: sky_tools
-version: 0.0.37
+name: flutter_tools
+version: 0.0.38
 description: Tools for building Flutter applications
 homepage: http://flutter.io
 author: Flutter Authors <flutter-dev@googlegroups.com>
@@ -31,7 +31,3 @@ dependencies:
 
 dev_dependencies:
   mockito: ^0.10.1
-
-# Add the bin/sky_tools.dart script to the scripts pub installs.
-executables:
-  sky_tools:

packages/flutter_tools/test/android_device_test.dart

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:sky_tools/src/device.dart';
+import 'package:flutter_tools/src/device.dart';
 import 'package:test/test.dart';
 
 main() => defineTests();

packages/flutter_tools/test/daemon_test.dart

@@ -5,7 +5,7 @@
 import 'dart:async';
 
 import 'package:mockito/mockito.dart';
-import 'package:sky_tools/src/commands/daemon.dart';
+import 'package:flutter_tools/src/commands/daemon.dart';
 import 'package:test/test.dart';
 
 import 'src/mocks.dart';

packages/flutter_tools/test/init_test.dart

@@ -6,9 +6,9 @@ import 'dart:io';
 
 import 'package:args/command_runner.dart';
 import 'package:path/path.dart' as p;
-import 'package:sky_tools/src/artifacts.dart';
-import 'package:sky_tools/src/commands/init.dart';
-import 'package:sky_tools/src/process.dart';
+import 'package:flutter_tools/src/artifacts.dart';
+import 'package:flutter_tools/src/commands/init.dart';
+import 'package:flutter_tools/src/process.dart';
 import 'package:test/test.dart';
 
 main() => defineTests();
@@ -18,7 +18,7 @@ defineTests() {
     Directory temp;
 
     setUp(() {
-      temp = Directory.systemTemp.createTempSync('sky_tools');
+      temp = Directory.systemTemp.createTempSync('flutter_tools');
     });
 
     tearDown(() {

packages/flutter_tools/test/install_test.dart

@@ -4,7 +4,7 @@
 
 import 'package:args/command_runner.dart';
 import 'package:mockito/mockito.dart';
-import 'package:sky_tools/src/commands/install.dart';
+import 'package:flutter_tools/src/commands/install.dart';
 import 'package:test/test.dart';
 
 import 'src/mocks.dart';

packages/flutter_tools/test/list_test.dart

@@ -6,7 +6,7 @@ import 'dart:io';
 
 import 'package:args/command_runner.dart';
 import 'package:mockito/mockito.dart';
-import 'package:sky_tools/src/commands/list.dart';
+import 'package:flutter_tools/src/commands/list.dart';
 import 'package:test/test.dart';
 
 import 'src/mocks.dart';

packages/flutter_tools/test/listen_test.dart

@@ -4,7 +4,7 @@
 
 import 'package:args/command_runner.dart';
 import 'package:mockito/mockito.dart';
-import 'package:sky_tools/src/commands/listen.dart';
+import 'package:flutter_tools/src/commands/listen.dart';
 import 'package:test/test.dart';
 
 import 'src/mocks.dart';

packages/flutter_tools/test/logs_test.dart

@@ -4,7 +4,7 @@
 
 import 'package:args/command_runner.dart';
 import 'package:mockito/mockito.dart';
-import 'package:sky_tools/src/commands/logs.dart';
+import 'package:flutter_tools/src/commands/logs.dart';
 import 'package:test/test.dart';
 
 import 'src/mocks.dart';

packages/flutter_tools/test/os_utils_test.dart

@@ -4,7 +4,7 @@
 
 import 'dart:io';
 
-import 'package:sky_tools/src/os_utils.dart';
+import 'package:flutter_tools/src/os_utils.dart';
 import 'package:test/test.dart';
 import 'package:path/path.dart' as p;
 
@@ -15,7 +15,7 @@ defineTests() {
     Directory temp;
 
     setUp(() {
-      temp = Directory.systemTemp.createTempSync('sky_tools');
+      temp = Directory.systemTemp.createTempSync('flutter_tools');
     });
 
     tearDown(() {

packages/flutter_tools/test/src/mocks.dart

@@ -3,11 +3,11 @@
 // found in the LICENSE file.
 
 import 'package:mockito/mockito.dart';
-import 'package:sky_tools/src/application_package.dart';
-import 'package:sky_tools/src/build_configuration.dart';
-import 'package:sky_tools/src/commands/flutter_command.dart';
-import 'package:sky_tools/src/device.dart';
-import 'package:sky_tools/src/toolchain.dart';
+import 'package:flutter_tools/src/application_package.dart';
+import 'package:flutter_tools/src/build_configuration.dart';
+import 'package:flutter_tools/src/commands/flutter_command.dart';
+import 'package:flutter_tools/src/device.dart';
+import 'package:flutter_tools/src/toolchain.dart';
 
 class MockApplicationPackageStore extends ApplicationPackageStore {
   MockApplicationPackageStore() : super(

packages/flutter_tools/test/start_test.dart

@@ -4,7 +4,7 @@
 
 import 'package:args/command_runner.dart';
 import 'package:mockito/mockito.dart';
-import 'package:sky_tools/src/commands/start.dart';
+import 'package:flutter_tools/src/commands/start.dart';
 import 'package:test/test.dart';
 
 import 'src/mocks.dart';

packages/flutter_tools/test/stop_test.dart

@@ -4,7 +4,7 @@
 
 import 'package:args/command_runner.dart';
 import 'package:mockito/mockito.dart';
-import 'package:sky_tools/src/commands/stop.dart';
+import 'package:flutter_tools/src/commands/stop.dart';
 import 'package:test/test.dart';
 
 import 'src/mocks.dart';

packages/flutter_tools/test/trace_test.dart

@@ -4,7 +4,7 @@
 
 import 'package:args/command_runner.dart';
 import 'package:mockito/mockito.dart';
-import 'package:sky_tools/src/commands/trace.dart';
+import 'package:flutter_tools/src/commands/trace.dart';
 import 'package:test/test.dart';
 
 import 'src/mocks.dart';

packages/flutter_tools/tool/daemon_client.dart

@@ -8,7 +8,7 @@ import 'dart:io';
 Process daemon;
 
 main() async {
-  daemon = await Process.start('dart', ['bin/sky_tools.dart', 'daemon']);
+  daemon = await Process.start('dart', ['bin/flutter_tools.dart', 'daemon']);
   print('daemon process started, pid: ${daemon.pid}');
 
   daemon.stdout

packages/unit/pubspec.yaml

@@ -8,5 +8,6 @@ dependencies:
     path: ../flutter
   stocks:
     path: ../../examples/stocks
-  sky_tools:
+  # To ensure the version of test doesn't get out of sync.
+  flutter_tools:
     path: ../flutter_tools