mango-cms 0.1.1 → 0.1.2

package/cli.js

@@ -10,6 +10,64 @@ const AdmZip = require('adm-zip');
 
 const program = new Command();
 
+// Helper function to download and extract src.zip
+async function ensureSrcExists(mangoCmsRoot) {
+    const srcDir = path.join(mangoCmsRoot, 'src');
+    if (!fs.existsSync(srcDir)) {
+        console.log('Downloading Mango CMS source files...');
+        const response = await axios({
+            method: 'get',
+            url: 'https://mango-cms.s3.amazonaws.com/src.zip',
+            responseType: 'arraybuffer'
+        });
+
+        const tempZipPath = path.join(mangoCmsRoot, 'src.zip');
+        fs.writeFileSync(tempZipPath, response.data);
+
+        console.log('Extracting source files...');
+        const zip = new AdmZip(tempZipPath);
+        zip.extractAllTo(mangoCmsRoot, true);
+
+        // Clean up the zip file
+        fs.unlinkSync(tempZipPath);
+        console.log('Source files installed successfully.');
+    }
+}
+
+// Helper function to validate and prompt for license if needed
+async function ensureLicenseExists(configPath) {
+    let settings = { license: null };
+
+    try {
+        if (fs.existsSync(configPath)) {
+            settings = JSON.parse(fs.readFileSync(configPath, 'utf8'));
+        }
+    } catch (error) {
+        console.log('Error reading settings file:', error.message);
+    }
+
+    if (!settings.license) {
+        const answer = await inquirer.prompt([
+            {
+                type: 'input',
+                name: 'license',
+                message: 'Enter your license key:',
+                validate: input => {
+                    if (!input) return 'License key is required';
+                    if (input !== 'admin') return 'Invalid license key';
+                    return true;
+                }
+            }
+        ]);
+
+        settings.license = answer.license;
+        fs.mkdirSync(path.dirname(configPath), { recursive: true });
+        fs.writeFileSync(configPath, JSON.stringify(settings, null, 2));
+    }
+
+    return settings.license;
+}
+
 program
     .name('mango')
     .description('Mango CMS CLI');
@@ -44,28 +102,7 @@ program
             ]);
 
             // First, handle the src.zip download if needed
-            const mangoCmsRoot = __dirname;
-            const srcDir = path.join(mangoCmsRoot, 'src');
-
-            if (!fs.existsSync(srcDir)) {
-                console.log('Downloading Mango CMS source files...');
-                const response = await axios({
-                    method: 'get',
-                    url: 'https://mango-cms.s3.amazonaws.com/src.zip',
-                    responseType: 'arraybuffer'
-                });
-
-                const tempZipPath = path.join(mangoCmsRoot, 'src.zip');
-                fs.writeFileSync(tempZipPath, response.data);
-
-                console.log('Extracting source files...');
-                const zip = new AdmZip(tempZipPath);
-                zip.extractAllTo(mangoCmsRoot, true);
-
-                // Clean up the zip file
-                fs.unlinkSync(tempZipPath);
-                console.log('Source files installed successfully.');
-            }
+            await ensureSrcExists(__dirname);
 
             // Now handle the project creation
             const projectDir = path.join(process.cwd(), answers.projectName);
@@ -80,7 +117,7 @@ program
             const configDir = path.join(projectDir, 'config');
 
             // Create or update settings.json
-            const settingsPath = path.join(configDir, 'settings.json');
+            const settingsPath = path.join(configDir, 'config/settings.json');
             const settings = {
                 license: answers.license
             };
@@ -101,13 +138,20 @@ To get started:
 program
     .command('start')
     .description('Start the Mango CMS in watch mode')
-    .action(() => {
+    .action(async () => {
         try {
+
+            // Check for license in settings.json
+            const settingsPath = path.join(process.cwd(), 'config/config/settings.json');
+            await ensureLicenseExists(settingsPath);
+
+            // Ensure src exists
+            await ensureSrcExists(__dirname);
+
             // Path to @mango-cms/core inside node_modules
             const cmsPackagePath = path.resolve(__dirname);
             // User's project root (where they run "mango start")
-            // const userProjectRoot = '../../'
-            const userProjectRoot = '/Users/coltonneifert/Sites/test-2'
+            const userProjectRoot = process.cwd();
 
             console.log(`Starting Mango CMS...`);
             console.log(`CMS package located at: ${cmsPackagePath}`);
@@ -122,8 +166,6 @@ program
                     stdio: 'inherit',
                     env: {
                         ...process.env,
-                        // NODE_OPTIONS: '--trace-warnings',
-                        // PROJECT_CONFIG: configDir,
                         NODE_PATH: path.resolve(cmsPackagePath, 'node_modules'),
                         MANGO_ROOT: cmsPackagePath,
                         PROJECT_ROOT: userProjectRoot

package/default/package.json

@@ -0,0 +1,8 @@
+{
+    "scripts": {
+        "mango": "mango"
+    },
+    "dependencies": {
+        "mango-cms": "^0.1.1"
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mango-cms",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "main": "index.js",
   "author": "Colton Neifert",
   "license": "ISC",