create ExpandBED command line version

This tool did not implement JFrame elements in the script class so the
CLI implementation did not need to create an src/window_interface/*/
ExpandBEDOutput class. As a result, fewer files were affected:

window_interface/*Window
	-adjust output argument when initializing script class to be
		full filename and not just directory
script/*
	-use output as filename rather than directory name
	-add capability to  print to STDOUT
cli/*
	-call appropriate script class
	-write up picocli parsing objects
	-write up validateInput() method to check inputs and write
		messages for the user

Author: owlang

src/cli/Coordinate_Manipulation/BED_Manipulation/ExpandBEDCLI.java

@@ -13,7 +13,7 @@
 
 import objects.ToolDescriptions;
 import util.ExtensionFileFilter;
-//import scripts.Coordinate_Manipulation.BED_Manipulation.ExpandBED;
+import scripts.Coordinate_Manipulation.BED_Manipulation.ExpandBED;
 
 /**
 	Coordinate_ManipulationCLI/ExpandBEDCLI
@@ -25,6 +25,26 @@
 	exitCodeOnExecutionException = 1)
 public class ExpandBEDCLI implements Callable<Integer> {
 
+	@Parameters( index = "0", description = "the BED file to expand on")
+	private File bedFile;
+	
+	@Option(names = {"-o", "--output"}, description = "specify output directory (name will be same as original with coordinate info appended)")
+	private File output = null;
+	@Option(names = {"-s", "--stdout"}, description = "output bed to STDOUT")
+	private boolean stdout = false;
+	
+	@ArgGroup(validate = false, heading = "%nType of Expansion%n")
+	ExpandType expandType = new ExpandType();
+	static class ExpandType {
+		@Option(names = {"-c", "--center"}, description = "expand from center (default, at 250bp)")
+		private int center = -999;
+		@Option(names = {"-b", "--border"}, description = "add to border")
+		private int border = -999;
+	}
+	
+	private boolean byCenter = true;
+	private int SIZE = 250;
+	
 	@Override
 	public Integer call() throws Exception {
 		System.err.println( ">ExpandBEDCLI.call()" );
@@ -35,16 +55,66 @@ public Integer call() throws Exception {
 			System.exit(1);
 		}
 
-		//SEStats.getSEStats( output, bamFile, null );
+		ExpandBED.expandBEDBorders(output, bedFile, SIZE, byCenter);
 
-		//System.err.println("Calculations Complete");
+		System.err.println("Expansion Complete");
 		return(0);
 	}
 
 	private String validateInput() throws IOException {
 		String r = "";
-		//validate input here
-		//append messages to the user to `r`
+		
+		//check inputs exist
+		if(!bedFile.exists()){
+			r += "(!)BED file does not exist: " + bedFile.getName() + "\n";
+			return(r);
+		}
+		//check input extensions
+		if(!"bed".equals(ExtensionFileFilter.getExtension(bedFile))){
+			r += "(!)Is this a BED file? Check extension: " + bedFile.getName() + "\n";
+		}
+		
+		// Define default behavior
+		if(expandType.center==-999 && expandType.border==-999){
+			SIZE = 250;
+			byCenter = true;
+		}else if(expandType.border==-999){
+			SIZE = expandType.center;
+			byCenter = true;
+		}else if(expandType.center==-999){
+			SIZE = expandType.border;
+			byCenter = false;
+		}else{
+			r += "(!) Both center and border are flagged. This should have been caught by Picocli.";
+		}
+		//check size of expansion is valid
+		if(SIZE<=0){
+			r += "(!) Invalid size input. Must be a positive integer greater than 0.";
+		}
+		
+		//set default output filename
+		if(output==null && !stdout){
+			if(byCenter){ output = new File(ExtensionFileFilter.stripExtension(bedFile) + "_" + Integer.toString(SIZE) + "bp.bed"); }
+			else{ output = new File(ExtensionFileFilter.stripExtension(bedFile) + "_border_" + Integer.toString(SIZE) + "bp.bed"); }
+		//check stdout and output not both selected
+		}else if(stdout){
+			if(output!=null){ r += "(!)Cannot use -s flag with -o.\n"; }
+		//check output filename is valid
+		}else{
+			//check ext
+			try{
+				if(!"bed".equals(ExtensionFileFilter.getExtension(output))){
+					r += "(!)Use BED extension for output filename. Try: " + ExtensionFileFilter.stripExtension(output) + ".bed\n";
+				}
+			} catch( NullPointerException e){ r += "(!)Output filename must have extension: use BED extension for output filename. Try: " + output + ".bed\n"; }
+			//check directory
+			if(output.getParent()==null){
+	// 			System.err.println("default to current directory");
+			} else if(!new File(output.getParent()).exists()){
+				r += "(!)Check output directory exists: " + output.getParent() + "\n";
+			}
+		}
+		
 		return(r);
 	}
-}
+}

src/scripts/Coordinate_Manipulation/BED_Manipulation/ExpandBED.java

@@ -7,12 +7,11 @@
 import java.util.Scanner;
 
 public class ExpandBED {
-	public static void expandBEDBorders(File out_path, File input, int SIZE, boolean ExCenter) throws IOException {
-		String newName = (input.getName()).substring(0,input.getName().length() - 4) + "_" + Integer.toString(SIZE) +"bp.bed";
-	    Scanner scan = new Scanner(input);
-	    PrintStream OUT = null;
-	    if(out_path == null) OUT = new PrintStream(newName);
-	    else OUT = new PrintStream(out_path + File.separator + newName);
+	public static void expandBEDBorders(File out_filepath, File input, int SIZE, boolean ExCenter) throws IOException {
+		
+		Scanner scan = new Scanner(input);
+	    PrintStream OUT = System.out;
+	    if( out_filepath != null ) OUT = new PrintStream(out_filepath);
 
 		while (scan.hasNextLine()) {
 			String[] temp = scan.nextLine().split("\t");

src/window_interface/Coordinate_Manipulation/BED_Manipulation/ExpandBEDWindow.java

@@ -70,7 +70,14 @@ public Void doInBackground() throws IOException {
         		} else {
 		        	setProgress(0);
 		        	for(int x = 0; x < BEDFiles.size(); x++) {
-						ExpandBED.expandBEDBorders(OUTPUT_PATH, BEDFiles.get(x), SIZE, rdbtnExpandFromCenter.isSelected());
+		        		File XBED = BEDFiles.get(x);
+		        		// Set outfilepath
+		        		String newName = (XBED.getName()).substring(0,XBED.getName().length() - 4) + "_" + Integer.toString(SIZE) +"bp.bed";
+		        		File OUT_FILE = null;
+		        		if(OUTPUT_PATH == null) OUT_FILE = new File( newName );
+		        		else OUT_FILE = new File( OUTPUT_PATH + File.separator + newName );
+						// Execute expansion and update progress
+						ExpandBED.expandBEDBorders(OUT_FILE, XBED, SIZE, rdbtnExpandFromCenter.isSelected());
 						int percentComplete = (int)(((double)(x + 1) / BEDFiles.size()) * 100);
 		        		setProgress(percentComplete);
 		        	}