Move more work into initialise script.

docs/README.md

@@ -0,0 +1,5 @@
+# npm rescue
+
+This is an npm-rescue git repository. Each branch in this repo contains a backup of a `node_modules` directory and its corresponding `package.json` file for a given npm project.
+
+See [npm-rescue](http://github.com/lifebeyondfife/npm-rescue) for project home.

initialise.js

@@ -5,10 +5,13 @@ const findNpmPackages = require('./src/findNpmPackages');
 const getRepoNames = require('./src/getRepoNames');
 const userPrompt = require('./src/userPrompt');
 const createRepo = require('./src/createRepo');
+const headCommit = require('./src/headCommit');
 
-const initialise = userPrompt().then(directories => {
-    const searchPath = directories[0];
-    const gitInitPath = directories[1];
+const initialise = userPrompt().then(userProperties => {
+    const searchPath = userProperties[0];
+    const gitInitPath = userProperties[1];
+    const gitUsername = userProperties[2];
+    const gitEmailAddress = userProperties[3];
 
     Promise.all([findNpmPackages(searchPath).then(packages => {
             if (!packages.length) {
@@ -19,14 +22,20 @@ const initialise = userPrompt().then(directories => {
 
             return getRepoNames(packages);
         }),
-        createRepo(gitInitPath)
+        createRepo(gitInitPath).then(git => {
+            return headCommit(git.repo, git.gitDirectory, gitUsername, gitEmailAddress);
+        })
     ]).then(values => {
-        const config = JSON.stringify(
-            Object.assign({
-                npmPackages: values[0]
-            }, {
-                gitDirectory: path.resolve(values[1])
-            }),
+        console.log('Val-you: ' + JSON.stringify(values[1]));
+        const config = JSON.stringify({
+                npmPackages: values[0],
+                gitDirectory: path.resolve(values[1].gitDirectory),
+                headCommitOid: values[1].headCommitOid,
+                gitSignature: {
+                    user: gitUsername,
+                    email: gitEmailAddress
+                }
+            },
             null, 4
         );
 

rescue.js

@@ -15,6 +15,15 @@ const git = require('nodegit');
 const path = require('path');
 const loadConfig = require('./src/loadConfig');
 
+
+/* Bit of a mess here now. The nodegit API doesn't allow you to do steps as easily as using git CLI.
+
+- when creating the git repo, make an initial commit.
+-   This is the OID that all other branches will come from.
+- ask for a name and email
+put oid, name, email in the config too
+*/
+
 const repoConfig = loadConfig.then(config => {
     return git.Repository.open(config.gitDirectory).then(repository => {
         return {repo: repository, config};

src/createRepo.js

@@ -20,11 +20,11 @@ const gitDirectory = directory => {
 };
 
 const createRepo = (gitInitPath) => {
-    return gitDirectory(gitInitPath).then(path => {
-        return git.Repository.init(path, 0).then(repository => {
+    return gitDirectory(gitInitPath).then(gitDirectory => {
+        return git.Repository.init(gitDirectory, 0).then(repo => {
             console.log('Initialised git repository');
 
-            return path;
+            return {gitDirectory, repo};
         });
     }).catch(error => {
         console.log(error.message);

src/headCommit.js

@@ -0,0 +1,22 @@
+'use strict';
+const fs = require('fs-extra');
+const git = require('nodegit');
+const path = require('path');
+
+const headCommit = (repo, gitDirectory, gitUsername, gitEmailAddress) => {
+    return new Promise((resolve, reject) => {
+        const readme = path.resolve(gitDirectory, 'README.md');
+
+        fs.copySync(path.resolve('./docs', 'README.md'), readme);
+
+        const signature = git.Signature.now(gitUsername, gitEmailAddress);
+
+        repo.createCommitOnHead([readme], signature, signature, 'Initial npm-rescue commit.').then(oid => {
+            return resolve({headCommitOid: oid.tostrS(), gitDirectory});
+        }).catch(error => {
+            return reject(error);
+        });
+    });
+};
+
+module.exports = headCommit;

src/userPrompt.js

@@ -1,9 +1,11 @@
 'use strict';
 const prompt = require('prompt');
 
-let homeDirectory = process.env[
+const homeDirectory = process.env[
     (process.platform == 'win32') ? 'USERPROFILE' : 'HOME'
 ];
+let gitUserName = process.env['USER'];
+let gitEmailAddress = 'npm@rescue.fake';
 
 const userPrompt = () => {
     return new Promise((resolve, reject) => {
@@ -17,8 +19,13 @@ const userPrompt = () => {
                 },
                 gitInitPath: {
                     description: `Enter where the npm-rescue repository should be created (${homeDirectory})`
-                }
-            }
+                },
+                gitUserName: {
+                    description: `Enter name for npm-rescue git commits (${gitUserName})`
+                },
+                gitEmailAddress: {
+                    description: `Enter email address for npm-rescue git commits (${gitEmailAddress})`
+                }            }
         }, (error, result) => {
             if (error) {
                 reject(Error(error));
@@ -29,9 +36,11 @@ const userPrompt = () => {
     }).then(userInput => {
         const searchPath = userInput.searchPath || homeDirectory;
         const gitInitPath = userInput.gitInitPath || homeDirectory;
+        gitUserName = userInput.gitUserName || gitUserName;
+        gitEmailAddress = userInput.gitEmailAddress || gitEmailAddress;
         prompt.stop();
 
-        return [searchPath, gitInitPath];
+        return [searchPath, gitInitPath, gitUserName, gitEmailAddress];
     }, error => {
         console.log(error.message);
         process.exit(1);