fixes #14, and fixes #15

Author: John Donovan

README.md

@@ -109,7 +109,7 @@ If either tool is ran within a customer folder, then the option is inferred and
 `pmbuilder` and `pmextractor` can also select the platform for you! This cuts down on typos, and typing out full file names. To use this option, navigate to your customer's directory and run `pmbuilder` with the `-s` option.
 
 ```bash
-$ pmbuilder -sp
+$ pmbuilder -s
 ```
 
 ### Using PM Builder's Import Utility

src/com/gtnexus/appxpress/cli/option/ParsedOptions.java

@@ -2,7 +2,6 @@
 
 import java.io.File;
 import java.nio.file.Path;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;

src/com/gtnexus/appxpress/commons/DirectoryHelper.java

@@ -97,4 +97,5 @@ public PMProperties getPmProperties() throws AppXpressException {
         }
 		return pmbProperties;
 	}
+
 }

src/com/gtnexus/appxpress/commons/file/FileService.java

@@ -195,6 +195,25 @@ public List<Path> moveFiles(final Collection<File> files,
 		return paths;
 	}
 
+	public List<Path> copyFiles(final Collection<String> fileNames,
+			final NameToPath converter, final File destination,
+			Precondition<File> precondition) throws IOException {
+		if (fileNames == null || destination == null) {
+			throw new NullPointerException(
+					"files and destination cannot be null.");
+		}
+		if (!destination.isDirectory()) {
+			throw new IllegalArgumentException(
+					"Destination must be a directory.");
+		}
+		List<Path> paths = new LinkedList<>();
+		for (String file : fileNames) {
+			paths.add(_copyFile(destination, precondition,
+					converter.resolve(file).toFile()));
+		}
+		return paths;
+	}
+
 	/**
 	 * 
 	 * @param files
@@ -210,20 +229,38 @@ public List<Path> copyFiles(final Collection<File> files,
 			throw new NullPointerException(
 					"files and destination cannot be null.");
 		}
+		if (!destination.isDirectory()) {
+			throw new IOException("Destination " + destination.getName()
+					+ " is not a directory.");
+		}
 		if (precondition == null) {
 			precondition = new Precondition.EmptyCondition<>();
 		}
+		return _copyFiles(files, destination, precondition);
+	}
+
+	private List<Path> _copyFiles(final Collection<File> files,
+			final File destination, Precondition<File> precondition)
+			throws IOException {
 		List<Path> paths = new LinkedList<>();
 		for (File file : files) {
-			if (precondition.isMet(file)) {
-				Path p = destination.toPath().resolve(file.getName());
-				Files.copy(file.toPath(), p,
-						StandardCopyOption.REPLACE_EXISTING);
-			}
+			Path result = _copyFile(destination, precondition, file);
+			if (result != null)
+				paths.add(result);
 		}
 		return paths;
 	}
 
+	private Path _copyFile(final File destination,
+			Precondition<File> precondition, File file) throws IOException {
+		if (precondition.isMet(file)) {
+			Path p = destination.toPath().resolve(file.getName());
+			return Files.copy(file.toPath(), p,
+					StandardCopyOption.REPLACE_EXISTING);
+		}
+		return null;
+	}
+
 	/**
 	 * 
 	 * @param sourceDir
@@ -246,13 +283,13 @@ public Path copyDirectory(File sourceDir, File destination)
 	public Path copyDirectory(Path source, Path destination) throws IOException {
 		if (!Files.exists(source)) {
 			throw new IOException("Cannot copy directory tree from source: "
-					+ source.toString()
-					+ ". Source directory does not exist.");
+					+ source.toString() + ". Source directory does not exist.");
 		}
-		if(destination.startsWith(source)) {
-			throw new IllegalArgumentException("Cannot copy directory structure into subdirectory of itself.");
+		if (destination.startsWith(source)) {
+			throw new IllegalArgumentException(
+					"Cannot copy directory structure into subdirectory of itself.");
 		}
-		if(!Files.exists(destination)) {
+		if (!Files.exists(destination)) {
 			Files.createDirectories(destination);
 		}
 		CopyDirVisitor visitor = new CopyDirVisitor(source, destination);
@@ -277,11 +314,10 @@ public boolean isFileType(final File file, final String extension) {
 	public void emptyDir(final File root) throws IOException {
 		emptyDir(root, false);
 	}
-	
+
 	public void emptyDir(final Path root) throws IOException {
 		emptyDir(root, false);
 	}
-	
 
 	/**
 	 * 
@@ -293,11 +329,10 @@ public void emptyDir(final File root, boolean deleteRoot)
 			throws IOException {
 		emptyDir(root.toPath(), deleteRoot);
 	}
-	
+
 	public void emptyDir(final Path root, boolean deleteRoot)
 			throws IOException {
-		DeleteDirVisitor visitor = new DeleteDirVisitor(root,
-				deleteRoot);
+		DeleteDirVisitor visitor = new DeleteDirVisitor(root, deleteRoot);
 		Files.walkFileTree(root, visitor);
 	}
 

src/com/gtnexus/appxpress/commons/file/LibResourceToPath.java

@@ -0,0 +1,18 @@
+package com.gtnexus.appxpress.commons.file;
+
+import java.nio.file.Path;
+
+public class LibResourceToPath implements NameToPath {
+	
+	private final Path libPath;
+	
+	public LibResourceToPath(Path libPath) {
+		this.libPath = libPath;
+	}
+
+	@Override
+	public Path resolve(String name) {
+		return libPath.resolve(name);
+	}
+	
+}

src/com/gtnexus/appxpress/commons/file/NameToPath.java

@@ -0,0 +1,9 @@
+package com.gtnexus.appxpress.commons.file;
+
+import java.nio.file.Path;
+
+public interface NameToPath {
+
+	public Path resolve(String name);
+	
+}

src/com/gtnexus/appxpress/context/AppXpressContext.java

@@ -1,6 +1,10 @@
 package com.gtnexus.appxpress.context;
 
+import static com.gtnexus.appxpress.AppXpressConstants.LIB;
+
 import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -15,6 +19,7 @@
 import com.gtnexus.appxpress.commons.PMProperties;
 import com.gtnexus.appxpress.commons.PropertiesPersister;
 import com.gtnexus.appxpress.commons.SimpleShutdown;
+import com.gtnexus.appxpress.pmbuilder.cli.BuilderOption;
 
 /**
  * 
@@ -59,6 +64,12 @@ public ApplicationInfo getApplicationInfo() {
 	public Map<T, String> getOptMap() {
 		return optMap;
 	}
+	
+	public Path getLibPath() {
+		String ld = properties.getProperty(BuilderOption.LOCAL_DIR);
+		Path localDir = Paths.get(ld);
+		return localDir.getParent().resolve(LIB);
+	}
 
 	public PMProperties getPMProperties() throws AppXpressException {
 		return dHelper.getPmProperties();

src/com/gtnexus/appxpress/pmbuilder/PlatformModuleBuilder.java

@@ -77,7 +77,7 @@ public void build(AppXpressContext<BuilderOption> context)
 			throws AppXpressException {
 		attachCleanUpHook(context);
 		PMBuilderVO vo = new PMBuilderVO(context.getOptMap());
-		BuildPrep prep = new BuildPrep(context);
+		BuildPrep prep = new BuildPrep(context, context.getLibPath());
 		PlatformModuleBundler bundler = new PlatformModuleBundler(
 				vo.getRootFile());
 		try {

src/com/gtnexus/appxpress/pmbuilder/bundle/platform/AppXpressMapper.java

@@ -7,8 +7,6 @@
 import com.gtnexus.appxpress.pmbuilder.bundle.Bundler;
 import com.gtnexus.appxpress.pmbuilder.bundle.scripts.FolderPrep;
 import com.gtnexus.appxpress.pmbuilder.bundle.scripts.ScriptBundler;
-import com.gtnexus.appxpress.pmbuilder.design.CustomObjectDesignXML;
-import com.gtnexus.appxpress.pmbuilder.exception.PMBuilderException;
 import com.gtnexus.appxpress.pmextractor.gitmap.Mapper;
 
 /**
@@ -44,18 +42,6 @@ public void doMapping() throws AppXpressException {
 		}
 		prep.prepare(root);
 		bundler.bundle(root);
-		xmlDesignCustomObjectScriptMatcher(root);
 	}
 
-	/**
-	 * Searches through the custom object module folder and ensures that each
-	 * custom object design xml file corresponds to the correct number of custom
-	 * object scripts
-	 */
-	private void xmlDesignCustomObjectScriptMatcher(File rootFile)
-			throws PMBuilderException {
-		CustomObjectDesignXML coDes = new CustomObjectDesignXML(rootFile);
-		coDes.ensureSoundDesign();
-	}
-
 }

src/com/gtnexus/appxpress/pmbuilder/bundle/platform/BuildPrep.java

@@ -25,19 +25,21 @@ public class BuildPrep implements Preparation<PMBuilderVO> {
 	private final FileService fs;
 	private final AppXpressDirResolver resolver;
 	private final TempResourceHolder tmpHolder;
+	private final Path libPath;
 
-	public BuildPrep(TempResourceHolder tmp) {
+	public BuildPrep(TempResourceHolder tmp, Path libPath) {
 		this.fs = new FileService();
 		this.resolver = new AppXpressDirResolver();
 		this.tmpHolder = tmp;
+		this.libPath = libPath;
 	}
 
 	@Override
 	public void prepare(final PMBuilderVO vo) throws PMBuilderException {
 		try {
 			File tmp = createTemp(vo);
 			vo.setWorkingDir(tmp);
-			runImportFind(tmp);
+			runImportFind(tmp, libPath);
 			map(tmp);
 		} catch (AppXpressException | IOException e) {
 			throw new PMBuilderException(
@@ -68,9 +70,9 @@ private File createTemp(final PMBuilderVO vo) throws IOException {
 	 *            Name of platform module folder
 	 * @throws AppXpressException
 	 */
-	private void runImportFind(File rootFile) throws AppXpressException {
+	private void runImportFind(final File rootFile, final Path lib) throws AppXpressException {
 		System.out.println("Gathering imports...");
-		ImportService iScanner = new ImportService(rootFile);
+		ImportService iScanner = new ImportService(rootFile, lib);
 		iScanner.scanAndImport();
 	}