Feature : Extension refactoring and use lazy configuration

build.gradle

@@ -2,7 +2,7 @@ allprojects {
 	apply plugin: 'java-gradle-plugin'
 	apply plugin: 'groovy'
 
-	def versionNumber = "0.2.8-SNAPSHOT"
+	def versionNumber = "0.16.0.a603076-SNAPSHOT"
 
 	if (project.hasProperty("versionNumber")) {
 		versionNumber = project.versionNumber
@@ -55,6 +55,27 @@ allprojects {
 			substitute module('ch.qos.logback:logback-classic') with module('org.slf4j:slf4j-api:1.7.+')
 		}
 	}
+
+	// Write the plugin's classpath to a file to share with the tests
+	task createClasspathManifest {
+		def outputDir = file("$buildDir/$name")
+
+		inputs.files sourceSets.main.runtimeClasspath
+		outputs.dir outputDir
+
+		doLast {
+			outputDir.mkdirs()
+			file("$outputDir/plugin-classpath.txt").text = project.files(project.rootProject.subprojects
+					.collect { it.sourceSets.main.runtimeClasspath }
+					.toList())
+					.files
+					.join("\n")
+		}
+	}
+
+	dependencies {
+		testRuntime files(createClasspathManifest)
+	}
 }
 
 

libxcode/src/main/groovy/org/openbakery/CommandRunner.groovy

@@ -38,7 +38,6 @@ class CommandRunner {
 
 	}
 
-
 	void setOutputFile(File outputFile) {
 		if (outputFile.exists()) {
 
@@ -172,20 +171,35 @@ class CommandRunner {
 	}
 
 	String runWithResult(String... commandList) {
-		return runWithResult(Arrays.asList(commandList));
+		return runWithResult(Arrays.asList(commandList))
+	}
+
+	String runWithResult(Map<String, String> environmentValues,
+						 String... commandList) {
+		return runWithResult(defaultBaseDirectory,
+				commandList.toList(),
+				environmentValues,
+				null)
 	}
 
 	String runWithResult(List<String> commandList) {
 		return runWithResult(defaultBaseDirectory, commandList)
 	}
 
-	String runWithResult(String directory, List<String> commandList) {
-		return runWithResult(directory, commandList, null, null)
+	String runWithResult(String directory,
+						 List<String> commandList) {
+		return runWithResult(directory,
+				commandList,
+				null,
+				null)
 	}
 
-	String runWithResult(String directory, List<String> commandList, Map<String, String> environment, OutputAppender outputAppender) {
+	String runWithResult(String directory,
+						 List<String> commandList,
+						 Map<String, String> environment,
+						 OutputAppender outputAppender) {
 		commandOutputBuffer = new ArrayList<>();
-		run(directory, commandList, environment, outputAppender);
+		run(directory, commandList, environment, outputAppender)
 		String result = commandOutputBuffer.join("\n")
 		commandOutputBuffer = null;
 		return result

libxcode/src/main/groovy/org/openbakery/codesign/ProvisioningProfileReader.groovy

@@ -69,7 +69,10 @@ class ProvisioningProfileReader {
 		checkExpired()
 	}
 
-	static File getProvisionFileForIdentifier(String bundleIdentifier, List<File> mobileProvisionFiles, CommandRunner commandRunner, PlistHelper plistHelper) {
+	static File getProvisionFileForIdentifier(String bundleIdentifier,
+											  List<File> mobileProvisionFiles,
+											  CommandRunner commandRunner,
+											  PlistHelper plistHelper) {
 		def provisionFileMap = [:]
 
 		for (File mobileProvisionFile : mobileProvisionFiles) {
@@ -99,8 +102,8 @@ class ProvisioningProfileReader {
 			}
 		}
 
-		logger.info("No provisioning profile found for bundle identifier {}",  bundleIdentifier)
-		logger.info("Available bundle identifier are {}" + provisionFileMap.keySet())
+		logger.warn("No provisioning profile found for bundle identifier {}", bundleIdentifier)
+		logger.warn("Available bundle identifier are {}" + provisionFileMap.keySet())
 
 		return null
 	}
@@ -142,7 +145,7 @@ class ProvisioningProfileReader {
 		Date expireDate = config.getProperty("ExpirationDate")
 		if (expireDate.before(new Date())) {
 			DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG, Locale.getDefault())
-			throw new IllegalArgumentException("The Provisioning Profile has expired on " + formatter.format(expireDate) )
+			throw new IllegalArgumentException("The Provisioning Profile has expired on " + formatter.format(expireDate))
 		}
 	}
 
@@ -159,6 +162,14 @@ class ProvisioningProfileReader {
 		return config.getString("TeamIdentifier")
 	}
 
+	String getTeamName() {
+		return config.getString("TeamName")
+	}
+
+	String getName() {
+		return config.getString("Name")
+	}
+
 	File getPlistFromProvisioningProfile() {
 		if (provisioningPlist == null) {
 			// unpack provisioning profile to plain plist
@@ -170,12 +181,12 @@ class ProvisioningProfileReader {
 
 			try {
 				commandRunner.run(["security",
-													 "cms",
-													 "-D",
-													 "-i",
-													 provisioningProfile.getCanonicalPath(),
-													 "-o",
-													 provisioningPlist.absolutePath
+								   "cms",
+								   "-D",
+								   "-i",
+								   provisioningProfile.getCanonicalPath(),
+								   "-o",
+								   provisioningPlist.absolutePath
 				])
 			} catch (CommandRunnerException ex) {
 				if (!provisioningPlist.exists()) {
@@ -204,15 +215,16 @@ class ProvisioningProfileReader {
 	}
 
 	/* xcent is the archive entitlements */
+
 	void extractEntitlements(File entitlementFile, String bundleIdentifier, List<String> keychainAccessGroups, Configuration configuration) {
 		logger.info("extractEntitlements for " + bundleIdentifier)
 		File plistFromProvisioningProfile = getPlistFromProvisioningProfile()
 		String entitlements = commandRunner.runWithResult([
-						"/usr/libexec/PlistBuddy",
-						"-x",
-						plistFromProvisioningProfile.absolutePath,
-						"-c",
-						"Print Entitlements"])
+				"/usr/libexec/PlistBuddy",
+				"-x",
+				plistFromProvisioningProfile.absolutePath,
+				"-c",
+				"Print Entitlements"])
 
 		if (StringUtils.isEmpty(entitlements)) {
 			logger.debug("No entitlements found in {}", plistFromProvisioningProfile)
@@ -228,7 +240,7 @@ class ProvisioningProfileReader {
 		String bundleIdentifierPrefix = ""
 		if (applicationIdentifier != null) {
 			String[] tokens = applicationIdentifier.split("\\.")
-			for (int i=1; i<tokens.length; i++) {
+			for (int i = 1; i < tokens.length; i++) {
 				if (tokens[i] == "*") {
 					break
 				}
@@ -269,14 +281,13 @@ class ProvisioningProfileReader {
 			plistHelper.deleteValueFromPlist(entitlementFile, "keychain-access-groups")
 		}
 
-
 		// copy the missing values that are in configuration (xcent or signing.entitlments) to the entitlements for signing
 		enumerateMissingEntitlements(entitlementFile, configuration) { key, value, action ->
 
 			if (value instanceof String) {
 				value = this.replaceVariables(value)
 			} else if (value instanceof List) {
-				value = this.replaceValuesInList((List)value)
+				value = this.replaceValuesInList((List) value)
 			}
 
 
@@ -308,7 +319,7 @@ class ProvisioningProfileReader {
 		def result = []
 		for (Object item : list) {
 			if (item instanceof String) {
-				result << replaceVariables((String)item)
+				result << replaceVariables((String) item)
 			} else {
 				result << item
 			}
@@ -330,7 +341,7 @@ class ProvisioningProfileReader {
 		}
 
 		Configuration entitlements = new ConfigurationFromPlist(entitlementFile)
-		Set<String>replaceKeys = configuration.getReplaceEntitlementsKeys()
+		Set<String> replaceKeys = configuration.getReplaceEntitlementsKeys()
 
 		for (String key in configuration.getKeys()) {
 			Object value = configuration.get(key) //plistHelper.getValueFromPlist(xcent, key)
@@ -366,7 +377,7 @@ class ProvisioningProfileReader {
 
 		} else {
 			if (currentValue.toString().endsWith('*')) {
-				plistHelper.setValueForPlist(entitlementFile, value, prefix + "."  + bundleIdentifier)
+				plistHelper.setValueForPlist(entitlementFile, value, prefix + "." + bundleIdentifier)
 			}
 		}
 	}

libxcode/src/main/groovy/org/openbakery/codesign/Security.groovy

@@ -1,6 +1,5 @@
 package org.openbakery.codesign
 
-import org.apache.commons.io.FileUtils
 import org.apache.commons.io.FilenameUtils
 import org.apache.commons.lang.StringUtils
 import org.openbakery.CommandRunner
@@ -9,7 +8,6 @@ import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
 import java.security.cert.CertificateException
-import java.text.ParseException
 
 class Security {
 	private static Logger logger = LoggerFactory.getLogger(Security.class)
@@ -60,6 +58,7 @@ class Security {
 		for (File keychain in keychainList) {
 			commandList.add(keychain.absolutePath)
 		}
+
 		commandRunner.run(commandList)
 	}
 

libxcode/src/main/groovy/org/openbakery/util/PathHelper.groovy

@@ -1,6 +1,7 @@
 package org.openbakery.util
 
 import groovy.transform.CompileStatic
+import org.gradle.api.Project
 import org.openbakery.xcode.Type
 
 @CompileStatic
@@ -9,6 +10,10 @@ class PathHelper {
 	public static final String APPLE_TV_SIMULATOR = "appletvsimulator"
 	public static final String IPHONE_SIMULATOR = "iphonesimulator"
 	public static final String IPHONE_OS = "iphoneos"
+	public static final String FOLDER_ARCHIVE = "archive"
+	public static final String FOLDER_PACKAGE = "package"
+	public static final String GENERATED_XCARCHIVE_FILE_NAME = "archive.xcconfig"
+	public static final String EXTENSION_XCARCHIVE = ".xcarchive"
 
 	static File resolvePath(Type type,
 							boolean simulator,
@@ -70,4 +75,25 @@ class PathHelper {
 		return new File(symRoot,
 				"${configuration}-${destination}")
 	}
+
+	static File resolveArchiveFolder(Project project) {
+		return new File(project.getBuildDir(), FOLDER_ARCHIVE)
+	}
+
+	static File resolveArchiveFile(Project project,
+								   String scheme) {
+		return new File(resolveArchiveFolder(project), scheme + EXTENSION_XCARCHIVE)
+	}
+
+	static File resolveArchivingLogFile(Project project) {
+		return new File(resolveArchiveFolder(project), "xcodebuild-archive-output.txt")
+	}
+
+	static File resolveXcConfigFile(Project project) {
+		return new File(resolveArchiveFolder(project), GENERATED_XCARCHIVE_FILE_NAME)
+	}
+
+	static File resolvePackageFolder(Project project) {
+		return new File(project.getBuildDir(), FOLDER_PACKAGE)
+	}
 }

libxcode/src/main/groovy/org/openbakery/util/PlistHelper.groovy

@@ -17,16 +17,15 @@ class PlistHelper {
 		this.commandRunner = commandRunner
 	}
 
-
 /**
-	 * Reads the value for the given key from the given plist
-	 *
-	 * @param plist
-	 * @param key
-     * @param commandRunner The commandRunner to execute commands (This is espacially needed for Unit Tests)
- 	 *
-	 * @return returns the value for the given key
-	 */
+ * Reads the value for the given key from the given plist
+ *
+ * @param plist
+ * @param key
+ * @param commandRunner The commandRunner to execute commands (This is espacially needed for Unit Tests)
+ *
+ * @return returns the value for the given key
+ */
 	def getValueFromPlist(File plist, String key) {
 
 		try {
@@ -75,6 +74,12 @@ class PlistHelper {
 		commandForPlist(plist, "Add :" + key + " string " + value)
 	}
 
+	void addDictForPlist(File plist, String key, Map<String, String> map) {
+		commandForPlist(plist, "Add :" + key + " dict")
+		map.keySet()
+				.each { it -> addValueForPlist(plist, ":$key:$it", map.get(it)) }
+	}
+
 	void addValueForPlist(File plist, String key, Number value) {
 		if (value instanceof Float || value instanceof Double || value instanceof BigDecimal) {
 			commandForPlist(plist, "Add :" + key + " real " + value)

libxcode/src/main/groovy/org/openbakery/xcode/DestinationResolver.groovy

@@ -36,10 +36,8 @@ class DestinationResolver {
 		def runtime = simulatorControl.getMostRecentRuntime(parameters.type)
 
 
-
 		if (isSimulatorFor(parameters)) {
 			// filter only on simulator builds
-
 			logger.debug("is a simulator build")
 			if (parameters.configuredDestinations != null) {
 

libxcode/src/main/groovy/org/openbakery/xcode/Version.groovy

@@ -1,6 +1,6 @@
 package org.openbakery.xcode
 
-class Version implements Comparable<Version> {
+class Version implements Comparable<Version>, Serializable {
 
 	public int major = -1
 	public int minor = -1
@@ -11,7 +11,7 @@ class Version implements Comparable<Version> {
 	public Version() {
 	}
 
-	public  Version(String version) {
+	public Version(String version) {
 		Scanner versionScanner = new Scanner(version);
 		versionScanner.useDelimiter("\\.");
 
@@ -30,8 +30,6 @@ class Version implements Comparable<Version> {
 		} catch (InputMismatchException ex) {
 			suffix = versionScanner.next()
 		}
-
-
 	}
 
 	@Override
@@ -71,13 +69,13 @@ class Version implements Comparable<Version> {
 			builder.append(minor)
 		}
 
-		if (this.maintenance>= 0) {
+		if (this.maintenance >= 0) {
 			builder.append(".")
 			builder.append(maintenance)
 		}
 
 		if (this.suffix != null) {
-			if (builder.length() > 0 ){
+			if (builder.length() > 0) {
 				builder.append(".")
 			}
 			builder.append(suffix)