Code clean up, remove unused fs require

looker · Jan 29, 2014 · c8a4b63 · c8a4b63
1 parent a85eeb2
commit c8a4b63
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 33 deletions.
diff --git a/tasks/coffee.js b/tasks/coffee.js
@@ -18,7 +18,7 @@ module.exports = function(grunt) {
       bare: false,
       join: false,
       sourceMap: false,
-      separator: grunt.util.linefeed
+      separator: grunt.util.linefeed,
     });
 
     options.separator = grunt.util.normalizelf(options.separator);
@@ -87,10 +87,10 @@ module.exports = function(grunt) {
     }
 
     options = _.extend({
-        generatedFile: path.basename(paths.dest),
-        sourceRoot: mapOptions.sourceRoot,
-        sourceFiles: mapOptions.sourceFiles
-      }, options);
+      generatedFile: path.basename(paths.dest),
+      sourceRoot: mapOptions.sourceRoot,
+      sourceFiles: mapOptions.sourceFiles
+    }, options);
 
     var output = compileCoffee(mapOptions.code, options, filepath);
     appendFooter(output, paths, options);
@@ -141,12 +141,10 @@ module.exports = function(grunt) {
   };
 
   var concatInput = function(files, options) {
-    if (!hasUniformExtensions(files)) {
-      return;
+    if (hasUniformExtensions(files)) {
+      var code = concatFiles(files, options.separator);
+      return compileCoffee(code, options);
     }
-
-    var code = concatFiles(files, options.separator);
-    return compileCoffee(code, options);
   };
 
   var concatOutput = function(files, options) {

diff --git a/test/coffee_test.js b/test/coffee_test.js
@@ -1,28 +1,23 @@
+'use strict';
+
 var grunt = require('grunt');
-var fs = require('fs');
 
 function readFile(file) {
-  'use strict';
-
   var contents = grunt.file.read(file);
-
   if (process.platform === 'win32') {
     contents = contents.replace(/\r\n/g, '\n');
   }
-
   return contents;
 }
 
 function assertFileEquality(test, pathToActual, pathToExpected, message) {
-    var actual = readFile(pathToActual);
-    var expected = readFile(pathToExpected);
-    test.equal(expected, actual, message);
+  var actual = readFile(pathToActual);
+  var expected = readFile(pathToExpected);
+  test.equal(expected, actual, message);
 }
 
 exports.coffee = {
   compileBare: function(test) {
-    'use strict';
-
     test.expect(4);
 
     assertFileEquality(test,
@@ -48,8 +43,6 @@ exports.coffee = {
     test.done();
   },
   compileDefault: function(test) {
-    'use strict';
-
     test.expect(4);
 
     assertFileEquality(test,
@@ -75,8 +68,6 @@ exports.coffee = {
     test.done();
   },
   compileJoined: function(test) {
-    'use strict';
-
     test.expect(4);
 
     assertFileEquality(test,
@@ -102,8 +93,6 @@ exports.coffee = {
     test.done();
   },
   compileMaps: function(test) {
-    'use strict';
-
     test.expect(10);
 
     assertFileEquality(test,
@@ -159,8 +148,6 @@ exports.coffee = {
     test.done();
   },
   compileEachMap: function(test) {
-    'use strict';
-
     test.expect(4);
 
     assertFileEquality(test,
@@ -186,8 +173,6 @@ exports.coffee = {
     test.done();
   },
   compileSourceMapDir: function(test) {
-    'use strict';
-
     test.expect(2);
 
     assertFileEquality(test,
@@ -203,8 +188,6 @@ exports.coffee = {
     test.done();
   },
   compileNested: function(test) {
-    'use strict';
-
     test.expect(2);
 
     assertFileEquality(test,
@@ -218,5 +201,5 @@ exports.coffee = {
       'Compilation of nested maps should change per file');
 
     test.done();
-  }
+  },
 };