Merge pull request #8 from CloudCannon/fix/hugo-environments

Fix/hugo environments

.gitignore

@@ -3,3 +3,4 @@ node_modules/
 test/integration/**/public/
 test/integration/**/resources/
 test/integration/**/.hugo_build.lock
+.hugo_build_lock

src/generators/info.js

@@ -8,11 +8,14 @@ import { getData } from './data.js';
 import { getConfig } from '../config.js';
 import { getCollectionsAndConfig } from './collections.js';
 
-async function getHugoUrls() {
+async function getHugoUrls(hugoConfig) {
 	log('⏳ Listing files from Hugo...');
 
 	const { source } = pathHelper.getPaths();
-	const cmdArgs = ['list', 'all', ...(source ? ['--source', source] : [])];
+	const { environment } = hugoConfig;
+	const cmdArgs = ['list', 'all', '--environment', environment || 'production'];
+	cmdArgs.push(...(source ? ['--source', source] : []));
+
 	const raw = await runProcess('hugo', cmdArgs);
 	const startIndex = raw.search(/^path,/m); // hugo logs warnings before this point
 	if (startIndex < 0) {
@@ -30,7 +33,7 @@ async function getHugoUrls() {
 
 export async function getInfo(hugoConfig, options) {
 	const config = await getConfig(hugoConfig);
-	const hugoUrls = await getHugoUrls();
+	const hugoUrls = await getHugoUrls(hugoConfig);
 
 	pathHelper.getSupportedLanguages(hugoConfig);
 

src/helpers/hugo-config.js

@@ -28,7 +28,7 @@ export function configSort(fileArray) {
 
 export async function getConfigPaths(flags = {}) {
 	const sourceDir = flags.source || '';
-	const environment = flags.environment || 'production'; // or just use root
+	const environment = flags.environment || process.env.HUGO_ENVIRONMENT || 'production';
 
 	const configDir = flags.configDir || 'config';
 	const configDirEnvironment = join(sourceDir, configDir, environment);
@@ -122,6 +122,10 @@ export async function getHugoConfig(flags = {}) {
 		configObject.source = flags.source;
 	}
 
+	if (flags.environment) {
+		configObject.environment = flags.environment;
+	}
+
 	if (flags.destination) {
 		configObject.destination = flags.destination;
 	}

test/integration/integration.test.js

@@ -26,8 +26,8 @@ const CHECKED_KEYS = [ // Skips time and generator
 	'source_editor'
 ];
 
-async function run(fixture, npxArgs = []) {
-	const expectedPath = join('test/integration', `${fixture}.json`);
+async function run(fixture, npxArgs = [], expectedOutputFile) {
+	const expectedPath = join('test/integration', expectedOutputFile || `${fixture}.json`);
 	const expectedRaw = await readFile(expectedPath);
 	const expected = JSON.parse(expectedRaw);
 
@@ -66,6 +66,10 @@ describe('integration should generate info.json', function () {
 		await run('yaml-config');
 	});
 
+	it('with YAML config file and specified environment', async function () {
+		await run('yaml-config', ['--environment', 'staging'], 'yaml-config-staging.json');
+	});
+
 	it('with collections_config_override', async function () {
 		await run('collections-config-override');
 	});