Merge pull request #581 from kevmoo/polymer

lib/src/compiler_options.dart

Index: lib/src/compiler_options.dart
diff --git a/lib/src/compiler_options.dart b/lib/src/compiler_options.dart
index de96d6d28edba7a8f7091dfcd4d24fd6a7bd01cf..702a24aa768c6792988a5b5f1d942d520821d8f8 100644
--- a/lib/src/compiler_options.dart
+++ b/lib/src/compiler_options.dart
@@ -2,7 +2,7 @@
 // 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.
 
-library options;
+library polymer.src.compiler_options;
 
 import 'package:args/args.dart';
 
@@ -51,14 +51,7 @@ class CompilerOptions {
   final bool jsonFormat;
 
   /** Emulate scoped styles using a CSS polyfill. */
-  final bool processCss;
-
-  /** Emit debugging information for CSS processing. */
-  final bool debugCss;
-
-  // TODO(terry): Delete this option; temporary for a transition period.
-  /** If true, emit mangled CSS otherwise emits component scoped CSS. **/
-  final bool mangleCss;
+  final bool emulateScopedCss;
 
   /** Use CSS file for CSS Reset. */
   final String resetCssFile;
@@ -66,8 +59,6 @@ class CompilerOptions {
   /** Whether to analyze the input for warnings without generating any code. */
   final bool analysisOnly;
 
-  bool get hasCssReset => resetCssFile != null;
-
   // We could make this faster, if it ever matters.
   factory CompilerOptions() => parse(['']);
 
@@ -83,10 +74,8 @@ class CompilerOptions {
       forceMangle = args['unique_output_filenames'],
       jsonFormat = args['json_format'],
       componentsOnly = args['components_only'],
-      processCss = args['css'],
-      debugCss = args['debug_css'],
+      emulateScopedCss = args['scoped-css'],
       resetCssFile = args['css-reset'],
-      mangleCss = args['css-mangle'],
       analysisOnly = args['analysis-only'],
       inputFile = args.rest.length > 0 ? args.rest[0] : null;
 
@@ -124,13 +113,9 @@ class CompilerOptions {
           help: 'Generate only the code for component classes, do not generate '
                 'HTML files or the main bootstrap code.',
           defaultsTo: false, negatable: false)
-      ..addFlag('css', help: 'Emulate scoped styles with CSS polyfill',
-          defaultsTo: true)
-      ..addFlag('debug_css', help: 'Debug information for CSS polyfill',
-          defaultsTo: false, negatable: false)
+      ..addFlag('scoped-css', help: 'Emulate scoped styles with CSS polyfill',
+          defaultsTo: false)
       ..addOption('css-reset', abbr: 'r', help: 'CSS file used to reset CSS')
-      ..addFlag('css-mangle', help: 'Mangle component\'s CSS', defaultsTo: true,
-          negatable: true)
       ..addFlag('analysis-only', help: 'Don\'t emit code, just show warnings '
           'and errors (unset by default)', defaultsTo: false, negatable: false)
       ..addOption('out', abbr: 'o', help: 'Directory where to generate files'