pagan-artifact 0.2.5 → 0.2.6

package/bin/art.js

@@ -2,7 +2,7 @@
 
 /**
  * art - Modern version control.
- * CLI (v0.2.5)
+ * CLI (v0.2.6)
  */
 
 const art = require('../index.js');
@@ -44,7 +44,8 @@ async function run() {
           lastCommit,
           staged,
           modified,
-          untracked
+          untracked,
+          ignored
         } = art.status();
 
         console.log(`On branch ${activeBranch}`);
@@ -65,8 +66,13 @@ async function run() {
           untracked.forEach(f => console.log(`${RED}\t${f}${RESET}`));
         }
 
+        if (ignored && ignored.length > 0) {
+          console.log('\nIgnored files:');
+          ignored.forEach(f => console.log(`${GRAY}\t${f}${RESET}`));
+        }
+
         if (untracked.length === 0 && modified.length === 0 && staged.length === 0) {
-          console.log('Nothing to commit.');
+          console.log('\nNothing to commit, working tree clean.');
         }
 
         break;
@@ -198,6 +204,7 @@ async function run() {
 
         break;
 
+      case 'remove':
       case 'rm':
         if (!args[0]) throw new Error('Specify a file path to remove.');
 

package/branching/index.js

@@ -1,6 +1,6 @@
 /**
  * art - Modern version control.
- * Module: Branching (v0.2.5)
+ * Module: Branching (v0.2.6)
  */
 
 const fs = require('fs');
@@ -226,7 +226,7 @@ function merge (targetBranch) {
 }
 
 module.exports = {
-  __libraryVersion: '0.2.5',
+  __libraryVersion: '0.2.6',
   __libraryAPIName: 'Branching',
   branch,
   checkout,

package/caches/index.js

@@ -1,6 +1,6 @@
 /**
  * art - Modern version control.
- * Module: Caches (v0.2.5)
+ * Module: Caches (v0.2.6)
  */
 
 const fs = require('fs');
@@ -215,7 +215,7 @@ function rm (filePath) {
 }
 
 module.exports = {
-  __libraryVersion: '0.2.5',
+  __libraryVersion: '0.2.6',
   __libraryAPIName: 'Caches',
   stash,
   reset,

package/changes/index.js

@@ -1,6 +1,6 @@
 /**
  * art - Modern version control.
- * Module: Changes (v0.2.5)
+ * Module: Changes (v0.2.6)
  */
 
 const fs = require('fs');
@@ -102,7 +102,7 @@ function log () {
 }
 
 module.exports = {
-  __libraryVersion: '0.2.5',
+  __libraryVersion: '0.2.6',
   __libraryAPIName: 'Changes',
   log,
   diff

package/contributions/index.js

@@ -1,6 +1,6 @@
 /**
  * art - Modern version control.
- * Module: Contributions (v0.2.5)
+ * Module: Contributions (v0.2.6)
  */
 
 const fs = require('fs');

package/index.js

@@ -1,6 +1,6 @@
 /**
  * art - Modern version control.
- * Core Library Entry Point (v0.2.5)
+ * Core Library Entry Point (v0.2.6)
  */
 
 const Setup = require('./setup');
@@ -50,7 +50,7 @@ const art = {
 
   // Metadata
 
-  version: '0.2.5',
+  version: '0.2.6',
   modules: [
     Setup.__libraryAPIName,
     Workflow.__libraryAPIName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pagan-artifact",
-  "version": "0.2.5",
+  "version": "0.2.6",
   "description": "Modern version control.",
   "main": "index.js",
   "bin": {

package/setup/index.js

@@ -1,6 +1,6 @@
 /**
  * art - Modern version control.
- * Module: Setup (v0.2.5)
+ * Module: Setup (v0.2.6)
  */
 
 const fs = require('fs');

package/utils/getStateByHash/index.js

@@ -1,6 +1,6 @@
 /**
  * art - Modern version control.
- * Module: Utils (v0.2.5)
+ * Module: Utils (v0.2.6)
  */
 
 const fs = require('fs');

package/utils/shouldIgnore/index.js

@@ -0,0 +1,58 @@
+const fs = require('fs');
+const path = require('path');
+
+let memoizedRules = null;
+
+function getRules () {
+  if (memoizedRules) {
+    return memoizedRules;
+  }
+
+  const root = process.cwd();
+  const ignorePath = path.join(root, '.artignore');
+  const rules = [];
+
+  if (fs.existsSync(ignorePath)) {
+    const lines = fs.readFileSync(ignorePath, 'utf8').split(/\r?\n/);
+
+    for (let line of lines) {
+      line = line.trim();
+
+      if (!line || line.startsWith('#')) {
+        continue;
+      }
+
+      let regexStr = line
+        .replace(/[.+^${}()|[\]\\]/g, '\\$&')
+        .replace(/\/\*\*\//g, '(/.+/|/)')
+        .replace(/\*/g, '[^/]+')
+        .replace(/\/$/, '(/.+)?');
+
+      if (line.startsWith('/')) {
+        regexStr = '^' + regexStr.slice(1);
+      } else {
+        regexStr = '(^|/)' + regexStr;
+      }
+
+      rules.push(new RegExp(regexStr));
+    }
+  }
+
+  memoizedRules = rules;
+
+  return rules;
+}
+
+function shouldIgnore (relPath) {
+  const normalizedPath = relPath.split(path.sep).join('/');
+
+  if (normalizedPath === '.art' || normalizedPath.startsWith('.art/')) {
+    return true;
+  }
+
+  const rules = getRules();
+
+  return rules.some(rule => rule.test(normalizedPath));
+}
+
+module.exports = shouldIgnore;

package/workflow/index.js

@@ -1,20 +1,25 @@
 /**
  * art - Modern version control.
- * Module: Workflow (v0.2.5)
+ * Module: Workflow (v0.2.6)
  */
 
 const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
 
+const getStateByHash = require('../utils/getStateByHash');
+const shouldIgnore = require('../utils/shouldIgnore');
+
 /**
  * Compares the working directory against the last commit and pending stage.
  */
 
-function status () {
+ function status() {
   const root = process.cwd();
   const artPath = path.join(root, '.art');
   const artJsonPath = path.join(artPath, 'art.json');
+  const shouldIgnore = require('../utils/shouldIgnore');
+  const getStateByHash = require('../utils/getStateByHash');
 
   if (!fs.existsSync(artJsonPath)) {
     throw new Error('No art repository found.');
@@ -25,24 +30,34 @@ function status () {
   const stagePath = path.join(artPath, 'stage.json');
 
   let stagedFiles = {};
-
   if (fs.existsSync(stagePath)) {
     stagedFiles = JSON.parse(fs.readFileSync(stagePath, 'utf8')).changes;
   }
 
-  const getStateByHash = require('../utils/getStateByHash');
   const activeState = getStateByHash(activeBranch, artJson.active.parent) || {};
 
-  const allWorkDirFiles = fs.readdirSync(root, { recursive: true })
-    .filter(f => !f.startsWith('.art') && !fs.statSync(path.join(root, f)).isDirectory());
+  const allFiles = fs.readdirSync(root, { recursive: true })
+    .filter(f => !fs.statSync(path.join(root, f)).isDirectory());
 
   const untracked = [];
   const modified = [];
+  const ignored = [];
 
-  for (const file of allWorkDirFiles) {
+  for (const file of allFiles) {
     const isStaged = !!stagedFiles[file];
     const isActive = !!activeState[file];
 
+    if (file === '.art' || file.startsWith(`.art${path.sep}`)) {
+      continue;
+    }
+
+    const isIgnored = shouldIgnore(file);
+
+    if (isIgnored && !isActive && !isStaged) {
+      ignored.push(file);
+      continue;
+    }
+
     if (!isStaged && !isActive) {
       untracked.push(file);
     } else if (!isStaged && isActive) {
@@ -59,7 +74,8 @@ function status () {
     lastCommit: artJson.active.parent,
     staged: Object.keys(stagedFiles),
     modified,
-    untracked
+    untracked,
+    ignored
   };
 }
 
@@ -68,103 +84,115 @@ function status () {
  * Implements character-precise position tracking.
  */
 
-function add (targetPath) {
-  const root = process.cwd();
-  const artPath = path.join(root, '.art');
-  const stagePath = path.join(artPath, 'stage.json');
-  const artJsonPath = path.join(artPath, 'art.json');
-  const fullPath = path.resolve(root, targetPath);
-
-  if (!fs.existsSync(fullPath)) {
-    throw new Error(`Path does not exist: ${targetPath}`);
-  }
-
-  let stage = { changes: {} };
-
-  if (fs.existsSync(stagePath)) {
-    stage = JSON.parse(fs.readFileSync(stagePath, 'utf8'));
-  }
-
-  const artJson = JSON.parse(fs.readFileSync(artJsonPath, 'utf8'));
-  const getStateByHash = require('../utils/getStateByHash');
-  const activeState = getStateByHash(artJson.active.branch, artJson.active.parent) || {};
-
-  const stats = fs.statSync(fullPath);
-
-  let filesToProcess = [];
-
-  if (stats.isDirectory()) {
-    filesToProcess = fs.readdirSync(fullPath, { recursive: true })
-      .filter(f => {
-        const absoluteF = path.join(fullPath, f);
-
-        return !fs.statSync(absoluteF).isDirectory() && !absoluteF.includes('.art');
-      })
-      .map(f => path.relative(root, path.join(fullPath, f)));
-  } else {
-    filesToProcess = [path.relative(root, fullPath)];
-  }
-
-  for (const relPath of filesToProcess) {
-    const currentContent = fs.readFileSync(path.join(root, relPath), 'utf8');
-    const previousContent = activeState[relPath];
-
-    if (previousContent === undefined) {
-      stage.changes[relPath] = {
-        type: 'createFile',
-        content: currentContent
-      };
-
-      continue;
-    }
-
-    if (currentContent !== previousContent) {
-      const operations = [];
-
-      let start = 0;
-
-      while (start < previousContent.length && start < currentContent.length && previousContent[start] === currentContent[start]) {
-        start++;
-      }
-
-      let oldEnd = previousContent.length - 1;
-      let newEnd = currentContent.length - 1;
-
-      while (oldEnd >= start && newEnd >= start && previousContent[oldEnd] === currentContent[newEnd]) {
-        oldEnd--;
-        newEnd--;
-      }
-
-      const deletionLength = oldEnd - start + 1;
-
-      if (deletionLength > 0) {
-        operations.push({
-          type: 'delete',
-          position: start,
-          length: deletionLength
-        });
-      }
-
-      const insertionContent = currentContent.slice(start, newEnd + 1);
-
-      if (insertionContent.length > 0) {
-        operations.push({
-          type: 'insert',
-          position: start,
-          content: insertionContent
-        });
-      }
-
-      if (operations.length > 0) {
-        stage.changes[relPath] = operations;
-      }
-    }
-  }
-
-  fs.writeFileSync(stagePath, JSON.stringify(stage, null, 2));
-
-  return `Added ${filesToProcess.length} file(s) to stage.`;
-}
+ function add (targetPath) {
+   const root = process.cwd();
+   const artPath = path.join(root, '.art');
+   const stagePath = path.join(artPath, 'stage.json');
+   const artJsonPath = path.join(artPath, 'art.json');
+   const fullPath = path.resolve(root, targetPath);
+
+   if (!fs.existsSync(fullPath)) {
+     throw new Error(`Path does not exist: ${targetPath}`);
+   }
+
+   const artJson = JSON.parse(fs.readFileSync(artJsonPath, 'utf8'));
+   const activeState = getStateByHash(artJson.active.branch, artJson.active.parent) || {};
+
+   const stats = fs.statSync(fullPath);
+   const relativeTarget = path.relative(root, fullPath);
+
+   if (!stats.isDirectory() && shouldIgnore(relativeTarget) && !activeState[relativeTarget]) {
+     return `${relativeTarget} is being ignored. Edit your .artignore file to remove it.`;
+   }
+
+   let stage = { changes: {} };
+   if (fs.existsSync(stagePath)) {
+     stage = JSON.parse(fs.readFileSync(stagePath, 'utf8'));
+   }
+
+   let filesToProcess = [];
+
+   if (stats.isDirectory()) {
+     filesToProcess = fs.readdirSync(fullPath, { recursive: true })
+       .filter(f => {
+         const absoluteF = path.join(fullPath, f);
+         const relF = path.relative(root, absoluteF);
+         const isDir = fs.statSync(absoluteF).isDirectory();
+
+         if (relF.startsWith('.art') || relF.includes(`${path.sep}.art`)) return false;
+
+         const isTracked = !!activeState[relF];
+         const isIgnored = shouldIgnore(relF);
+
+         return !isDir && (!isIgnored || isTracked);
+       })
+       .map(f => path.relative(root, path.join(fullPath, f)));
+   } else {
+     filesToProcess = [relativeTarget];
+   }
+
+   if (filesToProcess.length === 0) {
+     return "No changes to add.";
+   }
+
+   for (const relPath of filesToProcess) {
+     const currentContent = fs.readFileSync(path.join(root, relPath), 'utf8');
+     const previousContent = activeState[relPath];
+
+     if (previousContent === undefined) {
+       stage.changes[relPath] = {
+         type: 'createFile',
+         content: currentContent
+       };
+
+       continue;
+     }
+
+     if (currentContent !== previousContent) {
+       const operations = [];
+       let start = 0;
+
+       while (start < previousContent.length && start < currentContent.length && previousContent[start] === currentContent[start]) {
+         start++;
+       }
+
+       let oldEnd = previousContent.length - 1;
+       let newEnd = currentContent.length - 1;
+
+       while (oldEnd >= start && newEnd >= start && previousContent[oldEnd] === currentContent[newEnd]) {
+         oldEnd--;
+         newEnd--;
+       }
+
+       const deletionLength = oldEnd - start + 1;
+
+       if (deletionLength > 0) {
+         operations.push({
+           type: 'delete',
+           position: start,
+           length: deletionLength
+         });
+       }
+
+       const insertionContent = currentContent.slice(start, newEnd + 1);
+       if (insertionContent.length > 0) {
+         operations.push({
+           type: 'insert',
+           position: start,
+           content: insertionContent
+         });
+       }
+
+       if (operations.length > 0) {
+         stage.changes[relPath] = operations;
+       }
+     }
+   }
+
+   fs.writeFileSync(stagePath, JSON.stringify(stage, null, 2));
+
+   return `Added ${filesToProcess.length} file(s) to stage.`;
+ }
 
 /**
  * Finalizes the stage into a commit file.
@@ -220,7 +248,7 @@ function commit (message) {
 }
 
 module.exports = {
-  __libraryVersion: '0.2.5',
+  __libraryVersion: '0.2.6',
   __libraryAPIName: 'Workflow',
   status,
   add,