refactor: extract yaml parsing into loaders

Author: dominykas

lib/loader/contents.js

@@ -0,0 +1,19 @@
+'use strict';
+
+const Yaml = require('js-yaml');
+
+exports.convert = (buffer, options) => {
+
+    if (options.json) {
+        return JSON.parse(buffer.toString());
+    }
+
+    if (options.yaml) {
+        return Yaml.load(buffer, {
+            schema: Yaml.FAILSAFE_SCHEMA,
+            json: true
+        });
+    }
+
+    return buffer;
+};

lib/loader/path.js

@@ -3,6 +3,7 @@
 const Fs = require('fs');
 const Path = require('path');
 
+const Contents = require('./contents');
 const Utils = require('../utils');
 
 
@@ -30,11 +31,7 @@ exports.create = async (path) => {
 
             const buffer = Fs.readFileSync(fullPath);
 
-            if (options.json) {
-                return JSON.parse(buffer.toString());
-            }
-
-            return buffer;
+            return Contents.convert(buffer, options);
         }
     };
 };

lib/loader/repository.js

@@ -2,6 +2,7 @@
 
 const GitUrlParse = require('git-url-parse');
 
+const Contents = require('./contents');
 const Logger = require('../logger');
 const OctokitWrapper = require('./octokit-wrapper');
 const Utils = require('../utils');
@@ -60,13 +61,9 @@ exports.create = (repository) => {
 
                 Logger.log(['loader'], 'Loaded: %s', resource);
 
-                const content = Buffer.from(result.data.content, 'base64');
+                const buffer = Buffer.from(result.data.content, 'base64');
 
-                if (options.json) {
-                    return JSON.parse(content.toString());
-                }
-
-                return content;
+                return Contents.convert(buffer, options);
             }
             catch (err) {
 

lib/travis/index.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const Nv = require('@pkgjs/nv');
-const Yaml = require('js-yaml');
 
 const TravisImports = require('./imports');
 const Utils = require('../utils');
@@ -75,7 +74,7 @@ internals.scan = async (travisYaml, options) => {
 exports.detect = async ({ loadFile }) => {
 
     try {
-        var buffer = await loadFile('.travis.yml');
+        var travisYaml = await loadFile('.travis.yml', { yaml: true });
     }
     catch (err) {
 
@@ -86,11 +85,6 @@ exports.detect = async ({ loadFile }) => {
         throw err;
     }
 
-    const travisYaml = Yaml.load(buffer, {
-        schema: Yaml.FAILSAFE_SCHEMA,
-        json: true
-    });
-
     return {
         travis: await internals.scan(travisYaml, { loadFile })
     };