fixed issue for tracking fields and added logs

fundacionjala · May 13, 2015 · 5b04801 · 5b04801
1 parent f517530
commit 5b04801
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -63,7 +63,7 @@ dependencies {
 }
 
 group = 'org.fundacionjala.gradle.plugins.enforce'
-version = '1.0.0'
+version = '1.3.7'
 
 
 uploadArchives {

diff --git a/...in/groovy/org/fundacionjala/gradle/plugins/enforce/tasks/salesforce/SalesforceTask.groovy b/...in/groovy/org/fundacionjala/gradle/plugins/enforce/tasks/salesforce/SalesforceTask.groovy
@@ -91,6 +91,7 @@ abstract class SalesforceTask extends ForceTask {
         println("\tLogin type: ${credential.loginFormat}")
         println("___________________________________________  ")
         println AnsiColor.ANSI_RESET.value()
+        logger.debug('after show credentials')
     }
 
     /**
@@ -150,7 +151,9 @@ abstract class SalesforceTask extends ForceTask {
         poll = project.enforce.poll
         waitTime = project.enforce.waitTime
         loadCredential()
+        logger.debug('Finished load credential')
         fileManager.createDirectory(buildFolderPath)
+        logger.debug('Created directory at: ' + buildFolderPath)
         runTask()
     }
 

diff --git a/...groovy/org/fundacionjala/gradle/plugins/enforce/tasks/salesforce/deployment/Deploy.groovy b/...groovy/org/fundacionjala/gradle/plugins/enforce/tasks/salesforce/deployment/Deploy.groovy
@@ -57,6 +57,7 @@ class Deploy extends Deployment {
         folderDeploy = Paths.get(buildFolderPath, FOLDER_DEPLOY).toString()
         packagePathDeploy = Paths.get(folderDeploy, PACKAGE_NAME).toString()
         createDeploymentDirectory(folderDeploy)
+        logger.debug('Created folder  Deploy at: ' + folderDeploy)
         if (Util.isValidProperty(project, FOLDERS_DEPLOY)) {
             deployByFolder()
         } else {
@@ -97,21 +98,26 @@ class Deploy extends Deployment {
     def deployTruncateFiles() {
         checkStatusTruncate()
         displayFolderNoDeploy()
+        logger.debug('Displayed message')
         if (codeTruncateOn) {
             ArrayList<File> filesToTruncate = excludeFiles(fileManager.getFilesByFolders(projectPath, FOLDERS_TO_TRUNCATE))
             Files.copy(Paths.get(projectPath, PACKAGE_NAME), Paths.get(packagePathDeploy), StandardCopyOption.REPLACE_EXISTING)
             fileManager.copy(filesToTruncate, folderDeploy)
+            logger.debug('All files copied to deploy...')
             writePackage(packagePathDeploy, filesToTruncate)
+            logger.debug('Created package...')
             truncateComponents()
             componentDeploy.startMessage = DEPLOYING_TRUNCATED_CODE
             componentDeploy.successMessage = DEPLOYING_TRUNCATED_CODE_SUCCESSFULLY
             executeDeploy(folderDeploy)
             createDeploymentDirectory(folderDeploy)
+            logger.debug('Truncated components...')
         }
         fileManager.copy(excludeFiles(fileManager.getValidElements(projectPath)), folderDeploy)
         componentDeploy.startMessage = DEPLOYING_CODE
         componentDeploy.successMessage = DEPLOYING_CODE_SUCCESSFULLY
         deployToSalesForce()
+        logger.debug('Deployed components...')
     }
 
     /**

diff --git a/...roovy/org/fundacionjala/gradle/plugins/enforce/utils/salesforce/MetadataComponents.groovy b/...roovy/org/fundacionjala/gradle/plugins/enforce/utils/salesforce/MetadataComponents.groovy
@@ -69,6 +69,11 @@ public enum MetadataComponents {
     COMPACTLAYOUTS("CompactLayout", "sbc", "compactLayouts"),
     RECORDTYPES("RecordType", "sbc", "recordTypes"),
     VALIDATIONRULES("ValidationRule", "sbc", "validationRules"),
+    BUSINESSPROCESSES("BusinessProcess", "sbc", "businessProcesses"),
+    FIELDSETS("FieldSet", "sbc", "fieldSets"),
+    LISTVIEWS("ListView", "sbc", "listViews"),
+    SHARINGREASON("SharingReason", "sbc", "SharingReason"),
+    OBJECTWEBLINKS("Weblink", "sbc", "webLinks"),
     CUSTOMPERMISSIONS("CustomPermission", "customPermission", "customPermissions")
 
     public final static Map<String, MetadataComponents> COMPONENT;

diff --git a/...groovy/org/fundacionjala/gradle/plugins/enforce/interceptor/commands/ComponentTest.groovy b/...groovy/org/fundacionjala/gradle/plugins/enforce/interceptor/commands/ComponentTest.groovy
@@ -55,7 +55,7 @@ class ComponentTest extends Specification {
         when:
         componentContent.execute(file)
         then:
-        file.text == expectedContent
+        file.text.replaceAll("\\s*","") == expectedContent.replaceAll("\\s*","")
     }
     def cleanupSpec() {
         new File(TRUNCATED_PATH).deleteDir()

diff --git a/...ce/unittest/report/htmlManagerTest.groovy → ...ce/unittest/report/HtmlManagerTest.groovy b/...ce/unittest/report/htmlManagerTest.groovy → ...ce/unittest/report/HtmlManagerTest.groovy
diff --git a/...y/org/fundacionjala/gradle/plugins/enforce/utils/salesforce/MetadataComponentsTest.groovy b/...y/org/fundacionjala/gradle/plugins/enforce/utils/salesforce/MetadataComponentsTest.groovy
@@ -64,7 +64,9 @@ class MetadataComponentsTest extends Specification {
     def "Test enum name is equals to directory name"() {
         expect:
         MetadataComponents.COMPONENT.each {key, value->
-            assert key == value.directory.toUpperCase()
+            if(value.extension != 'sbc') {
+                assert key == value.directory.toUpperCase()
+            }
         }
     }