@ovipakla/gm-cli 1.0.1 → 1.0.3

package/GMFileWatcher.js

@@ -28,7 +28,7 @@ class GMModule {
         watcher: chokidar.watch(entry.dir, hook)
       }));
 
-    console.log(`♻️  Watching [${dir}] for changes...`);
+    console.log(`🔍️ Watching [${dir}] for changes...`);
   }
 
   createWatcher(subdir, hook) {
@@ -69,6 +69,15 @@ function defaultWatcherHook() {
   };
 }
 
+function syncWatcherHook() {
+  return {
+    ignored: /[\/\\]\./,
+    persistent: false,
+    ignoreInitial: true,
+    depth: 99,
+  };
+}
+
 /* ---------------------------------------------------------
  * GMFileWatcher
  * --------------------------------------------------------- */
@@ -88,16 +97,16 @@ class GMFileWatcher {
 
   initializeWatchedModules(dependencies) {
     return dependencies.map(([name, version]) => {
-      const gmModule = this.parseModule(name, version);
+      const gmModule = this.parseModule(name, version, true);
       this.syncModuleFiles(name, gmModule.dir, gmModule.objectWatchers, gmModule.sceneWatchers);
       return gmModule;
     });
   }
 
   initializeSyncModules(dependencies) {
-    dependencies.forEach(([name]) => {
-      const modulePath = path.join(this.modulesDirPath, name);
-      this.syncModuleFiles(name, modulePath);
+    dependencies.forEach(([name, version]) => {
+      const gmModule = this.parseModule(name, version, false);
+      this.syncModuleFiles(name, gmModule.dir, gmModule.objectWatchers, gmModule.sceneWatchers);
     });
     return [];
   }
@@ -171,8 +180,10 @@ class GMFileWatcher {
   /* ---------------------------------------------
    * Watcher handlers
    * --------------------------------------------- */
-  parseModule(name, version) {
-    const gmModule = new GMModule(resolvePath(path.join(this.modulesDirName, name)), version);
+  parseModule(name, version, watch = true) {
+    const gmModule = new GMModule(resolvePath(path.join(this.modulesDirName, name)), version, watch
+      ? defaultWatcherHook()
+      : syncWatcherHook());
 
     const moduleFilter = (p, module) =>
       path.normalize(p).includes(path.normalize(module.dir));
@@ -288,7 +299,7 @@ class GMFileWatcher {
     const existing = fs.readFileSync(dst, 'utf8');
     if (existing !== script.content) {
       const result = removeZeroFields(diffStats(existing.split('\n'), script.content.split('\n')))
-      console.log(`➡️  Save ${script.name}.${extension}:`, result);
+      console.log(`📝 Save ${script.name}.${extension}:`, result);
       fs.writeFileSync(dst, script.content, { encoding: 'utf8', flag: 'w' });
     }
 

package/app.js

@@ -77,40 +77,47 @@ program.command('sync')
   });
 program.command('install')
   .description('Install dependencies listed in package-gm.json to gm_modules folder')
+  .option('-c, --clean', 'remove existing gm_modules')
   .action(function() {
+    const options = this.opts();
+    const clean = options.clean !== undefined;
     const packageJsonPath = 'package-gm.json';
     const modulesDir = 'gm_modules';
 
     if (!fs.existsSync(modulesDir)) {
       fs.mkdirSync(modulesDir);
+    } else if (clean) {
+      fs.rmdirSync(modulesDir, { recursive: true });
+      fs.mkdirSync(modulesDir);
     }
 
     const packageData = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
     const dependencies = packageData.dependencies;
     Object.entries(dependencies).forEach(([key, dependency]) => {
+      console.log(`\n📦️ Install ${key}\n===========${"=".repeat(key.length)}`)
       const modulePath = path.join(modulesDir, key);
       if (fs.existsSync(modulePath)) {
         try {
           execSync('git rev-parse --is-inside-work-tree', { cwd: modulePath, stdio: 'ignore' });
-          console.log(`Syncing ${modulePath} to revision ${dependency.revision}`);
+          console.log(`🌐 Syncing ${modulePath} to revision ${dependency.revision}`);
           execSync('git reset --hard HEAD', { cwd: modulePath, stdio: 'inherit' });
           execSync('git clean -fdx -e', { cwd: modulePath, stdio: 'inherit' });
           execSync(`git checkout ${dependency.revision}`, { cwd: modulePath, stdio: 'inherit' });
         } catch (error) {
-          console.log(`Removing ${modulePath} because it's not a git repository`);
+          console.log(`🗑️ Removing ${modulePath} because it's not a git repository`);
           fs.rmSync(modulePath, { recursive: true, force: true });
-          console.log(`Initializing ${modulePath} to revision ${dependency.revision}`);
+          console.log(`🔧 Initializing ${modulePath} to revision ${dependency.revision}`);
           execSync(`git clone ${dependency.remote} ${modulePath}`, { stdio: 'inherit' });
           execSync(`git checkout ${dependency.revision}`, { cwd: modulePath, stdio: 'inherit' });
         }
       } else {
-        console.log(`Initializing ${modulePath} to revision ${dependency.revision}`);
+        console.log(`🔧 Initializing ${modulePath} to revision ${dependency.revision}`);
         execSync(`git clone ${dependency.remote} ${modulePath}`, { stdio: 'inherit' });
         execSync(`git checkout ${dependency.revision}`, { cwd: modulePath, stdio: 'inherit' });
       }
     });
 
-    console.log('All dependencies processed.');
+    console.log('\n\n✅ All dependencies processed.');
     process.exit(0);
   })
 program.command('run')

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "Gamemaker CLI toolkit. Watch & sync gml sources with yyp project.",
   "main": "app.js",
   "scripts": {},