Mirroristas/CommunitySolidServer
2
0
Fork 0
mirror of https://github.com/CommunitySolidServer/CommunitySolidServer.git synced 2024-10-03 14:55:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Ensure root file path is absolute.

Browse Source
This commit is contained in:
Ruben Verborgh 2021-01-01 18:57:21 +01:00
parent ba4f7ff26c
commit c41c41d0e9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/init/CliRunner.ts
View File

@ -37,7 +37,7 @@ export class CliRunner {
mainModulePath: { type: 'string', alias: 'm' }, mainModulePath: { type: 'string', alias: 'm' },
podTemplateFolder: { type: 'string', alias: 't' }, podTemplateFolder: { type: 'string', alias: 't' },
port: { type: 'number', alias: 'p', default: 3000 }, port: { type: 'number', alias: 'p', default: 3000 },
rootFilePath: { type: 'string', alias: 'f' }, rootFilePath: { type: 'string', alias: 'f', default: './' },
sparqlEndpoint: { type: 'string', alias: 's' }, sparqlEndpoint: { type: 'string', alias: 's' },
}) })
.help(); .help();
@ -85,7 +85,7 @@ export class CliRunner {
params.baseUrl ? ensureTrailingSlash(params.baseUrl) : `http://localhost:${params.port}/`, params.baseUrl ? ensureTrailingSlash(params.baseUrl) : `http://localhost:${params.port}/`,
'urn:solid-server:default:variable:loggingLevel': params.loggingLevel, 'urn:solid-server:default:variable:loggingLevel': params.loggingLevel,
'urn:solid-server:default:variable:port': params.port, 'urn:solid-server:default:variable:port': params.port,
'urn:solid-server:default:variable:rootFilePath': params.rootFilePath ?? process.cwd(), 'urn:solid-server:default:variable:rootFilePath': this.resolvePath(params.rootFilePath),
'urn:solid-server:default:variable:sparqlEndpoint': params.sparqlEndpoint, 'urn:solid-server:default:variable:sparqlEndpoint': params.sparqlEndpoint,
'urn:solid-server:default:variable:podTemplateFolder': 'urn:solid-server:default:variable:podTemplateFolder':
params.podTemplateFolder ?? this.resolvePath(null, 'templates'), params.podTemplateFolder ?? this.resolvePath(null, 'templates'),

8
test/unit/init/CliRunner.test.ts
View File

@ -45,7 +45,7 @@ describe('CliRunner', (): void => {
variables: { variables: {
'urn:solid-server:default:variable:port': 3000, 'urn:solid-server:default:variable:port': 3000,
'urn:solid-server:default:variable:baseUrl': 'http://localhost:3000/', 'urn:solid-server:default:variable:baseUrl': 'http://localhost:3000/',
'urn:solid-server:default:variable:rootFilePath': process.cwd(), 'urn:solid-server:default:variable:rootFilePath': '/var/cwd/',
'urn:solid-server:default:variable:sparqlEndpoint': undefined, 'urn:solid-server:default:variable:sparqlEndpoint': undefined,
'urn:solid-server:default:variable:loggingLevel': 'info', 'urn:solid-server:default:variable:loggingLevel': 'info',
'urn:solid-server:default:variable:podTemplateFolder': path.join(__dirname, '../../../templates'), 'urn:solid-server:default:variable:podTemplateFolder': path.join(__dirname, '../../../templates'),
@ -90,7 +90,7 @@ describe('CliRunner', (): void => {
'urn:solid-server:default:variable:loggingLevel': 'debug', 'urn:solid-server:default:variable:loggingLevel': 'debug',
'urn:solid-server:default:variable:podTemplateFolder': 'templates', 'urn:solid-server:default:variable:podTemplateFolder': 'templates',
'urn:solid-server:default:variable:port': 4000, 'urn:solid-server:default:variable:port': 4000,
'urn:solid-server:default:variable:rootFilePath': '/root', 'urn:solid-server:default:variable:rootFilePath': '/var/cwd/root',
'urn:solid-server:default:variable:sparqlEndpoint': 'http://localhost:5000/sparql', 'urn:solid-server:default:variable:sparqlEndpoint': 'http://localhost:5000/sparql',
}, },
}, },
@ -108,7 +108,7 @@ describe('CliRunner', (): void => {
'--mainModulePath', 'module/path', '--mainModulePath', 'module/path',
'--podTemplateFolder', 'templates', '--podTemplateFolder', 'templates',
'--port', '4000', '--port', '4000',
'--rootFilePath', '/root', '--rootFilePath', 'root',
'--sparqlEndpoint', 'http://localhost:5000/sparql', '--sparqlEndpoint', 'http://localhost:5000/sparql',
], ],
}); });
@ -129,7 +129,7 @@ describe('CliRunner', (): void => {
'urn:solid-server:default:variable:loggingLevel': 'debug', 'urn:solid-server:default:variable:loggingLevel': 'debug',
'urn:solid-server:default:variable:podTemplateFolder': 'templates', 'urn:solid-server:default:variable:podTemplateFolder': 'templates',
'urn:solid-server:default:variable:port': 4000, 'urn:solid-server:default:variable:port': 4000,
'urn:solid-server:default:variable:rootFilePath': '/root', 'urn:solid-server:default:variable:rootFilePath': '/var/cwd/root',
'urn:solid-server:default:variable:sparqlEndpoint': 'http://localhost:5000/sparql', 'urn:solid-server:default:variable:sparqlEndpoint': 'http://localhost:5000/sparql',
}, },
}, },