split into modules

idleberg · Jul 10, 2019 · 74059bf · 74059bf
1 parent 2887800
commit 74059bf
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 79 deletions.
diff --git a/lib/provider.js b/lib/provider.js
diff --git a/lib/provider.js.map b/lib/provider.js.map
diff --git a/src/config.js b/src/config.js
@@ -0,0 +1,29 @@
+import meta from '../package.json';
+
+export const configSchema = {
+  customArguments: {
+    title: 'Custom Arguments',
+    description: 'Specify your preferred arguments for `makensis`, supports [replacement](https://github.com/noseglid/atom-build#replacement) placeholders',
+    type: 'string',
+    default: '{FILE_ACTIVE}',
+    order: 0
+  },
+  manageDependencies: {
+    title: 'Manage Dependencies',
+    description: 'When enabled, third-party dependencies will be installed automatically',
+    type: 'boolean',
+    default: true,
+    order: 1
+  },
+  alwaysEligible: {
+    title: 'Always Eligible',
+    description: 'The build provider will be available in your project, even when not eligible',
+    type: 'boolean',
+    default: false,
+    order: 2
+  }
+};
+
+export function getConfig(key) {
+  return atom.config.get(`${meta.name}.${key}`);
+}
diff --git a/src/provider.js b/src/provider.js
@@ -1,77 +1,16 @@
 'use babel';
 
+import meta from '../package.json';
+import { configSchema, getConfig } from './config';
 import { EventEmitter } from 'events';
-import { install } from 'atom-package-deps';
 import { join } from 'path';
 import { platform } from 'os';
-import { spawn } from 'child_process';
+import { satisfyDependencies } from './util';
+import { spawnSync } from 'child_process';
 
-import meta from '../package.json';
 const pathToScript = join(__dirname, 'makensis-wine.sh');
 
-// Package settings
-export const config = {
-  customArguments: {
-    title: 'Custom Arguments',
-    description: 'Specify your preferred arguments for `makensis`, supports [replacement](https://github.com/noseglid/atom-build#replacement) placeholders',
-    type: 'string',
-    default: '{FILE_ACTIVE}',
-    order: 0
-  },
-  manageDependencies: {
-    title: 'Manage Dependencies',
-    description: 'When enabled, third-party dependencies will be installed automatically',
-    type: 'boolean',
-    default: true,
-    order: 1
-  },
-  alwaysEligible: {
-    title: 'Always Eligible',
-    description: 'The build provider will be available in your project, even when not eligible',
-    type: 'boolean',
-    default: false,
-    order: 2
-  }
-};
-
-export function satisfyDependencies() {
-  install(meta.name);
-
-  const packageDeps = meta['package-deps'];
-
-  packageDeps.forEach( packageDep => {
-    if (packageDep) {
-      if (atom.packages.isPackageDisabled(packageDep)) {
-        if (atom.inDevMode()) console.log(`Enabling package '${packageDep}\'`);
-        atom.packages.enablePackage(packageDep);
-      }
-    }
-  });
-}
-
-function spawnPromise(cmd, args) {
-  return new Promise(function (resolve, reject) {
-    const child = spawn(cmd, args);
-    let stdOut;
-    let stdErr;
-
-    child.stdout.on('data', function (line) {
-      stdOut += line.toString().trim();
-    });
-
-    child.stderr.on('data', function (line) {
-      stdErr += line.toString().trim();
-    });
-
-    child.on('close', function (code) {
-      if (code === 0) {
-        resolve(stdOut);
-      }
-
-      reject(stdErr);
-    });
-  });
-}
+export { configSchema as config };
 
 export function provideBuilder() {
   return class MakensisWineProvider extends EventEmitter {
@@ -85,22 +24,18 @@ export function provideBuilder() {
       return 'NSIS (Wine)';
     }
 
-    async isEligible() {
-      if (atom.config.get(`${meta.name}.alwaysEligible`) === true) {
+    isEligible() {
+      if (getConfig('alwaysEligible') === true) {
         return true;
       }
 
       if (platform() === 'win32') {
         return false;
       }
 
-      const whichCmd = await spawnPromise('which', ['wine']);
-
-      if (whichCmd.stdout && whichCmd.stdout.toString()) {
-        return true;
-      }
+      const whichCmd = spawnSync('which', ['wine']);
 
-      return false;
+      return (whichCmd.stdout && whichCmd.stdout.toString().length) ? true : false;
     }
 
     settings() {
@@ -113,7 +48,7 @@ export function provideBuilder() {
       const comboMatch = errorMatch.concat(warningMatch);
 
       // User settings
-      const customArguments = atom.config.get(`${meta.name}.customArguments`).trim().split(' ');
+      const customArguments = getConfig('customArguments').trim().split(' ');
 
       // Adjust errorMatch and warningMatch
       const customErrorMatch = (customArguments.includes('-WX')) ? comboMatch : errorMatch;
@@ -157,8 +92,8 @@ export function provideBuilder() {
   };
 }
 
-export function activate() {
-  if (atom.config.get(`${meta.name}.manageDependencies`) === true) {
+export async function activate() {
+  if (getConfig('manageDependencies') === true) {
     satisfyDependencies();
   }
 }
diff --git a/src/util.js b/src/util.js
@@ -0,0 +1,17 @@
+import meta from '../package.json';
+import { install } from 'atom-package-deps';
+
+export function satisfyDependencies() {
+  install(meta.name);
+
+  const packageDeps = meta['package-deps'];
+
+  packageDeps.forEach( packageDep => {
+    if (packageDep) {
+      if (atom.packages.isPackageDisabled(packageDep)) {
+        if (atom.inDevMode()) console.log(`Enabling package '${packageDep}\'`);
+        atom.packages.enablePackage(packageDep);
+      }
+    }
+  });
+}