refactoring

openhoat · Feb 11, 2013 · 68b8d51 · 68b8d51
1 parent 6902c71
commit 68b8d51
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -19,9 +19,9 @@ Put this in your grunt config :
     crypt:{
       files:[                                   // files to process
         {
-          dir:'demo/src',                       // root dir of files to encrypt, or dest dir of files to decrypt
+          dir:'demo',                           // root dir of files to encrypt / decrypt
           include:'**/*.js',                    // pattern to include files
-          encryptedDir:'demo/encrypted'         // dest dir of files to encrypt, or root dir of files to decrypt
+          encryptedExtension:'.encrypted'       // extension used for encrypted files
         }
       ],
       options:{

diff --git a/demo/.gitignore b/demo/.gitignore
diff --git a/demo/encrypted/hello.js b/demo/encrypted/hello.js
diff --git a/demo/hello.js b/demo/hello.js
@@ -0,0 +1 @@
+console.log('hello!');
diff --git a/grunt.js b/grunt.js
@@ -16,9 +16,9 @@ module.exports = function (grunt) {
     crypt:{
       files:[
         {
-          dir:'demo/src',
+          dir:'demo',
           include:'**/*.js',
-          encryptedDir:'demo/encrypted'
+          encryptedExtension:'.encrypted'
         }
       ],
       options:{

diff --git a/tasks/crypt.js b/tasks/crypt.js
@@ -9,17 +9,17 @@ module.exports = function (grunt) {
       , cryptKey = options.key;
     files.forEach(function (file) {
       var srcDir = file.dir || 'src'
-        , destDir = file.encryptedDir || path.join('encrypted', srcDir)
+        , encryptedExtension = file.encryptedExtension || '.encrypted'
         , include = file.include || '*.js'
         , filePaths = grunt.file.expand({ cwd:srcDir }, include);
       filePaths.forEach(function (filePath) {
         var srcFilePath = path.join(srcDir, filePath)
-          , destFilePath = path.join(destDir, filePath)
+          , destFilePath = srcFilePath + encryptedExtension
-          , content, encryptedContent;
+          , decryptedContent, encryptedContent;
         try {
           grunt.log.write('Encrypting "' + srcFilePath + '" to "' + destFilePath + '"...');
-          content = grunt.file.read(srcFilePath);
+          decryptedContent = grunt.file.read(srcFilePath);
-          encryptedContent = kruptosUtilCrypt.encryptText(content, cryptKey);
+          encryptedContent = kruptosUtilCrypt.encryptText(decryptedContent, cryptKey);
           grunt.file.write(destFilePath, encryptedContent);
           grunt.log.ok();
         } catch (e) {
@@ -35,19 +35,18 @@ module.exports = function (grunt) {
       , options = grunt.config('crypt').options
       , cryptKey = options.key;
     files.forEach(function (file) {
-      var destDir = file.dir || 'src'
+      var srcDir = file.dir || 'src'
-        , srcDir = file.encryptedDir || path.join('encrypted', destDir)
+        , encryptedExtension = file.encryptedExtension || '.encrypted'
-        , include = file.include || '*.js'
+        , filePaths = grunt.file.expand({ cwd:srcDir }, '*' + encryptedExtension);
-        , filePaths = grunt.file.expand({ cwd:srcDir }, include);
       filePaths.forEach(function (filePath) {
         var srcFilePath = path.join(srcDir, filePath)
-          , destFilePath = path.join(destDir, filePath)
+          , destFilePath = srcFilePath.substring(0, srcFilePath.length - encryptedExtension.length)
-          , content, encryptedContent;
+          , decryptedContent, encryptedContent;
         try {
           grunt.log.write('Decrypting "' + srcFilePath + '" to "' + destFilePath + '"...');
           encryptedContent = grunt.file.read(srcFilePath);
-          content = kruptosUtilCrypt.decryptText(encryptedContent, cryptKey);
+          decryptedContent = kruptosUtilCrypt.decryptText(encryptedContent, cryptKey);
-          grunt.file.write(destFilePath, content);
+          grunt.file.write(destFilePath, decryptedContent);
           grunt.log.ok();
         } catch (e) {
           grunt.log.error();