refactor: extract loader

Author: dominykas

lib/index.js

@@ -12,7 +12,7 @@ exports.detect = async ({ path, repository, packageName }) => {
     result.name = packageInfo.name;
     result.version = packageInfo.version;
 
-    const travis = await Travis.detect({ path, repository });
+    const travis = await Travis.detect(packageInfo);
 
     if (travis) {
         result.travis = travis;

lib/loader.js

@@ -0,0 +1,47 @@
+'use strict';
+
+const Fs = require('fs');
+const GitUrlParse = require('git-url-parse');
+const Path = require('path');
+const Wreck = require('@hapi/wreck');
+
+
+const internals = {};
+
+
+internals.createRepositoryLoader = (repository) => {
+
+    const parsedRepository = GitUrlParse(repository);
+
+    return async (filename) => {
+
+        const url = `https://raw.githubusercontent.com/${parsedRepository.full_name}/HEAD/${filename}`;
+
+        const { payload } = await Wreck.get(url);
+
+        return payload;
+    };
+};
+
+
+internals.createPathLoader = (path) => {
+
+    return (filename) => {
+
+        const fullPath = Path.join(path, filename);
+
+        if (!Fs.existsSync(fullPath)) {
+            return;
+        }
+
+        return Fs.readFileSync(fullPath);
+    };
+};
+
+
+exports.create = ({ path, repository }) => {
+
+    return repository
+        ? internals.createRepositoryLoader(repository)
+        : internals.createPathLoader(path);
+};

lib/package.js

@@ -1,29 +1,15 @@
 'use strict';
 
-const GitUrlParse = require('git-url-parse');
-const Path = require('path');
-const Wreck = require('@hapi/wreck');
+const Loader = require('./loader');
 
 
 exports.detect = async ({ path, repository, packageName }) => {
 
-    let packageJson;
+    const loadFile = Loader.create({ path, repository, packageName });
 
-    if (repository) {
-        const parsedRepository = GitUrlParse(repository);
-
-        const url = `https://raw.githubusercontent.com/${parsedRepository.full_name}/HEAD/package.json`;
-
-        const { payload } = await Wreck.get(url);
-
-        packageJson = JSON.parse(payload.toString());
-    }
-
-    if (path) {
-        packageJson = require(Path.join(path, 'package.json'));
-    }
+    const packageJson = JSON.parse((await loadFile('package.json')).toString());
 
     const { name, version } = packageJson;
 
-    return { name, version };
+    return { name, version, loadFile };
 };

lib/travis.js

@@ -1,9 +1,5 @@
 'use strict';
 
-const Fs = require('fs');
-const GitUrlParse = require('git-url-parse');
-const Path = require('path');
-const Wreck = require('@hapi/wreck');
 const Yaml = require('js-yaml');
 
 
@@ -58,29 +54,12 @@ internals.scan = (travisYaml) => {
 };
 
 
-exports.detect = async ({ path, repository }) => {
+exports.detect = async ({ loadFile }) => {
 
-    let buffer;
+    const buffer = await loadFile('.travis.yml');
 
-    if (repository) {
-        const parsedRepository = GitUrlParse(repository);
-
-        const url = `https://raw.githubusercontent.com/${parsedRepository.full_name}/HEAD/.travis.yml`;
-
-        const result = await Wreck.get(url);
-
-        buffer = result.payload;
-    }
-
-    if (path) {
-
-        const travisYamlPath = Path.join(path, '.travis.yml');
-
-        if (!Fs.existsSync(travisYamlPath)) {
-            return;
-        }
-
-        buffer = Fs.readFileSync(travisYamlPath);
+    if (buffer === undefined) {
+        return;
     }
 
     const travisYaml = Yaml.safeLoad(buffer, { schema: Yaml.FAILSAFE_SCHEMA });