Fixes #1 - option to remove inlined files.

Why:

* `minified.inlinedStylesheets` provides a list of inlined files, but,
  unlike in API, there is no way to say we want to remove these files;
* `--remove-inlined-files` (defaults to off) enables such behavior.

Author: jakubpawlowicz

History.md

@@ -2,6 +2,7 @@
 ==================
 
 * Bumps clean-css dependency to 4.1.x.
+* Fixed issue [#1](https://github.com/jakubpawlowicz/clean-css-cli/issues/1) - option to remove inlined files.
 * Fixed issue [#2](https://github.com/jakubpawlowicz/clean-css-cli/issues/2) - glob matching source paths.
 * Fixed issue [#7](https://github.com/jakubpawlowicz/clean-css-cli/issues/7) - using CLI as a module.
 

README.md

@@ -84,6 +84,7 @@ clean-css-cli 4.0 introduces some breaking changes:
 -O <n> [optimizations]         Turn on level <n> optimizations; optionally accepts a list of fine-grained options, defaults to `1`, see examples below
 --inline [rules]               Enables inlining for listed sources (defaults to `local`)
 --inline-timeout [seconds]     Per connection timeout when fetching remote stylesheets (defaults to 5 seconds)
+--remove-inlined-files         Remove files inlined in <source-file ...> or via `@import` statements
 --skip-rebase                  Disable URLs rebasing
 --source-map                   Enables building input's source map
 --source-map-inline-sources    Enables inlining sources inside source maps

index.js

@@ -10,6 +10,7 @@ function cli(process, beforeMinifyCallback) {
   var buildVersion = JSON.parse(packageConfig).version;
   var fromStdin;
   var debugMode;
+  var removeInlinedFiles;
   var options;
   var stdin;
   var data;
@@ -27,6 +28,7 @@ function cli(process, beforeMinifyCallback) {
     .option('-O <n> [optimizations]', 'Turn on level <n> optimizations; optionally accepts a list of fine-grained options, defaults to `1`, see examples below', function (val) { return Math.abs(parseInt(val)); })
     .option('--inline [rules]', 'Enables inlining for listed sources (defaults to `local`)')
     .option('--inline-timeout [seconds]', 'Per connection timeout when fetching remote stylesheets (defaults to 5 seconds)', parseFloat)
+    .option('--remove-inlined-files', 'Remove files inlined in <source-file ...> or via `@import` statements')
     .option('--skip-rebase', 'Disable URLs rebasing')
     .option('--source-map', 'Enables building input\'s source map')
     .option('--source-map-inline-sources', 'Enables inlining sources inside source maps');
@@ -134,6 +136,8 @@ function cli(process, beforeMinifyCallback) {
 
   // Now coerce commands into CleanCSS configuration...
   debugMode = commands.debug;
+  removeInlinedFiles = commands.removeInlinedFiles;
+
   options = {
     compatibility: commands.compatibility,
     format: commands.format,
@@ -156,7 +160,7 @@ function cli(process, beforeMinifyCallback) {
 
   // ... and do the magic!
   if (commands.args.length > 0) {
-    minify(process, beforeMinifyCallback, options, debugMode, expandGlobs(commands.args));
+    minify(process, beforeMinifyCallback, options, debugMode, removeInlinedFiles, expandGlobs(commands.args));
   } else {
     stdin = process.openStdin();
     stdin.setEncoding('utf-8');
@@ -165,7 +169,7 @@ function cli(process, beforeMinifyCallback) {
       data += chunk;
     });
     stdin.on('end', function () {
-      minify(process, beforeMinifyCallback, options, debugMode, data);
+      minify(process, beforeMinifyCallback, options, debugMode, removeInlinedFiles, data);
     });
   }
 }
@@ -204,7 +208,7 @@ function expandGlobs(paths) {
   }, []);
 }
 
-function minify(process, beforeMinifyCallback, options, debugMode, data) {
+function minify(process, beforeMinifyCallback, options, debugMode, removeInlinedFiles, data) {
   var cleanCss = new CleanCSS(options);
 
   beforeMinifyCallback(cleanCss);
@@ -232,6 +236,10 @@ function minify(process, beforeMinifyCallback, options, debugMode, data) {
       process.exit(1);
     }
 
+    if (removeInlinedFiles) {
+      minified.inlinedStylesheets.forEach(fs.unlinkSync);
+    }
+
     if (minified.sourceMap) {
       mapFilename = path.basename(options.output) + '.map';
       output(process, options, minified.styles + '/*# sourceMappingURL=' + mapFilename + ' */');

test/binary-test.js

@@ -636,4 +636,49 @@ vows.describe('cleancss')
       })
     }
   })
+  .addBatch({
+    'removing inlined stylesheets - off': {
+      'topic': function() {
+        var self = this;
+
+        exec('cp test/fixtures/reset.css test/fixtures/reset-removing.css', function () {
+          exec('__DIRECT__=1 ./bin/cleancss test/fixtures/reset-removing.css', self.callback);
+        });
+      },
+      'keeps the file': function () {
+        assert.isTrue(fs.existsSync('test/fixtures/reset-removing.css'));
+      },
+      'teardown': function () {
+        deleteFile('test/fixtures/reset-removing.css');
+      }
+    }
+  })
+  .addBatch({
+    'removing inlined stylesheets - on': {
+      'topic': function() {
+        var self = this;
+
+        exec('cp test/fixtures/reset.css test/fixtures/reset-removing.css', function () {
+          exec('__DIRECT__=1 ./bin/cleancss --remove-inlined-files test/fixtures/reset-removing.css', self.callback);
+        });
+      },
+      'removes the file': function () {
+        assert.isFalse(fs.existsSync('test/fixtures/reset-removing.css'));
+      }
+    }
+  })
+  .addBatch({
+    'removing inlined stylesheets - on via @import': {
+      'topic': function() {
+        var self = this;
+
+        exec('cp test/fixtures/reset.css test/fixtures/reset-removing.css', function () {
+          exec('echo "@import \'test/fixtures/reset-removing.css\';" | ./bin/cleancss --remove-inlined-files', self.callback);
+        });
+      },
+      'removes the file': function () {
+        assert.isFalse(fs.existsSync('test/fixtures/reset-removing.css'));
+      }
+    }
+  })
   .export(module);

test/fixtures/reset-duplicate.css

@@ -0,0 +1,64 @@
+/*reset*/
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  outline: 0;
+  font-weight: inherit;
+  font-style: inherit;
+  font-size: 100%;
+  font-family: inherit;
+  vertical-align: baseline;
+}
+/* remember to define focus styles! */
+:focus {
+  outline: 0;
+}
+body {
+  line-height: 1;
+  color: black;
+  background: white;
+}
+ol, ul {
+  list-style: none;
+}
+/* tables still need 'cellspacing="0"' in the markup */
+table {
+  border-collapse: separate;
+  border-spacing: 0;
+}
+caption, th, td {
+  text-align: left;
+  font-weight: normal;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+  content: "";
+}
+blockquote, q {
+  quotes: "" "";
+}
+.clear { 
+  clear:both;
+  display: inline-block; 
+}   
+.clear:after, .container:after {
+  content: "."; 
+  display: block; 
+  height: 0; 
+  clear: both; 
+  visibility: hidden;
+}
+* html .clear { 
+  height: 1%; 
+}
+.clear { 
+  display: block; 
+}