Filter using objects task attribute

mickle00 · Nov 11, 2013 · 2ef5e80 · 2ef5e80
1 parent 0c14eba
commit 2ef5e80
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -65,15 +65,15 @@ From the command line of any Salesforce development environment:
 	&lt;/target&gt;
 
 	&lt;target name="leapsfields"&gt;
-		&lt;leap:leapsfields username="${sf.dev.username}" password="${sf.dev.password}" token="${sf.dev.token}" serverurl="${sf.dev.url}" /&gt;
+		&lt;leap:leapsfields username="${sf.dev.username}" password="${sf.dev.password}" token="${sf.dev.token}" serverurl="${sf.dev.url}" objects="Lead,Contact,Account,Opportunity,Order__c" /&gt;
 	&lt;/target&gt;
 
 	&lt;target name="leaptriggers"&gt;
-		&lt;leap:leaptriggers username="${sf.dev.username}" password="${sf.dev.password}" token="${sf.dev.token}" serverurl="${sf.dev.url}" /&gt;
+		&lt;leap:leaptriggers username="${sf.dev.username}" password="${sf.dev.password}" token="${sf.dev.token}" serverurl="${sf.dev.url}" objects="Lead,Contact,Account,Opportunity,Order__c" /&gt;
 	&lt;/target&gt;
 
 	&lt;target name="leapwrappers"&gt;
-		&lt;leap:leapwrappers username="${sf.dev.username}" password="${sf.dev.password}" token="${sf.dev.token}" serverurl="${sf.dev.url}" /&gt;
+		&lt;leap:leapwrappers username="${sf.dev.username}" password="${sf.dev.password}" token="${sf.dev.token}" serverurl="${sf.dev.url}" objects="Lead,Contact,Account,Opportunity,Order__c" /&gt;
 	&lt;/target&gt;
 &lt;/project&gt;
 </pre>
diff --git a/build.xml b/build.xml
@@ -17,15 +17,15 @@
     </macrodef>
 
 	<target name="leapsfields">
-		<leap:leapsfields username="${sf.dev.username}" password="${sf.dev.password}" token="${sf.dev.token}" serverurl="${sf.dev.url}" />
+		<leap:leapsfields username="${sf.dev.username}" password="${sf.dev.password}" token="${sf.dev.token}" serverurl="${sf.dev.url}" objects="Lead,Contact,Account,Opportunity,Order__c" />
 	</target>
 
 	<target name="leaptriggers">
-		<leap:leaptriggers username="${sf.dev.username}" password="${sf.dev.password}" token="${sf.dev.token}" serverurl="${sf.dev.url}" />
+		<leap:leaptriggers username="${sf.dev.username}" password="${sf.dev.password}" token="${sf.dev.token}" serverurl="${sf.dev.url}" objects="Lead,Contact,Account,Opportunity,Order__c" />
 	</target>
 
 	<target name="leapwrappers">
-		<leap:leapwrappers username="${sf.dev.username}" password="${sf.dev.password}" token="${sf.dev.token}" serverurl="${sf.dev.url}" />
+		<leap:leapwrappers username="${sf.dev.username}" password="${sf.dev.password}" token="${sf.dev.token}" serverurl="${sf.dev.url}" objects="Lead,Contact,Account,Opportunity,Order__c" />
 	</target>
 
 	<target name="leapmetadiff">

diff --git a/src/main/java/org/leap/SFieldsTask.java b/src/main/java/org/leap/SFieldsTask.java
@@ -93,7 +93,9 @@ private String getSFieldEntries(){
 		String output = "";
 		Integer counter = 0;		
 		for (int i = 0; i < this.sObjects().length; i++) {
-			//if(this.customOnly && this.sObjects()[i].isCustom()){ continue;}
+			if(!this.objects.equals("all") && !this.objectList().contains(sObjects()[i].getName())){
+				continue;
+			}
 			if(this.limit != -1 && counter++ > this.limit){ break;}
 
 			String object_name = "ALL_" + this.getFormattedObjectName(this.sObjects()[i]) + "_FIELDS";

diff --git a/src/main/java/org/leap/TriggerTask.java b/src/main/java/org/leap/TriggerTask.java
@@ -16,10 +16,14 @@ public class TriggerTask extends LeapTask {
 	List<String> generatedFiles = new ArrayList<String>();
 
 	public void execute() {
+		System.out.println("Objects: " + this.objects);
 		for (int i = 0; i < this.sObjects().length; i++) {
 			if( !sObjects()[i].getTriggerable() || this.objectIsIgnored(sObjects()[i].getName()) ){
 				continue;
 			}
+			if(!this.objects.equals("all") && !this.objectList().contains(sObjects()[i].getName())){
+				continue;
+			}
 
 			try {
 				this.generateTriggerFile(this.sObjects()[i]);

diff --git a/src/main/java/org/leap/WrapperTask.java b/src/main/java/org/leap/WrapperTask.java
@@ -32,7 +32,9 @@ public void execute() {
 			if( objectIsIgnored(sObjects()[i].getName()) ){
 				continue;
 			}
-
+			if(!this.objects.equals("all") && !this.objectList().contains(sObjects()[i].getName())){
+				continue;
+			}
 			try {
 				this.generateWrapperClass(this.sObjects()[i]);				
 				this.generateTestFile(sObjects()[i]);