Skip to content

Refactor project config template engine #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
j3k0 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Refactor project config template engine #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions client/src/com/apm/client/commands/project/processes/IOSAdditionsMergeProcess.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package com.apm.client.commands.project.processes
import com.apm.client.processes.ProcessQueue;
import com.apm.data.project.ApplicationDescriptor;
import com.apm.utils.FileUtils;
import com.apm.utils.Template;
import com.apple.plist.Plist;

import flash.filesystem.File;
Expand Down Expand Up @@ -63,17 +64,7 @@ package com.apm.client.commands.project.processes
if (infoAdditionsProjectFile.exists)
{
APM.io.writeLine( "Merging with supplied info additions: config/ios/InfoAdditions.xml" );

// Read content and inject any config parameters
var infoAdditionsProjectContent:String = FileUtils.readFileContentAsString( infoAdditionsProjectFile );
for (var name:String in APM.config.projectDefinition.configuration)
{
var regex:RegExp = new RegExp( "\\$\\{" + name + "\\}", "g" );
var value:String = APM.config.projectDefinition.getConfigurationParam( name );

infoAdditionsProjectContent = infoAdditionsProjectContent.replace( regex, value );
}
FileUtils.writeStringAsFileContent( infoAdditionsFile, infoAdditionsProjectContent );
Template.compileFileToFile( infoAdditionsProjectFile, infoAdditionsFile, APM.config.projectDefinition.configuration );
}
else
{
Expand Down
14 changes: 3 additions & 11 deletions client/src/com/apm/client/commands/project/processes/IOSEntitlementsMergeProcess.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package com.apm.client.commands.project.processes
import com.apm.client.processes.ProcessQueue;
import com.apm.data.project.ApplicationDescriptor;
import com.apm.utils.FileUtils;
import com.apm.utils.Template;
import com.apple.plist.Plist;

import flash.filesystem.File;
Expand Down Expand Up @@ -63,17 +64,8 @@ package com.apm.client.commands.project.processes
if (entitlementsProjectFile.exists)
{
APM.io.writeLine( "Merging with supplied info additions: config/ios/Entitlements.xml" );

// Read content and inject any config parameters
var entitlementsProjectContent:String = FileUtils.readFileContentAsString( entitlementsProjectFile );
for (var name:String in APM.config.projectDefinition.configuration)
{
var regex:RegExp = new RegExp( "\\$\\{" + name + "\\}", "g" );
var value:String = APM.config.projectDefinition.getConfigurationParam( name );

entitlementsProjectContent = entitlementsProjectContent.replace( regex, value );
}
FileUtils.writeStringAsFileContent( entitlementsFile, entitlementsProjectContent );
Template.compileFileToFile( entitlementsProjectFile, entitlementsFile,
APM.config.projectDefinition.configuration );
}
else
{
Expand Down
12 changes: 3 additions & 9 deletions client/src/com/apm/client/commands/project/processes/IOSPlistMergeProcess.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package com.apm.client.commands.project.processes
{
import com.apm.client.APM;
import com.apm.client.processes.ProcessBase;
import com.apm.utils.FileUtils;
import com.apm.utils.Template;
import com.apple.plist.Plist;
import com.apple.plist.PlistUtils;

Expand Down Expand Up @@ -64,14 +64,8 @@ package com.apm.client.commands.project.processes
{
// Insert configuration parameters into merge plist
// Note: currentPlist should already have parameters
var mergeContent:String = FileUtils.readFileContentAsString( _mergePlist );
for (var name:String in APM.config.projectDefinition.configuration)
{
var regex:RegExp = new RegExp( "\\$\\{" + name + "\\}", "g" );
var value:String = APM.config.projectDefinition.getConfigurationParam( name );

mergeContent = mergeContent.replace( regex, value );
}
var mergeContent:String =
Template.compileFile( _mergePlist, APM.config.projectDefinition.configuration );

// Load and merge plists
var merge:Plist = new Plist( mergeContent );
Expand Down
49 changes: 49 additions & 0 deletions client/src/com/apm/utils/Template.as
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
/**
* @author Jean-Christophe Hoelt (https://github.com/j3k0)
* @created 23/9/21
*/
package com.apm.utils
{
import com.apm.client.logging.Log;
import com.apm.utils.FileUtils;
import flash.filesystem.File;

public class Template
{
public static function compile( content:String, configuration:Object ):String
{
var output:String = content;
for (var name:String in configuration)
{
var regex:RegExp = new RegExp( "\\$\\{[ \t]*" + name + "[ \t]*\\}", "g" );
var value:String = getParam( configuration, name );

output = output.replace( regex, value );
}
return output;
}

public static function compileFile( inputFile:File, configuration:Object ):String
{
var content:String = FileUtils.readFileContentAsString( inputFile );
return compile( content, configuration );
}

public static function compileFileToFile( inputFile:File, outputFile:File, configuration:Object ):String
{
var content:String = FileUtils.readFileContentAsString( inputFile );
var compiled:String = compile( content, configuration );
FileUtils.writeStringAsFileContent( outputFile, compiled );
return compiled;
}

private static function getParam( configuration:Object, key:String ):String
{
if (configuration.hasOwnProperty( key ))
{
return configuration[ key ];
}
return null;
}
}
}