v1.0.0-alpha.12

bin/cmds/align.js

@@ -0,0 +1,32 @@
+var lib = require('../../lib'),
+    Git = require('simple-git/promise'),
+    middleware = async () => {
+        return (await Git().revparse(['--show-toplevel'])).trim()
+    }
+
+exports.command = 'align <hash>'
+exports.desc = 'Align the status'
+exports.builder = (yargs) => {
+    return yargs
+        .option('hash', {
+            type: 'string',
+            description: 'hash of the last commit'
+        })
+}
+
+exports.handler = (argv) => {
+    var status;
+    middleware().then((folder) => {
+        status = new lib.Status(folder);
+        if (argv.hash) {
+            return status.hash(argv.hash)
+                .then(function () {
+                    return status.status(status.READY)
+                }).then(() => {
+                    console.log('Status aligned!')
+                })
+        }
+    }).catch((err) => {
+        console.error(err)
+    })
+}

lib/status.js

@@ -2,7 +2,7 @@ const debug = require('debug')('almost-git')
 var path = require('path'),
     fse = require('fs-extra');
 
-const FILE = 'almost-git.json';
+const FILE = '.git/almost-git.json';
 
 class Status {
     constructor(root) {

package.json

@@ -1,11 +1,11 @@
 {
     "name": "almost-git",
-    "version": "1.0.0-alpha.11",
+    "version": "1.0.0-alpha.12",
     "description": "almost-git is a tool for model and text co-evolution",
     "keywords": [
         "model-driven-development",
-        "git", 
-        "versioning", 
+        "git",
+        "versioning",
         "code-evolution"
     ],
     "bin": "./bin/cli.js",
@@ -40,4 +40,4 @@
         "lodash": "^4.17.10",
         "mocha": "^5.2.0"
     }
-}
+}