Merge pull request #3 from rundeck-plugins/issue/2

fixing issue with multiples matchers

Author: ltamaster

.gitignore

@@ -3,3 +3,5 @@
 *.iws
 *.iml
 /build
+.idea
+out

.travis.yml

@@ -1,6 +1,6 @@
 language: java
 jdk:
-- oraclejdk8
+- openjdk8
 before_cache:
 - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
 cache:

build.gradle

@@ -17,7 +17,7 @@ scmVersion {
         prefix = 'v'
         versionSeparator = ''
     }
-    ignoreUncommittedChanges = false
+    ignoreUncommittedChanges = true
 }
 
 allprojects {

src/main/java/org/rundeck/plugins/nodes/attributes/AttributeNodeEnhancer.java

@@ -1,14 +1,9 @@
 package org.rundeck.plugins.nodes.attributes;
 
-
-import com.dtolabs.rundeck.core.common.INodeEntry;
 import com.dtolabs.rundeck.core.plugins.Plugin;
-import com.dtolabs.rundeck.core.plugins.configuration.DynamicProperties;
-import com.dtolabs.rundeck.core.plugins.configuration.StringRenderingConstants;
 import com.dtolabs.rundeck.plugins.descriptions.*;
 import com.dtolabs.rundeck.plugins.nodes.IModifiableNodeEntry;
 import com.dtolabs.rundeck.plugins.nodes.NodeEnhancerPlugin;
-import org.rundeck.app.spi.Services;
 
 import java.io.IOException;
 import java.io.StringReader;
@@ -109,8 +104,9 @@ private void addAll(final Map<String, String> attributes) {
     }
 
     private boolean matchesAll(final Map<String, String> attributes) {
+        boolean regexMatch = true;
         Map<String, Predicate<String>> comparisons = new HashMap<>();
-        for (final String s : match.split("\r\n")) {
+        for (final String s : match.split("\r?\n")) {
             Matcher matcher = ComparisonPattern.matcher(s);
             if (matcher.matches()) {
                 String key = matcher.group("key");
@@ -120,9 +116,13 @@ private boolean matchesAll(final Map<String, String> attributes) {
                 comparisons.compute(key, (s1, stringPredicate) ->
                         stringPredicate != null ? stringPredicate.and(newOp) : newOp
                 );
-
+            }else{
+                regexMatch = false;
             }
         }
+        if(!regexMatch){
+            return false;
+        }
         for (String s : comparisons.keySet()) {
             if (!comparisons.get(s).test(attributes.get(s))) {
                 return false;

src/test/groovy/org/rundeck/plugins/nodes/attributes/AttributeNodeEnhancerSpec.groovy

@@ -0,0 +1,107 @@
+package org.rundeck.plugins.nodes.attributes
+
+import com.dtolabs.rundeck.core.common.NodeEntryImpl
+import com.dtolabs.rundeck.plugins.nodes.IModifiableNodeEntry
+import spock.lang.Specification
+
+class AttributeNodeEnhancerSpec extends Specification{
+
+    def "test bad regex match"(){
+
+        given:
+        def plugin = new AttributeNodeEnhancer()
+        plugin.match = "attb1=value1"
+        plugin.add = "attb2=value2"
+
+
+        def node = new ModifiableNodeEntry("test1")
+        node.attributes = [attb1:"value1"]
+
+        def project = "TestProject"
+        when:
+
+        plugin.updateNode(project, node)
+
+        then:
+        node.attributes.attb2 == null
+
+    }
+
+    def "test regex match"(){
+
+        given:
+        def plugin = new AttributeNodeEnhancer()
+        plugin.match = "attb1==value1"
+        plugin.add = "attb2=value2"
+
+
+        def node = new ModifiableNodeEntry("test1")
+        node.attributes = [attb1:"value1"]
+
+        def project = "TestProject"
+        when:
+
+        plugin.updateNode(project, node)
+
+        then:
+        node.attributes.attb2 == "value2"
+
+    }
+
+    def "test multiples regex match"(){
+
+        given:
+        def plugin = new AttributeNodeEnhancer()
+        plugin.match = match
+        plugin.add = "result=valueResult"
+
+
+        def node = new ModifiableNodeEntry("test1")
+        node.attributes = [attb1:"value1",attb2:"value2"]
+
+        def project = "TestProject"
+        when:
+
+        plugin.updateNode(project, node)
+
+        then:
+        node.attributes.result == result
+
+        where:
+        match                                   | result
+        "attb1==value1\nattb2==value2"          | "valueResult"
+        "attb1==value1\r\nattb2==value2"        | "valueResult"
+        "attb1=value1\r\nattb2==value2"         | null
+        "attb1==value1\nattb2=value2"           | null
+    }
+
+
+    class ModifiableNodeEntry extends NodeEntryImpl implements IModifiableNodeEntry{
+
+        ModifiableNodeEntry(final String nodename) {
+            super(nodename)
+        }
+
+
+        @Override
+        void addAttribute(final String name, final String value) {
+            attributes.put(name, value)
+        }
+
+        @Override
+        void removeAttribute(final String name) {
+            attributes.remove(name)
+        }
+
+        @Override
+        void addTag(final String tag) {
+            tags.add(tag)
+        }
+
+        @Override
+        void removeTag(String tag) {
+            tags.remove(tag)
+        }
+    }
+
+}