plugship 1.0.4 → 1.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plugship",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Deploy local WordPress plugins to remote sites from the command line",
   "type": "module",
   "bin": {
@@ -34,10 +34,10 @@
   ],
   "license": "MIT",
   "dependencies": {
+    "@inquirer/prompts": "^7.2.1",
     "archiver": "^7.0.1",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
-    "@inquirer/prompts": "^7.2.1",
     "form-data": "^4.0.1",
     "ora": "^8.1.1"
   }

package/src/lib/deployer.js

@@ -4,7 +4,7 @@ import { select, confirm } from '@inquirer/prompts';
 import chalk from 'chalk';
 import { getSite, listSites } from './config.js';
 import { detectPlugin } from './plugin-detector.js';
-import { createPluginZip } from './zipper.js';
+import { createPluginZip, getIgnoreSource } from './zipper.js';
 import { WordPressApi } from './wordpress-api.js';
 import { DeployError, ConfigError } from './errors.js';
 import { RECEIVER_DOWNLOAD_URL } from './constants.js';
@@ -48,18 +48,19 @@ async function getAllSites() {
 }
 
 async function checkIgnoreFile(cwd) {
-  try {
-    await access(join(cwd, '.plugshipignore'));
-  } catch {
-    logger.warn('No .plugshipignore file found.');
-    const create = await confirm({
-      message: 'Create one with default template?',
-      default: true,
-    });
-    if (create) {
-      const { ignoreCommand } = await import('../commands/ignore.js');
-      await ignoreCommand([]);
-    }
+  const source = await getIgnoreSource(cwd);
+  if (source) {
+    logger.info(`Using ${source} for file exclusions`);
+    return;
+  }
+  logger.warn('No .plugshipignore or .distignore file found.');
+  const create = await confirm({
+    message: 'Create .plugshipignore with default template?',
+    default: true,
+  });
+  if (create) {
+    const { ignoreCommand } = await import('../commands/ignore.js');
+    await ignoreCommand([]);
   }
 }
 
@@ -90,23 +91,46 @@ export async function deploy({ siteName, activate = true, dryRun = false, all =
   try {
     const zipStat = await stat(existingZipPath);
     const sizeMB = (zipStat.size / 1024 / 1024).toFixed(2);
-    logger.info(`Existing ZIP found: builds/${plugin.slug}.zip (${sizeMB} MB)`);
-    const action = await select({
-      message: 'What do you want to do?',
-      choices: [
-        { name: 'Use existing ZIP', value: 'existing' },
-        { name: 'Build a new ZIP', value: 'rebuild' },
-      ],
-    });
-    if (action === 'rebuild') {
+
+    // Check if ignore file was modified after the ZIP was built
+    let ignoreStale = false;
+    for (const ignoreFile of ['.plugshipignore', '.distignore']) {
+      try {
+        const ignoreStat = await stat(join(cwd, ignoreFile));
+        if (ignoreStat.mtimeMs > zipStat.mtimeMs) {
+          ignoreStale = true;
+        }
+        break;
+      } catch {
+        // file not found, try next
+      }
+    }
+
+    if (ignoreStale) {
+      logger.warn('Ignore file changed since last build — rebuilding ZIP...');
       const spin = logger.spinner('Creating ZIP archive...');
       spin.start();
       ({ zipPath, size } = await createPluginZip(cwd, plugin.slug));
       spin.succeed(`ZIP created (${(size / 1024 / 1024).toFixed(2)} MB)`);
     } else {
-      zipPath = existingZipPath;
-      size = zipStat.size;
-      logger.success(`Using existing ZIP (${sizeMB} MB)`);
+      logger.info(`Existing ZIP found: builds/${plugin.slug}.zip (${sizeMB} MB)`);
+      const action = await select({
+        message: 'What do you want to do?',
+        choices: [
+          { name: 'Use existing ZIP', value: 'existing' },
+          { name: 'Build a new ZIP', value: 'rebuild' },
+        ],
+      });
+      if (action === 'rebuild') {
+        const spin = logger.spinner('Creating ZIP archive...');
+        spin.start();
+        ({ zipPath, size } = await createPluginZip(cwd, plugin.slug));
+        spin.succeed(`ZIP created (${(size / 1024 / 1024).toFixed(2)} MB)`);
+      } else {
+        zipPath = existingZipPath;
+        size = zipStat.size;
+        logger.success(`Using existing ZIP (${sizeMB} MB)`);
+      }
     }
   } catch {
     const spin = logger.spinner('Creating ZIP archive...');

package/src/lib/zipper.js

@@ -4,19 +4,46 @@ import { stat, mkdir, readFile } from 'node:fs/promises';
 import archiver from 'archiver';
 import { DEFAULT_EXCLUDES } from './constants.js';
 
+async function loadIgnoreFile(filePath) {
+  const content = await readFile(filePath, 'utf-8');
+  const patterns = [];
+  for (const line of content.split('\n')) {
+    const trimmed = line.trim();
+    if (trimmed && !trimmed.startsWith('#')) {
+      patterns.push(trimmed);
+    }
+  }
+  return patterns;
+}
+
+export async function getIgnoreSource(sourceDir) {
+  try {
+    await readFile(join(sourceDir, '.plugshipignore'), 'utf-8');
+    return '.plugshipignore';
+  } catch {
+    try {
+      await readFile(join(sourceDir, '.distignore'), 'utf-8');
+      return '.distignore';
+    } catch {
+      return null;
+    }
+  }
+}
+
 async function loadIgnorePatterns(sourceDir) {
   const patterns = [...DEFAULT_EXCLUDES];
-  try {
-    const content = await readFile(join(sourceDir, '.plugshipignore'), 'utf-8');
-    for (const line of content.split('\n')) {
-      const trimmed = line.trim();
-      if (trimmed && !trimmed.startsWith('#')) {
-        patterns.push(trimmed);
-      }
+
+  // .plugshipignore takes priority, then .distignore
+  for (const file of ['.plugshipignore', '.distignore']) {
+    try {
+      const extra = await loadIgnoreFile(join(sourceDir, file));
+      patterns.push(...extra);
+      return patterns;
+    } catch {
+      // file not found, try next
     }
-  } catch {
-    // No .plugshipignore file — use defaults only
   }
+
   return patterns;
 }
 
@@ -52,11 +79,16 @@ export async function createPluginZip(sourceDir, slug) {
 }
 
 function matchGlob(filePath, pattern) {
-  // Strip trailing /** for directory matching
-  if (pattern.endsWith('/**')) {
-    const dir = pattern.slice(0, -3);
+  // Strip trailing /**, /* or / for directory matching
+  if (pattern.endsWith('/**') || pattern.endsWith('/*') || pattern.endsWith('/')) {
+    const dir = pattern.replace(/\/\*{0,2}$/, '');
     return filePath === dir || filePath.startsWith(dir + '/');
   }
+  // **/*.ext — match extension at any depth
+  if (pattern.startsWith('**/')) {
+    const sub = pattern.slice(3);
+    return matchGlob(filePath, sub) || filePath.split('/').some((seg) => matchGlob(seg, sub));
+  }
   // Exact match or wildcard prefix
   if (pattern.startsWith('*.')) {
     return filePath.endsWith(pattern.slice(1));
@@ -66,5 +98,10 @@ function matchGlob(filePath, pattern) {
     const firstSegment = filePath.split('/')[0];
     return firstSegment.startsWith('.');
   }
-  return filePath === pattern;
+  // Exact match (file or directory name)
+  // "resources" matches "resources", "resources/file.js", "resources/sub/file.js"
+  if (filePath === pattern || filePath.startsWith(pattern + '/')) {
+    return true;
+  }
+  return false;
 }