refactor(git): leverage extracted scaffolding logic from the git plugin

package.json

@@ -60,6 +60,7 @@
   "dependencies": {
     "@form8ion/core": "^4.3.0",
     "@form8ion/execa-wrapper": "^1.0.0",
+    "@form8ion/git": "^1.0.0-alpha.4",
     "@form8ion/overridable-prompts": "^1.1.0",
     "@form8ion/readme": "3.1.0",
     "@form8ion/results-reporter": "^1.1.0",

src/vcs/git/git.js

@@ -3,10 +3,11 @@ import {promises as fs} from 'node:fs';
 import {simpleGit} from 'simple-git';
 import hostedGitInfo from 'hosted-git-info';
 import {info, warn} from '@travi/cli-messages';
+import {scaffold as scaffoldGit} from '@form8ion/git';
 
 import promptForVcsHostDetails from '../host/prompt.js';
 import {questionNames} from '../../prompts/question-names.js';
-import {scaffold as scaffoldIgnoreFile, lift as liftIgnoreFile} from './ignore/index.js';
+import {lift as liftIgnoreFile} from './ignore/index.js';
 
 function generateConfigFiles(projectRoot, ignore) {
   info('Generating Git config files', {level: 'secondary'});
@@ -78,12 +79,9 @@ export async function initialize(
       return {owner: user, name: project, host: type};
     }
 
-    info('Initializing Git Repository');
-
     const [answers] = await Promise.all([
       promptForVcsHostDetails(vcsHosts, visibility, decisions),
-      git.init(),
-      scaffoldIgnoreFile({projectRoot})
+      scaffoldGit({projectRoot})
     ]);
 
     return {

src/vcs/git/git.test.js

@@ -1,38 +1,39 @@
 import {promises as fs} from 'node:fs';
 import hostedGitInfo from 'hosted-git-info';
 import * as simpleGit from 'simple-git';
+import {scaffold as scaffoldGit} from '@form8ion/git';
 
 import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
 import any from '@travi/any';
 import {when} from 'jest-when';
 
 import promptForVcsHostDetails from '../host/prompt.js';
 import {questionNames} from '../../prompts/question-names.js';
-import {scaffold as scaffoldIgnoreFile, lift as liftIgnoreFile} from './ignore/index.js';
+import {lift as liftIgnoreFile} from './ignore/index.js';
 import {initialize, scaffold} from './git.js';
 
 vi.mock('node:fs');
 vi.mock('hosted-git-info');
 vi.mock('simple-git');
+vi.mock('@form8ion/git');
 vi.mock('../host/prompt');
 vi.mock('./ignore/index.js');
 
 describe('git', () => {
-  let checkIsRepo, init, remote, listRemote, addRemote;
+  let checkIsRepo, remote, listRemote, addRemote;
   const projectRoot = any.string();
   const visibility = any.word();
   const decisions = any.simpleObject();
 
   beforeEach(() => {
     checkIsRepo = vi.fn();
-    init = vi.fn();
     remote = vi.fn();
     listRemote = vi.fn();
     addRemote = vi.fn();
 
     when(simpleGit.simpleGit)
       .calledWith({baseDir: projectRoot})
-      .mockReturnValue({checkIsRepo, init, remote, listRemote, addRemote});
+      .mockReturnValue({checkIsRepo, remote, listRemote, addRemote});
   });
 
   afterEach(() => {
@@ -54,9 +55,8 @@ describe('git', () => {
 
       const hostDetails = await initialize(true, projectRoot, projectName, vcsHosts, visibility, decisions);
 
-      expect(init).toHaveBeenCalledOnce();
+      expect(scaffoldGit).toHaveBeenCalledWith({projectRoot});
       expect(hostDetails).toEqual({host: repoHost.toLowerCase(), owner: repoOwner, name: projectName});
-      expect(scaffoldIgnoreFile).toHaveBeenCalledWith({projectRoot});
     });
 
     it('should not initialize the git repo if the project will not be versioned', async () => {
@@ -67,7 +67,7 @@ describe('git', () => {
 
       const hostDetails = await initialize(false, projectRoot, projectName, githubAccount, visibility, decisions);
 
-      expect(init).not.toHaveBeenCalledOnce();
+      expect(scaffoldGit).not.toHaveBeenCalled();
       expect(hostDetails).toBe(undefined);
     });
 
@@ -82,7 +82,7 @@ describe('git', () => {
 
       const hostDetails = await initialize(true, projectRoot, projectName, githubAccount, visibility);
 
-      expect(init).not.toHaveBeenCalledOnce();
+      expect(scaffoldGit).not.toHaveBeenCalled();
       expect(hostDetails).toEqual({host: repoHost.toLowerCase(), owner: repoOwner, name: repoName});
     });
   });
@@ -94,8 +94,7 @@ describe('git', () => {
       const results = await scaffold({projectRoot, origin: {}});
 
       expect(fs.writeFile).toHaveBeenCalledWith(`${projectRoot}/.gitattributes`, '* text=auto');
-      expect(scaffoldIgnoreFile).not.toHaveBeenCalled();
-      expect(init).not.toHaveBeenCalled();
+      expect(scaffoldGit).not.toHaveBeenCalled();
 
       expect(results.nextSteps).toEqual([{summary: 'Commit scaffolded files'}]);
     });