@surmrf/icloud-surge-sync 1.0.0 → 1.0.1

package/bin/cli.js

@@ -4,13 +4,13 @@ const fs = require('node:fs');
 const os = require('node:os');
 const path = require('node:path');
 const readline = require('node:readline/promises');
-const simpleGit = require('simple-git');
 const { stdin, stdout } = require('node:process');
 const packageJson = require('../package.json');
 const { loadConfig, resolveConfigPath, saveConfig } = require('../src/config');
 const { daemonStatus, followLogs, installDaemon, restartDaemon, uninstallDaemon } = require('../src/daemon');
 const { runPull } = require('../src/pull');
 const { runPush } = require('../src/push');
+const { createGit } = require('../src/utils/git');
 const {
   isInside,
   validateForPull,
@@ -104,7 +104,7 @@ async function isGitRepository(folder) {
     return false;
   }
   try {
-    return await simpleGit(folder).checkIsRepo();
+    return await createGit(folder).checkIsRepo();
   } catch {
     return false;
   }
@@ -112,7 +112,7 @@ async function isGitRepository(folder) {
 
 async function prepareGitFolder(gitFolder, remote, branch) {
   if (await isGitRepository(gitFolder)) {
-    const git = simpleGit(gitFolder);
+    const git = createGit(gitFolder);
     const remotes = await git.getRemotes();
     if (remote && !remotes.some((item) => item.name === 'origin')) {
       await git.addRemote('origin', remote);
@@ -128,7 +128,7 @@ async function prepareGitFolder(gitFolder, remote, branch) {
   }
   fs.mkdirSync(path.dirname(gitFolder), { recursive: true });
   const cloneOptions = branch ? ['--branch', branch] : [];
-  await simpleGit().clone(remote, gitFolder, cloneOptions);
+  await createGit().clone(remote, gitFolder, cloneOptions);
 }
 
 async function initialize(flags) {
@@ -211,10 +211,7 @@ async function runConfigured(configPath, requestedRole) {
 async function doctor(configPath) {
   const role = getConfiguredRole(configPath);
   const config = role === 'push' ? validateForPush(configPath) : validateForPull(configPath);
-  const git = simpleGit({ baseDir: config.gitFolder, timeout: { block: 60 * 1000 } }).env({
-    ...process.env,
-    GIT_TERMINAL_PROMPT: '0',
-  });
+  const git = createGit({ baseDir: config.gitFolder, timeout: { block: 60 * 1000 } });
   const remotes = await git.getRemotes(true);
   const origin = remotes.find((remote) => remote.name === 'origin');
   if (!origin) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@surmrf/icloud-surge-sync",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "One-way Surge configuration distribution from iCloud through Git.",
   "bin": {
     "icloud-surge-sync": "bin/cli.js",

package/src/pull.js

@@ -1,21 +1,14 @@
-const simpleGit = require('simple-git');
 const logger = require('./utils/logger');
 const { validateForPull } = require('./utils/config-validator');
+const { createGit } = require('./utils/git');
 
-function createGit(gitFolder) {
-  return simpleGit({
-    baseDir: gitFolder,
+async function runPull(options = {}) {
+  const config = options.config || validateForPull(options.configPath);
+  const git = createGit({
+    baseDir: config.gitFolder,
     maxConcurrentProcesses: 1,
     timeout: { block: 60 * 1000 },
-  }).env({
-    ...process.env,
-    GIT_TERMINAL_PROMPT: '0',
   });
-}
-
-async function runPull(options = {}) {
-  const config = options.config || validateForPull(options.configPath);
-  const git = createGit(config.gitFolder);
   const pollInterval = options.pollInterval || config.pollInterval || 10 * 1000;
   let pollTimer = null;
   let stopped = false;

package/src/push.js

@@ -1,26 +1,19 @@
 const chokidar = require('chokidar');
 const fs = require('fs-extra');
 const path = require('node:path');
-const simpleGit = require('simple-git');
 const logger = require('./utils/logger');
 const { validateForPush } = require('./utils/config-validator');
-
-function createGit(gitFolder) {
-  return simpleGit({
-    baseDir: gitFolder,
-    maxConcurrentProcesses: 1,
-    timeout: { block: 60 * 1000 },
-  }).env({
-    ...process.env,
-    GIT_TERMINAL_PROMPT: '0',
-  });
-}
+const { createGit } = require('./utils/git');
 
 async function runPush(options = {}) {
   const config = options.config || validateForPush(options.configPath);
   const icloudFolder = config.icloudFolder;
   const gitFolder = config.gitFolder;
-  const git = createGit(gitFolder);
+  const git = createGit({
+    baseDir: gitFolder,
+    maxConcurrentProcesses: 1,
+    timeout: { block: 60 * 1000 },
+  });
 
   const copyChangedFile = async (filePath) => {
     const relative = path.relative(icloudFolder, filePath);

package/src/utils/git.js

@@ -0,0 +1,15 @@
+const simpleGit = require('simple-git');
+
+function createGitEnvironment(environment = process.env) {
+  const gitEnvironment = { ...environment };
+  delete gitEnvironment.PAGER;
+  delete gitEnvironment.GIT_PAGER;
+  gitEnvironment.GIT_TERMINAL_PROMPT = '0';
+  return gitEnvironment;
+}
+
+function createGit(options) {
+  return simpleGit(options).env(createGitEnvironment());
+}
+
+module.exports = { createGit, createGitEnvironment };