Merge pull request #30 from yawetse/master

switched to async parallel, simplified installation process, installing extension dependencies via npm instead of github

Author: yawetse

.gitignore

@@ -1,4 +1,5 @@
 .DS_store
+*.DS_store
 lib-cov
 *.seed
 *.log
@@ -38,4 +39,9 @@ build/Release
 # see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
 node_modules
 public/uploads/files
-!content/extensions/node_modules/*
+!content/extensions/node_modules/*
+content/extensions/node_modules/periodicjs.ext.admin/node_modules
+content/extensions/node_modules/periodicjs.ext.dbseed/node_modules
+content/extensions/node_modules/periodicjs.ext.default_routes/node_modules
+content/extensions/node_modules/periodicjs.ext.login/node_modules
+content/extensions/node_modules/periodicjs.ext.mailer/node_modules

app/controller/application.js

@@ -82,7 +82,8 @@ var applicationController = function(resources){
 
 		var getExtensionView = function(viewname,callback){
 			if(extname){
-				var exttemplatefile = path.join(path.resolve(__dirname,'../../content/extensions/node_modules',extname,'views',viewname),'.'+themefileext);
+				var exttemplatefile = path.join(path.resolve(__dirname,'../../content/extensions/node_modules',extname),'views',viewname+'.'+themefileext);
+				console.log("exttemplatefile",exttemplatefile);
 				fs.open(exttemplatefile,'r',function(err,file){
 					if(err){
 						callback(err,viewname,null);

content/extensions/extensions.json

@@ -2,27 +2,103 @@
   "extensions": [
     {
       "name": "periodicjs.ext.install",
-      "version": "0.0.1",
-      "periodicCompatibility": "0.0.2",
+      "version": "0.1.0",
+      "periodicCompatibility": "0.1.0",
       "installed": true,
-      "enabled": false,
+      "enabled": true,
       "periodicConfig": {
         "name": "periodicjs.ext.install",
-        "periodicCompatibility": "0.0.2",
+        "periodicCompatibility": "0.1.0",
         "periodicDependencies": []
       }
     },
     {
       "name": "periodicjs.ext.default_routes",
-      "version": "0.0.1",
-      "periodicCompatibility": "0.0.2",
+      "version": "0.1.0",
+      "periodicCompatibility": "0.1.0",
       "installed": true,
       "enabled": true,
       "periodicConfig": {
         "name": "periodicjs.ext.default_routes",
-        "periodicCompatibility": "0.0.2",
+        "periodicCompatibility": "0.1.0",
         "periodicDependencies": []
       }
+    },
+    {
+      "name": "periodicjs.ext.mailer",
+      "version": "0.1.0",
+      "periodicCompatibility": "0.1.0",
+      "installed": true,
+      "enabled": false,
+      "periodicConfig": {
+        "name": "periodicjs.ext.mailer",
+        "periodicCompatibility": "0.1.0",
+        "periodicDependencies": [],
+        "periodicjs.ext.admin": {
+          "menu": {
+            "Extensions": {
+              "Mailer": "<a href=\"/p-admin/mailer/\">Mail Settings</a>"
+            }
+          }
+        }
+      }
+    },
+    {
+      "name": "periodicjs.ext.login",
+      "version": "0.1.0",
+      "periodicCompatibility": "0.1.0",
+      "installed": true,
+      "enabled": false,
+      "periodicConfig": {
+        "name": "periodicjs.ext.login",
+        "periodicCompatibility": "0.1.0",
+        "periodicDependencies": [
+          {
+            "extname": "periodicjs.ext.mailer",
+            "version": "0.1.0"
+          }
+        ]
+      }
+    },
+    {
+      "name": "periodicjs.ext.admin",
+      "version": "0.1.0",
+      "periodicCompatibility": "0.1.0",
+      "installed": true,
+      "enabled": false,
+      "periodicConfig": {
+        "name": "periodicjs.ext.admin",
+        "periodicCompatibility": "0.1.0",
+        "periodicDependencies": [
+          {
+            "extname": "periodicjs.ext.mailer",
+            "version": "0.1.0"
+          },
+          {
+            "extname": "periodicjs.ext.login",
+            "version": "0.1.0"
+          }
+        ]
+      }
+    },
+    {
+      "name": "periodicjs.ext.dbseed",
+      "version": "0.1.0",
+      "periodicCompatibility": "0.1.0",
+      "installed": true,
+      "enabled": false,
+      "periodicConfig": {
+        "name": "periodicjs.ext.dbseed",
+        "periodicCompatibility": "0.1.0",
+        "periodicDependencies": [],
+        "periodicjs.ext.admin": {
+          "menu": {
+            "Extensions": {
+              "seed admin": "<a href=\"/p-admin/dbseed\">DB Seed Content</a>"
+            }
+          }
+        }
+      }
     }
   ]
 }