remove deps on cli_util and which (#1280)

* remove deps on cli_util and which

* remove a reference to --dart-sdk

Author: devoncarew

bin/dartdoc.dart

@@ -10,8 +10,8 @@ import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/src/dart/sdk/sdk.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:args/args.dart';
-import 'package:cli_util/cli_util.dart' as cli_util;
 import 'package:dartdoc/dartdoc.dart';
+import 'package:dartdoc/src/sdk.dart';
 import 'package:path/path.dart' as path;
 import 'package:stack_trace/stack_trace.dart';
 
@@ -39,10 +39,9 @@ main(List<String> arguments) async {
     exit(0);
   }
 
-  Directory sdkDir = cli_util.getSdkDir(arguments);
+  Directory sdkDir = getSdkDir();
   if (sdkDir == null) {
-    print("Error: unable to locate the Dart SDK. Please use the --dart-sdk "
-        "command line option or set the DART_SDK environment variable.");
+    print("Error: unable to locate the Dart SDK.");
     exit(1);
   }
 
@@ -174,9 +173,6 @@ ArgParser _createArgsParser() {
       help: 'Add Crossdart links to the source code pieces.',
       negatable: false,
       defaultsTo: false);
-  parser.addOption('dart-sdk',
-      help:
-          "Location of the Dart SDK. Use if SDK isn't automatically located.");
   parser.addFlag('sdk-docs',
       help: 'Generate ONLY the docs for the Dart SDK.', negatable: false);
   parser.addFlag('show-progress',

lib/src/sdk.dart

@@ -0,0 +1,10 @@
+// Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
+// for details. 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:io';
+
+Directory getSdkDir() {
+  File vmExecutable = new File(Platform.resolvedExecutable);
+  return vmExecutable.parent.parent;
+}

pubspec.lock

@@ -43,12 +43,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
-  cli_util:
-    description:
-      name: cli_util
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.0.1+2"
   collection:
     description:
       name: collection
@@ -84,7 +78,7 @@ packages:
       name: grinder
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.8.0+2"
+    version: "0.8.0+3"
   html:
     description:
       name: html
@@ -307,18 +301,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.4"
-  when:
-    description:
-      name: when
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.2.0"
-  which:
-    description:
-      name: which
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.1.3"
   yaml:
     description:
       name: yaml

pubspec.yaml

@@ -9,7 +9,6 @@ environment:
 dependencies:
   analyzer: ^0.29.0
   args: ^0.13.0
-  cli_util: ^0.0.1
   collection: ^1.2.0
   html: '>=0.12.1 <0.14.0'
   # We don't use http_parser directly; this dep exists to ensure that we get at
@@ -29,6 +28,5 @@ dev_dependencies:
   http: ^0.11.0
   pub_semver: ^1.0.0
   test: ^0.12.0
-  which: ^0.1.3
 executables:
   dartdoc: null

test/compare_output_test.dart

@@ -4,20 +4,16 @@
 
 library dartdoc.compare_output_test;
 
-import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:mirrors';
 
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
-import 'package:which/which.dart';
 
 const List<String> _filesToIgnore = const <String>['.DS_Store'];
 
-const _gitBinName = 'git';
-
-String _gitCache;
+const String gitBinName = 'git';
 
 final _nameStatusLineRegexp = new RegExp(r'(\w)\t(.+)');
 
@@ -69,8 +65,6 @@ void main() {
         fail('dartdoc failed');
       }
 
-      var gitPath = await _gitBinPath();
-
       args = <String>[
         'diff',
         '--no-index',
@@ -80,7 +74,7 @@ void main() {
         tempDir.path
       ];
 
-      result = Process.runSync(gitPath, args);
+      result = Process.runSync(gitBinName, args);
 
       if (result.exitCode == 0) return;
 
@@ -102,7 +96,7 @@ void main() {
             p.join(_testPackageDocsPath, k),
             p.join(tempDir.path, k)
           ];
-          result = Process.runSync(gitPath, args);
+          result = Process.runSync(gitBinName, args);
           assert(result.exitCode != 0);
           message.add(result.stdout);
         }
@@ -167,13 +161,6 @@ void main() {
   }, onPlatform: {'windows': new Skip('Avoiding parsing git output')});
 }
 
-Future<String> _gitBinPath() async {
-  if (_gitCache == null) {
-    _gitCache = await which(_gitBinName);
-  }
-  return _gitCache;
-}
-
 Map<String, String> _parseOutput(
     String input, String sourcePath, String tempPath) {
   var values = <String, String>{};

test/dartdoc_test.dart

@@ -6,10 +6,10 @@ library dartdoc.dartdoc_test;
 
 import 'dart:io';
 
-import 'package:cli_util/cli_util.dart';
 import 'package:dartdoc/dartdoc.dart';
 import 'package:dartdoc/src/model.dart';
 import 'package:dartdoc/src/package_meta.dart';
+import 'package:dartdoc/src/sdk.dart';
 import 'package:path/path.dart' as path;
 import 'package:test/test.dart';
 

test/model_test.dart

@@ -6,11 +6,11 @@ library dartdoc.model_test;
 
 import 'dart:io';
 
-import 'package:cli_util/cli_util.dart' as cli_util;
 import 'package:dartdoc/dartdoc.dart';
 import 'package:dartdoc/src/model.dart';
 import 'package:dartdoc/src/model_utils.dart';
 import 'package:dartdoc/src/package_meta.dart';
+import 'package:dartdoc/src/sdk.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 
@@ -27,7 +27,7 @@ void main() {
   final Library twoExportsLib =
       package.libraries.firstWhere((lib) => lib.name == 'two_exports');
 
-  Directory sdkDir = cli_util.getSdkDir();
+  Directory sdkDir = getSdkDir();
 
   if (sdkDir == null) {
     print("Warning: unable to locate the Dart SDK.");

test/package_meta_test.dart

@@ -6,8 +6,8 @@ library dartdoc.package_utils_test;
 
 import 'dart:io';
 
-import 'package:cli_util/cli_util.dart';
 import 'package:dartdoc/src/package_meta.dart';
+import 'package:dartdoc/src/sdk.dart';
 import 'package:path/path.dart' as path;
 import 'package:test/test.dart';
 

test/src/utils.dart

@@ -14,9 +14,9 @@ import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/java_io.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source_io.dart';
-import 'package:cli_util/cli_util.dart' as cli_util;
 import 'package:dartdoc/src/model.dart';
 import 'package:dartdoc/src/package_meta.dart';
+import 'package:dartdoc/src/sdk.dart';
 import 'package:path/path.dart' as p;
 
 AnalyzerHelper analyzerHelper;
@@ -38,7 +38,7 @@ void delete(Directory dir) {
 void init() {
   ResourceProvider resourceProvider = PhysicalResourceProvider.INSTANCE;
   sdkDir = new FolderBasedDartSdk(
-      resourceProvider, resourceProvider.getFolder(cli_util.getSdkDir().path));
+      resourceProvider, resourceProvider.getFolder(getSdkDir().path));
 
   analyzerHelper = new AnalyzerHelper();
   var pathsForTestLib = [