Skip to content

Commit eea2ea6

Browse files
committed
more logging, exception for some plugins
1 parent 582150f commit eea2ea6

3 files changed

Lines changed: 34 additions & 12 deletions

File tree

lib/checker.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class OutputModel {
2727
}
2828

2929
async function _setup(out: OutputModel) {
30-
Logger.debug('running setup...');
30+
Logger.log('running setup...');
3131
const tnsVersion: string = await execPromise('.', 'tns --version', true) as string;
3232
const npmVersion = await execPromise('.', 'npm --version', true) as string;
3333
out.time = new Date().getTime();
@@ -42,7 +42,7 @@ async function _setup(out: OutputModel) {
4242
await execPromise('.', 'tns extension install nativescript-cloud');
4343
await execPromise('.', 'tns accept eula');
4444
await execPromise('.', 'tns config apply test --apiVersion test');
45-
await execPromise('.', `tns dev-login ${user} ${pass}`);
45+
Logger.log(await execPromise('.', `tns dev-login ${user} ${pass}`, true) as string);
4646
// setup android signing
4747
if (existsSync('debug.p12')) {
4848
unlinkSync('debug.p12');

lib/github.service.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export namespace GithubService {
7070

7171
async function _prepareDemoProject(cwd: string, name: string) {
7272
// TODO: run 'tns update' / detect and build webpack
73-
Logger.debug(`preparing project in ${cwd}...`);
73+
Logger.log(`preparing project in ${cwd}...`);
7474

7575
// replace plugin version in package.json with latest(*)
7676
const pkgFilePath = path.join(cwd, 'package.json');
@@ -110,20 +110,20 @@ export namespace GithubService {
110110
}
111111

112112
async function _buildProject(cwd: string, platform: string) {
113-
Logger.debug(`building project in ${cwd} for ${platform}...`);
113+
Logger.log(`building project in ${cwd} for ${platform}...`);
114114
const result = await execPromise(cwd, `tns build ${platform}`);
115115
return result;
116116
}
117117

118118
async function _cloneProject(repositoryUrl: string, name: string) {
119-
Logger.debug(`cloning into ${name} ...`);
119+
Logger.log(`cloning into ${name} ...`);
120120
await execPromise(testDirectory, `git clone ${repositoryUrl} ${name}`);
121121
}
122122

123123
async function _checkTestDirectory() {
124124
if (existsSync(testDirectory)) {
125125
return new Promise((resolve, reject) => {
126-
Logger.debug(`removing ${testDirectory} project root`);
126+
Logger.log(`removing ${testDirectory} project root`);
127127
rimraf(testDirectory, errR => {
128128
if (errR) {
129129
return reject(errR);
@@ -139,7 +139,7 @@ export namespace GithubService {
139139
}
140140

141141
async function _createTestDirectory() {
142-
Logger.debug(`creating ${testDirectory} project root`);
142+
Logger.log(`creating ${testDirectory} project root`);
143143
return new Promise((resolve, reject) => {
144144
mkdir(testDirectory, errM => {
145145
return errM ? reject(errM) : resolve();

lib/project.service.ts

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,18 @@ import { execPromise } from './execPromise';
99
const testDirectory = 'test';
1010
const testProject = 'baseNG';
1111
const testProjectOriginalSuffix = '_original';
12+
const exceptions = {
13+
'nativescript-plugin-google-places': {
14+
file: 'google-places.config.json',
15+
content: `{
16+
"ios_key": "ios_key",
17+
"android_key": "android_key",
18+
"browser_key": "browser_key",
19+
"location": true,
20+
"images": true
21+
}`
22+
}
23+
};
1224

1325
export namespace ProjectService {
1426
export let cloudEnabled = false;
@@ -103,7 +115,7 @@ export namespace ProjectService {
103115
}
104116

105117
async function _buildProject(projectName: string, platform: string, options: string) {
106-
Logger.debug(`building project for ${platform} ...`);
118+
Logger.log(`building project for ${platform} ...`);
107119
const cwd = path.join(testDirectory, projectName);
108120
if (platform === 'ios' && cloudEnabled) {
109121
options += ' --provision /tns-official/CodeSign/ios/Icenium_QA_Development.mobileprovision --certificate /tns-official/CodeSign/ios/iPhone\\ Developer\\ Dragon\\ Telerikov\\ \\(GNKAEXW8YQ\\).p12 --certificatePassword 1';
@@ -116,8 +128,18 @@ export namespace ProjectService {
116128
async function _installPlugin(plugin: MarketplaceService.PluginModel, projectName: string) {
117129
const name = plugin.name;
118130
const isDev = name && name.indexOf('-dev-') !== -1;
119-
Logger.debug(`installing ${name} plugin ...`);
131+
Logger.log(`installing ${name} plugin ...`);
120132
const cwd = path.join(testDirectory, projectName);
133+
134+
if (exceptions[name]) {
135+
try {
136+
Logger.log(`Applying plugin exception for ${name}`);
137+
writeFileSync(path.join(cwd, exceptions[name].file), exceptions[name].content, 'utf8');
138+
} catch (ex) {
139+
Logger.log('Error when applying plugin exception: ' + ex.message);
140+
}
141+
}
142+
121143
let command = `tns plugin add ${name}`;
122144
if (isDev) {
123145
// dev plugin (e.g. nativescript-dev-typescript)
@@ -192,7 +214,7 @@ export namespace ProjectService {
192214
}
193215

194216
async function _createProject(name: string) {
195-
Logger.debug(`creating project ${name} ...`);
217+
Logger.log(`creating project ${name} ...`);
196218
const baseProjectDir = path.join(testDirectory, name);
197219
await execPromise(testDirectory, `tns create ${name} --template tns-template-blank-ng`);
198220
await execPromise(baseProjectDir, 'npm i');
@@ -202,15 +224,15 @@ export namespace ProjectService {
202224

203225
async function _removeDirectory(name: string) {
204226
return new Promise((resolve, reject) => {
205-
Logger.debug(`removing ${name} project root`);
227+
Logger.log(`removing ${name} project root`);
206228
rimraf(name, errR => {
207229
return errR ? reject(errR) : resolve();
208230
});
209231
});
210232
}
211233

212234
async function _createTestDirectory() {
213-
Logger.debug(`creating ${testDirectory} project root`);
235+
Logger.log(`creating ${testDirectory} project root`);
214236
return new Promise((resolve, reject) => {
215237
mkdir(testDirectory, errM => {
216238
return errM ? reject(errM) : resolve();

0 commit comments

Comments
 (0)