Merge pull request #13 from tomasz-oponowicz/develop

Release 1.1.0

Author: tomasz-oponowicz

README.md

@@ -8,23 +8,25 @@ Conceal your logic and hide any data contained in the code. Please read document
 
 Original code:
 
-    (function(){
-        var variable = 'abc';
-        console.log(variable);
-    })();
+```js
+(function(){
+    var variable = 'abc';
+    console.log(variable);
+})();
+```
 
 Protected code:
 
-    var _0xabf1 = [
-        '\x61\x62\x63',
-        '\x6c\x6f\x67'
-    ];
-    (function() {
-        var _0xe6fab6 = _0xabf1[0x0];
-        console[_0xabf1[0x1]](_0xe6fab6);
-    }());
-
-
+```js
+var _0xabf1 = [
+    '\x61\x62\x63',
+    '\x6c\x6f\x67'
+];
+(function() {
+    var _0xe6fab6 = _0xabf1[0x0];
+    console[_0xabf1[0x1]](_0xe6fab6);
+}());
+```
 
 Special thanks for [@sanex3339](https://github.com/sanex3339) for his outstanding [javascript-obfuscator](https://github.com/javascript-obfuscator/javascript-obfuscator) library.
 
@@ -108,11 +110,29 @@ grunt.initConfig({
 });
 ```
 
+#### Obfuscate and overwrite
+
+In this example, source files are obfuscated and overwritten:
+
+```js
+grunt.initConfig({
+  javascript_obfuscator: {
+    options: {
+      /* Default options */
+    },
+    main: {
+      src: ['src/module1.js', 'src/module2.js']
+    }
+  },
+});
+```
+
 ## Contributing
 In lieu of a formal styleguide, take care to maintain the existing coding style. Add unit tests for any new or changed functionality. Lint and test your code using [Grunt](http://gruntjs.com/).
 
 ## Release History
 
+ * 2016-12-23 / v1.1.0 / Obfuscate and overwrite files without destination.
  * 2016-11-11 / v1.0.4 / Updated README.
  * 2016-11-09 / v1.0.3 / Updated README.
  * 2016-11-09 / v1.0.2 / Fixed examples.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "grunt-javascript-obfuscator",
   "description": "Obfuscates JavaScript files using amazing javascript-obfuscator.",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "main": "tasks/javascript_obfuscator.js",
   "files": ["tasks"],
   "homepage": "https://github.com/tomasz-oponowicz/grunt-javascript-obfuscator",

tasks/javascript_obfuscator.js

@@ -16,12 +16,35 @@ function concat(grunt, paths) {
   }
 
   return paths.map(function(path) {
-
-    // Read file source.
     return grunt.file.read(path);
   }).join(grunt.util.normalizelf(';'));
 }
 
+function obfuscate(grunt, originalSource, destFile, options) {
+  var obfuscatedSource = JavaScriptObfuscator.obfuscate(originalSource, options).getObfuscatedCode();
+  grunt.file.write(destFile, obfuscatedSource);
+  grunt.log.writeln('File "' + destFile + '" obfuscated.');
+}
+
+function obfuscateSingleTarget(grunt, srcFiles, destFile, options) {
+  var source;
+
+  try {
+    source = concat(grunt, srcFiles);
+  } catch (error) {
+    return grunt.fail.warn(error);
+  }
+
+  obfuscate(grunt, source, destFile, options);
+}
+
+function obfuscateMultiplesTargets(grunt, destFiles, options) {
+  destFiles.forEach(function (destFile) {
+    var source = grunt.file.read(destFile);
+    obfuscate(grunt, source, destFile, options);
+  });
+}
+
 module.exports = function(grunt) {
   grunt.registerMultiTask('javascript_obfuscator', 'Obfuscates JavaScript files.', function() {
 
@@ -33,22 +56,12 @@ module.exports = function(grunt) {
       throw new Error('Target files not found.');
     }
 
-    files.forEach(function(f) {
-      var src;
-
-      try {
-        src = concat(grunt, f.src);
-      } catch (e) {
-        return grunt.fail.warn(e);
+    files.forEach(function(file) {
+      if (file.dest) {
+        obfuscateSingleTarget(grunt, file.src, file.dest, options);
+      } else {
+        obfuscateMultiplesTargets(grunt, file.src, options);
       }
-
-      src = JavaScriptObfuscator.obfuscate(src, options).getObfuscatedCode();
-
-      // Write the destination file.
-      grunt.file.write(f.dest, src);
-
-      // Print a success message.
-      grunt.log.writeln('File "' + f.dest + '" created.');
     });
   });
 };

test/fixtures/gruntfile_overwrite_without_dest.js

@@ -0,0 +1,6 @@
+module.exports = require('./gruntfile_generic').setup({
+    options: {},
+    overwrite_without_dest: {
+        src: '../../tmp/overwrite_without_dest_*'
+    }
+});

test/javascript_obfuscator_test.js

@@ -131,6 +131,40 @@ exports.javascript_obfuscator = {
             // should be obfuscated
             test.ok(obfuscated.indexOf('FIRST_STRING_LITERAL') === -1, '`FIRST_STRING_LITERAL` should be obfuscated');
 
+            test.done();
+        });
+    },
+
+    overwrite_without_dest: function(test) {
+        test.expect(8);
+
+        grunt.file.copy('test/fixtures/first_sample.js', 'tmp/overwrite_without_dest_first.js');
+        grunt.file.copy('test/fixtures/second_sample.js', 'tmp/overwrite_without_dest_second.js');
+
+        helper.callGruntfile('fixtures/gruntfile_overwrite_without_dest.js', function (error, stdout, stderr) {
+            test.equal(error, null, "Command should not fail.");
+            test.equal(stderr, '', "Standard error stream should be empty.");
+
+            var obfuscated;
+
+            obfuscated = grunt.file.read('tmp/overwrite_without_dest_first.js');
+
+            // should NOT be obfuscated
+            test.ok(obfuscated.indexOf('console') > -1, '`console` shouldn\'t be obfuscated');
+            test.ok(obfuscated.indexOf('FIRST_LOCAL_VARIABLE') > -1, '`FIRST_LOCAL_VARIABLE` shouldn\'t be obfuscated');
+
+            // should be obfuscated
+            test.ok(obfuscated.indexOf('FIRST_STRING_LITERAL') === -1, '`FIRST_STRING_LITERAL` should be obfuscated');
+
+            obfuscated = grunt.file.read('tmp/overwrite_without_dest_second.js');
+
+            // should NOT be obfuscated
+            test.ok(obfuscated.indexOf('console') > -1, '`console` shouldn\'t be obfuscated');
+            test.ok(obfuscated.indexOf('SECOND_LOCAL_VARIABLE') > -1, '`SECOND_LOCAL_VARIABLE` shouldn\'t be obfuscated');
+
+            // should be obfuscated
+            test.ok(obfuscated.indexOf('SECOND_STRING_LITERAL') === -1, '`SECOND_STRING_LITERAL` should be obfuscated');
+
             test.done();
         });
     }