moved show executables flag to deps subcommand

* run --list flag is removed
* buffer is used to output executables
* tests are adapted for --dev/--no-dev flag

Author: akhomchenko

lib/src/command/deps.dart

@@ -4,12 +4,37 @@
 
 import 'dart:collection';
 
+import 'package:analyzer/analyzer.dart' as analyzer;
+import 'package:path/path.dart' as p;
+
 import '../ascii_tree.dart' as tree;
 import '../command.dart';
+import '../dart.dart';
 import '../log.dart' as log;
 import '../package.dart';
+import '../package_name.dart';
 import '../utils.dart';
 
+/// Returns `true` if [path] looks like a Dart entrypoint.
+bool _isDartExecutable(String path) {
+  if (p.extension(path) == '.dart') {
+    try {
+      var unit = analyzer.parseDartFile(path, parseFunctionBodies: false);
+      return isEntrypoint(unit);
+    } on analyzer.AnalyzerErrorGroup {
+      return false;
+    }
+  }
+
+  return false;
+}
+
+/// The immediate non-dev dependencies this package specifies in its pubspec.
+List<PackageRange> _nonDevDependencies(Package package) {
+  var toSkip = package.devDependencies.map((d) => d.name);
+  return package.immediateDependencies.where((r) => !toSkip.contains(r.name));
+}
+
 /// Handles the `deps` pub command.
 class DepsCommand extends PubCommand {
   String get name => "deps";
@@ -36,6 +61,9 @@ class DepsCommand extends PubCommand {
         negatable: true,
         help: "Whether to include dev dependencies.",
         defaultsTo: true);
+
+    argParser.addFlag("executables",
+        negatable: false, help: "List all available executables.");
   }
 
   void run() {
@@ -44,18 +72,22 @@ class DepsCommand extends PubCommand {
 
     _buffer = new StringBuffer();
 
-    _buffer.writeln(_labelPackage(entrypoint.root));
-
-    switch (argResults["style"]) {
-      case "compact":
-        _outputCompact();
-        break;
-      case "list":
-        _outputList();
-        break;
-      case "tree":
-        _outputTree();
-        break;
+    if (argResults['executables']) {
+      _outputExecutables();
+    } else {
+      _buffer.writeln(_labelPackage(entrypoint.root));
+
+      switch (argResults["style"]) {
+        case "compact":
+          _outputCompact();
+          break;
+        case "list":
+          _outputList();
+          break;
+        case "tree":
+          _outputTree();
+          break;
+      }
     }
 
     log.message(_buffer);
@@ -231,4 +263,61 @@ class DepsCommand extends PubCommand {
         'was generated, please run "pub get" again.');
     return null;
   }
+
+  /// Outputs all executables reachable from [entrypoint].
+  void _outputExecutables() {
+    var packages = []
+      ..add(entrypoint.root)
+      ..addAll((_includeDev
+              ? entrypoint.root.immediateDependencies
+              : _nonDevDependencies(entrypoint.root))
+          .map((dep) => entrypoint.packageGraph.packages[dep.name]));
+
+    for (var package in packages) {
+      var executables = _getExecutablesFor(package);
+      if (executables.isNotEmpty) {
+        _buffer.writeln(_formatExecutables(package.name, executables.toList()));
+      }
+    }
+  }
+
+  /// Lists all Dart files in the `bin` directory of the [package].
+  ///
+  /// Returns file names without extensions.
+  List<String> _getExecutablesFor(Package package) => package
+      .listFiles(beneath: 'bin', recursive: false)
+      .where(_isDartExecutable)
+      .map(p.basenameWithoutExtension);
+
+  /// Returns formatted string that lists [executables] for the [packageName].
+  /// Examples:
+  ///
+  ///     _formatExecutables('foo', ['foo'])        // -> 'foo'
+  ///     _formatExecutables('foo', ['bar'])        // -> 'foo:bar'
+  ///     _formatExecutables('foo', ['bar', 'foo']) // -> 'foo: foo, bar'
+  ///
+  /// Note the leading space before first executable and sorting order in the
+  /// last example.
+  String _formatExecutables(String packageName, List<String> executables) {
+    if (executables.length == 1) {
+      // If executable matches the package name omit the name of executable in
+      // the output.
+      return executables.first != packageName
+          ? '${packageName}:${log.bold(executables.first)}'
+          : log.bold(executables.first);
+    }
+
+    // Sort executables to make executable that matches the package name to be
+    // the first in the list.
+    executables.sort((e1, e2) {
+      if (e1 == packageName)
+        return -1;
+      else if (e2 == packageName)
+        return 1;
+      else
+        return e1.compareTo(e2);
+    });
+
+    return '${packageName}: ${executables.map(log.bold).join(', ')}';
+  }
 }

lib/src/command/run.dart

@@ -4,32 +4,14 @@
 
 import 'dart:async';
 
-import 'package:analyzer/analyzer.dart' as analyzer;
 import 'package:barback/barback.dart';
 import 'package:path/path.dart' as p;
 
 import '../command.dart';
-import '../dart.dart';
 import '../executable.dart';
 import '../io.dart';
-import '../log.dart' as log;
-import '../package.dart';
 import '../utils.dart';
 
-/// Returns `true` if [path] looks like a Dart entrypoint.
-bool _isDartExecutable(String path) {
-  if (p.extension(path) == '.dart') {
-    try {
-      var unit = analyzer.parseDartFile(path, parseFunctionBodies: false);
-      return isEntrypoint(unit);
-    } on analyzer.AnalyzerErrorGroup {
-      return false;
-    }
-  }
-
-  return false;
-}
-
 /// Handles the `run` pub command.
 class RunCommand extends PubCommand {
   String get name => "run";
@@ -40,20 +22,14 @@ class RunCommand extends PubCommand {
   RunCommand() {
     argParser.addFlag("checked",
         abbr: "c", help: "Enable runtime type checks and assertions.");
-    argParser.addFlag('list',
-        negatable: false, help: 'List all available executables.');
+
     argParser.addOption("mode",
         help: 'Mode to run transformers in.\n'
             '(defaults to "release" for dependencies, "debug" for '
             'entrypoint)');
   }
 
   Future run() async {
-    if (argResults['list']) {
-      _listExecutables();
-      return;
-    }
-
     if (argResults.rest.isEmpty) {
       usageException("Must specify an executable to run.");
     }
@@ -94,61 +70,4 @@ class RunCommand extends PubCommand {
         checked: argResults['checked'], mode: mode);
     await flushThenExit(exitCode);
   }
-
-  /// Lists all executables reachable from [entrypoint].
-  void _listExecutables() {
-    var packages = []
-      ..add(entrypoint.root)
-      ..addAll(entrypoint.root.immediateDependencies
-          .map((dep) => entrypoint.packageGraph.packages[dep.name]));
-
-    for (var package in packages) {
-      var executables = _listExecutablesFor(package);
-      if (executables.isNotEmpty) {
-        log.message(_formatExecutables(package.name, executables.toList()));
-      }
-    }
-  }
-
-  /// Lists all Dart files in the `bin` directory of the [package].
-  ///
-  /// Returns file names without extensions.
-  List<String> _listExecutablesFor(Package package) {
-    return package
-        .listFiles(beneath: 'bin', recursive: false)
-        .where(_isDartExecutable)
-        .map(p.basenameWithoutExtension);
-  }
-
-  /// Returns formatted string that lists [executables] for the [packageName].
-  /// Examples:
-  ///
-  ///     _formatExecutables('foo', ['foo'])        // -> 'foo'
-  ///     _formatExecutables('foo', ['bar'])        // -> 'foo:bar'
-  ///     _formatExecutables('foo', ['bar', 'foo']) // -> 'foo: foo, bar'
-  ///
-  /// Note the leading space before first executable and sorting order in the
-  /// last example.
-  String _formatExecutables(String packageName, List<String> executables) {
-    if (executables.length == 1) {
-      // If executable matches the package name omit the name of executable in
-      // the output.
-      return executables.first != packageName
-          ? '${packageName}:${log.bold(executables.first)}'
-          : log.bold(executables.first);
-    } else {
-      // Sort executables to make executable that matches the package name to be
-      // the first in the list.
-      executables.sort((e1, e2) {
-        if (e1 == packageName)
-          return -1;
-        else if (e2 == packageName)
-          return 1;
-        else
-          return e1.compareTo(e2);
-      });
-
-      return '${packageName}: ${executables.map(log.bold).join(', ')}';
-    }
-  }
 }