From 31a50056454f713b6365e3568e1adf1cb3d34c4a Mon Sep 17 00:00:00 2001
From: Devon Carew <devoncarew@gmail.com>
Date: Wed, 12 Nov 2014 22:20:56 -0800
Subject: [PATCH] add human readable names

---
 lib/generators/consoleapp.dart  | 1 +
 lib/generators/package.dart     | 1 +
 lib/generators/polymerapp.dart  | 1 +
 lib/generators/shelfserver.dart | 1 +
 lib/generators/webapp.dart      | 1 +
 lib/src/cli_app.dart            | 3 ++-
 lib/src/common.dart             | 5 +++--
 lib/stagehand.dart              | 3 ++-
 8 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/generators/consoleapp.dart b/lib/generators/consoleapp.dart
index 1a6738e0..97c97263 100644
--- a/lib/generators/consoleapp.dart
+++ b/lib/generators/consoleapp.dart
@@ -14,6 +14,7 @@ import 'consoleapp_data.dart';
 class ConsoleAppGenerator extends DefaultGenerator {
   ConsoleAppGenerator() : super(
       'consoleapp',
+      'Console Application',
       'A simple command-line application.',
       categories: const ['dart', 'console', 'minimal']) {
 
diff --git a/lib/generators/package.dart b/lib/generators/package.dart
index c779b0fb..40b06de0 100644
--- a/lib/generators/package.dart
+++ b/lib/generators/package.dart
@@ -14,6 +14,7 @@ import 'package_data.dart';
 class PackageGenerator extends DefaultGenerator {
   PackageGenerator() : super(
       'package',
+      'Dart Package',
       'A starting point for Dart libraries or applications.',
       categories: const ['dart']) {
 
diff --git a/lib/generators/polymerapp.dart b/lib/generators/polymerapp.dart
index 7eca22bb..d3e07f7b 100644
--- a/lib/generators/polymerapp.dart
+++ b/lib/generators/polymerapp.dart
@@ -14,6 +14,7 @@ import 'polymerapp_data.dart';
 class PolymerAppGenerator extends DefaultGenerator {
   PolymerAppGenerator() : super(
       'polymerapp',
+      'Polymer Web Application',
       'A web app built using polymer.dart.',
       categories: const ['dart', 'web']) {
 
diff --git a/lib/generators/shelfserver.dart b/lib/generators/shelfserver.dart
index e14ca49f..ab6b0d0a 100644
--- a/lib/generators/shelfserver.dart
+++ b/lib/generators/shelfserver.dart
@@ -14,6 +14,7 @@ import 'shelfserver_data.dart';
 class ShelfServerGenerator extends DefaultGenerator {
   ShelfServerGenerator() : super(
       'shelfserver',
+      'Shelf Web Server',
       'A web server built using the shelf package.',
       categories: const ['dart', 'shelf', 'server']) {
 
diff --git a/lib/generators/webapp.dart b/lib/generators/webapp.dart
index b7aed336..317c3c13 100644
--- a/lib/generators/webapp.dart
+++ b/lib/generators/webapp.dart
@@ -14,6 +14,7 @@ import 'webapp_data.dart';
 class WebAppGenerator extends DefaultGenerator {
   WebAppGenerator() : super(
       'webapp',
+      'Web Application',
       "A web app for the developer that doesn’t want to be confused by too "
       "much going on.",
       categories: const ['dart', 'web']) {
diff --git a/lib/src/cli_app.dart b/lib/src/cli_app.dart
index 3edb16c3..00094cbe 100644
--- a/lib/src/cli_app.dart
+++ b/lib/src/cli_app.dart
@@ -222,6 +222,7 @@ class CliApp {
     Iterable itor = generators.map((Generator generator) {
       Map m = {
         'name': generator.id,
+        'label': generator.label,
         'description': generator.description
       };
 
@@ -251,7 +252,7 @@ class CliApp {
     _out('Stagehand will generate the given application type into the current directory.');
     _out('');
     _out('usage: ${APP_NAME} <generator-name>');
-    _out(argParser.getUsage());
+    _out(argParser.usage);
     _out('');
     _out('Available generators:');
     int len = generators
diff --git a/lib/src/common.dart b/lib/src/common.dart
index 2fd9c8d3..534a8c8a 100644
--- a/lib/src/common.dart
+++ b/lib/src/common.dart
@@ -120,8 +120,9 @@ List<String> wrap(String str, [int col = 80]) {
  * An abstract implementation of a [Generator].
  */
 abstract class DefaultGenerator extends Generator {
-  DefaultGenerator(String id, String description, {List<String> categories: const []})
-      : super(id, description, categories: categories);
+  DefaultGenerator(String id, String label, String description,
+      {List<String> categories: const []})
+      : super(id, label, description, categories: categories);
 
   TemplateFile addFile(String path, String contents) =>
       addTemplateFile(new TemplateFile(path, contents));
diff --git a/lib/stagehand.dart b/lib/stagehand.dart
index f4c9f325..79cc3b0a 100644
--- a/lib/stagehand.dart
+++ b/lib/stagehand.dart
@@ -51,13 +51,14 @@ Generator getGenerator(String id) {
  */
 abstract class Generator implements Comparable<Generator> {
   final String id;
+  final String label;
   final String description;
   final List<String> categories;
 
   final List<TemplateFile> files = [];
   TemplateFile _entrypoint;
 
-  Generator(this.id, this.description, {this.categories: const []});
+  Generator(this.id, this.label, this.description, {this.categories: const []});
 
   /**
    * The entrypoint of the application; the main file for the project, which an